From c95e8dfe17f9ebf48ece6450c7bab40d7546ee0d Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 25 Jun 2019 11:06:06 +0200
Subject: Frontend initial draft

New frontend initial draft in React with docker image in nginx

Issue-ID: CLAMP-413
Change-Id: Ie5826d79aa3db23f863e8fd217189ba41534abe9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/images/logo_onap_2017.png | Bin 0 -> 21360 bytes
 ui-react/src/index.css                 |  50 +++++++++++++++++++++++++++++++++
 ui-react/src/index.js                  |  46 ++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 ui-react/src/images/logo_onap_2017.png
 create mode 100644 ui-react/src/index.css
 create mode 100644 ui-react/src/index.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/images/logo_onap_2017.png b/ui-react/src/images/logo_onap_2017.png
new file mode 100644
index 000000000..c6f6857a5
Binary files /dev/null and b/ui-react/src/images/logo_onap_2017.png differ
diff --git a/ui-react/src/index.css b/ui-react/src/index.css
new file mode 100644
index 000000000..86e0f9e4b
--- /dev/null
+++ b/ui-react/src/index.css
@@ -0,0 +1,50 @@
+.nav {
+	margin-left: 2px; 
+	margin-right: 2px;
+}
+.navbar-brand {
+  float: left;
+  height: 50px;
+  padding: 15px 15px;
+  font-size: 18px;
+  line-height: 20px;
+}
+.rowC {
+	display: flex;
+	flex-direction:row;
+}
+.logo {
+	font-family: 'Trebuchet MS', cursive;
+	font-size: 20px;
+	font-weight: 500;
+	text-align: center;
+}
+.image_style {
+	display: inline-block; 
+	float: left;
+}
+.dummy {
+	float: right; 
+	padding-right: 50px;
+}
+.user_name {
+	display: block;
+	float: left;
+	font-family: 'Trebuchet MS', cursive;
+	font-size: 15px;
+	font-weight: 500;
+	height: 50px;
+	text-align: right;
+}
+
+.ClampHeader {
+	margin-left: 2px; 
+	margin-right: 2px;
+}
+
+.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+    float: left;
+  }
+  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+    float: left;
+  }
\ No newline at end of file
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
new file mode 100644
index 000000000..fed8c0f41
--- /dev/null
+++ b/ui-react/src/index.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+
+class UserBar extends React.Component {
+	render () {
+		const user = this.props.user;
+		return (
+			<div className="user_name">Hello:{user}
+			</div>
+		);
+	}
+}
+
+class ClampLogo extends React.Component {
+	render() {
+		return (
+			<div className="col-md-4 col-lg-4">
+				<img className="image_style" alt="" src={require('./images/logo_onap_2017.png')} 
+				height="50px"
+				width="234px"/>
+				<div className="navbar-brand logo">
+					&nbsp;&nbsp;
+					<b>CLAMP</b>
+				</div>
+			</div>
+		);
+	}
+}
+
+class ClampHeader extends React.Component {
+	render() {
+		return (
+			<div className='rowC'>
+			<ClampLogo />
+			<div className="dummy"></div>
+			<UserBar />
+			</div>
+		);
+	}
+}
+
+ReactDOM.render(
+	<ClampHeader />,
+	document.getElementById('root')
+)
-- 
cgit 1.2.3-korg


From 065c6a97d802c94e7b7b3b22cc82dd64667db729 Mon Sep 17 00:00:00 2001
From: xg353y <xg353y@intl.att.com>
Date: Tue, 25 Jun 2019 12:23:28 +0200
Subject: Restructure the clamp ui header

Restructure the clamp ui header

Issue-ID: CLAMP-414
Change-Id: I96553a60665553d4de8a8a60cb0e5d53ff949c62
Signed-off-by: xg353y <xg353y@intl.att.com>
---
 ui-react/public/index.html  | 23 ++++++++++++++++-
 ui-react/src/ClampHeader.js | 42 ++++++++++++++++++++++++++++++
 ui-react/src/ClampLogo.js   | 43 +++++++++++++++++++++++++++++++
 ui-react/src/MenuBar.js     | 55 ++++++++++++++++++++++++++++++++++++++++
 ui-react/src/UserBar.js     | 36 ++++++++++++++++++++++++++
 ui-react/src/index.js       | 62 +++++++++++++++++----------------------------
 6 files changed, 221 insertions(+), 40 deletions(-)
 create mode 100644 ui-react/src/ClampHeader.js
 create mode 100644 ui-react/src/ClampLogo.js
 create mode 100644 ui-react/src/MenuBar.js
 create mode 100644 ui-react/src/UserBar.js

(limited to 'ui-react/src')

diff --git a/ui-react/public/index.html b/ui-react/public/index.html
index 85267426d..f255b75fb 100644
--- a/ui-react/public/index.html
+++ b/ui-react/public/index.html
@@ -1,4 +1,25 @@
-
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/ui-react/src/ClampHeader.js b/ui-react/src/ClampHeader.js
new file mode 100644
index 000000000..79a24cdff
--- /dev/null
+++ b/ui-react/src/ClampHeader.js
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+
+import React from 'react';
+import ClampLogo from './ClampLogo';
+import UserBar from './UserBar';
+import MenuBar from './MenuBar';
+import './index.css';
+
+class ClampHeader extends React.Component {
+	render() {
+		return (
+			<div >
+
+<MenuBar />
+			<UserBar />
+			</div>
+		);
+	}
+}
+
+export default ClampHeader;
diff --git a/ui-react/src/ClampLogo.js b/ui-react/src/ClampLogo.js
new file mode 100644
index 000000000..bbde81e71
--- /dev/null
+++ b/ui-react/src/ClampLogo.js
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+
+import React from 'react';
+import './index.css';
+
+class ClampLogo extends React.Component {
+	render() {
+		return (
+			<div className="col-md-4 col-lg-4">
+				<img className="image_style" alt="" src={require('./images/logo_onap_2017.png')}
+				height="50px"
+				width="234px"/>
+				<div className="navbar-brand logo">
+					&nbsp;&nbsp;
+					<b>CLAMP</b>
+				</div>
+			</div>
+		);
+	}
+}
+
+export default ClampLogo;
diff --git a/ui-react/src/MenuBar.js b/ui-react/src/MenuBar.js
new file mode 100644
index 000000000..2078c962b
--- /dev/null
+++ b/ui-react/src/MenuBar.js
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+import React from 'react';
+import Navbar from 'react-bootstrap/Navbar';
+import Nav from 'react-bootstrap/Nav';
+import NavItem from 'react-bootstrap/NavItem';
+import NavDropdown from 'react-bootstrap/NavDropdown';
+
+
+class MenuBar extends React.Component {
+	render () {
+	   return (
+<div>
+<Navbar bg="light" expand="lg">
+  <Navbar.Brand href="#home">React-Bootstrap</Navbar.Brand>
+  <Navbar.Toggle aria-controls="basic-navbar-nav" />
+  <Navbar.Collapse id="basic-navbar-nav">
+    <Nav className="mr-auto">
+      <NavDropdown title="Dropdown" id="basic-nav-dropdown">
+        <NavDropdown.Item href="#action/3.1">Action</NavDropdown.Item>
+        <NavDropdown.Item href="#action/3.2">Another action</NavDropdown.Item>
+        <NavDropdown.Item href="#action/3.3">Something</NavDropdown.Item>
+      </NavDropdown>
+    </Nav>
+  </Navbar.Collapse>
+</Navbar>
+
+  		</div>
+
+
+    );
+  }
+}
+
+export default MenuBar;
diff --git a/ui-react/src/UserBar.js b/ui-react/src/UserBar.js
new file mode 100644
index 000000000..d5f2554bc
--- /dev/null
+++ b/ui-react/src/UserBar.js
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+import React from 'react';
+import './index.css';
+
+class UserBar extends React.Component {
+	render () {
+		const user = this.props.user;
+		return (
+			<div className="user_name">Hello:{user}
+			</div>
+		);
+	}
+}
+
+export default UserBar;
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index fed8c0f41..53d369888 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -1,44 +1,28 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import './index.css';
-
-class UserBar extends React.Component {
-	render () {
-		const user = this.props.user;
-		return (
-			<div className="user_name">Hello:{user}
-			</div>
-		);
-	}
-}
-
-class ClampLogo extends React.Component {
-	render() {
-		return (
-			<div className="col-md-4 col-lg-4">
-				<img className="image_style" alt="" src={require('./images/logo_onap_2017.png')} 
-				height="50px"
-				width="234px"/>
-				<div className="navbar-brand logo">
-					&nbsp;&nbsp;
-					<b>CLAMP</b>
-				</div>
-			</div>
-		);
-	}
-}
-
-class ClampHeader extends React.Component {
-	render() {
-		return (
-			<div className='rowC'>
-			<ClampLogo />
-			<div className="dummy"></div>
-			<UserBar />
-			</div>
-		);
-	}
-}
+import ClampHeader from './ClampHeader'; 
 
 ReactDOM.render(
 	<ClampHeader />,
-- 
cgit 1.2.3-korg


From 19e628ca032e6f0f9b00b7041a4c32390b5839e1 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Thu, 27 Jun 2019 17:41:01 +0200
Subject: Create the sub components for new Clamp UI

Create the sub components for the new React Clamp UI

Issue-ID: CLAMP-414
Change-Id: I3e9e6bf05559829d22936e06556fef60635a33d0
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/package.json                |  5 +-
 ui-react/public/index.html           | 20 ++++----
 ui-react/src/Clamp.js                | 40 ++++++++++++++++
 ui-react/src/ClampHeader.js          | 33 ++++++++------
 ui-react/src/ClampLogo.js            | 37 ++++++++-------
 ui-react/src/ClampLogoImg.js         | 40 ++++++++++++++++
 ui-react/src/ClosedLoopLogs.js       | 57 +++++++++++++++++++++++
 ui-react/src/ClosedLoopSVG.js        | 35 ++++++++++++++
 ui-react/src/ClosedLoopStatus.js     | 56 +++++++++++++++++++++++
 ui-react/src/ClosedLoopView.js       | 41 +++++++++++++++++
 ui-react/src/ClosedLoopViewBody.js   | 70 ++++++++++++++++++++++++++++
 ui-react/src/ClosedLoopViewHeader.js | 43 ++++++++++++++++++
 ui-react/src/MenuBar.js              | 59 +++++++++++++-----------
 ui-react/src/UserBar.js              | 30 +++++++-----
 ui-react/src/css/index.css           | 88 ++++++++++++++++++++++++++++++++++++
 ui-react/src/index.css               | 50 --------------------
 ui-react/src/index.js                | 22 ++++-----
 17 files changed, 579 insertions(+), 147 deletions(-)
 create mode 100644 ui-react/src/Clamp.js
 create mode 100644 ui-react/src/ClampLogoImg.js
 create mode 100644 ui-react/src/ClosedLoopLogs.js
 create mode 100644 ui-react/src/ClosedLoopSVG.js
 create mode 100644 ui-react/src/ClosedLoopStatus.js
 create mode 100644 ui-react/src/ClosedLoopView.js
 create mode 100644 ui-react/src/ClosedLoopViewBody.js
 create mode 100644 ui-react/src/ClosedLoopViewHeader.js
 create mode 100644 ui-react/src/css/index.css
 delete mode 100644 ui-react/src/index.css

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 166423854..943ed7ad1 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -16,11 +16,8 @@
     "react": "~16.8.0",
     "react-dom": "~16.8.0",
     "react-scripts": "~3.0.1",
-    "onap-ui-react": "0.1.1",
     "react-bootstrap": "1.0.0-beta.9",
-    "babel-loader": "8.0.5",
-    "webpack": "4.29.6",
-    "browserslist": "4.6.3"
+    "bootstrap-css-only": "4.3.1"
   },
   "browserslist": [
     ">0.2%",
diff --git a/ui-react/public/index.html b/ui-react/public/index.html
index 4a10babe9..2b740fea8 100644
--- a/ui-react/public/index.html
+++ b/ui-react/public/index.html
@@ -5,22 +5,22 @@
   Copyright (C) 2019 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License"); 
-  you may not use this file except in compliance with the License. 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software 
-  distributed under the License is distributed on an "AS IS" BASIS, 
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-  See the License for the specific language governing permissions and 
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END============================================
   ===================================================================
-  
+
   -->
-  
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/ui-react/src/Clamp.js b/ui-react/src/Clamp.js
new file mode 100644
index 000000000..38634b3a4
--- /dev/null
+++ b/ui-react/src/Clamp.js
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react';
+import ClampHeader from './ClampHeader';
+import ClosedLoopView from './ClosedLoopView';
+
+
+class Clamp extends React.Component {
+	render() {
+		return (
+			<div>
+				<ClampHeader />
+				<ClosedLoopView />
+			</div>
+		);
+	}
+}
+
+export default Clamp;
diff --git a/ui-react/src/ClampHeader.js b/ui-react/src/ClampHeader.js
index 79a24cdff..9460023f6 100644
--- a/ui-react/src/ClampHeader.js
+++ b/ui-react/src/ClampHeader.js
@@ -5,36 +5,39 @@
  * Copyright (C) 2019 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 
 import React from 'react';
+import ClampLogoImg from './ClampLogoImg';
 import ClampLogo from './ClampLogo';
 import UserBar from './UserBar';
 import MenuBar from './MenuBar';
-import './index.css';
+import Navbar from 'react-bootstrap/Navbar';
+import 'bootstrap-css-only/css/bootstrap.min.css';
 
 class ClampHeader extends React.Component {
 	render() {
 		return (
-			<div >
-
-<MenuBar />
-			<UserBar />
-			</div>
+			<Navbar bg="light" expand="lg">
+				<ClampLogoImg />
+				<ClampLogo />
+				<MenuBar />
+				<UserBar />
+			</Navbar>
 		);
 	}
 }
diff --git a/ui-react/src/ClampLogo.js b/ui-react/src/ClampLogo.js
index bbde81e71..ffceee1df 100644
--- a/ui-react/src/ClampLogo.js
+++ b/ui-react/src/ClampLogo.js
@@ -5,37 +5,36 @@
  * Copyright (C) 2019 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 
 import React from 'react';
-import './index.css';
+import Navbar from 'react-bootstrap/Navbar';
+import Nav from 'react-bootstrap/Nav';
+import './css/index.css';
+import 'bootstrap-css-only/css/bootstrap.min.css';
 
 class ClampLogo extends React.Component {
 	render() {
 		return (
-			<div className="col-md-4 col-lg-4">
-				<img className="image_style" alt="" src={require('./images/logo_onap_2017.png')}
-				height="50px"
-				width="234px"/>
-				<div className="navbar-brand logo">
-					&nbsp;&nbsp;
-					<b>CLAMP</b>
-				</div>
-			</div>
+			<Nav className="justify-content-left logo_text">
+				<Navbar.Text>
+					Clamp
+				</Navbar.Text>
+			</Nav>
 		);
 	}
 }
diff --git a/ui-react/src/ClampLogoImg.js b/ui-react/src/ClampLogoImg.js
new file mode 100644
index 000000000..8b34dad9c
--- /dev/null
+++ b/ui-react/src/ClampLogoImg.js
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react';
+import Navbar from 'react-bootstrap/Navbar';
+import 'bootstrap-css-only/css/bootstrap.min.css';
+
+class ClampLogoImg extends React.Component {
+	render() {
+		return (
+			<Navbar.Brand>
+			  <img alt="" src={require('./images/logo_onap_2017.png')}
+				  height="50px" width="234px"
+				  className="d-inline-block align-top"/>
+		  </Navbar.Brand>
+		);
+	}
+}
+
+export default ClampLogoImg;
diff --git a/ui-react/src/ClosedLoopLogs.js b/ui-react/src/ClosedLoopLogs.js
new file mode 100644
index 000000000..65e057cce
--- /dev/null
+++ b/ui-react/src/ClosedLoopLogs.js
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import Table from 'react-bootstrap/Table';
+import './css/index.css';
+
+class ClosedLoopViewLogs extends React.Component {
+  render() {
+    return (
+      <div className="log_div">
+        <div className="log_table">
+          <label className="table_header">Loop Logs</label>
+          <Table striped hover id="loop-log-div">
+            <thead>
+  							<tr>
+  								<th><span align="left" className="text">Date</span></th>
+  								<th><span align="left" className="text">Type</span></th>
+  								<th><span align="left" className="text">Component</span></th>
+  								<th><span align="right" className="text">Log</span></th>
+  							</tr>
+  						</thead>
+  						<tbody>
+  							<tr>
+  								<td className="row_10_per">test</td>
+  								<td className="row_10_per">test</td>
+  								<td className="row_10_per">test</td>
+  								<td className="row_70_per">test</td>
+  							</tr>
+  						</tbody>
+            </Table>
+          </div>
+        </div>
+    );
+  }
+}
+
+export default ClosedLoopViewLogs;
diff --git a/ui-react/src/ClosedLoopSVG.js b/ui-react/src/ClosedLoopSVG.js
new file mode 100644
index 000000000..ffba83093
--- /dev/null
+++ b/ui-react/src/ClosedLoopSVG.js
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import './css/index.css';
+
+class ClosedLoopViewSVG extends React.Component {
+  render() {
+    return (
+        <div id="loop_content">
+        </div>
+    );
+  }
+}
+
+export default ClosedLoopViewSVG;
diff --git a/ui-react/src/ClosedLoopStatus.js b/ui-react/src/ClosedLoopStatus.js
new file mode 100644
index 000000000..5f4274649
--- /dev/null
+++ b/ui-react/src/ClosedLoopStatus.js
@@ -0,0 +1,56 @@
+/*-
+* ============LICENSE_START=======================================================
+* ONAP CLAMP
+* ================================================================================
+* Copyright (C) 2019 AT&T Intellectual Property. All rights
+*                             reserved.
+* ================================================================================
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ============LICENSE_END============================================
+* ===================================================================
+*
+*/
+import React from 'react';
+import Table from 'react-bootstrap/Table';
+import './css/index.css';
+
+class ClosedLoopStatus extends React.Component {
+  render() {
+  	return (
+      <div>
+        <span id="status_clds" className="status_title">Status:
+          <span className="status">&nbsp;&nbsp;&nbsp;TestStatus&nbsp;&nbsp;&nbsp;</span>
+        </span>
+
+        <div className="status_table">
+          <Table striped hover>
+            <thead>
+                <tr>
+                  <th><span align="left" className="text">ComponentState</span></th>
+                  <th><span align="left" className="text">Description</span></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td className="row_30_per">long test State</td>
+                  <td className="row_70_per">test description very very very long description</td>
+                </tr>
+              </tbody>
+            </Table>
+          </div>
+      </div>
+  	);
+  }
+}
+
+export default ClosedLoopStatus;
diff --git a/ui-react/src/ClosedLoopView.js b/ui-react/src/ClosedLoopView.js
new file mode 100644
index 000000000..daa366062
--- /dev/null
+++ b/ui-react/src/ClosedLoopView.js
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import ClosedLoopViewHeader from './ClosedLoopViewHeader';
+import ClosedLoopViewBody from './ClosedLoopViewBody';
+import './css/index.css';
+
+ class ClosedLoopView extends React.Component {
+ 	render() {
+ 		return (
+      <div className="container-fluid cldsmodelling">
+      		<div className="cl_panel">
+            <ClosedLoopViewHeader />
+            <ClosedLoopViewBody />
+          </div>
+      </div>
+ 		);
+ 	}
+ }
+
+ export default ClosedLoopView;
diff --git a/ui-react/src/ClosedLoopViewBody.js b/ui-react/src/ClosedLoopViewBody.js
new file mode 100644
index 000000000..bfa05f8b9
--- /dev/null
+++ b/ui-react/src/ClosedLoopViewBody.js
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import ClosedLoopSVG from './ClosedLoopSVG';
+import ClosedLoopLogs from './ClosedLoopLogs';
+import ClosedLoopStatus from './ClosedLoopStatus';
+import './css/index.css';
+
+ class ClosedLoopViewBody extends React.Component {
+
+   constructor(props) {
+      super(props);
+      this.state = {
+         disableDiv: false
+      };
+      this.disableDiv = this.disableDiv.bind(this);
+      this.enableDiv = this.enableDiv.bind(this);
+    }
+
+    disableDiv() {
+      this.setState({
+         disableDiv:true
+      });
+    }
+
+    enableDiv() {
+      this.setState({
+         disableDiv:false
+      });
+    }
+
+
+   render() {
+     var divStyle = {
+      display:this.state.disableDiv?'block':'none'
+    };
+   	return (
+        <div id="paletteDiv" className="cl_view_body" style={divStyle}>
+          <div id="js-canvas" className="js_canvas">
+            <ClosedLoopSVG />
+            <ClosedLoopLogs />
+          </div>
+          <ClosedLoopStatus />
+        </div>
+   	);
+   }
+ }
+
+
+ export default ClosedLoopViewBody;
diff --git a/ui-react/src/ClosedLoopViewHeader.js b/ui-react/src/ClosedLoopViewHeader.js
new file mode 100644
index 000000000..8f2d845f1
--- /dev/null
+++ b/ui-react/src/ClosedLoopViewHeader.js
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react';
+import './css/index.css';
+
+class ClosedLoopViewHeader extends React.Component {
+  render() {
+  	return (
+      <div className="cl_panel_heading clearfix">
+        <div className="color_white">
+          <span className="pull-left"> <span id="modeler_name">Closed
+              Loop Modeler</span>
+          </span> <span className="pull-right"> <span id="loop_name">No
+              LOOP loaded yet</span> &nbsp; <i ></i>
+          </span>
+        </div>
+      </div>
+  	);
+  }
+}
+
+export default ClosedLoopViewHeader;
diff --git a/ui-react/src/MenuBar.js b/ui-react/src/MenuBar.js
index 2078c962b..ce962f338 100644
--- a/ui-react/src/MenuBar.js
+++ b/ui-react/src/MenuBar.js
@@ -5,51 +5,58 @@
  * Copyright (C) 2019 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 import React from 'react';
 import Navbar from 'react-bootstrap/Navbar';
-import Nav from 'react-bootstrap/Nav';
-import NavItem from 'react-bootstrap/NavItem';
 import NavDropdown from 'react-bootstrap/NavDropdown';
-
+import 'bootstrap-css-only/css/bootstrap.min.css';
 
 class MenuBar extends React.Component {
 	render () {
 	   return (
-<div>
-<Navbar bg="light" expand="lg">
-  <Navbar.Brand href="#home">React-Bootstrap</Navbar.Brand>
-  <Navbar.Toggle aria-controls="basic-navbar-nav" />
-  <Navbar.Collapse id="basic-navbar-nav">
-    <Nav className="mr-auto">
-      <NavDropdown title="Dropdown" id="basic-nav-dropdown">
-        <NavDropdown.Item href="#action/3.1">Action</NavDropdown.Item>
-        <NavDropdown.Item href="#action/3.2">Another action</NavDropdown.Item>
-        <NavDropdown.Item href="#action/3.3">Something</NavDropdown.Item>
+  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
+      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
+        <NavDropdown.Item href="#action/3.1">Open CL</NavDropdown.Item>
+        <NavDropdown.Item href="#action/3.2">Properties CL</NavDropdown.Item>
+        <NavDropdown.Item href="#action/3.3">Close Model</NavDropdown.Item>
       </NavDropdown>
-    </Nav>
+			<NavDropdown title="Manage" id="basic-nav-dropdown">
+				<NavDropdown.Item href="#action/3.1">Submit</NavDropdown.Item>
+				<NavDropdown.Item href="#action/3.2">Stop</NavDropdown.Item>
+				<NavDropdown.Item href="#action/3.3">Restart</NavDropdown.Item>
+				<NavDropdown.Item href="#action/3.3">Delete</NavDropdown.Item>
+				<NavDropdown.Item href="#action/3.3">Deploy</NavDropdown.Item>
+				<NavDropdown.Item href="#action/3.3">UnDeploy</NavDropdown.Item>
+			</NavDropdown>
+			<NavDropdown title="View" id="basic-nav-dropdown">
+				<NavDropdown.Item href="#action/3.1">Refresh Status</NavDropdown.Item>
+			</NavDropdown>
+		<NavDropdown title="Help" id="basic-nav-dropdown">
+			<NavDropdown.Item href="#action/3.1">Wiki</NavDropdown.Item>
+			<NavDropdown.Item href="#action/3.2">Contact Us</NavDropdown.Item>
+			<NavDropdown.Item href="#action/3.3">User Info</NavDropdown.Item>
+		</NavDropdown>
   </Navbar.Collapse>
-</Navbar>
-
-  		</div>
 
 
     );
   }
 }
 
+
+
 export default MenuBar;
diff --git a/ui-react/src/UserBar.js b/ui-react/src/UserBar.js
index d5f2554bc..d4b3ede74 100644
--- a/ui-react/src/UserBar.js
+++ b/ui-react/src/UserBar.js
@@ -5,30 +5,36 @@
  * Copyright (C) 2019 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 import React from 'react';
-import './index.css';
+import Navbar from 'react-bootstrap/Navbar';
+import 'bootstrap-css-only/css/bootstrap.min.css';
 
 class UserBar extends React.Component {
 	render () {
 		const user = this.props.user;
 		return (
-			<div className="user_name">Hello:{user}
-			</div>
+
+ <Navbar.Collapse className="justify-content-end">
+	<Navbar.Text>
+		Hello: <a>{user}</a>
+	</Navbar.Text>
+</Navbar.Collapse>
+
 		);
 	}
 }
diff --git a/ui-react/src/css/index.css b/ui-react/src/css/index.css
new file mode 100644
index 000000000..5a06c3b2b
--- /dev/null
+++ b/ui-react/src/css/index.css
@@ -0,0 +1,88 @@
+.cldsmodelling {
+	height: 90vh;
+	overflow: hidden;
+	margin-left: 1px;
+	margin-right: 1px;
+}
+.cl_panel {
+	margin-bottom: 20px;
+	background-color: #fff;
+	border: 1px solid transparent;
+	border-radius: 4px;
+	box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+	width:100% ;
+	height: 100%;
+	border-color: #337ab7;
+}
+.cl_panel_heading{
+	color: #fff;
+	background-color: #337ab7;
+	border-color: #337ab7;
+	padding: 10px 15px;
+	border-bottom: 1px solid transparent;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	font-size: 12px;
+}
+.pull-left{
+	float: left !important;
+}
+.pull-right{
+	float: right !important;
+}
+
+.color_white {
+	color: white;
+}
+.cl_view_body {
+	height: 83.5vh; width: 100%;
+}
+.logo_text {
+	font-size: 20px;
+	font-weight: bold;
+}
+.js_canvas {
+	margin-top: 200px;
+	margin-left: 20px;
+	margin-right: 20px;
+}
+.log_div{
+	border: 2px solid gray;
+	margin-right: 20px;
+	font-size: 12px;
+}
+.log_table {
+	width: 100%;
+	height: 87%;
+	overflow: auto;
+}
+.row_10_per {
+	width: 10%;
+}
+.row_30_per {
+	width: 30%;
+}
+.row_70_per {
+	width: 70%;
+}
+.table_header {
+	font-weight: bold;
+}
+.status_title{
+	position: absolute;
+	left: 61%;
+	top: 151px;
+	font-size:20px;
+}
+.status{
+	background-color: gray;
+	-moz-border-radius: 50px;
+	-webkit-border-radius: 50px;
+	border-radius: 50px;
+}
+.status_table {
+	position: absolute;
+	left: 61%;
+	top: 191px;
+	font-size:10px;
+}
diff --git a/ui-react/src/index.css b/ui-react/src/index.css
deleted file mode 100644
index 86e0f9e4b..000000000
--- a/ui-react/src/index.css
+++ /dev/null
@@ -1,50 +0,0 @@
-.nav {
-	margin-left: 2px; 
-	margin-right: 2px;
-}
-.navbar-brand {
-  float: left;
-  height: 50px;
-  padding: 15px 15px;
-  font-size: 18px;
-  line-height: 20px;
-}
-.rowC {
-	display: flex;
-	flex-direction:row;
-}
-.logo {
-	font-family: 'Trebuchet MS', cursive;
-	font-size: 20px;
-	font-weight: 500;
-	text-align: center;
-}
-.image_style {
-	display: inline-block; 
-	float: left;
-}
-.dummy {
-	float: right; 
-	padding-right: 50px;
-}
-.user_name {
-	display: block;
-	float: left;
-	font-family: 'Trebuchet MS', cursive;
-	font-size: 15px;
-	font-weight: 500;
-	height: 50px;
-	text-align: right;
-}
-
-.ClampHeader {
-	margin-left: 2px; 
-	margin-right: 2px;
-}
-
-.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
-    float: left;
-  }
\ No newline at end of file
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index 53d369888..39162f562 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -5,26 +5,26 @@
  * Copyright (C) 2019 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import ClampHeader from './ClampHeader'; 
+import Clamp from './Clamp';
 
 ReactDOM.render(
-	<ClampHeader />,
+	<Clamp />,
 	document.getElementById('root')
 )
-- 
cgit 1.2.3-korg


From c8d6130e6355a6f8f460c114ed7bac0221eb0020 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 4 Jul 2019 15:50:34 +0200
Subject: More modular approach

Modular approach for React components and CSS + theming

Issue-ID: CLAMP-418
Change-Id: I359f31e92492ae75ac26ef297abde822c6cd56ea
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/package.json                              |  11 +-
 ui-react/src/Clamp.js                              |  40 --
 ui-react/src/ClampHeader.js                        |  45 --
 ui-react/src/ClampLogo.js                          |  42 --
 ui-react/src/ClampLogoImg.js                       |  40 --
 ui-react/src/ClosedLoopLogs.js                     |  57 ---
 ui-react/src/ClosedLoopSVG.js                      |  35 --
 ui-react/src/ClosedLoopStatus.js                   |  56 ---
 ui-react/src/ClosedLoopView.js                     |  41 --
 ui-react/src/ClosedLoopViewBody.js                 |  70 ---
 ui-react/src/ClosedLoopViewHeader.js               |  43 --
 ui-react/src/MenuBar.js                            |  62 ---
 ui-react/src/OnapClamp.js                          |  39 ++
 ui-react/src/UserBar.js                            |  42 --
 ui-react/src/components/app/LoopUI.js              | 146 +++++++
 ui-react/src/components/app/logo.png               | Bin 0 -> 21360 bytes
 .../components/backend_communication/LoopCache.js  | 116 +++++
 .../OperationalPolicy/OperationalPolicy.css        |  73 ++++
 .../dialogs/OperationalPolicy/OperationalPolicy.js | 486 +++++++++++++++++++++
 .../components/loop_viewer/logs/ClosedLoopLogs.js  |  55 +++
 .../loop_viewer/status/ClosedLoopStatus.css        |  19 +
 .../loop_viewer/status/ClosedLoopStatus.js         |  55 +++
 .../components/loop_viewer/svg/ClosedLoopSvg.js    |  43 ++
 .../src/components/loop_viewer/svg/example.svg     |  13 +
 ui-react/src/components/menu/MenuBar.js            |  69 +++
 ui-react/src/css/index.css                         |  88 ----
 ui-react/src/images/logo_onap_2017.png             | Bin 21360 -> 0 bytes
 ui-react/src/index.js                              |   5 +-
 ui-react/src/theme/globalStyle.js                  |  79 ++++
 29 files changed, 1202 insertions(+), 668 deletions(-)
 delete mode 100644 ui-react/src/Clamp.js
 delete mode 100644 ui-react/src/ClampHeader.js
 delete mode 100644 ui-react/src/ClampLogo.js
 delete mode 100644 ui-react/src/ClampLogoImg.js
 delete mode 100644 ui-react/src/ClosedLoopLogs.js
 delete mode 100644 ui-react/src/ClosedLoopSVG.js
 delete mode 100644 ui-react/src/ClosedLoopStatus.js
 delete mode 100644 ui-react/src/ClosedLoopView.js
 delete mode 100644 ui-react/src/ClosedLoopViewBody.js
 delete mode 100644 ui-react/src/ClosedLoopViewHeader.js
 delete mode 100644 ui-react/src/MenuBar.js
 create mode 100644 ui-react/src/OnapClamp.js
 delete mode 100644 ui-react/src/UserBar.js
 create mode 100644 ui-react/src/components/app/LoopUI.js
 create mode 100644 ui-react/src/components/app/logo.png
 create mode 100644 ui-react/src/components/backend_communication/LoopCache.js
 create mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css
 create mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js
 create mode 100644 ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
 create mode 100644 ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css
 create mode 100644 ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js
 create mode 100644 ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js
 create mode 100644 ui-react/src/components/loop_viewer/svg/example.svg
 create mode 100644 ui-react/src/components/menu/MenuBar.js
 delete mode 100644 ui-react/src/css/index.css
 delete mode 100644 ui-react/src/images/logo_onap_2017.png
 create mode 100644 ui-react/src/theme/globalStyle.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 943ed7ad1..7d0e407b3 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -12,12 +12,13 @@
   "author": "ONAP Clamp Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "json-editor": "^0.7.28",
-    "react": "~16.8.0",
-    "react-dom": "~16.8.0",
-    "react-scripts": "~3.0.1",
+    "json-editor": "0.7.28",
+    "react": "16.8.0",
+    "react-dom": "16.8.0",
+    "react-scripts": "3.0.1",
     "react-bootstrap": "1.0.0-beta.9",
-    "bootstrap-css-only": "4.3.1"
+    "bootstrap-css-only": "4.3.1",
+    "styled-components": "4.3.2"
   },
   "browserslist": [
     ">0.2%",
diff --git a/ui-react/src/Clamp.js b/ui-react/src/Clamp.js
deleted file mode 100644
index 38634b3a4..000000000
--- a/ui-react/src/Clamp.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react';
-import ClampHeader from './ClampHeader';
-import ClosedLoopView from './ClosedLoopView';
-
-
-class Clamp extends React.Component {
-	render() {
-		return (
-			<div>
-				<ClampHeader />
-				<ClosedLoopView />
-			</div>
-		);
-	}
-}
-
-export default Clamp;
diff --git a/ui-react/src/ClampHeader.js b/ui-react/src/ClampHeader.js
deleted file mode 100644
index 9460023f6..000000000
--- a/ui-react/src/ClampHeader.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react';
-import ClampLogoImg from './ClampLogoImg';
-import ClampLogo from './ClampLogo';
-import UserBar from './UserBar';
-import MenuBar from './MenuBar';
-import Navbar from 'react-bootstrap/Navbar';
-import 'bootstrap-css-only/css/bootstrap.min.css';
-
-class ClampHeader extends React.Component {
-	render() {
-		return (
-			<Navbar bg="light" expand="lg">
-				<ClampLogoImg />
-				<ClampLogo />
-				<MenuBar />
-				<UserBar />
-			</Navbar>
-		);
-	}
-}
-
-export default ClampHeader;
diff --git a/ui-react/src/ClampLogo.js b/ui-react/src/ClampLogo.js
deleted file mode 100644
index ffceee1df..000000000
--- a/ui-react/src/ClampLogo.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react';
-import Navbar from 'react-bootstrap/Navbar';
-import Nav from 'react-bootstrap/Nav';
-import './css/index.css';
-import 'bootstrap-css-only/css/bootstrap.min.css';
-
-class ClampLogo extends React.Component {
-	render() {
-		return (
-			<Nav className="justify-content-left logo_text">
-				<Navbar.Text>
-					Clamp
-				</Navbar.Text>
-			</Nav>
-		);
-	}
-}
-
-export default ClampLogo;
diff --git a/ui-react/src/ClampLogoImg.js b/ui-react/src/ClampLogoImg.js
deleted file mode 100644
index 8b34dad9c..000000000
--- a/ui-react/src/ClampLogoImg.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react';
-import Navbar from 'react-bootstrap/Navbar';
-import 'bootstrap-css-only/css/bootstrap.min.css';
-
-class ClampLogoImg extends React.Component {
-	render() {
-		return (
-			<Navbar.Brand>
-			  <img alt="" src={require('./images/logo_onap_2017.png')}
-				  height="50px" width="234px"
-				  className="d-inline-block align-top"/>
-		  </Navbar.Brand>
-		);
-	}
-}
-
-export default ClampLogoImg;
diff --git a/ui-react/src/ClosedLoopLogs.js b/ui-react/src/ClosedLoopLogs.js
deleted file mode 100644
index 65e057cce..000000000
--- a/ui-react/src/ClosedLoopLogs.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import Table from 'react-bootstrap/Table';
-import './css/index.css';
-
-class ClosedLoopViewLogs extends React.Component {
-  render() {
-    return (
-      <div className="log_div">
-        <div className="log_table">
-          <label className="table_header">Loop Logs</label>
-          <Table striped hover id="loop-log-div">
-            <thead>
-  							<tr>
-  								<th><span align="left" className="text">Date</span></th>
-  								<th><span align="left" className="text">Type</span></th>
-  								<th><span align="left" className="text">Component</span></th>
-  								<th><span align="right" className="text">Log</span></th>
-  							</tr>
-  						</thead>
-  						<tbody>
-  							<tr>
-  								<td className="row_10_per">test</td>
-  								<td className="row_10_per">test</td>
-  								<td className="row_10_per">test</td>
-  								<td className="row_70_per">test</td>
-  							</tr>
-  						</tbody>
-            </Table>
-          </div>
-        </div>
-    );
-  }
-}
-
-export default ClosedLoopViewLogs;
diff --git a/ui-react/src/ClosedLoopSVG.js b/ui-react/src/ClosedLoopSVG.js
deleted file mode 100644
index ffba83093..000000000
--- a/ui-react/src/ClosedLoopSVG.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import './css/index.css';
-
-class ClosedLoopViewSVG extends React.Component {
-  render() {
-    return (
-        <div id="loop_content">
-        </div>
-    );
-  }
-}
-
-export default ClosedLoopViewSVG;
diff --git a/ui-react/src/ClosedLoopStatus.js b/ui-react/src/ClosedLoopStatus.js
deleted file mode 100644
index 5f4274649..000000000
--- a/ui-react/src/ClosedLoopStatus.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
-* ============LICENSE_START=======================================================
-* ONAP CLAMP
-* ================================================================================
-* Copyright (C) 2019 AT&T Intellectual Property. All rights
-*                             reserved.
-* ================================================================================
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-* ============LICENSE_END============================================
-* ===================================================================
-*
-*/
-import React from 'react';
-import Table from 'react-bootstrap/Table';
-import './css/index.css';
-
-class ClosedLoopStatus extends React.Component {
-  render() {
-  	return (
-      <div>
-        <span id="status_clds" className="status_title">Status:
-          <span className="status">&nbsp;&nbsp;&nbsp;TestStatus&nbsp;&nbsp;&nbsp;</span>
-        </span>
-
-        <div className="status_table">
-          <Table striped hover>
-            <thead>
-                <tr>
-                  <th><span align="left" className="text">ComponentState</span></th>
-                  <th><span align="left" className="text">Description</span></th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td className="row_30_per">long test State</td>
-                  <td className="row_70_per">test description very very very long description</td>
-                </tr>
-              </tbody>
-            </Table>
-          </div>
-      </div>
-  	);
-  }
-}
-
-export default ClosedLoopStatus;
diff --git a/ui-react/src/ClosedLoopView.js b/ui-react/src/ClosedLoopView.js
deleted file mode 100644
index daa366062..000000000
--- a/ui-react/src/ClosedLoopView.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import ClosedLoopViewHeader from './ClosedLoopViewHeader';
-import ClosedLoopViewBody from './ClosedLoopViewBody';
-import './css/index.css';
-
- class ClosedLoopView extends React.Component {
- 	render() {
- 		return (
-      <div className="container-fluid cldsmodelling">
-      		<div className="cl_panel">
-            <ClosedLoopViewHeader />
-            <ClosedLoopViewBody />
-          </div>
-      </div>
- 		);
- 	}
- }
-
- export default ClosedLoopView;
diff --git a/ui-react/src/ClosedLoopViewBody.js b/ui-react/src/ClosedLoopViewBody.js
deleted file mode 100644
index bfa05f8b9..000000000
--- a/ui-react/src/ClosedLoopViewBody.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import ClosedLoopSVG from './ClosedLoopSVG';
-import ClosedLoopLogs from './ClosedLoopLogs';
-import ClosedLoopStatus from './ClosedLoopStatus';
-import './css/index.css';
-
- class ClosedLoopViewBody extends React.Component {
-
-   constructor(props) {
-      super(props);
-      this.state = {
-         disableDiv: false
-      };
-      this.disableDiv = this.disableDiv.bind(this);
-      this.enableDiv = this.enableDiv.bind(this);
-    }
-
-    disableDiv() {
-      this.setState({
-         disableDiv:true
-      });
-    }
-
-    enableDiv() {
-      this.setState({
-         disableDiv:false
-      });
-    }
-
-
-   render() {
-     var divStyle = {
-      display:this.state.disableDiv?'block':'none'
-    };
-   	return (
-        <div id="paletteDiv" className="cl_view_body" style={divStyle}>
-          <div id="js-canvas" className="js_canvas">
-            <ClosedLoopSVG />
-            <ClosedLoopLogs />
-          </div>
-          <ClosedLoopStatus />
-        </div>
-   	);
-   }
- }
-
-
- export default ClosedLoopViewBody;
diff --git a/ui-react/src/ClosedLoopViewHeader.js b/ui-react/src/ClosedLoopViewHeader.js
deleted file mode 100644
index 8f2d845f1..000000000
--- a/ui-react/src/ClosedLoopViewHeader.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react';
-import './css/index.css';
-
-class ClosedLoopViewHeader extends React.Component {
-  render() {
-  	return (
-      <div className="cl_panel_heading clearfix">
-        <div className="color_white">
-          <span className="pull-left"> <span id="modeler_name">Closed
-              Loop Modeler</span>
-          </span> <span className="pull-right"> <span id="loop_name">No
-              LOOP loaded yet</span> &nbsp; <i ></i>
-          </span>
-        </div>
-      </div>
-  	);
-  }
-}
-
-export default ClosedLoopViewHeader;
diff --git a/ui-react/src/MenuBar.js b/ui-react/src/MenuBar.js
deleted file mode 100644
index ce962f338..000000000
--- a/ui-react/src/MenuBar.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import Navbar from 'react-bootstrap/Navbar';
-import NavDropdown from 'react-bootstrap/NavDropdown';
-import 'bootstrap-css-only/css/bootstrap.min.css';
-
-class MenuBar extends React.Component {
-	render () {
-	   return (
-  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
-      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
-        <NavDropdown.Item href="#action/3.1">Open CL</NavDropdown.Item>
-        <NavDropdown.Item href="#action/3.2">Properties CL</NavDropdown.Item>
-        <NavDropdown.Item href="#action/3.3">Close Model</NavDropdown.Item>
-      </NavDropdown>
-			<NavDropdown title="Manage" id="basic-nav-dropdown">
-				<NavDropdown.Item href="#action/3.1">Submit</NavDropdown.Item>
-				<NavDropdown.Item href="#action/3.2">Stop</NavDropdown.Item>
-				<NavDropdown.Item href="#action/3.3">Restart</NavDropdown.Item>
-				<NavDropdown.Item href="#action/3.3">Delete</NavDropdown.Item>
-				<NavDropdown.Item href="#action/3.3">Deploy</NavDropdown.Item>
-				<NavDropdown.Item href="#action/3.3">UnDeploy</NavDropdown.Item>
-			</NavDropdown>
-			<NavDropdown title="View" id="basic-nav-dropdown">
-				<NavDropdown.Item href="#action/3.1">Refresh Status</NavDropdown.Item>
-			</NavDropdown>
-		<NavDropdown title="Help" id="basic-nav-dropdown">
-			<NavDropdown.Item href="#action/3.1">Wiki</NavDropdown.Item>
-			<NavDropdown.Item href="#action/3.2">Contact Us</NavDropdown.Item>
-			<NavDropdown.Item href="#action/3.3">User Info</NavDropdown.Item>
-		</NavDropdown>
-  </Navbar.Collapse>
-
-
-    );
-  }
-}
-
-
-
-export default MenuBar;
diff --git a/ui-react/src/OnapClamp.js b/ui-react/src/OnapClamp.js
new file mode 100644
index 000000000..bdcea6290
--- /dev/null
+++ b/ui-react/src/OnapClamp.js
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react';
+import LoopUI from './components/app/LoopUI'
+import { ThemeProvider } from 'styled-components';
+import { DefaultClampTheme } from './theme/globalStyle.js';
+
+export default class OnapClamp extends LoopUI {
+	
+	render() {
+		console.log("Onap Clamp UI starting");
+		return (
+		<ThemeProvider theme={DefaultClampTheme}>
+			{super.render()}
+		</ThemeProvider>);
+	}
+}
+
diff --git a/ui-react/src/UserBar.js b/ui-react/src/UserBar.js
deleted file mode 100644
index d4b3ede74..000000000
--- a/ui-react/src/UserBar.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import Navbar from 'react-bootstrap/Navbar';
-import 'bootstrap-css-only/css/bootstrap.min.css';
-
-class UserBar extends React.Component {
-	render () {
-		const user = this.props.user;
-		return (
-
- <Navbar.Collapse className="justify-content-end">
-	<Navbar.Text>
-		Hello: <a>{user}</a>
-	</Navbar.Text>
-</Navbar.Collapse>
-
-		);
-	}
-}
-
-export default UserBar;
diff --git a/ui-react/src/components/app/LoopUI.js b/ui-react/src/components/app/LoopUI.js
new file mode 100644
index 000000000..d0f5aa329
--- /dev/null
+++ b/ui-react/src/components/app/LoopUI.js
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+import MenuBar from '../menu/MenuBar';
+import Navbar from 'react-bootstrap/Navbar';
+import logo from './logo.png';
+import { GlobalClampStyle } from '../../theme/globalStyle.js';
+
+import ClosedLoopSvg from '../loop_viewer/svg/ClosedLoopSvg';
+import ClosedLoopLogs from '../loop_viewer/logs/ClosedLoopLogs';
+import ClosedLoopStatus from '../loop_viewer/status/ClosedLoopStatus';
+
+const ProjectNameStyle = styled.a`
+	vertical-align: middle;
+	padding-left: 30px;
+	font-size: 30px;
+
+`
+const LoopViewDivStyle = styled.div`
+	height: 90vh;
+	overflow: hidden;
+	margin-left: 10px;
+	margin-right: 10px;
+	margin-bottom: 10px;
+	color: ${props => props.theme.loopViewerFontColor};
+	background-color: ${props => props.theme.loopViewerBackgroundColor};
+	border: 1px solid transparent;
+	border-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+`
+
+const LoopViewHeaderDivStyle = styled.div`
+	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	padding: 10px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+
+const LoopViewBodyDivStyle = styled.div`
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	padding: 10px 10px;
+	color: ${props => (props.theme.loopViewerHeaderFontColor)};
+	height: 95%;
+`
+
+const LoopViewLoopNameSpanStyle = styled.span`
+	font-weight: bold;
+	color: ${props => (props.theme.loopViewerHeaderFontColor)};
+	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
+`
+
+export default class LoopUI extends React.Component {
+	
+	user = "testuser";
+	loopName="Empty (NO loop loaded yet)";
+		
+	renderMenuNavBar() {
+		return (
+			<MenuBar />
+		);
+	}
+	
+	renderUserLoggedNavBar() {
+		return (
+			<Navbar.Text>
+				Signed in as: <a href="login">{this.user}</a>
+			</Navbar.Text>
+		);
+	}
+	
+	renderLogoNavBar() {
+		return (
+			<Navbar.Brand>
+				<img height="50px" width="234px" src={logo} alt=""/>
+				<ProjectNameStyle>CLAMP</ProjectNameStyle>
+			</Navbar.Brand>
+		);
+	}
+	
+	renderNavBar() {
+		return (
+		<Navbar expand="lg">
+			{this.renderLogoNavBar()}
+			{this.renderMenuNavBar()}
+			{this.renderUserLoggedNavBar()}
+		</Navbar>
+	);
+	}
+	
+	renderLoopViewHeader() {
+		return (
+			<LoopViewHeaderDivStyle>
+				Loop Viewer - <LoopViewLoopNameSpanStyle id="loop_name">{this.loopName}</LoopViewLoopNameSpanStyle> 
+			</LoopViewHeaderDivStyle>
+		);
+	}
+	
+	renderLoopViewBody() {
+		return (
+			<LoopViewBodyDivStyle>
+				<ClosedLoopSvg />
+				<ClosedLoopLogs />
+				<ClosedLoopStatus />
+			</LoopViewBodyDivStyle>
+		);
+	}
+	
+	renderLoopViewer() {
+		return (
+			<LoopViewDivStyle>
+					{this.renderLoopViewHeader()}
+					{this.renderLoopViewBody()}
+			</LoopViewDivStyle>
+	 		);
+	}
+	
+	render() {
+		return (
+				<div>
+				 	<GlobalClampStyle />
+					{this.renderNavBar()}
+					{this.renderLoopViewer()}
+				</div>
+		);
+	}
+}
diff --git a/ui-react/src/components/app/logo.png b/ui-react/src/components/app/logo.png
new file mode 100644
index 000000000..c6f6857a5
Binary files /dev/null and b/ui-react/src/components/app/logo.png differ
diff --git a/ui-react/src/components/backend_communication/LoopCache.js b/ui-react/src/components/backend_communication/LoopCache.js
new file mode 100644
index 000000000..7fd20596b
--- /dev/null
+++ b/ui-react/src/components/backend_communication/LoopCache.js
@@ -0,0 +1,116 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+class LoopCache
+{
+	constructor(loopJson) {
+		this.loopJsonCache=loopJson;
+	}
+	
+	updateMsProperties(type, newMsProperties) {
+	    if (newMsProperties["name"] == type) {
+	        for (p in this.loopJsonCache["microServicePolicies"]) {
+	            if (this.loopJsonCache["microServicePolicies"][p]["name"] == type) {
+	                this.loopJsonCache["microServicePolicies"][p] = newMsProperties;
+	            }
+	        }
+	    }
+	}
+	
+	 updateGlobalProperties(newGlobalProperties) {
+	    this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
+	}
+	
+	 updateOpPolicyProperties(newOpProperties) {	
+	   this.loopJsonCache["operationalPolicies"] = newOpProperties;
+	}
+	
+	 getLoopName() {
+	    return this.loopJsonCache["name"];
+	}
+	
+	 getOperationalPolicyProperty() {
+	    return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
+	}
+	
+	 getOperationalPolicies() {
+	    return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
+	}
+	
+	 getGlobalProperty() {
+	    return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
+	}
+	
+	 getDeploymentProperties() {
+	    return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
+	}
+	
+	 getMsJson(type) {
+	    var msProperties = this.loopJsonCache["microServicePolicies"];
+	    for (p in msProperties) {
+	        if (msProperties[p]["name"] == type) {
+	           return JSON.parse(JSON.stringify(msProperties[p]));
+	        }
+	    }
+	    return null;
+	}
+	
+	 getMsProperty(type) {
+	    var msProperties = this.loopJsonCache["microServicePolicies"];
+	    for (p in msProperties) {
+	        if (msProperties[p]["name"] == type) {
+	        	if (msProperties[p]["properties"] !== null && msProperties[p]["properties"] !== undefined) {
+	        		return JSON.parse(JSON.stringify(msProperties[p]["properties"]));
+	        	}
+	        }
+	    }
+	    return null;
+	}
+	
+	 getMsUI(type) {
+	    var msProperties = this.loopJsonCache["microServicePolicies"];
+	    for (p in msProperties) {
+	        if (msProperties[p]["name"] == type) {
+	        	return JSON.parse(JSON.stringify(msProperties[p]["jsonRepresentation"]));
+	        }
+	    }
+	    return null;
+	}
+	
+	 getResourceDetailsVfProperty() {
+		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VF"];
+	}
+	
+	 getResourceDetailsVfModuleProperty() {
+		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VFModule"];
+	}
+	
+	 getLoopLogsArray() {
+		return this.loopJsonCache.loopLogs;
+	}
+	
+	 getComponentStates() {
+		return this.loopJsonCache.components;
+	}
+
+}
+export default LoopCache;
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css
new file mode 100644
index 000000000..94a91c234
--- /dev/null
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css
@@ -0,0 +1,73 @@
+.disabled {
+	background-color: #dddd;
+}
+
+label {
+	text-align: right;
+	vertical-align: middle;
+}
+
+.leftPolicyPanel {
+	padding: 0 10px 0 0;
+}
+
+.idError {
+	color: red;
+	padding: 50px 0px;
+	text-align: center;
+	display: none;
+}
+
+.policyPanel {
+	background-color: #f5f5f5;
+	padding: 15px 5px 0 5px;
+}
+
+.form-group.clearfix {
+	display: -webkit-flex;
+	display: flex;
+	align-items: center;
+}
+
+label {
+	margin-bottom: 0px;
+}
+
+.withnote {
+	margin-bottom: 0px;
+}
+
+.note {
+	font-size:10px;
+	margin-left: 250px;
+	font-weight: normal;
+}
+
+#policyTable {
+	cursor: pointer;
+	width: 100%;
+}
+
+#policyTable tr {
+	border-bottom: 1px solid #ddd;
+	border-collapse: collapse;
+	text-align: left;
+	font-size: 12px;
+	font-weight: normal;
+}
+
+#policyTable td {
+	padding: 8px 10px;
+}
+
+#policyTable tr.highlight {
+	background-color: #f5f5f5;
+	font-weight: bold;
+	font-size: 13px;
+}
+
+#policyTableHolder {
+	height: 200px;
+	width: 100%;
+	overflow: auto;
+}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js
new file mode 100644
index 000000000..7b4ed0f89
--- /dev/null
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js
@@ -0,0 +1,486 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+
+import './OperationalPolicy.css'
+
+class OperationalPolicy extends React.Component {
+	
+	constructor(props, context) {
+	    super(props, context);
+
+	    this.handleShow = this.handleShow.bind(this);
+	    this.handleClose = this.handleClose.bind(this);
+		this.initPolicySelect = this.initPolicySelect.bind(this);
+
+		this.allPolicies=[];
+		this.policy_ids=[];
+
+	    this.state = {
+	      show: false,
+	    };
+	  }
+
+	  handleClose() {
+	    this.setState({ show: false });
+	  }
+
+	  handleShow() {
+	    this.setState({ show: true });
+	  }
+
+	  initPolicySelect() {
+		    if (this.allPolicies['operational_policy'] === undefined || this.allPolicies['operational_policy'] === null) {
+			    this.allPolicies = getOperationalPolicyProperty();
+		    }
+		    // Provision all policies ID first
+		    if (policy_ids.length == 0 && this.allPolicies['operational_policy'] != undefined) {
+			    $.each(this.allPolicies['operational_policy']['policies'], function() {
+				    policy_ids.push(this['id']);
+			    });
+		    }
+	    }
+
+	  render() {
+	    return (
+	      <>
+	        <Button variant="primary" onClick={this.handleShow}>
+	          Launch demo modal
+	        </Button>
+
+	        <Modal size="lg" show={this.state.show} onHide={this.handleClose}>
+	          <Modal.Header closeButton>
+	            <Modal.Title>Modal heading</Modal.Title>
+	          </Modal.Header>
+	          <Modal.Body>
+	          <div attribute-test="policywindowproperties" id="configure-widgets"
+	        		className="disabled-block-container">
+	        		<div attribute-test="policywindowpropertiesh" className="modal-header">
+	        			<button type="button" className="close" onClick="close(false)"
+	        				aria-hidden="true" style={{marginTop: '-3px'}}>&times;</button>
+	        			<h4>Operational Policy</h4>
+	        		</div>
+
+	        		<div className="modal-body">
+	        			<div attribute-test="policywindowpropertiesb" className="modal-body row">
+
+	        				<div className="panel panel-default col-sm-10 policyPanel">
+	        					<form id="operationalPolicyHeaderForm" className="form-horizontal">
+	        							<div className="form-group clearfix">
+	        								<label className="col-sm-2">Parent policy</label>
+	        								<div className="col-sm-3" style={{padding: '0px'}}>
+	        									<select type="text" id="trigger_policy" name="trigger_policy"
+	        										className="form-control" ng-init="initPolicySelect()"
+	        										ng-options="policy for policy in policy_ids track by policy">
+	        										<option value="">-- choose an option --</option>
+	        										</select>
+	        								</div>
+
+	        								<label htmlFor="timeout" className="col-sm-3"
+	        									style={{paddingLeft: '5px', paddingRight: '10px'}}>Overall
+	        									Time Limit</label>
+	        								<div className="col-sm-2" style={{paddingLeft: '0px'}}>
+	        									<input type="text" ng-pattern="/^[0-9]*$/" ng-model="number"
+	        										className="form-control" id="timeout" name="timeout"/>
+	        								</div>
+
+	        								<label htmlFor="abatement" className="col-sm-2">Abatement</label>
+	        								<div className="col-sm-2" style={{paddingLeft: '0px'}}>
+	        									<select className="form-control" id="abatement" name="abatement" onChange={this.handleChange}>
+	        	   									<option value="false">False</option>
+	        	   									<option value="true">True</option>
+	        									</select>
+	        								</div>
+	        							</div>
+	        							<div className="form-group clearfix row">
+	        	   						    <label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
+	        							    <div className="col-sm-8">
+	        								    <input type="text" className="form-control" name="controlLoopName"
+	        									    readOnly="readonly" id="clname" ng-model="clname"/>
+	        							    </div>
+	        							</div>
+	        					</form>
+	        					<div className="panel-heading" style={{backgroundColor: 'white'}}>
+	        						<ul id="nav_Tabs" className="nav nav-tabs">
+	        							<li>
+		        							<a id="add_one_more" href="#desc_tab">
+			        							<span
+		        									className="glyphicon glyphicon-plus" aria-hidden="true">
+	        									</span>
+        									</a>
+       									</li>
+	        						</ul>
+	        					</div>
+	        					<div className="panel-body">
+	        						<div className="tab-content">
+	        							<div id="properties_tab" className="tab-pane fade in active"></div>
+	        						</div>
+	        					</div>
+	        				</div>
+
+	        				<span id="formSpan" style={{display: 'none'}}>
+	        					<form className="policyProperties" className="form-horizontal"
+	        						style={{border:'2px dotted gray'}}
+	        						title="Operational Policy Properties">
+	        						<div className="form-group clearfix">
+	        							<label className="col-sm-4 control-label" htmlFor="id">ID</label>
+	        							<div className="col-sm-8">
+	        								<input type="text" className="form-control"  name="id" id="id" ng-model="duplicated" ng-init="duplicated = false"
+	        									ng-keyup="updateTabLabel($event)" />
+	        								<span >ID must be unique</span>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" name="recipe" id="recipe"
+	        									ng-model="recipe" ng-click="updateGuardRecipe($event)">
+	        									<option value="">-- choose an option --</option>
+	        									<option value="Restart">Restart</option>
+	        									<option value="Rebuild">Rebuild</option>
+	        									<option value="Migrate">Migrate</option>
+	        									<option value="Health-Check">Health-Check</option>
+	        									<option value="ModifyConfig">ModifyConfig</option>
+	        									<option value="VF Module Create">VF Module Create</option>
+	        									<option value="VF Module Delete">VF Module Delete</option>
+	        									<option value="Reroute">Reroute</option>
+	        								</select>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="retry" className="col-sm-4 control-label"> Retry</label>
+	        							<div className="col-sm-8">
+	        								<input type="text" maxLength="5" className="form-control" id="retry"
+	        									ng-pattern="/^[0-9]*$/" ng-model="number" name="retry">
+	        								</input>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="timeout" className="col-sm-4 control-label">
+	        								Timeout</label>
+	        							<div className="col-sm-8">
+	        								<input type="text" maxLength="5" className="form-control"
+	        									id="timeout" ng-pattern="/^[0-9]*$/" ng-model="number"
+	        									name="timeout"></input>
+	        							</div>
+	        						</div>
+
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="actor" className="col-sm-4 control-label"> Actor</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="actor" name="actor" ng-click="updateGuardActor($event)" ng-model="actor">
+	        								    <option value="">-- choose an option --</option>
+	        									<option value="APPC">APPC</option>
+	        									<option value="SO">SO</option>
+	        									<option value="VFC">VFC</option>
+	        									<option value="SDNC">SDNC</option>°
+	        									<option value="SDNR">SDNR</option>°
+	        								</select>
+	        							</div>
+
+	        							<label htmlFor="payload" className="col-sm-4 control-label">
+	        								Payload (YAML)</label>
+	        							<div className="col-sm-8">
+	        								<textarea className="form-control" id="payload" name="payload"></textarea>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="success" className="col-sm-4 control-label">When
+	        								Success</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="success" name="success"
+	        									ng-model="null_dump"
+	        									ng-options="policy for policy in policy_ids track by policy">
+	        									<option value="">-- choose an option --</option>
+	        									</select>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="failure" className="col-sm-4 control-label">When
+	        								Failure</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="failure" name="failure"
+	        									ng-model="null_dump"
+	        									ng-options="policy for policy in policy_ids track by policy">
+	        									<option value="">-- choose an option --</option>
+	        									</select>
+
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="failure_timeout" className="col-sm-4 control-label">When
+	        								Failure Timeout</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="failure_timeout"
+	        									name="failure_timeout" ng-model="null_dump"
+	        									ng-options="policy for policy in policy_ids track by policy">
+	        									<option value="">-- choose an option --</option>
+	        									</select>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="failure_retries" className="col-sm-4 control-label">When
+	        								Failure Retries</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="failure_retries"
+	        									name="failure_retries" ng-model="null_dump"
+	        									ng-options="policy for policy in policy_ids track by policy">
+	        									<option value="">-- choose an option --</option>
+	        									</select>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="failure_exception" className="col-sm-4 control-label">When
+	        								Failure Exception</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="failure_exception"
+	        									name="failure_exception" ng-model="null_dump"
+	        									ng-options="policy for policy in policy_ids track by policy">
+	        									<option value="">-- choose an option --</option>
+	        									</select>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="failure_guard" className="col-sm-4 control-label">When
+	        								Failure Guard</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" id="failure_guard"
+	        									name="failure_guard" ng-model="null_dump"
+	        									ng-options="policy for policy in policy_ids track by policy">
+	        									<option value="">-- choose an option --</option>
+	        									</select>
+	        							</div>
+	        						</div>
+	        					</form>
+	        					<form className="policyTarget" className="form-horizontal"
+	        						title="Operational Policy Target" style={{border: '2px dotted gray'}}>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="type" className="col-sm-4 control-label"> Target
+	        								Type</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" name="type" id="type"
+	        									ng-click="initTargetResourceId($event)" ng-model="type">
+	        	                						<option value="">-- choose an option --</option>                                                    
+	        									<option value="VFMODULE">VFMODULE</option>
+	        									<option value="VM">VM</option>
+	        									<option value="VNF">VNF</option>
+	        								</select>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="resourceID" className="col-sm-4 control-label">
+	        								Target ResourceId</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" name="resourceID" id="resourceID"
+	        									ng-click="changeTargetResourceId($event)"
+	        									ng-model="resourceId">
+	        									<option value="">-- choose an option --</option>
+	        								</select>
+	        							</div>
+	        						</div>
+	        						<div id="metadata">
+	        							<div className="form-group clearfix">
+	        								<label htmlFor="modelInvariantId" className="col-sm-4 control-label">
+	        									Model Invariant Id</label>
+	        								<div className="col-sm-8">
+	        									<input className="form-control" name="modelInvariantId"
+	        										id="modelInvariantId" readOnly/>
+	        								</div>
+	        							</div>
+	        							<div className="form-group clearfix">
+	        								<label htmlFor="modelVersionId" className="col-sm-4 control-label">
+	        									Model Version Id</label>
+	        								<div className="col-sm-8">
+	        									<input className="form-control" name="modelVersionId"
+	        										id="modelVersionId" readOnly/>
+	        								</div>
+	        							</div>
+	        							<div className="form-group clearfix">
+	        								<label htmlFor="modelName" className="col-sm-4 control-label">
+	        									Model Name</label>
+	        								<div className="col-sm-8">
+	        									<input className="form-control" name="modelName" id="modelName"
+	        										readOnly/>
+	        								</div>
+	        							</div>
+	        							<div className="form-group clearfix">
+	        								<label htmlFor="modelVersion" className="col-sm-4 control-label">
+	        									Model Version</label>
+	        								<div className="col-sm-8">
+	        									<input className="form-control" name="modelVersion"
+	        										id="modelVersion" readOnly/>
+	        								</div>
+	        							</div>
+	        							<div className="form-group clearfix">
+	        								<label htmlFor="modelCustomizationId" className="col-sm-4 control-label">
+	        									Model Customization Id</label>
+	        								<div className="col-sm-8">
+	        									<input className="form-control" name="modelCustomizationId"
+	        										id="modelCustomizationId" readOnly/>
+	        								</div>
+	        							</div>
+	        						</div>
+	        					</form>
+	        					<div className="form-group clearfix">
+	        						<label htmlFor="enableGuardPolicy" className="col-sm-4 control-label">
+	        							Enable Guard Policy</label>
+	        						<div className="col-sm-8">
+	        							<input type="checkbox" className="form-control"
+	        								name="enableGuardPolicy" id="enableGuardPolicy" />
+	        						</div>
+
+	        						<div className="col-sm-8">
+	        							<label htmlFor="guardPolicyType" className="col-sm-4 control-label">
+	        								Guard Policy Type</label> <select className="form-control"
+	        								name="guardPolicyType" id="guardPolicyType"
+	        								ng-click="changeGuardPolicyType()" ng-model="guardType">
+	        								<option value="GUARD_MIN_MAX">MinMax</option>
+	        								<option value="GUARD_YAML">FrequencyLimiter</option>
+	        							</select>
+	        						</div>
+	        					</div>
+	        					<form className="guardProperties" className="form-horizontal"
+	        						title="Guard policy associated" style={{border: '2px dotted gray'}}>
+
+	        						<div className="form-group clearfix withnote">
+	        							<label className="col-sm-4 control-label" htmlFor="id">Guard Policy ID</label>
+	        							<div className="col-sm-8">
+	        								<input type="text" className="form-control" name="id" id="id" ng-blur="changeGuardId()" ng-model="id"/>
+	        							</div>
+	        						</div>
+	        						<div>
+	        							<label className="form-group note">Note: Prefix will be added to Guard Policy ID automatically based on Guard Policy Type</label>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
+	        							<div className="col-sm-8">
+	        								<input type="text" className="form-control" name="recipe"
+	        									readOnly="readonly" id="recipe"/>
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
+	        							<div className="col-sm-8">
+	        								<input type="text" className="form-control" name="clname"
+	        									readOnly="readonly" id="clname" ng-model="clname" />
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        						    <label htmlFor="actor" className="col-sm-4 control-label">Actor</label>
+	        							<div className="col-sm-8">
+	        							    <input type="text" className="form-control" name="actor"
+	        									readOnly="readonly" id="actor" />
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+
+	        							<label htmlFor="targets" className="col-sm-4 control-label">Guard
+	        								targets</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="targets" id="targets" />
+	        							</div>
+	        						</div>
+
+	        						<div className="form-group clearfix" id="minMaxGuardPolicyDiv">
+	        							<label htmlFor="min" className="col-sm-4 control-label"> Min
+	        								Guard</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="min" id="min" />
+	        							</div>
+	        							<label htmlFor="max" className="col-sm-4 control-label"> Max
+	        								Guard</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="max" id="max" />
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix"
+	        							id="frequencyLimiterGuardPolicyDiv" style={{display: 'none'}}>
+	        							<label htmlFor="limit" className="col-sm-4 control-label">Limit</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="limit" id="limit" />
+	        							</div>
+	        							<label htmlFor="timeUnits" className="col-sm-4 control-label">Time Units</label>
+	        							<div className="col-sm-8">
+	        								<select className="form-control" name="timeUnits"
+	        									id="timeUnits">
+	        									<option value=""></option>
+	        									<option value="minute">minute</option>
+	        									<option value="hour">hour</option>
+	        									<option value="day">day</option>
+	        									<option value="week">week</option>
+	        									<option value="month">month</option>
+	        									<option value="year">year</option>
+	        								</select> 
+	        							</div>
+	        							<label htmlFor="timeWindow" className="col-sm-4 control-label">Time	Window</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="timeWindow" id="timeWindow" />
+	        							</div>
+	        						</div>
+	        						<div className="form-group clearfix">
+	        							<label htmlFor="guardActiveStart" className="col-sm-4 control-label">
+	        								Guard Active Start</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="guardActiveStart"
+	        									id="guardActiveStart"  value="00:00:00Z"/>
+	        							</div>
+	        							<label htmlFor="guardActiveEnd" className="col-sm-4 control-label">
+	        								Guard Active End</label>
+	        							<div className="col-sm-8">
+	        								<input className="form-control" name="guardActiveEnd"
+	        									id="guardActiveEnd" value="00:00:01Z"/>
+	        							</div>
+	        						</div>
+
+	        					</form>
+
+	        				</span>
+	        			</div>
+	        		</div>
+
+	        		<div attribute-test="policywindowpropertiesf" className="modal-footer">
+	        			<button id="savePropsBtn" className="btn btn-primary" ng-disabled="duplicated">Close</button>
+	        			<button ng-click="close(true)" id="close_button"
+	        				className="btn btn-primary">Cancel</button>
+	        		</div>
+
+	        	</div>
+	          </Modal.Body>
+	          <Modal.Footer>
+	            <Button variant="secondary" onClick={this.handleClose}>
+	              Close
+	            </Button>
+	            <Button variant="primary" onClick={this.handleClose}>
+	              Save Changes
+	            </Button>
+	          </Modal.Footer>
+	        </Modal>
+	      </>
+	    );
+	  }
+}
+
+export default OperationalPolicy;
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
new file mode 100644
index 000000000..709cec96a
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import Table from 'react-bootstrap/Table';
+import './ClosedLoopLogs.css';
+
+export default class ClosedLoopViewLogs extends React.Component {
+  render() {
+    return (
+      <div className="log_div">
+        <div className="log_table">
+          <label className="table_header">Loop Logs</label>
+          <Table striped hover id="loop-log-div">
+            <thead>
+  							<tr>
+  								<th><span align="left" className="text">Date</span></th>
+  								<th><span align="left" className="text">Type</span></th>
+  								<th><span align="left" className="text">Component</span></th>
+  								<th><span align="right" className="text">Log</span></th>
+  							</tr>
+  						</thead>
+  						<tbody>
+  							<tr>
+  								<td className="row_10_per">test</td>
+  								<td className="row_10_per">test</td>
+  								<td className="row_10_per">test</td>
+  								<td className="row_70_per">test</td>
+  							</tr>
+  						</tbody>
+            </Table>
+          </div>
+        </div>
+    );
+  }
+}
diff --git a/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css b/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css
new file mode 100644
index 000000000..14add0f53
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css
@@ -0,0 +1,19 @@
+
+.status_title{
+	position: absolute;
+	left: 61%;
+	top: 151px;
+	font-size:20px;
+}
+.status{
+	background-color: gray;
+	-moz-border-radius: 50px;
+	-webkit-border-radius: 50px;
+	border-radius: 50px;
+}
+.status_table {
+	position: absolute;
+	left: 61%;
+	top: 191px;
+	font-size:10px;
+}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js b/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js
new file mode 100644
index 000000000..da5969e46
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js
@@ -0,0 +1,55 @@
+/*-
+* ============LICENSE_START=======================================================
+* ONAP CLAMP
+* ================================================================================
+* Copyright (C) 2019 AT&T Intellectual Property. All rights
+*                             reserved.
+* ================================================================================
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ============LICENSE_END============================================
+* ===================================================================
+*
+*/
+import React from 'react';
+import Table from 'react-bootstrap/Table';
+import './ClosedLoopStatus.css';
+
+export default class ClosedLoopStatus extends React.Component {
+  render() {
+  	return (
+      <div>
+        <span id="status_clds" className="status_title">Status:
+          <span className="status">&nbsp;&nbsp;&nbsp;TestStatus&nbsp;&nbsp;&nbsp;</span>
+        </span>
+
+        <div className="status_table">
+          <Table striped hover>
+            <thead>
+                <tr>
+                  <th><span align="left" className="text">ComponentState</span></th>
+                  <th><span align="left" className="text">Description</span></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td className="row_30_per">long test State</td>
+                  <td className="row_70_per">test description very very very long description</td>
+                </tr>
+              </tbody>
+            </Table>
+          </div>
+      </div>
+  	);
+  }
+}
+
diff --git a/ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js b/ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js
new file mode 100644
index 000000000..d9f5eaf80
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import styled from 'styled-components';
+import { ReactComponent as SvgExample } from './example.svg';
+const LoopViewSvgDivStyle = styled.div`
+
+	overflow: hidden;
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	border: 1px solid transparent;
+	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+`
+
+export default class ClosedLoopViewSvg extends React.Component {
+  render() {
+    return (
+    	<LoopViewSvgDivStyle id="loop_svg">
+    		<SvgExample />
+    	</LoopViewSvgDivStyle>
+    );
+  }
+}
+
diff --git a/ui-react/src/components/loop_viewer/svg/example.svg b/ui-react/src/components/loop_viewer/svg/example.svg
new file mode 100644
index 000000000..bb3327042
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/example.svg
@@ -0,0 +1,13 @@
+<svg width="400" height="200">
+  <defs>
+    <filter id="MyFilter" filterUnits="userSpaceOnUse" x="0" y="0" width="200" height="120">
+      <feGaussianBlur in="SourceAlpha" stdDeviation="4" result="blur"/>
+    </filter>
+  </defs>
+  <rect x="1" y="1" width="198" height="118" fill="#cccccc" />
+  <g filter="url(#MyFilter)">
+    <path fill="none" stroke="#D90000" stroke-width="10" d="M50,90 C0,90 0,30 50,30 L150,30 C200,30 200,90 150,90 z" />
+    <text fill="#FFFFFF" stroke="black" font-size="45" font-family="Verdana" x="52" y="76">SVG</text>
+  </g>
+  Sorry, your browser does not support inline SVG.  
+</svg>
\ No newline at end of file
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
new file mode 100644
index 000000000..3077bde65
--- /dev/null
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import Navbar from 'react-bootstrap/Navbar';
+import NavDropdown from 'react-bootstrap/NavDropdown';
+import 'bootstrap-css-only/css/bootstrap.min.css';
+import styled from 'styled-components';
+
+const StyledNavDropdownItem = styled(NavDropdown.Item)`
+	color: ${props => props.theme.fontNormal};
+	:hover {
+			background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+			color:  ${props => props.theme.loopViewerHeaderFontColor}
+	}
+`;
+
+export default class MenuBar extends React.Component {
+	
+	render () {
+	   return (
+		  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
+		      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
+		        <StyledNavDropdownItem href="#action/3.1">Open CL</StyledNavDropdownItem>
+		        <StyledNavDropdownItem href="#action/3.2">Properties CL</StyledNavDropdownItem>
+		        <StyledNavDropdownItem href="#action/3.3">Close Model</StyledNavDropdownItem>
+		      </NavDropdown>
+					<NavDropdown title="Manage" id="basic-nav-dropdown">
+						<StyledNavDropdownItem href="#action/3.1">Submit</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="#action/3.2">Stop</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="#action/3.3">Restart</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="#action/3.3">Delete</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="#action/3.3">Deploy</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="#action/3.3">UnDeploy</StyledNavDropdownItem>
+					</NavDropdown>
+					<NavDropdown title="View" id="basic-nav-dropdown">
+						<StyledNavDropdownItem href="#action/3.1">Refresh Status</StyledNavDropdownItem>
+					</NavDropdown>
+				<NavDropdown title="Help" id="basic-nav-dropdown">
+					<StyledNavDropdownItem href="#action/3.1">Wiki</StyledNavDropdownItem>
+					<StyledNavDropdownItem href="#action/3.2">Contact Us</StyledNavDropdownItem>
+					<StyledNavDropdownItem href="#action/3.3">User Info</StyledNavDropdownItem>
+				</NavDropdown>
+		  </Navbar.Collapse>
+
+
+    );
+  }
+}
+
diff --git a/ui-react/src/css/index.css b/ui-react/src/css/index.css
deleted file mode 100644
index 5a06c3b2b..000000000
--- a/ui-react/src/css/index.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.cldsmodelling {
-	height: 90vh;
-	overflow: hidden;
-	margin-left: 1px;
-	margin-right: 1px;
-}
-.cl_panel {
-	margin-bottom: 20px;
-	background-color: #fff;
-	border: 1px solid transparent;
-	border-radius: 4px;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-	width:100% ;
-	height: 100%;
-	border-color: #337ab7;
-}
-.cl_panel_heading{
-	color: #fff;
-	background-color: #337ab7;
-	border-color: #337ab7;
-	padding: 10px 15px;
-	border-bottom: 1px solid transparent;
-	border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-	font-size: 12px;
-}
-.pull-left{
-	float: left !important;
-}
-.pull-right{
-	float: right !important;
-}
-
-.color_white {
-	color: white;
-}
-.cl_view_body {
-	height: 83.5vh; width: 100%;
-}
-.logo_text {
-	font-size: 20px;
-	font-weight: bold;
-}
-.js_canvas {
-	margin-top: 200px;
-	margin-left: 20px;
-	margin-right: 20px;
-}
-.log_div{
-	border: 2px solid gray;
-	margin-right: 20px;
-	font-size: 12px;
-}
-.log_table {
-	width: 100%;
-	height: 87%;
-	overflow: auto;
-}
-.row_10_per {
-	width: 10%;
-}
-.row_30_per {
-	width: 30%;
-}
-.row_70_per {
-	width: 70%;
-}
-.table_header {
-	font-weight: bold;
-}
-.status_title{
-	position: absolute;
-	left: 61%;
-	top: 151px;
-	font-size:20px;
-}
-.status{
-	background-color: gray;
-	-moz-border-radius: 50px;
-	-webkit-border-radius: 50px;
-	border-radius: 50px;
-}
-.status_table {
-	position: absolute;
-	left: 61%;
-	top: 191px;
-	font-size:10px;
-}
diff --git a/ui-react/src/images/logo_onap_2017.png b/ui-react/src/images/logo_onap_2017.png
deleted file mode 100644
index c6f6857a5..000000000
Binary files a/ui-react/src/images/logo_onap_2017.png and /dev/null differ
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index 39162f562..b2fc3b0f6 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -22,9 +22,10 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import Clamp from './Clamp';
+import OnapClamp from './OnapClamp';
+
 
 ReactDOM.render(
-	<Clamp />,
+	<OnapClamp/>,
 	document.getElementById('root')
 )
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
new file mode 100644
index 000000000..df9126296
--- /dev/null
+++ b/ui-react/src/theme/globalStyle.js
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import { createGlobalStyle } from 'styled-components';
+
+export const GlobalClampStyle = createGlobalStyle`
+  body {
+    padding: 0;
+    margin: 0;
+    font-family: ${props => props.theme.fontFamily};
+    font-size: ${props => props.theme.fontSize};
+    font-weight: normal;
+    color: ${props => props.theme.fontNormal};
+    background-color: ${props => props.theme.backgroundColor};
+  }
+
+ span {
+	font-family: ${props => props.theme.fontFamily};
+    font-size: ${props => props.theme.fontSize};
+    font-weight: bold;
+    color: ${props => props.theme.fontNormal};
+    background-color: ${props => props.theme.backgroundColor};
+  }
+  
+  a {
+	font-family: ${props => props.theme.fontFamily};
+    font-size: ${props => props.theme.fontSize};
+    font-weight: bold;
+    color: ${props => props.theme.fontNormal};
+    background-color: ${props => props.theme.backgroundColor};
+
+  }
+  
+  div {
+  	font-family: ${props => props.theme.fontFamily};
+    font-size: ${props => props.theme.fontSize};
+  	border-radius: 4px;
+  	color: ${props => props.theme.fontNormal};
+    background-color: ${props => (props.theme.backgroundColor)};
+  }
+`
+
+export const DefaultClampTheme = {
+	fontDanger: '#eb238e',
+	fontWarning: '#eb238e',
+	fontLight: '#ffffff',
+	fontDark: '#888888',
+	fontHighlight: '#ffff00',
+	fontNormal: 'black',
+	
+	backgroundColor: '#eeeeee',
+	fontFamily: 'Arial, Sans-serif',
+	fontSize: '15px',
+	
+  	loopViewerBackgroundColor: 'white',
+  	loopViewerFontColor: 'yellow',
+  	loopViewerHeaderBackgroundColor: '#337ab7',
+  	loopViewerHeaderFontColor: 'white',
+};
-- 
cgit 1.2.3-korg


From 7c7323d8ec54e65ac7a9a5e8c7cd8bdc755ea70a Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 9 Jul 2019 11:52:20 +0200
Subject: Create login page and add wiki/contact item

Create the login page for Clamp Ui; Add wiki/contact page which chould
be selected from the menu bar.

Issue-ID: CLAMP-416, CLAMP-417
Change-Id: Idddafd9c59a1e4d2897e962c831060e55083025c
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/package.json                              |   3 +-
 ui-react/src/components/app/LoopUI.js              |   5 +-
 ui-react/src/components/app/NotFound.js            |  36 +++++++
 .../src/components/app/login/BasicAuthLogin.js     | 117 +++++++++++++++++++++
 .../src/components/app/login/LoginFailedPage.js    |  35 ++++++
 ui-react/src/components/app/login/LoginPage.js     |  48 +++++++++
 .../backend_communication/LoopActionService.js     |  56 ++++++++++
 .../backend_communication/LoopService.js           |  66 ++++++++++++
 ui-react/src/components/menu/MenuBar.js            |  11 +-
 ui-react/src/components/route/LoginRoute.js        |  36 +++++++
 ui-react/src/index.js                              |  24 ++++-
 11 files changed, 428 insertions(+), 9 deletions(-)
 create mode 100644 ui-react/src/components/app/NotFound.js
 create mode 100644 ui-react/src/components/app/login/BasicAuthLogin.js
 create mode 100644 ui-react/src/components/app/login/LoginFailedPage.js
 create mode 100644 ui-react/src/components/app/login/LoginPage.js
 create mode 100644 ui-react/src/components/backend_communication/LoopActionService.js
 create mode 100644 ui-react/src/components/backend_communication/LoopService.js
 create mode 100644 ui-react/src/components/route/LoginRoute.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 7d0e407b3..791ab9df5 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -18,7 +18,8 @@
     "react-scripts": "3.0.1",
     "react-bootstrap": "1.0.0-beta.9",
     "bootstrap-css-only": "4.3.1",
-    "styled-components": "4.3.2"
+    "styled-components": "4.3.2",
+    "react-router-dom": "5.0.1"
   },
   "browserslist": [
     ">0.2%",
diff --git a/ui-react/src/components/app/LoopUI.js b/ui-react/src/components/app/LoopUI.js
index d0f5aa329..7de6ad01b 100644
--- a/ui-react/src/components/app/LoopUI.js
+++ b/ui-react/src/components/app/LoopUI.js
@@ -70,8 +70,7 @@ const LoopViewLoopNameSpanStyle = styled.span`
 `
 
 export default class LoopUI extends React.Component {
-	
-	user = "testuser";
+
 	loopName="Empty (NO loop loaded yet)";
 		
 	renderMenuNavBar() {
@@ -83,7 +82,7 @@ export default class LoopUI extends React.Component {
 	renderUserLoggedNavBar() {
 		return (
 			<Navbar.Text>
-				Signed in as: <a href="login">{this.user}</a>
+				Signed in as: <a href="login">{localStorage.getItem('user')}</a>
 			</Navbar.Text>
 		);
 	}
diff --git a/ui-react/src/components/app/NotFound.js b/ui-react/src/components/app/NotFound.js
new file mode 100644
index 000000000..d4b53fd71
--- /dev/null
+++ b/ui-react/src/components/app/NotFound.js
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react'
+
+
+export default class NotFound extends React.Component {
+	render () {
+		return (
+      <div id='main'>
+      	<div class="divRow"><b>Page Not Found!</b></div>
+      	<div class="divRow">Please cick <a href="/">here</a> to go back to the main page.</div>
+      </div>
+
+		);
+	}
+}
diff --git a/ui-react/src/components/app/login/BasicAuthLogin.js b/ui-react/src/components/app/login/BasicAuthLogin.js
new file mode 100644
index 000000000..994255cd3
--- /dev/null
+++ b/ui-react/src/components/app/login/BasicAuthLogin.js
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import styled from 'styled-components';
+import LoopService from '../../backend_communication/LoopService';
+
+const LoginHeaderStyle = styled.span`
+  font-size: 20px;
+  font-weight: bold;
+  padding-left: 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+const LoginDivStyle = styled.div`
+  font-size: 12px;
+	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	padding: 10px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+const LoginSubmitButtonStyle = styled.button`
+  font-size: 12px;
+	padding: 5px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+  border: 2px solid;
+  border-radius: 8px;
+`
+const LoginTextInputStyle = styled.input`
+  padding: 10px 10px;
+  margin-left: 20px;
+  border: 1px solid #ced4da;
+  border-radius: 3px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+
+export default class BasicAuthLogin extends React.Component {
+    constructor(props) {
+        super(props);
+        this.handleSubmit = this.handleSubmit.bind(this);
+        this.handleChange = this.handleChange.bind(this);
+        console.log('BasicAuthLogin');
+        this.state = {
+            username: '',
+            password: '',
+            submitted: 'false'
+        };
+    }
+
+    handleChange(e) {
+        const { name, value } = e.target;
+        this.setState({ [name]: value });
+    }
+
+    handleSubmit(e) {
+            e.preventDefault();
+            this.setState({ submitted: true });
+            const { username, password } = this.state;
+            LoopService.login(username, password)
+            .then(
+              user => {
+                  const { from } = { from: { pathname: "/" } };
+                  this.props.history.push(from);
+              },
+              error => {
+                  const { from } = { from: { pathname: "/loginFailed" } };
+                  this.props.history.push(from);
+                  console.log ("Basic login failed");
+              }
+        );
+    }
+
+    render() {
+      const { username, password, submitted} = this.state;
+        return (
+            <div>
+                <LoginHeaderStyle>Login</LoginHeaderStyle>
+                <form name="form" onSubmit={this.handleSubmit}>
+                    <LoginDivStyle className={(submitted && !username ? ' has-error' : '')}>
+                        <label htmlFor="username">Username</label>
+                        <LoginTextInputStyle name="username" value={username} onChange={this.handleChange} />
+                        {submitted && !username &&
+                            <div className="help-block">Username is required</div>
+                        }
+                    </LoginDivStyle>
+                    <LoginDivStyle className={(submitted && !password ? ' has-error' : '')}>
+                        <label htmlFor="password">Password</label>
+                        <LoginTextInputStyle type="password" name="password" value={password} onChange={this.handleChange} />
+                        {submitted && !password &&
+                            <div className="help-block">Password is required</div>
+                        }
+                    </LoginDivStyle>
+                    <LoginDivStyle>
+                        <LoginSubmitButtonStyle className="btn btn-primary">Login</LoginSubmitButtonStyle>
+                    </LoginDivStyle>
+                </form>
+            </div>
+        );
+    }
+}
diff --git a/ui-react/src/components/app/login/LoginFailedPage.js b/ui-react/src/components/app/login/LoginFailedPage.js
new file mode 100644
index 000000000..fb398efd3
--- /dev/null
+++ b/ui-react/src/components/app/login/LoginFailedPage.js
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react'
+
+
+export default class LoginFailedPage extends React.Component {
+	render () {
+		return (
+      		<div id='main'>
+      			<div class="divRow"><b>Login Failed!</b></div>
+      			<div class="divRow">Please cick <a href="/">here</a> to go back to the main page.</div>
+      		</div>
+		);
+	}
+}
diff --git a/ui-react/src/components/app/login/LoginPage.js b/ui-react/src/components/app/login/LoginPage.js
new file mode 100644
index 000000000..5169435c2
--- /dev/null
+++ b/ui-react/src/components/app/login/LoginPage.js
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+
+import LoopService from '../../backend_communication/LoopService';
+
+export default class LoginPage extends React.Component {
+    constructor(props) {
+        super(props);
+        console.log('LoginPage')
+        LoopService.login().then(
+                user => {
+                    const { from } = { from: { pathname: "/" } };
+                    this.props.history.push(from);
+                },
+                error => {
+                  const { from } = { from: { pathname: "/" } };
+                  this.props.history.push(from);
+                  console.log ("Certification login failed");
+                }
+            );
+    }
+    render() {
+      return (
+        <div>
+  			</div>);
+}
+}
diff --git a/ui-react/src/components/backend_communication/LoopActionService.js b/ui-react/src/components/backend_communication/LoopActionService.js
new file mode 100644
index 000000000..027243be1
--- /dev/null
+++ b/ui-react/src/components/backend_communication/LoopActionService.js
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+const clActionService = {
+    submit
+};
+
+function submit(uiAction) {
+    const cl_name = "";
+    console.log("clActionServices perform action: " + uiAction + " closedloopName="
+		    + cl_name);
+    const svcAction = uiAction.toLowerCase();
+		const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
+
+    let options = {
+        method: 'GET'
+    };
+    return sendRequest (svcUrl, svcAction, options);
+}
+
+
+
+function sendRequest (svcUrl, svcAction) {
+  fetch(svcUrl, options)
+    .then(
+      response => {
+        alertService.alertMessage("Action Successful: " + svcAction, 1)
+    }).error( error => {
+        alertService.alertMessage("Action Failure: " + svcAction, 2);
+        return Promise.reject(error);
+    });
+
+      return response.json();
+    });
+}
+
+export default clActionService;
diff --git a/ui-react/src/components/backend_communication/LoopService.js b/ui-react/src/components/backend_communication/LoopService.js
new file mode 100644
index 000000000..982180df5
--- /dev/null
+++ b/ui-react/src/components/backend_communication/LoopService.js
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+const LoopService = {
+    login
+};
+
+function login(username, password) {
+    let options = {
+           method: 'GET'
+         };
+    if (username && password) {
+      options = {
+             method: 'GET',
+             credentials: 'include',
+             headers: {
+                'Authorization': "Basic " + new Buffer(username + ":" + password).toString("base64")
+             }
+           };
+    }
+
+    return fetch(`/restservices/clds/v1/user/getUser`, options)
+      .then(response => handleResponse(response))
+      .then(function(data) {
+          localStorage.setItem('user', data);
+          console.log(data);
+});
+}
+
+function handleResponse(response) {
+     if (!response.ok || response.redirected === true) {
+          if (response.status === 401 || response.status === 500 || response.redirected === true) {
+              if (localStorage.getItem('tryBasicAuth')) {
+                // login failed, go to invalud login page
+                localStorage.removeItem('user');
+              } else {
+                // try to login with username and password
+                localStorage.setItem('tryBasicAuth', true);
+              }
+          }
+          const error = response.statusText;
+          return Promise.reject(error);
+      }
+    return response.text();
+}
+export default LoopService;
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 3077bde65..348541968 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -36,6 +36,13 @@ const StyledNavDropdownItem = styled(NavDropdown.Item)`
 
 export default class MenuBar extends React.Component {
 	
+	openEmailConsole() {
+		console.log("contactUs");
+		var link = "mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please "
+			+ "send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.";
+		window.location.href = link;
+	};
+
 	render () {
 	   return (
 		  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
@@ -56,8 +63,8 @@ export default class MenuBar extends React.Component {
 						<StyledNavDropdownItem href="#action/3.1">Refresh Status</StyledNavDropdownItem>
 					</NavDropdown>
 				<NavDropdown title="Help" id="basic-nav-dropdown">
-					<StyledNavDropdownItem href="#action/3.1">Wiki</StyledNavDropdownItem>
-					<StyledNavDropdownItem href="#action/3.2">Contact Us</StyledNavDropdownItem>
+					<NavDropdown.Item onClick={()=> window.open("https://wiki.onap.org/", "_blank")}>Wiki</NavDropdown.Item>
+					<NavDropdown.Item onClick={()=> this.openEmailConsole()}>Contact Us</NavDropdown.Item>
 					<StyledNavDropdownItem href="#action/3.3">User Info</StyledNavDropdownItem>
 				</NavDropdown>
 		  </Navbar.Collapse>
diff --git a/ui-react/src/components/route/LoginRoute.js b/ui-react/src/components/route/LoginRoute.js
new file mode 100644
index 000000000..f24e31b4a
--- /dev/null
+++ b/ui-react/src/components/route/LoginRoute.js
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { Route, Redirect } from 'react-router-dom';
+
+const LoginRoute = ({ component: Component, ...rest }) => (
+    <Route {...rest} render={props => (
+        localStorage.getItem('user')
+            ? <Component {...props} />
+            : localStorage.getItem('tryBasicAuth')
+                ? <Redirect to={{ pathname: '/basicAuthLogin', state: { from: props.location } }} />
+                : <Redirect to={{ pathname: '/login', state: { from: props.location } }} />
+    )} />
+)
+
+export default LoginRoute;
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index b2fc3b0f6..8236eb15c 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -22,10 +22,28 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
+
+import { Route, Switch, BrowserRouter } from 'react-router-dom'
 import OnapClamp from './OnapClamp';
+import NotFound from './components/app/NotFound';
+import LoginPage from './components/app/login/LoginPage';
+import LoginFailedPage from './components/app/login/LoginFailedPage';
+import BasicAuthLogin from './components/app/login/BasicAuthLogin';
+import LoginRoute from './components/route/LoginRoute';
 
 
-ReactDOM.render(
-	<OnapClamp/>,
-	document.getElementById('root')
+const routing = (
+  <BrowserRouter>
+    <div>
+      <Switch>
+        <LoginRoute exact path="/" component={OnapClamp} />
+        <Route path="/basicAuthLogin" component={BasicAuthLogin} />
+        <Route path="/login" component={LoginPage} />
+        <Route path="/loginFailed" component={LoginFailedPage} />
+        <Route component={NotFound} />
+      </Switch>
+		</div>
+  </BrowserRouter>
 )
+
+ReactDOM.render(routing, document.getElementById('root'))
-- 
cgit 1.2.3-korg


From 4946e5b7d80fa1a7baa1c6042100fa1dee24ee31 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 10 Jul 2019 12:32:36 +0200
Subject: Introduce modal

Test Modal for Operational policy and use react-router to show it

Issue-ID: CLAMP-415
Change-Id: Ie0df5f1085925224076062c7d331dc2f4c72d032
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/package.json                              |   1 +
 ui-react/src/components/app/LoopUI.js              |  56 ++-
 .../src/components/app/login/BasicAuthLogin.js     | 117 -----
 .../src/components/app/login/LoginFailedPage.js    |  35 --
 ui-react/src/components/app/login/LoginPage.js     |  48 --
 .../backend_communication/LoopActionService.js     |  50 +-
 .../components/backend_communication/LoopCache.js  | 162 +++---
 .../backend_communication/LoopService.js           |  66 ---
 .../backend_communication/UserService.js           |  50 ++
 .../components/backend_communication/example.json  | 417 ++++++++++++++++
 .../dialogs/OperationalPolicy/OperationalPolicy.js | 486 ------------------
 .../OperationalPolicy/OperationalPolicyModal.js    | 555 +++++++++++++++++++++
 .../dialogs/OperationalPolicy/template.json        |  52 ++
 .../src/components/loop_viewer/svg/example.svg     | 455 ++++++++++++++++-
 ui-react/src/components/menu/MenuBar.js            |  17 +-
 ui-react/src/components/route/LoginRoute.js        |  36 --
 ui-react/src/index.js                              |  31 +-
 17 files changed, 1675 insertions(+), 959 deletions(-)
 delete mode 100644 ui-react/src/components/app/login/BasicAuthLogin.js
 delete mode 100644 ui-react/src/components/app/login/LoginFailedPage.js
 delete mode 100644 ui-react/src/components/app/login/LoginPage.js
 delete mode 100644 ui-react/src/components/backend_communication/LoopService.js
 create mode 100644 ui-react/src/components/backend_communication/UserService.js
 create mode 100644 ui-react/src/components/backend_communication/example.json
 delete mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js
 create mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
 create mode 100644 ui-react/src/components/dialogs/OperationalPolicy/template.json
 delete mode 100644 ui-react/src/components/route/LoginRoute.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 791ab9df5..c6369a3a3 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "description": "ONAP Clamp Designer UI",
   "main": "index.js",
+  "proxy": "http://localhost:8080",
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
diff --git a/ui-react/src/components/app/LoopUI.js b/ui-react/src/components/app/LoopUI.js
index 7de6ad01b..d058543a2 100644
--- a/ui-react/src/components/app/LoopUI.js
+++ b/ui-react/src/components/app/LoopUI.js
@@ -31,14 +31,15 @@ import { GlobalClampStyle } from '../../theme/globalStyle.js';
 import ClosedLoopSvg from '../loop_viewer/svg/ClosedLoopSvg';
 import ClosedLoopLogs from '../loop_viewer/logs/ClosedLoopLogs';
 import ClosedLoopStatus from '../loop_viewer/status/ClosedLoopStatus';
+import UserService from '../backend_communication/UserService';
 
-const ProjectNameStyle = styled.a`
+const ProjectNameStyled = styled.a`
 	vertical-align: middle;
 	padding-left: 30px;
 	font-size: 30px;
 
 `
-const LoopViewDivStyle = styled.div`
+const LoopViewDivStyled = styled.div`
 	height: 90vh;
 	overflow: hidden;
 	margin-left: 10px;
@@ -50,52 +51,69 @@ const LoopViewDivStyle = styled.div`
 	border-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
 `
 
-const LoopViewHeaderDivStyle = styled.div`
+const LoopViewHeaderDivStyled = styled.div`
 	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
 	padding: 10px 10px;
 	color: ${props => props.theme.loopViewerHeaderFontColor};
 `
 
-const LoopViewBodyDivStyle = styled.div`
+const LoopViewBodyDivStyled = styled.div`
 	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	padding: 10px 10px;
 	color: ${props => (props.theme.loopViewerHeaderFontColor)};
 	height: 95%;
 `
 
-const LoopViewLoopNameSpanStyle = styled.span`
+const LoopViewLoopNameSpanStyled = styled.span`
 	font-weight: bold;
 	color: ${props => (props.theme.loopViewerHeaderFontColor)};
 	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
 `
 
 export default class LoopUI extends React.Component {
+	state = {
+		userName: null,
+		loopName: "Empty (NO loop loaded yet)",
+	};
 
-	loopName="Empty (NO loop loaded yet)";
+	constructor() {
+		super();
+		this.getUser = this.getUser.bind(this);
+	}
+
+ 	componentDidMount() {
+		 this.getUser();
+	 }
+
+	getUser() {
+		UserService.LOGIN().then(user => {
+			this.setState({userName:user})
+		});
+	}
 		
 	renderMenuNavBar() {
 		return (
 			<MenuBar />
 		);
 	}
-	
+
 	renderUserLoggedNavBar() {
 		return (
 			<Navbar.Text>
-				Signed in as: <a href="login">{localStorage.getItem('user')}</a>
+				Signed in as: <a href="/login">{this.state.userName}</a>
 			</Navbar.Text>
 		);
 	}
-	
+
 	renderLogoNavBar() {
 		return (
 			<Navbar.Brand>
 				<img height="50px" width="234px" src={logo} alt=""/>
-				<ProjectNameStyle>CLAMP</ProjectNameStyle>
+				<ProjectNameStyled>CLAMP</ProjectNameStyled>
 			</Navbar.Brand>
 		);
 	}
-	
+
 	renderNavBar() {
 		return (
 		<Navbar expand="lg">
@@ -108,34 +126,34 @@ export default class LoopUI extends React.Component {
 	
 	renderLoopViewHeader() {
 		return (
-			<LoopViewHeaderDivStyle>
-				Loop Viewer - <LoopViewLoopNameSpanStyle id="loop_name">{this.loopName}</LoopViewLoopNameSpanStyle> 
-			</LoopViewHeaderDivStyle>
+			<LoopViewHeaderDivStyled>
+				Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled> 
+			</LoopViewHeaderDivStyled>
 		);
 	}
 	
 	renderLoopViewBody() {
 		return (
-			<LoopViewBodyDivStyle>
+			<LoopViewBodyDivStyled>
 				<ClosedLoopSvg />
 				<ClosedLoopLogs />
 				<ClosedLoopStatus />
-			</LoopViewBodyDivStyle>
+			</LoopViewBodyDivStyled>
 		);
 	}
 	
 	renderLoopViewer() {
 		return (
-			<LoopViewDivStyle>
+			<LoopViewDivStyled>
 					{this.renderLoopViewHeader()}
 					{this.renderLoopViewBody()}
-			</LoopViewDivStyle>
+			</LoopViewDivStyled>
 	 		);
 	}
 	
 	render() {
 		return (
-				<div>
+			<div id="main_div">
 				 	<GlobalClampStyle />
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
diff --git a/ui-react/src/components/app/login/BasicAuthLogin.js b/ui-react/src/components/app/login/BasicAuthLogin.js
deleted file mode 100644
index 994255cd3..000000000
--- a/ui-react/src/components/app/login/BasicAuthLogin.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import styled from 'styled-components';
-import LoopService from '../../backend_communication/LoopService';
-
-const LoginHeaderStyle = styled.span`
-  font-size: 20px;
-  font-weight: bold;
-  padding-left: 10px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
-`
-const LoginDivStyle = styled.div`
-  font-size: 12px;
-	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-	padding: 10px 10px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
-`
-const LoginSubmitButtonStyle = styled.button`
-  font-size: 12px;
-	padding: 5px 10px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
-  border: 2px solid;
-  border-radius: 8px;
-`
-const LoginTextInputStyle = styled.input`
-  padding: 10px 10px;
-  margin-left: 20px;
-  border: 1px solid #ced4da;
-  border-radius: 3px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
-`
-
-export default class BasicAuthLogin extends React.Component {
-    constructor(props) {
-        super(props);
-        this.handleSubmit = this.handleSubmit.bind(this);
-        this.handleChange = this.handleChange.bind(this);
-        console.log('BasicAuthLogin');
-        this.state = {
-            username: '',
-            password: '',
-            submitted: 'false'
-        };
-    }
-
-    handleChange(e) {
-        const { name, value } = e.target;
-        this.setState({ [name]: value });
-    }
-
-    handleSubmit(e) {
-            e.preventDefault();
-            this.setState({ submitted: true });
-            const { username, password } = this.state;
-            LoopService.login(username, password)
-            .then(
-              user => {
-                  const { from } = { from: { pathname: "/" } };
-                  this.props.history.push(from);
-              },
-              error => {
-                  const { from } = { from: { pathname: "/loginFailed" } };
-                  this.props.history.push(from);
-                  console.log ("Basic login failed");
-              }
-        );
-    }
-
-    render() {
-      const { username, password, submitted} = this.state;
-        return (
-            <div>
-                <LoginHeaderStyle>Login</LoginHeaderStyle>
-                <form name="form" onSubmit={this.handleSubmit}>
-                    <LoginDivStyle className={(submitted && !username ? ' has-error' : '')}>
-                        <label htmlFor="username">Username</label>
-                        <LoginTextInputStyle name="username" value={username} onChange={this.handleChange} />
-                        {submitted && !username &&
-                            <div className="help-block">Username is required</div>
-                        }
-                    </LoginDivStyle>
-                    <LoginDivStyle className={(submitted && !password ? ' has-error' : '')}>
-                        <label htmlFor="password">Password</label>
-                        <LoginTextInputStyle type="password" name="password" value={password} onChange={this.handleChange} />
-                        {submitted && !password &&
-                            <div className="help-block">Password is required</div>
-                        }
-                    </LoginDivStyle>
-                    <LoginDivStyle>
-                        <LoginSubmitButtonStyle className="btn btn-primary">Login</LoginSubmitButtonStyle>
-                    </LoginDivStyle>
-                </form>
-            </div>
-        );
-    }
-}
diff --git a/ui-react/src/components/app/login/LoginFailedPage.js b/ui-react/src/components/app/login/LoginFailedPage.js
deleted file mode 100644
index fb398efd3..000000000
--- a/ui-react/src/components/app/login/LoginFailedPage.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react'
-
-
-export default class LoginFailedPage extends React.Component {
-	render () {
-		return (
-      		<div id='main'>
-      			<div class="divRow"><b>Login Failed!</b></div>
-      			<div class="divRow">Please cick <a href="/">here</a> to go back to the main page.</div>
-      		</div>
-		);
-	}
-}
diff --git a/ui-react/src/components/app/login/LoginPage.js b/ui-react/src/components/app/login/LoginPage.js
deleted file mode 100644
index 5169435c2..000000000
--- a/ui-react/src/components/app/login/LoginPage.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-
-import LoopService from '../../backend_communication/LoopService';
-
-export default class LoginPage extends React.Component {
-    constructor(props) {
-        super(props);
-        console.log('LoginPage')
-        LoopService.login().then(
-                user => {
-                    const { from } = { from: { pathname: "/" } };
-                    this.props.history.push(from);
-                },
-                error => {
-                  const { from } = { from: { pathname: "/" } };
-                  this.props.history.push(from);
-                  console.log ("Certification login failed");
-                }
-            );
-    }
-    render() {
-      return (
-        <div>
-  			</div>);
-}
-}
diff --git a/ui-react/src/components/backend_communication/LoopActionService.js b/ui-react/src/components/backend_communication/LoopActionService.js
index 027243be1..9ce8ff0a9 100644
--- a/ui-react/src/components/backend_communication/LoopActionService.js
+++ b/ui-react/src/components/backend_communication/LoopActionService.js
@@ -20,37 +20,35 @@
  * ===================================================================
  *
  */
-const clActionService = {
-    submit
+const loopActionService = {
+	submit
 };
 
+
 function submit(uiAction) {
-    const cl_name = "";
-    console.log("clActionServices perform action: " + uiAction + " closedloopName="
-		    + cl_name);
-    const svcAction = uiAction.toLowerCase();
-		const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
+	const cl_name = "";
+	console.log("clActionServices perform action: " + uiAction + " closedloopName="
+		+ cl_name);
+	const svcAction = uiAction.toLowerCase();
+	const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
 
-    let options = {
-        method: 'GET'
-    };
-    return sendRequest (svcUrl, svcAction, options);
+	let options = {
+		method: 'GET'
+	};
+	return sendRequest(svcUrl, svcAction, options);
 }
 
+function sendRequest(svcUrl, svcAction) {
+	fetch(svcUrl, options)
+		.then(
+			response => {
+				alertService.alertMessage("Action Successful: " + svcAction, 1)
+			}).error(error => {
+				alertService.alertMessage("Action Failure: " + svcAction, 2);
+				return Promise.reject(error);
+			});
 
+	return response.json();
+};
 
-function sendRequest (svcUrl, svcAction) {
-  fetch(svcUrl, options)
-    .then(
-      response => {
-        alertService.alertMessage("Action Successful: " + svcAction, 1)
-    }).error( error => {
-        alertService.alertMessage("Action Failure: " + svcAction, 2);
-        return Promise.reject(error);
-    });
-
-      return response.json();
-    });
-}
-
-export default clActionService;
+export default loopActionService;
\ No newline at end of file
diff --git a/ui-react/src/components/backend_communication/LoopCache.js b/ui-react/src/components/backend_communication/LoopCache.js
index 7fd20596b..2ef839629 100644
--- a/ui-react/src/components/backend_communication/LoopCache.js
+++ b/ui-react/src/components/backend_communication/LoopCache.js
@@ -20,95 +20,95 @@
  * ===================================================================
  * 
  */
-class LoopCache
-{
-	constructor(loopJson) {
-		this.loopJsonCache=loopJson;
+class LoopCache {
+	constructor() {
+		//this.loopJsonCache=loopJson;
+		this.loopJsonCache = require('./example.json'); //(with path)
 	}
-	
+
 	updateMsProperties(type, newMsProperties) {
-	    if (newMsProperties["name"] == type) {
-	        for (p in this.loopJsonCache["microServicePolicies"]) {
-	            if (this.loopJsonCache["microServicePolicies"][p]["name"] == type) {
-	                this.loopJsonCache["microServicePolicies"][p] = newMsProperties;
-	            }
-	        }
-	    }
-	}
-	
-	 updateGlobalProperties(newGlobalProperties) {
-	    this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
-	}
-	
-	 updateOpPolicyProperties(newOpProperties) {	
-	   this.loopJsonCache["operationalPolicies"] = newOpProperties;
-	}
-	
-	 getLoopName() {
-	    return this.loopJsonCache["name"];
-	}
-	
-	 getOperationalPolicyProperty() {
-	    return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
-	}
-	
-	 getOperationalPolicies() {
-	    return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
-	}
-	
-	 getGlobalProperty() {
-	    return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
-	}
-	
-	 getDeploymentProperties() {
-	    return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
-	}
-	
-	 getMsJson(type) {
-	    var msProperties = this.loopJsonCache["microServicePolicies"];
-	    for (p in msProperties) {
-	        if (msProperties[p]["name"] == type) {
-	           return JSON.parse(JSON.stringify(msProperties[p]));
-	        }
-	    }
-	    return null;
-	}
-	
-	 getMsProperty(type) {
-	    var msProperties = this.loopJsonCache["microServicePolicies"];
-	    for (p in msProperties) {
-	        if (msProperties[p]["name"] == type) {
-	        	if (msProperties[p]["properties"] !== null && msProperties[p]["properties"] !== undefined) {
-	        		return JSON.parse(JSON.stringify(msProperties[p]["properties"]));
-	        	}
-	        }
-	    }
-	    return null;
-	}
-	
-	 getMsUI(type) {
-	    var msProperties = this.loopJsonCache["microServicePolicies"];
-	    for (p in msProperties) {
-	        if (msProperties[p]["name"] == type) {
-	        	return JSON.parse(JSON.stringify(msProperties[p]["jsonRepresentation"]));
-	        }
-	    }
-	    return null;
-	}
-	
-	 getResourceDetailsVfProperty() {
+		if (newMsProperties["name"] == type) {
+			for (var policy in this.loopJsonCache["microServicePolicies"]) {
+				if (this.loopJsonCache["microServicePolicies"][policy]["name"] == type) {
+					this.loopJsonCache["microServicePolicies"][policy] = newMsProperties;
+				}
+			}
+		}
+	}
+
+	updateGlobalProperties(newGlobalProperties) {
+		this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
+	}
+
+	updateOpPolicyProperties(newOpProperties) {
+		this.loopJsonCache["operationalPolicies"] = newOpProperties;
+	}
+
+	getLoopName() {
+		return this.loopJsonCache["name"];
+	}
+
+	getOperationalPolicyProperty() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
+	}
+
+	getOperationalPolicies() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
+	}
+
+	getGlobalProperty() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
+	}
+
+	getDeploymentProperties() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
+	}
+
+	getMsJson(type) {
+		var msProperties = this.loopJsonCache["microServicePolicies"];
+		for (var policy in msProperties) {
+			if (msProperties[policy]["name"] == type) {
+				return JSON.parse(JSON.stringify(msProperties[policy]));
+			}
+		}
+		return null;
+	}
+
+	getMsProperty(type) {
+		var msProperties = this.loopJsonCache["microServicePolicies"];
+		for (var policy in msProperties) {
+			if (msProperties[policy]["name"] == type) {
+				if (msProperties[policy]["properties"] !== null && msProperties[policy]["properties"] !== undefined) {
+					return JSON.parse(JSON.stringify(msProperties[policy]["properties"]));
+				}
+			}
+		}
+		return null;
+	}
+
+	getMsUI(type) {
+		var msProperties = this.loopJsonCache["microServicePolicies"];
+		for (var policy in msProperties) {
+			if (msProperties[policy]["name"] == type) {
+				return JSON.parse(JSON.stringify(msProperties[policy]["jsonRepresentation"]));
+			}
+		}
+		return null;
+	}
+
+	getResourceDetailsVfProperty() {
 		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VF"];
 	}
-	
-	 getResourceDetailsVfModuleProperty() {
+
+	getResourceDetailsVfModuleProperty() {
 		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VFModule"];
 	}
-	
-	 getLoopLogsArray() {
+
+	getLoopLogsArray() {
 		return this.loopJsonCache.loopLogs;
 	}
-	
-	 getComponentStates() {
+
+	getComponentStates() {
 		return this.loopJsonCache.components;
 	}
 
diff --git a/ui-react/src/components/backend_communication/LoopService.js b/ui-react/src/components/backend_communication/LoopService.js
deleted file mode 100644
index 982180df5..000000000
--- a/ui-react/src/components/backend_communication/LoopService.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-const LoopService = {
-    login
-};
-
-function login(username, password) {
-    let options = {
-           method: 'GET'
-         };
-    if (username && password) {
-      options = {
-             method: 'GET',
-             credentials: 'include',
-             headers: {
-                'Authorization': "Basic " + new Buffer(username + ":" + password).toString("base64")
-             }
-           };
-    }
-
-    return fetch(`/restservices/clds/v1/user/getUser`, options)
-      .then(response => handleResponse(response))
-      .then(function(data) {
-          localStorage.setItem('user', data);
-          console.log(data);
-});
-}
-
-function handleResponse(response) {
-     if (!response.ok || response.redirected === true) {
-          if (response.status === 401 || response.status === 500 || response.redirected === true) {
-              if (localStorage.getItem('tryBasicAuth')) {
-                // login failed, go to invalud login page
-                localStorage.removeItem('user');
-              } else {
-                // try to login with username and password
-                localStorage.setItem('tryBasicAuth', true);
-              }
-          }
-          const error = response.statusText;
-          return Promise.reject(error);
-      }
-    return response.text();
-}
-export default LoopService;
diff --git a/ui-react/src/components/backend_communication/UserService.js b/ui-react/src/components/backend_communication/UserService.js
new file mode 100644
index 000000000..814539551
--- /dev/null
+++ b/ui-react/src/components/backend_communication/UserService.js
@@ -0,0 +1,50 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class UserService {
+
+	static LOGIN() {
+		return fetch('/restservices/clds/v1/user/getUser', {
+				method: 'GET',
+				credentials: 'include',
+			})
+		.then(function (response) {
+			if (response.ok) {
+				console.log("getUser response received: ", response.status);
+				return response.text();
+			} else {
+				console.error("getUser failed with status code: ",response.status);
+				return "Anonymous";
+			}
+		})
+		.then(function (data) {
+			console.log ("User connected:",data)
+			return data;
+		})
+		.catch(function(error) {
+			console.error("getUser error received",error);
+			return "Anonymous";
+		});
+	}
+}
+
diff --git a/ui-react/src/components/backend_communication/example.json b/ui-react/src/components/backend_communication/example.json
new file mode 100644
index 000000000..f3cc9e189
--- /dev/null
+++ b/ui-react/src/components/backend_communication/example.json
@@ -0,0 +1,417 @@
+{
+  "name": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
+  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
+  "globalPropertiesJson": {
+    "dcaeDeployParameters": {
+      "location_id": "",
+      "service_id": "",
+      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+    }
+  },
+  "modelPropertiesJson": {
+    "serviceDetails": {
+      "serviceType": "",
+      "namingPolicy": "",
+      "environmentContext": "General_Revenue-Bearing",
+      "serviceEcompNaming": "true",
+      "serviceRole": "",
+      "name": "vLoadBalancerMS",
+      "description": "vLBMS",
+      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+      "ecompGeneratedNaming": "true",
+      "category": "Network L4+",
+      "type": "Service",
+      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+      "instantiationType": "A-la-carte"
+    },
+    "resourceDetails": {
+      "CP": {},
+      "VL": {},
+      "VF": {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      },
+      "CR": {},
+      "VFC": {},
+      "PNF": {},
+      "Service": {},
+      "CVFC": {},
+      "Service Proxy": {},
+      "Configuration": {},
+      "AllottedResource": {},
+      "VFModule": {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        },
+        "Vloadbalancerms..vdns..module-3": {
+          "vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vdns..module-3",
+          "vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
+          "vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vdns",
+          "max_vf_module_instances": 50,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        },
+        "Vloadbalancerms..base_template..module-0": {
+          "vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..base_template..module-0",
+          "vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
+          "vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+          "min_vf_module_instances": 1,
+          "vf_module_label": "base_template",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Base",
+          "isBase": true,
+          "initial_count": 1,
+          "volume_group": false
+        },
+        "Vloadbalancerms..vlb..module-2": {
+          "vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vlb..module-2",
+          "vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+          "vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vlb",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      }
+    }
+  },
+  "lastComputedState": "DESIGN",
+  "components": {
+    "POLICY": {
+      "componentState": {
+        "stateName": "NOT_SENT",
+        "description": "The policies defined have NOT yet been created on the policy engine"
+      }
+    },
+    "DCAE": {
+      "componentState": {
+        "stateName": "BLUEPRINT_DEPLOYED",
+        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+      }
+    }
+  },
+  "operationalPolicies": [
+    {
+      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "configurationsJson": {
+        "guard_policies": {
+          "guard.minmax.new": {
+            "recipe": "",
+            "clname": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
+            "actor": "",
+            "targets": "",
+            "min": "gg",
+            "max": "gg",
+            "limit": "",
+            "timeUnits": "",
+            "timeWindow": "",
+            "guardActiveStart": "00:00:00Z",
+            "guardActiveEnd": "00:00:01Z"
+          }
+        },
+        "operational_policy": {
+          "controlLoop": {
+            "trigger_policy": "new",
+            "timeout": "0",
+            "abatement": "false",
+            "controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
+          },
+          "policies": [
+            {
+              "id": "new",
+              "recipe": "",
+              "retry": "0",
+              "timeout": "0",
+              "actor": "",
+              "payload": "",
+              "success": "",
+              "failure": "",
+              "failure_timeout": "",
+              "failure_retries": "",
+              "failure_exception": "",
+              "failure_guard": "",
+              "target": {
+                "type": "VM",
+                "resourceID": ""
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "microServicePolicies": [
+    {
+      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+      "properties": {
+        "domain": "measurementsForVfScaling",
+        "metricsPerEventName": [
+          {
+            "policyVersion": "ff",
+            "thresholds": [
+              {
+                "severity": "CRITICAL",
+                "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                "thresholdValue": 0,
+                "closedLoopEventStatus": "ONSET",
+                "closedLoopControlName": "ff",
+                "version": "ff",
+                "direction": "LESS"
+              }
+            ],
+            "policyName": "ff",
+            "controlLoopSchemaType": "VM",
+            "policyScope": "ff",
+            "eventName": "ff"
+          }
+        ]
+      },
+      "shared": false,
+      "jsonRepresentation": {
+        "schema": {
+          "uniqueItems": "true",
+          "format": "tabs-top",
+          "type": "array",
+          "title": "TCA Policy JSON",
+          "items": {
+            "type": "object",
+            "title": "TCA Policy JSON",
+            "required": [
+              "domain",
+              "metricsPerEventName"
+            ],
+            "properties": {
+              "domain": {
+                "propertyOrder": 1001,
+                "default": "measurementsForVfScaling",
+                "title": "Domain name to which TCA needs to be applied",
+                "type": "string"
+              },
+              "metricsPerEventName": {
+                "propertyOrder": 1002,
+                "uniqueItems": "true",
+                "format": "tabs-top",
+                "title": "Contains eventName and threshold details that need to be applied to given eventName",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "controlLoopSchemaType",
+                    "eventName",
+                    "policyName",
+                    "policyScope",
+                    "policyVersion",
+                    "thresholds"
+                  ],
+                  "properties": {
+                    "policyVersion": {
+                      "propertyOrder": 1007,
+                      "title": "TCA Policy Scope Version",
+                      "type": "string"
+                    },
+                    "thresholds": {
+                      "propertyOrder": 1008,
+                      "uniqueItems": "true",
+                      "format": "tabs-top",
+                      "title": "Thresholds associated with eventName",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "closedLoopControlName",
+                          "closedLoopEventStatus",
+                          "direction",
+                          "fieldPath",
+                          "severity",
+                          "thresholdValue",
+                          "version"
+                        ],
+                        "properties": {
+                          "severity": {
+                            "propertyOrder": 1013,
+                            "title": "Threshold Event Severity",
+                            "type": "string",
+                            "enum": [
+                              "CRITICAL",
+                              "MAJOR",
+                              "MINOR",
+                              "WARNING",
+                              "NORMAL"
+                            ]
+                          },
+                          "fieldPath": {
+                            "propertyOrder": 1012,
+                            "title": "Json field Path as per CEF message which needs to be analyzed for TCA",
+                            "type": "string",
+                            "enum": [
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                              "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                              "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+                            ]
+                          },
+                          "thresholdValue": {
+                            "propertyOrder": 1014,
+                            "title": "Threshold value for the field Path inside CEF message",
+                            "type": "integer"
+                          },
+                          "closedLoopEventStatus": {
+                            "propertyOrder": 1010,
+                            "title": "Closed Loop Event Status of the threshold",
+                            "type": "string",
+                            "enum": [
+                              "ONSET",
+                              "ABATED"
+                            ]
+                          },
+                          "closedLoopControlName": {
+                            "propertyOrder": 1009,
+                            "title": "Closed Loop Control Name associated with the threshold",
+                            "type": "string"
+                          },
+                          "version": {
+                            "propertyOrder": 1015,
+                            "title": "Version number associated with the threshold",
+                            "type": "string"
+                          },
+                          "direction": {
+                            "propertyOrder": 1011,
+                            "title": "Direction of the threshold",
+                            "type": "string",
+                            "enum": [
+                              "LESS",
+                              "LESS_OR_EQUAL",
+                              "GREATER",
+                              "GREATER_OR_EQUAL",
+                              "EQUAL"
+                            ]
+                          }
+                        }
+                      }
+                    },
+                    "policyName": {
+                      "propertyOrder": 1005,
+                      "title": "TCA Policy Scope Name",
+                      "type": "string"
+                    },
+                    "controlLoopSchemaType": {
+                      "propertyOrder": 1003,
+                      "title": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+                      "type": "string",
+                      "enum": [
+                        "VM",
+                        "VNF"
+                      ]
+                    },
+                    "policyScope": {
+                      "propertyOrder": 1006,
+                      "title": "TCA Policy Scope",
+                      "type": "string"
+                    },
+                    "eventName": {
+                      "propertyOrder": 1004,
+                      "title": "Event name to which thresholds need to be applied",
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "loopLogs": [
+    {
+      "id": 2,
+      "logType": "INFO",
+      "logComponent": "CLAMP",
+      "message": "Micro Service policies UPDATED",
+      "logInstant": "2019-07-08T09:44:53Z"
+    },
+    {
+      "id": 1,
+      "logType": "INFO",
+      "logComponent": "CLAMP",
+      "message": "Operational and Guard policies UPDATED",
+      "logInstant": "2019-07-08T09:44:37Z"
+    }
+  ]
+}
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js
deleted file mode 100644
index 7b4ed0f89..000000000
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.js
+++ /dev/null
@@ -1,486 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-
-import './OperationalPolicy.css'
-
-class OperationalPolicy extends React.Component {
-	
-	constructor(props, context) {
-	    super(props, context);
-
-	    this.handleShow = this.handleShow.bind(this);
-	    this.handleClose = this.handleClose.bind(this);
-		this.initPolicySelect = this.initPolicySelect.bind(this);
-
-		this.allPolicies=[];
-		this.policy_ids=[];
-
-	    this.state = {
-	      show: false,
-	    };
-	  }
-
-	  handleClose() {
-	    this.setState({ show: false });
-	  }
-
-	  handleShow() {
-	    this.setState({ show: true });
-	  }
-
-	  initPolicySelect() {
-		    if (this.allPolicies['operational_policy'] === undefined || this.allPolicies['operational_policy'] === null) {
-			    this.allPolicies = getOperationalPolicyProperty();
-		    }
-		    // Provision all policies ID first
-		    if (policy_ids.length == 0 && this.allPolicies['operational_policy'] != undefined) {
-			    $.each(this.allPolicies['operational_policy']['policies'], function() {
-				    policy_ids.push(this['id']);
-			    });
-		    }
-	    }
-
-	  render() {
-	    return (
-	      <>
-	        <Button variant="primary" onClick={this.handleShow}>
-	          Launch demo modal
-	        </Button>
-
-	        <Modal size="lg" show={this.state.show} onHide={this.handleClose}>
-	          <Modal.Header closeButton>
-	            <Modal.Title>Modal heading</Modal.Title>
-	          </Modal.Header>
-	          <Modal.Body>
-	          <div attribute-test="policywindowproperties" id="configure-widgets"
-	        		className="disabled-block-container">
-	        		<div attribute-test="policywindowpropertiesh" className="modal-header">
-	        			<button type="button" className="close" onClick="close(false)"
-	        				aria-hidden="true" style={{marginTop: '-3px'}}>&times;</button>
-	        			<h4>Operational Policy</h4>
-	        		</div>
-
-	        		<div className="modal-body">
-	        			<div attribute-test="policywindowpropertiesb" className="modal-body row">
-
-	        				<div className="panel panel-default col-sm-10 policyPanel">
-	        					<form id="operationalPolicyHeaderForm" className="form-horizontal">
-	        							<div className="form-group clearfix">
-	        								<label className="col-sm-2">Parent policy</label>
-	        								<div className="col-sm-3" style={{padding: '0px'}}>
-	        									<select type="text" id="trigger_policy" name="trigger_policy"
-	        										className="form-control" ng-init="initPolicySelect()"
-	        										ng-options="policy for policy in policy_ids track by policy">
-	        										<option value="">-- choose an option --</option>
-	        										</select>
-	        								</div>
-
-	        								<label htmlFor="timeout" className="col-sm-3"
-	        									style={{paddingLeft: '5px', paddingRight: '10px'}}>Overall
-	        									Time Limit</label>
-	        								<div className="col-sm-2" style={{paddingLeft: '0px'}}>
-	        									<input type="text" ng-pattern="/^[0-9]*$/" ng-model="number"
-	        										className="form-control" id="timeout" name="timeout"/>
-	        								</div>
-
-	        								<label htmlFor="abatement" className="col-sm-2">Abatement</label>
-	        								<div className="col-sm-2" style={{paddingLeft: '0px'}}>
-	        									<select className="form-control" id="abatement" name="abatement" onChange={this.handleChange}>
-	        	   									<option value="false">False</option>
-	        	   									<option value="true">True</option>
-	        									</select>
-	        								</div>
-	        							</div>
-	        							<div className="form-group clearfix row">
-	        	   						    <label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
-	        							    <div className="col-sm-8">
-	        								    <input type="text" className="form-control" name="controlLoopName"
-	        									    readOnly="readonly" id="clname" ng-model="clname"/>
-	        							    </div>
-	        							</div>
-	        					</form>
-	        					<div className="panel-heading" style={{backgroundColor: 'white'}}>
-	        						<ul id="nav_Tabs" className="nav nav-tabs">
-	        							<li>
-		        							<a id="add_one_more" href="#desc_tab">
-			        							<span
-		        									className="glyphicon glyphicon-plus" aria-hidden="true">
-	        									</span>
-        									</a>
-       									</li>
-	        						</ul>
-	        					</div>
-	        					<div className="panel-body">
-	        						<div className="tab-content">
-	        							<div id="properties_tab" className="tab-pane fade in active"></div>
-	        						</div>
-	        					</div>
-	        				</div>
-
-	        				<span id="formSpan" style={{display: 'none'}}>
-	        					<form className="policyProperties" className="form-horizontal"
-	        						style={{border:'2px dotted gray'}}
-	        						title="Operational Policy Properties">
-	        						<div className="form-group clearfix">
-	        							<label className="col-sm-4 control-label" htmlFor="id">ID</label>
-	        							<div className="col-sm-8">
-	        								<input type="text" className="form-control"  name="id" id="id" ng-model="duplicated" ng-init="duplicated = false"
-	        									ng-keyup="updateTabLabel($event)" />
-	        								<span >ID must be unique</span>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" name="recipe" id="recipe"
-	        									ng-model="recipe" ng-click="updateGuardRecipe($event)">
-	        									<option value="">-- choose an option --</option>
-	        									<option value="Restart">Restart</option>
-	        									<option value="Rebuild">Rebuild</option>
-	        									<option value="Migrate">Migrate</option>
-	        									<option value="Health-Check">Health-Check</option>
-	        									<option value="ModifyConfig">ModifyConfig</option>
-	        									<option value="VF Module Create">VF Module Create</option>
-	        									<option value="VF Module Delete">VF Module Delete</option>
-	        									<option value="Reroute">Reroute</option>
-	        								</select>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="retry" className="col-sm-4 control-label"> Retry</label>
-	        							<div className="col-sm-8">
-	        								<input type="text" maxLength="5" className="form-control" id="retry"
-	        									ng-pattern="/^[0-9]*$/" ng-model="number" name="retry">
-	        								</input>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="timeout" className="col-sm-4 control-label">
-	        								Timeout</label>
-	        							<div className="col-sm-8">
-	        								<input type="text" maxLength="5" className="form-control"
-	        									id="timeout" ng-pattern="/^[0-9]*$/" ng-model="number"
-	        									name="timeout"></input>
-	        							</div>
-	        						</div>
-
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="actor" className="col-sm-4 control-label"> Actor</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="actor" name="actor" ng-click="updateGuardActor($event)" ng-model="actor">
-	        								    <option value="">-- choose an option --</option>
-	        									<option value="APPC">APPC</option>
-	        									<option value="SO">SO</option>
-	        									<option value="VFC">VFC</option>
-	        									<option value="SDNC">SDNC</option>°
-	        									<option value="SDNR">SDNR</option>°
-	        								</select>
-	        							</div>
-
-	        							<label htmlFor="payload" className="col-sm-4 control-label">
-	        								Payload (YAML)</label>
-	        							<div className="col-sm-8">
-	        								<textarea className="form-control" id="payload" name="payload"></textarea>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="success" className="col-sm-4 control-label">When
-	        								Success</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="success" name="success"
-	        									ng-model="null_dump"
-	        									ng-options="policy for policy in policy_ids track by policy">
-	        									<option value="">-- choose an option --</option>
-	        									</select>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="failure" className="col-sm-4 control-label">When
-	        								Failure</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="failure" name="failure"
-	        									ng-model="null_dump"
-	        									ng-options="policy for policy in policy_ids track by policy">
-	        									<option value="">-- choose an option --</option>
-	        									</select>
-
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="failure_timeout" className="col-sm-4 control-label">When
-	        								Failure Timeout</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="failure_timeout"
-	        									name="failure_timeout" ng-model="null_dump"
-	        									ng-options="policy for policy in policy_ids track by policy">
-	        									<option value="">-- choose an option --</option>
-	        									</select>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="failure_retries" className="col-sm-4 control-label">When
-	        								Failure Retries</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="failure_retries"
-	        									name="failure_retries" ng-model="null_dump"
-	        									ng-options="policy for policy in policy_ids track by policy">
-	        									<option value="">-- choose an option --</option>
-	        									</select>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="failure_exception" className="col-sm-4 control-label">When
-	        								Failure Exception</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="failure_exception"
-	        									name="failure_exception" ng-model="null_dump"
-	        									ng-options="policy for policy in policy_ids track by policy">
-	        									<option value="">-- choose an option --</option>
-	        									</select>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="failure_guard" className="col-sm-4 control-label">When
-	        								Failure Guard</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" id="failure_guard"
-	        									name="failure_guard" ng-model="null_dump"
-	        									ng-options="policy for policy in policy_ids track by policy">
-	        									<option value="">-- choose an option --</option>
-	        									</select>
-	        							</div>
-	        						</div>
-	        					</form>
-	        					<form className="policyTarget" className="form-horizontal"
-	        						title="Operational Policy Target" style={{border: '2px dotted gray'}}>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="type" className="col-sm-4 control-label"> Target
-	        								Type</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" name="type" id="type"
-	        									ng-click="initTargetResourceId($event)" ng-model="type">
-	        	                						<option value="">-- choose an option --</option>                                                    
-	        									<option value="VFMODULE">VFMODULE</option>
-	        									<option value="VM">VM</option>
-	        									<option value="VNF">VNF</option>
-	        								</select>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="resourceID" className="col-sm-4 control-label">
-	        								Target ResourceId</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" name="resourceID" id="resourceID"
-	        									ng-click="changeTargetResourceId($event)"
-	        									ng-model="resourceId">
-	        									<option value="">-- choose an option --</option>
-	        								</select>
-	        							</div>
-	        						</div>
-	        						<div id="metadata">
-	        							<div className="form-group clearfix">
-	        								<label htmlFor="modelInvariantId" className="col-sm-4 control-label">
-	        									Model Invariant Id</label>
-	        								<div className="col-sm-8">
-	        									<input className="form-control" name="modelInvariantId"
-	        										id="modelInvariantId" readOnly/>
-	        								</div>
-	        							</div>
-	        							<div className="form-group clearfix">
-	        								<label htmlFor="modelVersionId" className="col-sm-4 control-label">
-	        									Model Version Id</label>
-	        								<div className="col-sm-8">
-	        									<input className="form-control" name="modelVersionId"
-	        										id="modelVersionId" readOnly/>
-	        								</div>
-	        							</div>
-	        							<div className="form-group clearfix">
-	        								<label htmlFor="modelName" className="col-sm-4 control-label">
-	        									Model Name</label>
-	        								<div className="col-sm-8">
-	        									<input className="form-control" name="modelName" id="modelName"
-	        										readOnly/>
-	        								</div>
-	        							</div>
-	        							<div className="form-group clearfix">
-	        								<label htmlFor="modelVersion" className="col-sm-4 control-label">
-	        									Model Version</label>
-	        								<div className="col-sm-8">
-	        									<input className="form-control" name="modelVersion"
-	        										id="modelVersion" readOnly/>
-	        								</div>
-	        							</div>
-	        							<div className="form-group clearfix">
-	        								<label htmlFor="modelCustomizationId" className="col-sm-4 control-label">
-	        									Model Customization Id</label>
-	        								<div className="col-sm-8">
-	        									<input className="form-control" name="modelCustomizationId"
-	        										id="modelCustomizationId" readOnly/>
-	        								</div>
-	        							</div>
-	        						</div>
-	        					</form>
-	        					<div className="form-group clearfix">
-	        						<label htmlFor="enableGuardPolicy" className="col-sm-4 control-label">
-	        							Enable Guard Policy</label>
-	        						<div className="col-sm-8">
-	        							<input type="checkbox" className="form-control"
-	        								name="enableGuardPolicy" id="enableGuardPolicy" />
-	        						</div>
-
-	        						<div className="col-sm-8">
-	        							<label htmlFor="guardPolicyType" className="col-sm-4 control-label">
-	        								Guard Policy Type</label> <select className="form-control"
-	        								name="guardPolicyType" id="guardPolicyType"
-	        								ng-click="changeGuardPolicyType()" ng-model="guardType">
-	        								<option value="GUARD_MIN_MAX">MinMax</option>
-	        								<option value="GUARD_YAML">FrequencyLimiter</option>
-	        							</select>
-	        						</div>
-	        					</div>
-	        					<form className="guardProperties" className="form-horizontal"
-	        						title="Guard policy associated" style={{border: '2px dotted gray'}}>
-
-	        						<div className="form-group clearfix withnote">
-	        							<label className="col-sm-4 control-label" htmlFor="id">Guard Policy ID</label>
-	        							<div className="col-sm-8">
-	        								<input type="text" className="form-control" name="id" id="id" ng-blur="changeGuardId()" ng-model="id"/>
-	        							</div>
-	        						</div>
-	        						<div>
-	        							<label className="form-group note">Note: Prefix will be added to Guard Policy ID automatically based on Guard Policy Type</label>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
-	        							<div className="col-sm-8">
-	        								<input type="text" className="form-control" name="recipe"
-	        									readOnly="readonly" id="recipe"/>
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
-	        							<div className="col-sm-8">
-	        								<input type="text" className="form-control" name="clname"
-	        									readOnly="readonly" id="clname" ng-model="clname" />
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        						    <label htmlFor="actor" className="col-sm-4 control-label">Actor</label>
-	        							<div className="col-sm-8">
-	        							    <input type="text" className="form-control" name="actor"
-	        									readOnly="readonly" id="actor" />
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-
-	        							<label htmlFor="targets" className="col-sm-4 control-label">Guard
-	        								targets</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="targets" id="targets" />
-	        							</div>
-	        						</div>
-
-	        						<div className="form-group clearfix" id="minMaxGuardPolicyDiv">
-	        							<label htmlFor="min" className="col-sm-4 control-label"> Min
-	        								Guard</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="min" id="min" />
-	        							</div>
-	        							<label htmlFor="max" className="col-sm-4 control-label"> Max
-	        								Guard</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="max" id="max" />
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix"
-	        							id="frequencyLimiterGuardPolicyDiv" style={{display: 'none'}}>
-	        							<label htmlFor="limit" className="col-sm-4 control-label">Limit</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="limit" id="limit" />
-	        							</div>
-	        							<label htmlFor="timeUnits" className="col-sm-4 control-label">Time Units</label>
-	        							<div className="col-sm-8">
-	        								<select className="form-control" name="timeUnits"
-	        									id="timeUnits">
-	        									<option value=""></option>
-	        									<option value="minute">minute</option>
-	        									<option value="hour">hour</option>
-	        									<option value="day">day</option>
-	        									<option value="week">week</option>
-	        									<option value="month">month</option>
-	        									<option value="year">year</option>
-	        								</select> 
-	        							</div>
-	        							<label htmlFor="timeWindow" className="col-sm-4 control-label">Time	Window</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="timeWindow" id="timeWindow" />
-	        							</div>
-	        						</div>
-	        						<div className="form-group clearfix">
-	        							<label htmlFor="guardActiveStart" className="col-sm-4 control-label">
-	        								Guard Active Start</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="guardActiveStart"
-	        									id="guardActiveStart"  value="00:00:00Z"/>
-	        							</div>
-	        							<label htmlFor="guardActiveEnd" className="col-sm-4 control-label">
-	        								Guard Active End</label>
-	        							<div className="col-sm-8">
-	        								<input className="form-control" name="guardActiveEnd"
-	        									id="guardActiveEnd" value="00:00:01Z"/>
-	        							</div>
-	        						</div>
-
-	        					</form>
-
-	        				</span>
-	        			</div>
-	        		</div>
-
-	        		<div attribute-test="policywindowpropertiesf" className="modal-footer">
-	        			<button id="savePropsBtn" className="btn btn-primary" ng-disabled="duplicated">Close</button>
-	        			<button ng-click="close(true)" id="close_button"
-	        				className="btn btn-primary">Cancel</button>
-	        		</div>
-
-	        	</div>
-	          </Modal.Body>
-	          <Modal.Footer>
-	            <Button variant="secondary" onClick={this.handleClose}>
-	              Close
-	            </Button>
-	            <Button variant="primary" onClick={this.handleClose}>
-	              Save Changes
-	            </Button>
-	          </Modal.Footer>
-	        </Modal>
-	      </>
-	    );
-	  }
-}
-
-export default OperationalPolicy;
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
new file mode 100644
index 000000000..e52d930a2
--- /dev/null
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -0,0 +1,555 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import LoopCache from '../../backend_communication/LoopCache'
+import './OperationalPolicy.css'
+import styled from 'styled-components';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class OperationalPolicyModal extends React.Component {
+
+	constructor(props, context) {
+		super(props, context);
+
+		this.loopCache = new LoopCache();
+
+		this.handleClose = this.handleClose.bind(this);
+		this.initPolicySelect = this.initPolicySelect.bind(this);
+
+		this.allPolicies = [];
+		this.policyIds = [];
+
+		this.initPolicySelect();
+
+		this.state = {
+			show: true,
+		};
+
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+	}
+
+	initPolicySelect() {
+		if (this.allPolicies['operational_policy'] === undefined || this.allPolicies['operational_policy'] === null) {
+			this.allPolicies = this.loopCache.getOperationalPolicyProperty();
+		}
+		// Provision all policies ID first
+		if (this.policyIds.length == 0 && this.allPolicies['operational_policy'] != undefined) {
+
+			for (let i = 0; i < this.allPolicies['operational_policy']['policies'].length; i++) {
+				this.policyIds.push(this.allPolicies['operational_policy']['policies'][i]['id']);
+			}
+		}
+	}
+
+	renderPolicyIdSelect() {
+		return (
+			<select type="text" id="trigger_policy" name="trigger_policy"
+				className="form-control">
+				<option value="">-- choose an option --</option>
+				{this.policyIds.map(policyId => (<option key={policyId}>{policyId}</option>))}
+			</select>
+		);
+	}
+
+	serializeElement(element) {
+		var o = {};
+		element.serializeArray().forEach(function () {
+			if (o[this.name]) {
+				if (!o[this.name].push) {
+					o[this.name] = [o[this.name]];
+				}
+				o[this.name].push(this.value || '');
+			} else {
+				o[this.name] = this.value || '';
+			}
+		});
+		return o;
+	}
+
+	// When we change the name of a policy
+	isDuplicatedId (event) {
+		// update policy id structure
+		var formNum = document.getElementById(event.target).closest('.formId').attr('id').substring(6);
+		var policyId = document.getElementById(event.target).val();
+		if (this.policyIds.includes(policyId)) {
+			console.log("Duplicated ID, cannot proceed");
+			return true;
+		} else {
+			this.duplicated = false;
+			this.policyIds.splice(this.policyIds.indexOf(document.getElementById("#formId" + formNum + " #id").val()), 1);
+			this.policyIds.push(document.getElementById(event.target).val());
+			// Update the tab now
+			document.getElementById("#go_properties_tab" + formNum).text(document.getElementById(event.target).val());
+		}
+	}
+
+	configureComponents() {
+		    console.log("Load properties to op policy");
+		    // Set the header
+		    document.getElementsByClassName('form-control').forEach(function() {
+			    this.val(this.allPolicies['operational_policy']['controlLoop'][this.id]);
+		    });
+		    // Set the sub-policies
+		    this.allPolicies['operational_policy']['policies'].forEach(function(opPolicyElemIndex, opPolicyElemValue) {
+
+/*			    var formNum = add_one_more();
+			    forEach(document.getElementsByClassName('policyProperties').find('.form-control'), function(opPolicyPropIndex, opPolicyPropValue) {
+
+				    $("#formId" + formNum + " .policyProperties").find("#" + opPolicyPropValue.id).val(
+				    allPolicies['operational_policy']['policies'][opPolicyElemIndex][opPolicyPropValue.id]);
+			    });
+
+			    // Initial TargetResourceId options
+			    initTargetResourceIdOptions(allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target']['type'], formNum);
+			    $.each($('.policyTarget').find('.form-control'), function(opPolicyTargetPropIndex, opPolicyTargetPropValue) {
+
+				    $("#formId" + formNum + " .policyTarget").find("#" + opPolicyTargetPropValue.id).val(
+				    allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target'][opPolicyTargetPropValue.id]);
+			    });
+
+			    // update the current tab label
+			    $("#go_properties_tab" + formNum).text(
+			    allPolicies['operational_policy']['policies'][opPolicyElemIndex]['id']);
+			    // Check if there is a guard set for it
+			    $.each(allPolicies['guard_policies'], function(guardElemId, guardElemValue) {
+
+				    if (guardElemValue.recipe === $($("#formId" + formNum + " #recipe")[0]).val()) {
+					    // Found one, set all guard prop
+					    $.each($('.guardProperties').find('.form-control'), function(guardPropElemIndex,
+					                                                                 guardPropElemValue) {
+
+						    guardElemValue['id'] = guardElemId;
+						    $("#formId" + formNum + " .guardProperties").find("#" + guardPropElemValue.id).val(
+						    guardElemValue[guardPropElemValue.id]);
+					    });
+					    iniGuardPolicyType(guardElemId, formNum);
+					    // And finally enable the flag
+					    $("#formId" + formNum + " #enableGuardPolicy").prop("checked", true);
+				    }
+			    });*/
+			});
+	    }
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Operational policies</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<div attribute-test="policywindowproperties" id="configure-widgets"
+						className="disabled-block-container">
+						<div attribute-test="policywindowpropertiesb" className="modal-body row">
+							<div className="panel panel-default col-sm-10 policyPanel">
+								<form id="operationalPolicyHeaderForm" className="form-horizontal">
+									<div className="form-group clearfix">
+										<label className="col-sm-2">Parent policy</label>
+										<div className="col-sm-3" style={{ padding: '0px' }}>
+											{this.renderPolicyIdSelect()}
+										</div>
+
+										<label htmlFor="timeout" className="col-sm-3"
+											style={{ paddingLeft: '5px', paddingRight: '10px' }}>Overall
+	        									Time Limit</label>
+										<div className="col-sm-2" style={{ paddingLeft: '0px' }}>
+											<input type="text" ng-pattern="/^[0-9]*$/" ng-model="number"
+												className="form-control" id="timeout" name="timeout" />
+										</div>
+
+										<label htmlFor="abatement" className="col-sm-2">Abatement</label>
+										<div className="col-sm-2" style={{ paddingLeft: '0px' }}>
+											<select className="form-control" id="abatement" name="abatement">
+												<option value="false">False</option>
+												<option value="true">True</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix row">
+										<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
+										<div className="col-sm-8">
+											<input type="text" className="form-control" name="controlLoopName"
+												readOnly="readonly" id="clname" value={this.loopCache.getLoopName()} />
+										</div>
+									</div>
+								</form>
+								<div className="panel-heading" style={{ backgroundColor: 'white' }}>
+									<ul id="nav_Tabs" className="nav nav-tabs">
+										<li>
+											<a id="add_one_more" href="#desc_tab">
+												<span
+													className="glyphicon glyphicon-plus" aria-hidden="true">
+												</span>
+											</a>
+										</li>
+									</ul>
+								</div>
+								<div className="panel-body">
+									<div className="tab-content">
+										<div id="properties_tab" className="tab-pane fade in active"></div>
+									</div>
+								</div>
+							</div>
+
+							<span id="formSpan" style={{ display: 'none' }}>
+								<form className="policyProperties" className="form-horizontal"
+									style={{ border: '2px dotted gray' }}
+									title="Operational Policy Properties">
+									<div className="form-group clearfix">
+										<label className="col-sm-4 control-label" htmlFor="id">ID</label>
+										<div className="col-sm-8">
+											<input type="text" className="form-control" name="id" id="id"
+										onKeyUp="updateTabLabel($event)" />
+											<span >ID must be unique</span>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
+										<div className="col-sm-8">
+											<select className="form-control" name="recipe" id="recipe"
+												ng-model="recipe" ng-click="updateGuardRecipe($event)">
+												<option value="">-- choose an option --</option>
+												<option value="Restart">Restart</option>
+												<option value="Rebuild">Rebuild</option>
+												<option value="Migrate">Migrate</option>
+												<option value="Health-Check">Health-Check</option>
+												<option value="ModifyConfig">ModifyConfig</option>
+												<option value="VF Module Create">VF Module Create</option>
+												<option value="VF Module Delete">VF Module Delete</option>
+												<option value="Reroute">Reroute</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="retry" className="col-sm-4 control-label"> Retry</label>
+										<div className="col-sm-8">
+											<input type="text" maxLength="5" className="form-control" id="retry"
+												ng-pattern="/^[0-9]*$/" ng-model="number" name="retry">
+											</input>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="timeout" className="col-sm-4 control-label">
+											Timeout</label>
+										<div className="col-sm-8">
+											<input type="text" maxLength="5" className="form-control"
+												id="timeout" ng-pattern="/^[0-9]*$/" ng-model="number"
+												name="timeout"></input>
+										</div>
+									</div>
+
+									<div className="form-group clearfix">
+										<label htmlFor="actor" className="col-sm-4 control-label"> Actor</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="actor" name="actor" ng-click="updateGuardActor($event)" ng-model="actor">
+												<option value="">-- choose an option --</option>
+												<option value="APPC">APPC</option>
+												<option value="SO">SO</option>
+												<option value="VFC">VFC</option>
+												<option value="SDNC">SDNC</option>°
+	        									<option value="SDNR">SDNR</option>°
+	        								</select>
+										</div>
+
+										<label htmlFor="payload" className="col-sm-4 control-label">
+											Payload (YAML)</label>
+										<div className="col-sm-8">
+											<textarea className="form-control" id="payload" name="payload"></textarea>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="success" className="col-sm-4 control-label">When
+	        								Success</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="success" name="success"
+												ng-model="null_dump"
+												ng-options="policy for policy in policy_ids track by policy">
+												<option value="">-- choose an option --</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="failure" className="col-sm-4 control-label">When
+	        								Failure</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="failure" name="failure"
+												ng-model="null_dump"
+												ng-options="policy for policy in policy_ids track by policy">
+												<option value="">-- choose an option --</option>
+											</select>
+
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="failure_timeout" className="col-sm-4 control-label">When
+	        								Failure Timeout</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="failure_timeout"
+												name="failure_timeout" ng-model="null_dump"
+												ng-options="policy for policy in policy_ids track by policy">
+												<option value="">-- choose an option --</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="failure_retries" className="col-sm-4 control-label">When
+	        								Failure Retries</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="failure_retries"
+												name="failure_retries" ng-model="null_dump"
+												ng-options="policy for policy in policy_ids track by policy">
+												<option value="">-- choose an option --</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="failure_exception" className="col-sm-4 control-label">When
+	        								Failure Exception</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="failure_exception"
+												name="failure_exception" ng-model="null_dump"
+												ng-options="policy for policy in policy_ids track by policy">
+												<option value="">-- choose an option --</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="failure_guard" className="col-sm-4 control-label">When
+	        								Failure Guard</label>
+										<div className="col-sm-8">
+											<select className="form-control" id="failure_guard"
+												name="failure_guard" ng-model="null_dump"
+												ng-options="policy for policy in policy_ids track by policy">
+												<option value="">-- choose an option --</option>
+											</select>
+										</div>
+									</div>
+								</form>
+								<form className="policyTarget" className="form-horizontal"
+									title="Operational Policy Target" style={{ border: '2px dotted gray' }}>
+									<div className="form-group clearfix">
+										<label htmlFor="type" className="col-sm-4 control-label"> Target
+	        								Type</label>
+										<div className="col-sm-8">
+											<select className="form-control" name="type" id="type"
+												ng-click="initTargetResourceId($event)" ng-model="type">
+												<option value="">-- choose an option --</option>
+												<option value="VFMODULE">VFMODULE</option>
+												<option value="VM">VM</option>
+												<option value="VNF">VNF</option>
+											</select>
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="resourceID" className="col-sm-4 control-label">
+											Target ResourceId</label>
+										<div className="col-sm-8">
+											<select className="form-control" name="resourceID" id="resourceID"
+												ng-click="changeTargetResourceId($event)"
+												ng-model="resourceId">
+												<option value="">-- choose an option --</option>
+											</select>
+										</div>
+									</div>
+									<div id="metadata">
+										<div className="form-group clearfix">
+											<label htmlFor="modelInvariantId" className="col-sm-4 control-label">
+												Model Invariant Id</label>
+											<div className="col-sm-8">
+												<input className="form-control" name="modelInvariantId"
+													id="modelInvariantId" readOnly />
+											</div>
+										</div>
+										<div className="form-group clearfix">
+											<label htmlFor="modelVersionId" className="col-sm-4 control-label">
+												Model Version Id</label>
+											<div className="col-sm-8">
+												<input className="form-control" name="modelVersionId"
+													id="modelVersionId" readOnly />
+											</div>
+										</div>
+										<div className="form-group clearfix">
+											<label htmlFor="modelName" className="col-sm-4 control-label">
+												Model Name</label>
+											<div className="col-sm-8">
+												<input className="form-control" name="modelName" id="modelName"
+													readOnly />
+											</div>
+										</div>
+										<div className="form-group clearfix">
+											<label htmlFor="modelVersion" className="col-sm-4 control-label">
+												Model Version</label>
+											<div className="col-sm-8">
+												<input className="form-control" name="modelVersion"
+													id="modelVersion" readOnly />
+											</div>
+										</div>
+										<div className="form-group clearfix">
+											<label htmlFor="modelCustomizationId" className="col-sm-4 control-label">
+												Model Customization Id</label>
+											<div className="col-sm-8">
+												<input className="form-control" name="modelCustomizationId"
+													id="modelCustomizationId" readOnly />
+											</div>
+										</div>
+									</div>
+								</form>
+								<div className="form-group clearfix">
+									<label htmlFor="enableGuardPolicy" className="col-sm-4 control-label">
+										Enable Guard Policy</label>
+									<div className="col-sm-8">
+										<input type="checkbox" className="form-control"
+											name="enableGuardPolicy" id="enableGuardPolicy" />
+									</div>
+
+									<div className="col-sm-8">
+										<label htmlFor="guardPolicyType" className="col-sm-4 control-label">
+											Guard Policy Type</label> <select className="form-control"
+												name="guardPolicyType" id="guardPolicyType"
+												ng-click="changeGuardPolicyType()" ng-model="guardType">
+											<option value="GUARD_MIN_MAX">MinMax</option>
+											<option value="GUARD_YAML">FrequencyLimiter</option>
+										</select>
+									</div>
+								</div>
+								<form className="guardProperties" className="form-horizontal"
+									title="Guard policy associated" style={{ border: '2px dotted gray' }}>
+
+									<div className="form-group clearfix withnote">
+										<label className="col-sm-4 control-label" htmlFor="id">Guard Policy ID</label>
+										<div className="col-sm-8">
+											<input type="text" className="form-control" name="id" id="id" ng-blur="changeGuardId()" ng-model="id" />
+										</div>
+									</div>
+									<div>
+										<label className="form-group note">Note: Prefix will be added to Guard Policy ID automatically based on Guard Policy Type</label>
+									</div>
+									<div className="form-group clearfix">
+										<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
+										<div className="col-sm-8">
+											<input type="text" className="form-control" name="recipe"
+												readOnly="readonly" id="recipe" />
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
+										<div className="col-sm-8">
+											<input type="text" className="form-control" name="clname"
+												readOnly="readonly" id="clname" ng-model="clname" />
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="actor" className="col-sm-4 control-label">Actor</label>
+										<div className="col-sm-8">
+											<input type="text" className="form-control" name="actor"
+												readOnly="readonly" id="actor" />
+										</div>
+									</div>
+									<div className="form-group clearfix">
+
+										<label htmlFor="targets" className="col-sm-4 control-label">Guard
+	        								targets</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="targets" id="targets" />
+										</div>
+									</div>
+
+									<div className="form-group clearfix" id="minMaxGuardPolicyDiv">
+										<label htmlFor="min" className="col-sm-4 control-label"> Min
+	        								Guard</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="min" id="min" />
+										</div>
+										<label htmlFor="max" className="col-sm-4 control-label"> Max
+	        								Guard</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="max" id="max" />
+										</div>
+									</div>
+									<div className="form-group clearfix"
+										id="frequencyLimiterGuardPolicyDiv" style={{ display: 'none' }}>
+										<label htmlFor="limit" className="col-sm-4 control-label">Limit</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="limit" id="limit" />
+										</div>
+										<label htmlFor="timeUnits" className="col-sm-4 control-label">Time Units</label>
+										<div className="col-sm-8">
+											<select className="form-control" name="timeUnits"
+												id="timeUnits">
+												<option value=""></option>
+												<option value="minute">minute</option>
+												<option value="hour">hour</option>
+												<option value="day">day</option>
+												<option value="week">week</option>
+												<option value="month">month</option>
+												<option value="year">year</option>
+											</select>
+										</div>
+										<label htmlFor="timeWindow" className="col-sm-4 control-label">Time	Window</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="timeWindow" id="timeWindow" />
+										</div>
+									</div>
+									<div className="form-group clearfix">
+										<label htmlFor="guardActiveStart" className="col-sm-4 control-label">
+											Guard Active Start</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="guardActiveStart"
+												id="guardActiveStart" value="00:00:00Z" />
+										</div>
+										<label htmlFor="guardActiveEnd" className="col-sm-4 control-label">
+											Guard Active End</label>
+										<div className="col-sm-8">
+											<input className="form-control" name="guardActiveEnd"
+												id="guardActiveEnd" value="00:00:01Z" />
+										</div>
+									</div>
+
+								</form>
+
+							</span>
+						</div>
+					</div>
+		
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" onClick={this.handleClose}>
+						Close
+	            </Button>
+					<Button variant="primary" onClick={this.handleClose}>
+						Save Changes
+	            </Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/template.json b/ui-react/src/components/dialogs/OperationalPolicy/template.json
new file mode 100644
index 000000000..6b4477f88
--- /dev/null
+++ b/ui-react/src/components/dialogs/OperationalPolicy/template.json
@@ -0,0 +1,52 @@
+{
+	"operationalPolicies": [
+		{
+			"name": "OPERATIONAL_LOOP_NAME",
+			"configurationsJson": {
+				"guard_policies": {
+					"guard.minmax.new": {
+						"recipe": "",
+						"clname": "LOOP_NAME",
+						"actor": "",
+						"targets": "",
+						"min": "",
+						"max": "",
+						"limit": "",
+						"timeUnits": "",
+						"timeWindow": "",
+						"guardActiveStart": "00:00:00Z",
+						"guardActiveEnd": "00:00:01Z"
+					}
+				},
+				"operational_policy": {
+					"controlLoop": {
+						"trigger_policy": "new",
+						"timeout": "0",
+						"abatement": "false",
+						"controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
+					},
+					"policies": [
+						{
+							"id": "new",
+							"recipe": "",
+							"retry": "0",
+							"timeout": "0",
+							"actor": "",
+							"payload": "",
+							"success": "",
+							"failure": "",
+							"failure_timeout": "",
+							"failure_retries": "",
+							"failure_exception": "",
+							"failure_guard": "",
+							"target": {
+								"type": "VM",
+								"resourceID": ""
+							}
+						}
+					]
+				}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/svg/example.svg b/ui-react/src/components/loop_viewer/svg/example.svg
index bb3327042..2f5ebd037 100644
--- a/ui-react/src/components/loop_viewer/svg/example.svg
+++ b/ui-react/src/components/loop_viewer/svg/example.svg
@@ -1,13 +1,444 @@
-<svg width="400" height="200">
-  <defs>
-    <filter id="MyFilter" filterUnits="userSpaceOnUse" x="0" y="0" width="200" height="120">
-      <feGaussianBlur in="SourceAlpha" stdDeviation="4" result="blur"/>
-    </filter>
-  </defs>
-  <rect x="1" y="1" width="198" height="118" fill="#cccccc" />
-  <g filter="url(#MyFilter)">
-    <path fill="none" stroke="#D90000" stroke-width="10" d="M50,90 C0,90 0,30 50,30 L150,30 C200,30 200,90 150,90 z" />
-    <text fill="#FFFFFF" stroke="black" font-size="45" font-family="Verdana" x="52" y="76">SVG</text>
-  </g>
-  Sorry, your browser does not support inline SVG.  
+<svg xmlns="http://www.w3.org/2000/svg">
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="start-circle"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<circle
+					fill="none"
+					r="17"
+					cx="18"
+					cy="41" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="Arrow-411c11ec-37fe-40bc-8544-417c2c05e4a7"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<line
+					y2="41"
+					fill="none"
+					x1="35"
+					x2="123"
+					y1="41" />
+				<polygon
+					fill="none"
+					points=" 121 39 121 43 125 41" />
+				<polygon
+					points=" 121 39 121 43 125 41"
+					stroke="none" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="VES"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<rect
+					fill="none"
+					x="127"
+					width="123"
+					y="1"
+					height="82" />
+			</g>
+			<g
+				fill-opacity="0"
+				fill="rgb(0,0,0)"
+				text-rendering="optimizeQuality"
+				shape-rendering="geometricPrecision"
+				stroke="rgb(0,0,0)"
+				stroke-opacity="0"
+				stroke-width="2">
+				<rect
+					x="127"
+					width="123"
+					y="1"
+					height="82"
+					stroke="none" />
+			</g>
+			<g
+				text-rendering="optimizeQuality"
+				stroke-width="2"
+				shape-rendering="geometricPrecision"
+				font-family="sans-serif">
+				<text
+					x="176.5"
+					xml:space="preserve"
+					y="46.5"
+					stroke="none">VES</text>
+				<line
+					y2="83"
+					fill="none"
+					x1="147"
+					x2="147"
+					y1="1" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="Arrow-17086665-1142-4cbf-9681-cf4462954c96"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<line
+					y2="41"
+					fill="none"
+					x1="250"
+					x2="338"
+					y1="41" />
+				<polygon
+					fill="none"
+					points=" 336 39 336 43 340 41" />
+				<polygon
+					points=" 336 39 336 43 340 41"
+					stroke="none" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="tca_k8s_aLs74_v1_0_ResourceInstanceName2_tca_2"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<rect
+					fill="none"
+					x="342"
+					width="123"
+					y="1"
+					height="82" />
+			</g>
+			<g
+				fill-opacity="0"
+				fill="rgb(0,0,0)"
+				text-rendering="optimizeQuality"
+				shape-rendering="geometricPrecision"
+				stroke="rgb(0,0,0)"
+				stroke-opacity="0"
+				stroke-width="2">
+				<rect
+					x="342"
+					width="123"
+					y="1"
+					height="82"
+					stroke="none" />
+			</g>
+			<g
+				text-rendering="optimizeQuality"
+				stroke-width="2"
+				shape-rendering="geometricPrecision"
+				font-family="sans-serif">
+				<text
+					x="379.5"
+					xml:space="preserve"
+					y="46.5"
+					stroke="none">tca_k8s</text>
+				<line
+					y2="61"
+					fill="none"
+					x1="342"
+					x2="465"
+					y1="61" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="Arrow-d48a7f5f-643d-4550-8045-ee46bb05ddfa"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<line
+					y2="41"
+					fill="none"
+					x1="465"
+					x2="553"
+					y1="41" />
+				<polygon
+					fill="none"
+					points=" 551 39 551 43 555 41" />
+				<polygon
+					points=" 551 39 551 43 555 41"
+					stroke="none" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="OperationalPolicy"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<rect
+					fill="none"
+					x="557"
+					width="123"
+					y="1"
+					height="82" />
+			</g>
+			<g
+				fill-opacity="0"
+				fill="rgb(0,0,0)"
+				text-rendering="optimizeQuality"
+				shape-rendering="geometricPrecision"
+				stroke="rgb(0,0,0)"
+				stroke-opacity="0"
+				stroke-width="2">
+				<rect
+					x="557"
+					width="123"
+					y="1"
+					height="82"
+					stroke="none" />
+			</g>
+			<g
+				text-rendering="optimizeQuality"
+				stroke-width="2"
+				shape-rendering="geometricPrecision"
+				font-family="sans-serif">
+				<text
+					x="564.5"
+					xml:space="preserve"
+					y="46.5"
+					stroke="none">OperationalPolicy</text>
+				<line
+					y2="1"
+					fill="none"
+					x1="557"
+					x2="618"
+					y1="42" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="Arrow-79f11b91-5a48-4945-9d2c-18a423105a7d"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="2">
+				<line
+					y2="41"
+					fill="none"
+					x1="680"
+					x2="768"
+					y1="41" />
+				<polygon
+					fill="none"
+					points=" 766 39 766 43 770 41" />
+				<polygon
+					points=" 766 39 766 43 770 41"
+					stroke="none" />
+			</g>
+		</g>
+	</g>
+	<g
+		fill-opacity="1"
+		color-rendering="auto"
+		color-interpolation="auto"
+		text-rendering="auto"
+		stroke="black"
+		stroke-linecap="square"
+		stroke-miterlimit="10"
+		shape-rendering="auto"
+		stroke-opacity="1"
+		fill="black"
+		stroke-dasharray="none"
+		font-weight="normal"
+		stroke-width="1"
+		font-family="'Dialog'"
+		font-style="normal"
+		data-element-id="stop-circle"
+		stroke-linejoin="miter"
+		font-size="12px"
+		image-rendering="auto"
+		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
+		<defs id="genericDefs" />
+		<g>
+			<g
+				shape-rendering="geometricPrecision"
+				text-rendering="optimizeQuality"
+				stroke-width="4">
+				<circle
+					fill="none"
+					r="17"
+					cx="789"
+					cy="41" />
+			</g>
+		</g>
+	</g>
 </svg>
\ No newline at end of file
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 348541968..85d32c539 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -35,13 +35,6 @@ const StyledNavDropdownItem = styled(NavDropdown.Item)`
 `;
 
 export default class MenuBar extends React.Component {
-	
-	openEmailConsole() {
-		console.log("contactUs");
-		var link = "mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please "
-			+ "send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.";
-		window.location.href = link;
-	};
 
 	render () {
 	   return (
@@ -52,7 +45,7 @@ export default class MenuBar extends React.Component {
 		        <StyledNavDropdownItem href="#action/3.3">Close Model</StyledNavDropdownItem>
 		      </NavDropdown>
 					<NavDropdown title="Manage" id="basic-nav-dropdown">
-						<StyledNavDropdownItem href="#action/3.1">Submit</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="/operationalPolicyModal">Submit</StyledNavDropdownItem>
 						<StyledNavDropdownItem href="#action/3.2">Stop</StyledNavDropdownItem>
 						<StyledNavDropdownItem href="#action/3.3">Restart</StyledNavDropdownItem>
 						<StyledNavDropdownItem href="#action/3.3">Delete</StyledNavDropdownItem>
@@ -63,14 +56,12 @@ export default class MenuBar extends React.Component {
 						<StyledNavDropdownItem href="#action/3.1">Refresh Status</StyledNavDropdownItem>
 					</NavDropdown>
 				<NavDropdown title="Help" id="basic-nav-dropdown">
-					<NavDropdown.Item onClick={()=> window.open("https://wiki.onap.org/", "_blank")}>Wiki</NavDropdown.Item>
-					<NavDropdown.Item onClick={()=> this.openEmailConsole()}>Contact Us</NavDropdown.Item>
+					<StyledNavDropdownItem href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavDropdownItem>
+					<StyledNavDropdownItem href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavDropdownItem>
 					<StyledNavDropdownItem href="#action/3.3">User Info</StyledNavDropdownItem>
 				</NavDropdown>
 		  </Navbar.Collapse>
-
-
-    );
+	   );
   }
 }
 
diff --git a/ui-react/src/components/route/LoginRoute.js b/ui-react/src/components/route/LoginRoute.js
deleted file mode 100644
index f24e31b4a..000000000
--- a/ui-react/src/components/route/LoginRoute.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { Route, Redirect } from 'react-router-dom';
-
-const LoginRoute = ({ component: Component, ...rest }) => (
-    <Route {...rest} render={props => (
-        localStorage.getItem('user')
-            ? <Component {...props} />
-            : localStorage.getItem('tryBasicAuth')
-                ? <Redirect to={{ pathname: '/basicAuthLogin', state: { from: props.location } }} />
-                : <Redirect to={{ pathname: '/login', state: { from: props.location } }} />
-    )} />
-)
-
-export default LoginRoute;
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index 8236eb15c..1b2f2f595 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -22,28 +22,19 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-
-import { Route, Switch, BrowserRouter } from 'react-router-dom'
 import OnapClamp from './OnapClamp';
-import NotFound from './components/app/NotFound';
-import LoginPage from './components/app/login/LoginPage';
-import LoginFailedPage from './components/app/login/LoginFailedPage';
-import BasicAuthLogin from './components/app/login/BasicAuthLogin';
-import LoginRoute from './components/route/LoginRoute';
+import { Route, BrowserRouter } from 'react-router-dom'
 
+import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 
 const routing = (
-  <BrowserRouter>
-    <div>
-      <Switch>
-        <LoginRoute exact path="/" component={OnapClamp} />
-        <Route path="/basicAuthLogin" component={BasicAuthLogin} />
-        <Route path="/login" component={LoginPage} />
-        <Route path="/loginFailed" component={LoginFailedPage} />
-        <Route component={NotFound} />
-      </Switch>
-		</div>
-  </BrowserRouter>
-)
+	<BrowserRouter >
+		<OnapClamp />
+		<Route path="/operationalPolicyModal" render={() => <OperationalPolicyModal />} />
+	</BrowserRouter>
+);
 
-ReactDOM.render(routing, document.getElementById('root'))
+ReactDOM.render(
+	routing,
+	document.getElementById('root')
+)
-- 
cgit 1.2.3-korg


From e44fdb1905fae612b12b56886af8f387e516e485 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 12 Jul 2019 12:25:56 +0200
Subject: Rework the structure

Rework of the project structure and static loop cache added for the
entire site

Issue-ID: CLAMP-418
Change-Id: Ia2cf62431cd9139c91bf74bb639b502a368ce761
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             | 163 ++++++++
 ui-react/src/NotFound.js                           |  36 ++
 ui-react/src/OnapClamp.js                          |   2 +-
 ui-react/src/api/LoopActionService.js              |  54 +++
 ui-react/src/api/LoopCache.js                      | 129 +++++++
 ui-react/src/api/UserService.js                    |  50 +++
 ui-react/src/api/example.json                      | 417 +++++++++++++++++++++
 ui-react/src/components/app/LoopUI.js              | 163 --------
 ui-react/src/components/app/NotFound.js            |  36 --
 ui-react/src/components/app/logo.png               | Bin 21360 -> 0 bytes
 .../backend_communication/LoopActionService.js     |  54 ---
 .../components/backend_communication/LoopCache.js  | 116 ------
 .../backend_communication/UserService.js           |  50 ---
 .../components/backend_communication/example.json  | 417 ---------------------
 .../OperationalPolicy/OperationalPolicyModal.js    |   8 +-
 ui-react/src/logo.png                              | Bin 0 -> 21360 bytes
 16 files changed, 853 insertions(+), 842 deletions(-)
 create mode 100644 ui-react/src/LoopUI.js
 create mode 100644 ui-react/src/NotFound.js
 create mode 100644 ui-react/src/api/LoopActionService.js
 create mode 100644 ui-react/src/api/LoopCache.js
 create mode 100644 ui-react/src/api/UserService.js
 create mode 100644 ui-react/src/api/example.json
 delete mode 100644 ui-react/src/components/app/LoopUI.js
 delete mode 100644 ui-react/src/components/app/NotFound.js
 delete mode 100644 ui-react/src/components/app/logo.png
 delete mode 100644 ui-react/src/components/backend_communication/LoopActionService.js
 delete mode 100644 ui-react/src/components/backend_communication/LoopCache.js
 delete mode 100644 ui-react/src/components/backend_communication/UserService.js
 delete mode 100644 ui-react/src/components/backend_communication/example.json
 create mode 100644 ui-react/src/logo.png

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
new file mode 100644
index 000000000..997f94b18
--- /dev/null
+++ b/ui-react/src/LoopUI.js
@@ -0,0 +1,163 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+import MenuBar from './components/menu/MenuBar';
+import Navbar from 'react-bootstrap/Navbar';
+import logo from './logo.png';
+import { GlobalClampStyle } from './theme/globalStyle.js';
+
+import ClosedLoopSvg from './components/loop_viewer/svg/ClosedLoopSvg';
+import ClosedLoopLogs from './components/loop_viewer/logs/ClosedLoopLogs';
+import ClosedLoopStatus from './components/loop_viewer/status/ClosedLoopStatus';
+import UserService from './api/UserService';
+
+const ProjectNameStyled = styled.a`
+	vertical-align: middle;
+	padding-left: 30px;
+	font-size: 30px;
+
+`
+const LoopViewDivStyled = styled.div`
+	height: 90vh;
+	overflow: hidden;
+	margin-left: 10px;
+	margin-right: 10px;
+	margin-bottom: 10px;
+	color: ${props => props.theme.loopViewerFontColor};
+	background-color: ${props => props.theme.loopViewerBackgroundColor};
+	border: 1px solid transparent;
+	border-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+`
+
+const LoopViewHeaderDivStyled = styled.div`
+	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	padding: 10px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+
+const LoopViewBodyDivStyled = styled.div`
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	padding: 10px 10px;
+	color: ${props => (props.theme.loopViewerHeaderFontColor)};
+	height: 95%;
+`
+
+const LoopViewLoopNameSpanStyled = styled.span`
+	font-weight: bold;
+	color: ${props => (props.theme.loopViewerHeaderFontColor)};
+	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
+`
+
+export default class LoopUI extends React.Component {
+	state = {
+		userName: null,
+		loopName: "Empty (NO loop loaded yet)",
+	};
+
+	constructor() {
+		super();
+		this.getUser = this.getUser.bind(this);
+	}
+	
+ 	componentDidMount() {
+		 this.getUser();
+	 }
+
+	getUser() {
+		UserService.LOGIN().then(user => {
+			this.setState({userName:user})
+		});
+	}
+		
+	renderMenuNavBar() {
+		return (
+			<MenuBar />
+		);
+	}
+
+	renderUserLoggedNavBar() {
+		return (
+			<Navbar.Text>
+				Signed in as: <a href="/login">{this.state.userName}</a>
+			</Navbar.Text>
+		);
+	}
+
+	renderLogoNavBar() {
+		return (
+			<Navbar.Brand>
+				<img height="50px" width="234px" src={logo} alt=""/>
+				<ProjectNameStyled>CLAMP</ProjectNameStyled>
+			</Navbar.Brand>
+		);
+	}
+
+	renderNavBar() {
+		return (
+		<Navbar expand="lg">
+			{this.renderLogoNavBar()}
+			{this.renderMenuNavBar()}
+			{this.renderUserLoggedNavBar()}
+		</Navbar>
+	);
+	}
+	
+	renderLoopViewHeader() {
+		return (
+			<LoopViewHeaderDivStyled>
+				Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled> 
+			</LoopViewHeaderDivStyled>
+		);
+	}
+	
+	renderLoopViewBody() {
+		return (
+			<LoopViewBodyDivStyled>
+				<ClosedLoopSvg />
+				<ClosedLoopLogs />
+				<ClosedLoopStatus />
+			</LoopViewBodyDivStyled>
+		);
+	}
+	
+	renderLoopViewer() {
+		return (
+			<LoopViewDivStyled>
+					{this.renderLoopViewHeader()}
+					{this.renderLoopViewBody()}
+			</LoopViewDivStyled>
+	 		);
+	}
+	
+	render() {
+		return (
+			<div id="main_div">
+				 	<GlobalClampStyle />
+					{this.renderNavBar()}
+					{this.renderLoopViewer()}
+				</div>
+		);
+	}
+}
diff --git a/ui-react/src/NotFound.js b/ui-react/src/NotFound.js
new file mode 100644
index 000000000..d4b53fd71
--- /dev/null
+++ b/ui-react/src/NotFound.js
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react'
+
+
+export default class NotFound extends React.Component {
+	render () {
+		return (
+      <div id='main'>
+      	<div class="divRow"><b>Page Not Found!</b></div>
+      	<div class="divRow">Please cick <a href="/">here</a> to go back to the main page.</div>
+      </div>
+
+		);
+	}
+}
diff --git a/ui-react/src/OnapClamp.js b/ui-react/src/OnapClamp.js
index bdcea6290..a8cc2154a 100644
--- a/ui-react/src/OnapClamp.js
+++ b/ui-react/src/OnapClamp.js
@@ -22,7 +22,7 @@
  */
 
 import React from 'react';
-import LoopUI from './components/app/LoopUI'
+import LoopUI from './LoopUI'
 import { ThemeProvider } from 'styled-components';
 import { DefaultClampTheme } from './theme/globalStyle.js';
 
diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js
new file mode 100644
index 000000000..9ce8ff0a9
--- /dev/null
+++ b/ui-react/src/api/LoopActionService.js
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+const loopActionService = {
+	submit
+};
+
+
+function submit(uiAction) {
+	const cl_name = "";
+	console.log("clActionServices perform action: " + uiAction + " closedloopName="
+		+ cl_name);
+	const svcAction = uiAction.toLowerCase();
+	const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
+
+	let options = {
+		method: 'GET'
+	};
+	return sendRequest(svcUrl, svcAction, options);
+}
+
+function sendRequest(svcUrl, svcAction) {
+	fetch(svcUrl, options)
+		.then(
+			response => {
+				alertService.alertMessage("Action Successful: " + svcAction, 1)
+			}).error(error => {
+				alertService.alertMessage("Action Failure: " + svcAction, 2);
+				return Promise.reject(error);
+			});
+
+	return response.json();
+};
+
+export default loopActionService;
\ No newline at end of file
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
new file mode 100644
index 000000000..80f02f027
--- /dev/null
+++ b/ui-react/src/api/LoopCache.js
@@ -0,0 +1,129 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+
+class LoopCache {
+	loopJsonCache;
+
+	constructor(loopJson) {
+		this.loopJsonCache=loopJson;
+		//LoopCache.SET_LOOP_JSON_CACHE(require('./example.json');
+	}
+
+	updateMsProperties(type, newMsProperties) {
+		if (newMsProperties["name"] == type) {
+			for (var policy in this.loopJsonCache["microServicePolicies"]) {
+				if (this.loopJsonCache["microServicePolicies"][policy]["name"] == type) {
+					this.loopJsonCache["microServicePolicies"][policy] = newMsProperties;
+				}
+			}
+		}
+	}
+
+	updateGlobalProperties(newGlobalProperties) {
+		this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
+	}
+
+	updateOpPolicyProperties(newOpProperties) {
+		this.loopJsonCache["operationalPolicies"] = newOpProperties;
+	}
+
+	getLoopName() {
+		return this.loopJsonCache["name"];
+	}
+
+	getOperationalPolicyProperty() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
+	}
+
+	getOperationalPolicies() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
+	}
+
+	getGlobalProperty() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
+	}
+
+	getDeploymentProperties() {
+		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
+	}
+
+	getMsJson(type) {
+		var msProperties = this.loopJsonCache["microServicePolicies"];
+		for (var policy in msProperties) {
+			if (msProperties[policy]["name"] == type) {
+				return JSON.parse(JSON.stringify(msProperties[policy]));
+			}
+		}
+		return null;
+	}
+
+	getMsProperty(type) {
+		var msProperties = this.loopJsonCache["microServicePolicies"];
+		for (var policy in msProperties) {
+			if (msProperties[policy]["name"] == type) {
+				if (msProperties[policy]["properties"] !== null && msProperties[policy]["properties"] !== undefined) {
+					return JSON.parse(JSON.stringify(msProperties[policy]["properties"]));
+				}
+			}
+		}
+		return null;
+	}
+
+	getMsUI(type) {
+		var msProperties = this.loopJsonCache["microServicePolicies"];
+		for (var policy in msProperties) {
+			if (msProperties[policy]["name"] == type) {
+				return JSON.parse(JSON.stringify(msProperties[policy]["jsonRepresentation"]));
+			}
+		}
+		return null;
+	}
+
+	getResourceDetailsVfProperty() {
+		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VF"];
+	}
+
+	getResourceDetailsVfModuleProperty() {
+		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VFModule"];
+	}
+
+	getLoopLogsArray() {
+		return this.loopJsonCache.loopLogs;
+	}
+
+	getComponentStates() {
+		return this.loopJsonCache.components;
+	}
+
+	get getLoopJsonCache() {
+		return this.loopJsonCache;
+	}
+
+	set setLoopJsonCache(newJson) {
+		this.loopJsonCache = newJson;
+	}
+}
+
+export const LOOP_CACHE = new LoopCache(require('./example.json'));
+
+export default LoopCache;
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
new file mode 100644
index 000000000..814539551
--- /dev/null
+++ b/ui-react/src/api/UserService.js
@@ -0,0 +1,50 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class UserService {
+
+	static LOGIN() {
+		return fetch('/restservices/clds/v1/user/getUser', {
+				method: 'GET',
+				credentials: 'include',
+			})
+		.then(function (response) {
+			if (response.ok) {
+				console.log("getUser response received: ", response.status);
+				return response.text();
+			} else {
+				console.error("getUser failed with status code: ",response.status);
+				return "Anonymous";
+			}
+		})
+		.then(function (data) {
+			console.log ("User connected:",data)
+			return data;
+		})
+		.catch(function(error) {
+			console.error("getUser error received",error);
+			return "Anonymous";
+		});
+	}
+}
+
diff --git a/ui-react/src/api/example.json b/ui-react/src/api/example.json
new file mode 100644
index 000000000..f3cc9e189
--- /dev/null
+++ b/ui-react/src/api/example.json
@@ -0,0 +1,417 @@
+{
+  "name": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
+  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
+  "globalPropertiesJson": {
+    "dcaeDeployParameters": {
+      "location_id": "",
+      "service_id": "",
+      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+    }
+  },
+  "modelPropertiesJson": {
+    "serviceDetails": {
+      "serviceType": "",
+      "namingPolicy": "",
+      "environmentContext": "General_Revenue-Bearing",
+      "serviceEcompNaming": "true",
+      "serviceRole": "",
+      "name": "vLoadBalancerMS",
+      "description": "vLBMS",
+      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+      "ecompGeneratedNaming": "true",
+      "category": "Network L4+",
+      "type": "Service",
+      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+      "instantiationType": "A-la-carte"
+    },
+    "resourceDetails": {
+      "CP": {},
+      "VL": {},
+      "VF": {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      },
+      "CR": {},
+      "VFC": {},
+      "PNF": {},
+      "Service": {},
+      "CVFC": {},
+      "Service Proxy": {},
+      "Configuration": {},
+      "AllottedResource": {},
+      "VFModule": {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        },
+        "Vloadbalancerms..vdns..module-3": {
+          "vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vdns..module-3",
+          "vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
+          "vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vdns",
+          "max_vf_module_instances": 50,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        },
+        "Vloadbalancerms..base_template..module-0": {
+          "vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..base_template..module-0",
+          "vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
+          "vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+          "min_vf_module_instances": 1,
+          "vf_module_label": "base_template",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Base",
+          "isBase": true,
+          "initial_count": 1,
+          "volume_group": false
+        },
+        "Vloadbalancerms..vlb..module-2": {
+          "vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vlb..module-2",
+          "vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+          "vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vlb",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      }
+    }
+  },
+  "lastComputedState": "DESIGN",
+  "components": {
+    "POLICY": {
+      "componentState": {
+        "stateName": "NOT_SENT",
+        "description": "The policies defined have NOT yet been created on the policy engine"
+      }
+    },
+    "DCAE": {
+      "componentState": {
+        "stateName": "BLUEPRINT_DEPLOYED",
+        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+      }
+    }
+  },
+  "operationalPolicies": [
+    {
+      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "configurationsJson": {
+        "guard_policies": {
+          "guard.minmax.new": {
+            "recipe": "",
+            "clname": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
+            "actor": "",
+            "targets": "",
+            "min": "gg",
+            "max": "gg",
+            "limit": "",
+            "timeUnits": "",
+            "timeWindow": "",
+            "guardActiveStart": "00:00:00Z",
+            "guardActiveEnd": "00:00:01Z"
+          }
+        },
+        "operational_policy": {
+          "controlLoop": {
+            "trigger_policy": "new",
+            "timeout": "0",
+            "abatement": "false",
+            "controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
+          },
+          "policies": [
+            {
+              "id": "new",
+              "recipe": "",
+              "retry": "0",
+              "timeout": "0",
+              "actor": "",
+              "payload": "",
+              "success": "",
+              "failure": "",
+              "failure_timeout": "",
+              "failure_retries": "",
+              "failure_exception": "",
+              "failure_guard": "",
+              "target": {
+                "type": "VM",
+                "resourceID": ""
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "microServicePolicies": [
+    {
+      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+      "properties": {
+        "domain": "measurementsForVfScaling",
+        "metricsPerEventName": [
+          {
+            "policyVersion": "ff",
+            "thresholds": [
+              {
+                "severity": "CRITICAL",
+                "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                "thresholdValue": 0,
+                "closedLoopEventStatus": "ONSET",
+                "closedLoopControlName": "ff",
+                "version": "ff",
+                "direction": "LESS"
+              }
+            ],
+            "policyName": "ff",
+            "controlLoopSchemaType": "VM",
+            "policyScope": "ff",
+            "eventName": "ff"
+          }
+        ]
+      },
+      "shared": false,
+      "jsonRepresentation": {
+        "schema": {
+          "uniqueItems": "true",
+          "format": "tabs-top",
+          "type": "array",
+          "title": "TCA Policy JSON",
+          "items": {
+            "type": "object",
+            "title": "TCA Policy JSON",
+            "required": [
+              "domain",
+              "metricsPerEventName"
+            ],
+            "properties": {
+              "domain": {
+                "propertyOrder": 1001,
+                "default": "measurementsForVfScaling",
+                "title": "Domain name to which TCA needs to be applied",
+                "type": "string"
+              },
+              "metricsPerEventName": {
+                "propertyOrder": 1002,
+                "uniqueItems": "true",
+                "format": "tabs-top",
+                "title": "Contains eventName and threshold details that need to be applied to given eventName",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "required": [
+                    "controlLoopSchemaType",
+                    "eventName",
+                    "policyName",
+                    "policyScope",
+                    "policyVersion",
+                    "thresholds"
+                  ],
+                  "properties": {
+                    "policyVersion": {
+                      "propertyOrder": 1007,
+                      "title": "TCA Policy Scope Version",
+                      "type": "string"
+                    },
+                    "thresholds": {
+                      "propertyOrder": 1008,
+                      "uniqueItems": "true",
+                      "format": "tabs-top",
+                      "title": "Thresholds associated with eventName",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "closedLoopControlName",
+                          "closedLoopEventStatus",
+                          "direction",
+                          "fieldPath",
+                          "severity",
+                          "thresholdValue",
+                          "version"
+                        ],
+                        "properties": {
+                          "severity": {
+                            "propertyOrder": 1013,
+                            "title": "Threshold Event Severity",
+                            "type": "string",
+                            "enum": [
+                              "CRITICAL",
+                              "MAJOR",
+                              "MINOR",
+                              "WARNING",
+                              "NORMAL"
+                            ]
+                          },
+                          "fieldPath": {
+                            "propertyOrder": 1012,
+                            "title": "Json field Path as per CEF message which needs to be analyzed for TCA",
+                            "type": "string",
+                            "enum": [
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                              "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                              "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+                            ]
+                          },
+                          "thresholdValue": {
+                            "propertyOrder": 1014,
+                            "title": "Threshold value for the field Path inside CEF message",
+                            "type": "integer"
+                          },
+                          "closedLoopEventStatus": {
+                            "propertyOrder": 1010,
+                            "title": "Closed Loop Event Status of the threshold",
+                            "type": "string",
+                            "enum": [
+                              "ONSET",
+                              "ABATED"
+                            ]
+                          },
+                          "closedLoopControlName": {
+                            "propertyOrder": 1009,
+                            "title": "Closed Loop Control Name associated with the threshold",
+                            "type": "string"
+                          },
+                          "version": {
+                            "propertyOrder": 1015,
+                            "title": "Version number associated with the threshold",
+                            "type": "string"
+                          },
+                          "direction": {
+                            "propertyOrder": 1011,
+                            "title": "Direction of the threshold",
+                            "type": "string",
+                            "enum": [
+                              "LESS",
+                              "LESS_OR_EQUAL",
+                              "GREATER",
+                              "GREATER_OR_EQUAL",
+                              "EQUAL"
+                            ]
+                          }
+                        }
+                      }
+                    },
+                    "policyName": {
+                      "propertyOrder": 1005,
+                      "title": "TCA Policy Scope Name",
+                      "type": "string"
+                    },
+                    "controlLoopSchemaType": {
+                      "propertyOrder": 1003,
+                      "title": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+                      "type": "string",
+                      "enum": [
+                        "VM",
+                        "VNF"
+                      ]
+                    },
+                    "policyScope": {
+                      "propertyOrder": 1006,
+                      "title": "TCA Policy Scope",
+                      "type": "string"
+                    },
+                    "eventName": {
+                      "propertyOrder": 1004,
+                      "title": "Event name to which thresholds need to be applied",
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "loopLogs": [
+    {
+      "id": 2,
+      "logType": "INFO",
+      "logComponent": "CLAMP",
+      "message": "Micro Service policies UPDATED",
+      "logInstant": "2019-07-08T09:44:53Z"
+    },
+    {
+      "id": 1,
+      "logType": "INFO",
+      "logComponent": "CLAMP",
+      "message": "Operational and Guard policies UPDATED",
+      "logInstant": "2019-07-08T09:44:37Z"
+    }
+  ]
+}
diff --git a/ui-react/src/components/app/LoopUI.js b/ui-react/src/components/app/LoopUI.js
deleted file mode 100644
index d058543a2..000000000
--- a/ui-react/src/components/app/LoopUI.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react';
-import styled from 'styled-components';
-import MenuBar from '../menu/MenuBar';
-import Navbar from 'react-bootstrap/Navbar';
-import logo from './logo.png';
-import { GlobalClampStyle } from '../../theme/globalStyle.js';
-
-import ClosedLoopSvg from '../loop_viewer/svg/ClosedLoopSvg';
-import ClosedLoopLogs from '../loop_viewer/logs/ClosedLoopLogs';
-import ClosedLoopStatus from '../loop_viewer/status/ClosedLoopStatus';
-import UserService from '../backend_communication/UserService';
-
-const ProjectNameStyled = styled.a`
-	vertical-align: middle;
-	padding-left: 30px;
-	font-size: 30px;
-
-`
-const LoopViewDivStyled = styled.div`
-	height: 90vh;
-	overflow: hidden;
-	margin-left: 10px;
-	margin-right: 10px;
-	margin-bottom: 10px;
-	color: ${props => props.theme.loopViewerFontColor};
-	background-color: ${props => props.theme.loopViewerBackgroundColor};
-	border: 1px solid transparent;
-	border-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-`
-
-const LoopViewHeaderDivStyled = styled.div`
-	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-	padding: 10px 10px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
-`
-
-const LoopViewBodyDivStyled = styled.div`
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
-	padding: 10px 10px;
-	color: ${props => (props.theme.loopViewerHeaderFontColor)};
-	height: 95%;
-`
-
-const LoopViewLoopNameSpanStyled = styled.span`
-	font-weight: bold;
-	color: ${props => (props.theme.loopViewerHeaderFontColor)};
-	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
-`
-
-export default class LoopUI extends React.Component {
-	state = {
-		userName: null,
-		loopName: "Empty (NO loop loaded yet)",
-	};
-
-	constructor() {
-		super();
-		this.getUser = this.getUser.bind(this);
-	}
-
- 	componentDidMount() {
-		 this.getUser();
-	 }
-
-	getUser() {
-		UserService.LOGIN().then(user => {
-			this.setState({userName:user})
-		});
-	}
-		
-	renderMenuNavBar() {
-		return (
-			<MenuBar />
-		);
-	}
-
-	renderUserLoggedNavBar() {
-		return (
-			<Navbar.Text>
-				Signed in as: <a href="/login">{this.state.userName}</a>
-			</Navbar.Text>
-		);
-	}
-
-	renderLogoNavBar() {
-		return (
-			<Navbar.Brand>
-				<img height="50px" width="234px" src={logo} alt=""/>
-				<ProjectNameStyled>CLAMP</ProjectNameStyled>
-			</Navbar.Brand>
-		);
-	}
-
-	renderNavBar() {
-		return (
-		<Navbar expand="lg">
-			{this.renderLogoNavBar()}
-			{this.renderMenuNavBar()}
-			{this.renderUserLoggedNavBar()}
-		</Navbar>
-	);
-	}
-	
-	renderLoopViewHeader() {
-		return (
-			<LoopViewHeaderDivStyled>
-				Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled> 
-			</LoopViewHeaderDivStyled>
-		);
-	}
-	
-	renderLoopViewBody() {
-		return (
-			<LoopViewBodyDivStyled>
-				<ClosedLoopSvg />
-				<ClosedLoopLogs />
-				<ClosedLoopStatus />
-			</LoopViewBodyDivStyled>
-		);
-	}
-	
-	renderLoopViewer() {
-		return (
-			<LoopViewDivStyled>
-					{this.renderLoopViewHeader()}
-					{this.renderLoopViewBody()}
-			</LoopViewDivStyled>
-	 		);
-	}
-	
-	render() {
-		return (
-			<div id="main_div">
-				 	<GlobalClampStyle />
-					{this.renderNavBar()}
-					{this.renderLoopViewer()}
-				</div>
-		);
-	}
-}
diff --git a/ui-react/src/components/app/NotFound.js b/ui-react/src/components/app/NotFound.js
deleted file mode 100644
index d4b53fd71..000000000
--- a/ui-react/src/components/app/NotFound.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react'
-
-
-export default class NotFound extends React.Component {
-	render () {
-		return (
-      <div id='main'>
-      	<div class="divRow"><b>Page Not Found!</b></div>
-      	<div class="divRow">Please cick <a href="/">here</a> to go back to the main page.</div>
-      </div>
-
-		);
-	}
-}
diff --git a/ui-react/src/components/app/logo.png b/ui-react/src/components/app/logo.png
deleted file mode 100644
index c6f6857a5..000000000
Binary files a/ui-react/src/components/app/logo.png and /dev/null differ
diff --git a/ui-react/src/components/backend_communication/LoopActionService.js b/ui-react/src/components/backend_communication/LoopActionService.js
deleted file mode 100644
index 9ce8ff0a9..000000000
--- a/ui-react/src/components/backend_communication/LoopActionService.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-const loopActionService = {
-	submit
-};
-
-
-function submit(uiAction) {
-	const cl_name = "";
-	console.log("clActionServices perform action: " + uiAction + " closedloopName="
-		+ cl_name);
-	const svcAction = uiAction.toLowerCase();
-	const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
-
-	let options = {
-		method: 'GET'
-	};
-	return sendRequest(svcUrl, svcAction, options);
-}
-
-function sendRequest(svcUrl, svcAction) {
-	fetch(svcUrl, options)
-		.then(
-			response => {
-				alertService.alertMessage("Action Successful: " + svcAction, 1)
-			}).error(error => {
-				alertService.alertMessage("Action Failure: " + svcAction, 2);
-				return Promise.reject(error);
-			});
-
-	return response.json();
-};
-
-export default loopActionService;
\ No newline at end of file
diff --git a/ui-react/src/components/backend_communication/LoopCache.js b/ui-react/src/components/backend_communication/LoopCache.js
deleted file mode 100644
index 2ef839629..000000000
--- a/ui-react/src/components/backend_communication/LoopCache.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * 
- */
-class LoopCache {
-	constructor() {
-		//this.loopJsonCache=loopJson;
-		this.loopJsonCache = require('./example.json'); //(with path)
-	}
-
-	updateMsProperties(type, newMsProperties) {
-		if (newMsProperties["name"] == type) {
-			for (var policy in this.loopJsonCache["microServicePolicies"]) {
-				if (this.loopJsonCache["microServicePolicies"][policy]["name"] == type) {
-					this.loopJsonCache["microServicePolicies"][policy] = newMsProperties;
-				}
-			}
-		}
-	}
-
-	updateGlobalProperties(newGlobalProperties) {
-		this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
-	}
-
-	updateOpPolicyProperties(newOpProperties) {
-		this.loopJsonCache["operationalPolicies"] = newOpProperties;
-	}
-
-	getLoopName() {
-		return this.loopJsonCache["name"];
-	}
-
-	getOperationalPolicyProperty() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
-	}
-
-	getOperationalPolicies() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
-	}
-
-	getGlobalProperty() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
-	}
-
-	getDeploymentProperties() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
-	}
-
-	getMsJson(type) {
-		var msProperties = this.loopJsonCache["microServicePolicies"];
-		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] == type) {
-				return JSON.parse(JSON.stringify(msProperties[policy]));
-			}
-		}
-		return null;
-	}
-
-	getMsProperty(type) {
-		var msProperties = this.loopJsonCache["microServicePolicies"];
-		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] == type) {
-				if (msProperties[policy]["properties"] !== null && msProperties[policy]["properties"] !== undefined) {
-					return JSON.parse(JSON.stringify(msProperties[policy]["properties"]));
-				}
-			}
-		}
-		return null;
-	}
-
-	getMsUI(type) {
-		var msProperties = this.loopJsonCache["microServicePolicies"];
-		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] == type) {
-				return JSON.parse(JSON.stringify(msProperties[policy]["jsonRepresentation"]));
-			}
-		}
-		return null;
-	}
-
-	getResourceDetailsVfProperty() {
-		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VF"];
-	}
-
-	getResourceDetailsVfModuleProperty() {
-		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VFModule"];
-	}
-
-	getLoopLogsArray() {
-		return this.loopJsonCache.loopLogs;
-	}
-
-	getComponentStates() {
-		return this.loopJsonCache.components;
-	}
-
-}
-export default LoopCache;
diff --git a/ui-react/src/components/backend_communication/UserService.js b/ui-react/src/components/backend_communication/UserService.js
deleted file mode 100644
index 814539551..000000000
--- a/ui-react/src/components/backend_communication/UserService.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-export default class UserService {
-
-	static LOGIN() {
-		return fetch('/restservices/clds/v1/user/getUser', {
-				method: 'GET',
-				credentials: 'include',
-			})
-		.then(function (response) {
-			if (response.ok) {
-				console.log("getUser response received: ", response.status);
-				return response.text();
-			} else {
-				console.error("getUser failed with status code: ",response.status);
-				return "Anonymous";
-			}
-		})
-		.then(function (data) {
-			console.log ("User connected:",data)
-			return data;
-		})
-		.catch(function(error) {
-			console.error("getUser error received",error);
-			return "Anonymous";
-		});
-	}
-}
-
diff --git a/ui-react/src/components/backend_communication/example.json b/ui-react/src/components/backend_communication/example.json
deleted file mode 100644
index f3cc9e189..000000000
--- a/ui-react/src/components/backend_communication/example.json
+++ /dev/null
@@ -1,417 +0,0 @@
-{
-  "name": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
-  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
-  "globalPropertiesJson": {
-    "dcaeDeployParameters": {
-      "location_id": "",
-      "service_id": "",
-      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-    }
-  },
-  "modelPropertiesJson": {
-    "serviceDetails": {
-      "serviceType": "",
-      "namingPolicy": "",
-      "environmentContext": "General_Revenue-Bearing",
-      "serviceEcompNaming": "true",
-      "serviceRole": "",
-      "name": "vLoadBalancerMS",
-      "description": "vLBMS",
-      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-      "ecompGeneratedNaming": "true",
-      "category": "Network L4+",
-      "type": "Service",
-      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-      "instantiationType": "A-la-carte"
-    },
-    "resourceDetails": {
-      "CP": {},
-      "VL": {},
-      "VF": {
-        "vLoadBalancerMS 0": {
-          "resourceVendor": "Test",
-          "resourceVendorModelNumber": "",
-          "name": "vLoadBalancerMS",
-          "description": "vLBMS",
-          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-          "subcategory": "Load Balancer",
-          "category": "Application L4+",
-          "type": "VF",
-          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-          "version": "1.0",
-          "resourceVendorRelease": "1.0",
-          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
-        }
-      },
-      "CR": {},
-      "VFC": {},
-      "PNF": {},
-      "Service": {},
-      "CVFC": {},
-      "Service Proxy": {},
-      "Configuration": {},
-      "AllottedResource": {},
-      "VFModule": {
-        "Vloadbalancerms..vpkg..module-1": {
-          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vpkg",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        },
-        "Vloadbalancerms..vdns..module-3": {
-          "vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-          "vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-          "vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vdns",
-          "max_vf_module_instances": 50,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        },
-        "Vloadbalancerms..base_template..module-0": {
-          "vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-          "vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-          "vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-          "min_vf_module_instances": 1,
-          "vf_module_label": "base_template",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Base",
-          "isBase": true,
-          "initial_count": 1,
-          "volume_group": false
-        },
-        "Vloadbalancerms..vlb..module-2": {
-          "vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-          "vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-          "vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vlb",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        }
-      }
-    }
-  },
-  "lastComputedState": "DESIGN",
-  "components": {
-    "POLICY": {
-      "componentState": {
-        "stateName": "NOT_SENT",
-        "description": "The policies defined have NOT yet been created on the policy engine"
-      }
-    },
-    "DCAE": {
-      "componentState": {
-        "stateName": "BLUEPRINT_DEPLOYED",
-        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
-      }
-    }
-  },
-  "operationalPolicies": [
-    {
-      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
-      "configurationsJson": {
-        "guard_policies": {
-          "guard.minmax.new": {
-            "recipe": "",
-            "clname": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
-            "actor": "",
-            "targets": "",
-            "min": "gg",
-            "max": "gg",
-            "limit": "",
-            "timeUnits": "",
-            "timeWindow": "",
-            "guardActiveStart": "00:00:00Z",
-            "guardActiveEnd": "00:00:01Z"
-          }
-        },
-        "operational_policy": {
-          "controlLoop": {
-            "trigger_policy": "new",
-            "timeout": "0",
-            "abatement": "false",
-            "controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
-          },
-          "policies": [
-            {
-              "id": "new",
-              "recipe": "",
-              "retry": "0",
-              "timeout": "0",
-              "actor": "",
-              "payload": "",
-              "success": "",
-              "failure": "",
-              "failure_timeout": "",
-              "failure_retries": "",
-              "failure_exception": "",
-              "failure_guard": "",
-              "target": {
-                "type": "VM",
-                "resourceID": ""
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "microServicePolicies": [
-    {
-      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "properties": {
-        "domain": "measurementsForVfScaling",
-        "metricsPerEventName": [
-          {
-            "policyVersion": "ff",
-            "thresholds": [
-              {
-                "severity": "CRITICAL",
-                "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                "thresholdValue": 0,
-                "closedLoopEventStatus": "ONSET",
-                "closedLoopControlName": "ff",
-                "version": "ff",
-                "direction": "LESS"
-              }
-            ],
-            "policyName": "ff",
-            "controlLoopSchemaType": "VM",
-            "policyScope": "ff",
-            "eventName": "ff"
-          }
-        ]
-      },
-      "shared": false,
-      "jsonRepresentation": {
-        "schema": {
-          "uniqueItems": "true",
-          "format": "tabs-top",
-          "type": "array",
-          "title": "TCA Policy JSON",
-          "items": {
-            "type": "object",
-            "title": "TCA Policy JSON",
-            "required": [
-              "domain",
-              "metricsPerEventName"
-            ],
-            "properties": {
-              "domain": {
-                "propertyOrder": 1001,
-                "default": "measurementsForVfScaling",
-                "title": "Domain name to which TCA needs to be applied",
-                "type": "string"
-              },
-              "metricsPerEventName": {
-                "propertyOrder": 1002,
-                "uniqueItems": "true",
-                "format": "tabs-top",
-                "title": "Contains eventName and threshold details that need to be applied to given eventName",
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "required": [
-                    "controlLoopSchemaType",
-                    "eventName",
-                    "policyName",
-                    "policyScope",
-                    "policyVersion",
-                    "thresholds"
-                  ],
-                  "properties": {
-                    "policyVersion": {
-                      "propertyOrder": 1007,
-                      "title": "TCA Policy Scope Version",
-                      "type": "string"
-                    },
-                    "thresholds": {
-                      "propertyOrder": 1008,
-                      "uniqueItems": "true",
-                      "format": "tabs-top",
-                      "title": "Thresholds associated with eventName",
-                      "type": "array",
-                      "items": {
-                        "type": "object",
-                        "required": [
-                          "closedLoopControlName",
-                          "closedLoopEventStatus",
-                          "direction",
-                          "fieldPath",
-                          "severity",
-                          "thresholdValue",
-                          "version"
-                        ],
-                        "properties": {
-                          "severity": {
-                            "propertyOrder": 1013,
-                            "title": "Threshold Event Severity",
-                            "type": "string",
-                            "enum": [
-                              "CRITICAL",
-                              "MAJOR",
-                              "MINOR",
-                              "WARNING",
-                              "NORMAL"
-                            ]
-                          },
-                          "fieldPath": {
-                            "propertyOrder": 1012,
-                            "title": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                            "type": "string",
-                            "enum": [
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                              "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                              "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                            ]
-                          },
-                          "thresholdValue": {
-                            "propertyOrder": 1014,
-                            "title": "Threshold value for the field Path inside CEF message",
-                            "type": "integer"
-                          },
-                          "closedLoopEventStatus": {
-                            "propertyOrder": 1010,
-                            "title": "Closed Loop Event Status of the threshold",
-                            "type": "string",
-                            "enum": [
-                              "ONSET",
-                              "ABATED"
-                            ]
-                          },
-                          "closedLoopControlName": {
-                            "propertyOrder": 1009,
-                            "title": "Closed Loop Control Name associated with the threshold",
-                            "type": "string"
-                          },
-                          "version": {
-                            "propertyOrder": 1015,
-                            "title": "Version number associated with the threshold",
-                            "type": "string"
-                          },
-                          "direction": {
-                            "propertyOrder": 1011,
-                            "title": "Direction of the threshold",
-                            "type": "string",
-                            "enum": [
-                              "LESS",
-                              "LESS_OR_EQUAL",
-                              "GREATER",
-                              "GREATER_OR_EQUAL",
-                              "EQUAL"
-                            ]
-                          }
-                        }
-                      }
-                    },
-                    "policyName": {
-                      "propertyOrder": 1005,
-                      "title": "TCA Policy Scope Name",
-                      "type": "string"
-                    },
-                    "controlLoopSchemaType": {
-                      "propertyOrder": 1003,
-                      "title": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                      "type": "string",
-                      "enum": [
-                        "VM",
-                        "VNF"
-                      ]
-                    },
-                    "policyScope": {
-                      "propertyOrder": 1006,
-                      "title": "TCA Policy Scope",
-                      "type": "string"
-                    },
-                    "eventName": {
-                      "propertyOrder": 1004,
-                      "title": "Event name to which thresholds need to be applied",
-                      "type": "string"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "loopLogs": [
-    {
-      "id": 2,
-      "logType": "INFO",
-      "logComponent": "CLAMP",
-      "message": "Micro Service policies UPDATED",
-      "logInstant": "2019-07-08T09:44:53Z"
-    },
-    {
-      "id": 1,
-      "logType": "INFO",
-      "logComponent": "CLAMP",
-      "message": "Operational and Guard policies UPDATED",
-      "logInstant": "2019-07-08T09:44:37Z"
-    }
-  ]
-}
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index e52d930a2..7d339313e 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -24,7 +24,7 @@
 import React from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
-import LoopCache from '../../backend_communication/LoopCache'
+import { LOOP_CACHE } from '../../../api/LoopCache'
 import './OperationalPolicy.css'
 import styled from 'styled-components';
 
@@ -37,8 +37,6 @@ export default class OperationalPolicyModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 
-		this.loopCache = new LoopCache();
-
 		this.handleClose = this.handleClose.bind(this);
 		this.initPolicySelect = this.initPolicySelect.bind(this);
 
@@ -59,7 +57,7 @@ export default class OperationalPolicyModal extends React.Component {
 
 	initPolicySelect() {
 		if (this.allPolicies['operational_policy'] === undefined || this.allPolicies['operational_policy'] === null) {
-			this.allPolicies = this.loopCache.getOperationalPolicyProperty();
+			this.allPolicies = LOOP_CACHE.getOperationalPolicyProperty();
 		}
 		// Provision all policies ID first
 		if (this.policyIds.length == 0 && this.allPolicies['operational_policy'] != undefined) {
@@ -197,7 +195,7 @@ export default class OperationalPolicyModal extends React.Component {
 										<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
 										<div className="col-sm-8">
 											<input type="text" className="form-control" name="controlLoopName"
-												readOnly="readonly" id="clname" value={this.loopCache.getLoopName()} />
+												readOnly="readonly" id="clname" value={LOOP_CACHE.getLoopName()} />
 										</div>
 									</div>
 								</form>
diff --git a/ui-react/src/logo.png b/ui-react/src/logo.png
new file mode 100644
index 000000000..c6f6857a5
Binary files /dev/null and b/ui-react/src/logo.png differ
-- 
cgit 1.2.3-korg


From f248df69de034f43e04d8dbcf0ad836850cb9654 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 15 Jul 2019 15:16:18 +0200
Subject: Rework the Open CL window

Rework the Open CL window of the Clamp UI.

Issue-ID: CLAMP-420
Change-Id: Ic7e1e6add4067bc2ee94bd758d76e15397d941df
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/package.json                              |   3 +-
 ui-react/src/api/LoopCache.js                      |  12 +--
 ui-react/src/api/LoopService.js                    |  76 ++++++++++++++
 ui-react/src/components/dialogs/LoopModal.js       | 110 +++++++++++++++++++++
 .../OperationalPolicy/OperationalPolicyModal.js    |   4 +-
 .../components/loop_viewer/logs/ClosedLoopLogs.js  |   1 -
 ui-react/src/components/menu/MenuBar.js            |   3 +-
 ui-react/src/index.js                              |   3 +-
 8 files changed, 199 insertions(+), 13 deletions(-)
 create mode 100644 ui-react/src/api/LoopService.js
 create mode 100644 ui-react/src/components/dialogs/LoopModal.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index c6369a3a3..1b98d0f12 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -20,7 +20,8 @@
     "react-bootstrap": "1.0.0-beta.9",
     "bootstrap-css-only": "4.3.1",
     "styled-components": "4.3.2",
-    "react-router-dom": "5.0.1"
+    "react-router-dom": "5.0.1",
+    "react-select": "3.0.4"
   },
   "browserslist": [
     ">0.2%",
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 80f02f027..d44b5cfd8 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 
 class LoopCache {
@@ -30,9 +30,9 @@ class LoopCache {
 	}
 
 	updateMsProperties(type, newMsProperties) {
-		if (newMsProperties["name"] == type) {
+		if (newMsProperties["name"] === type) {
 			for (var policy in this.loopJsonCache["microServicePolicies"]) {
-				if (this.loopJsonCache["microServicePolicies"][policy]["name"] == type) {
+				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === type) {
 					this.loopJsonCache["microServicePolicies"][policy] = newMsProperties;
 				}
 			}
@@ -70,7 +70,7 @@ class LoopCache {
 	getMsJson(type) {
 		var msProperties = this.loopJsonCache["microServicePolicies"];
 		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] == type) {
+			if (msProperties[policy]["name"] === type) {
 				return JSON.parse(JSON.stringify(msProperties[policy]));
 			}
 		}
@@ -80,7 +80,7 @@ class LoopCache {
 	getMsProperty(type) {
 		var msProperties = this.loopJsonCache["microServicePolicies"];
 		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] == type) {
+			if (msProperties[policy]["name"] === type) {
 				if (msProperties[policy]["properties"] !== null && msProperties[policy]["properties"] !== undefined) {
 					return JSON.parse(JSON.stringify(msProperties[policy]["properties"]));
 				}
@@ -92,7 +92,7 @@ class LoopCache {
 	getMsUI(type) {
 		var msProperties = this.loopJsonCache["microServicePolicies"];
 		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] == type) {
+			if (msProperties[policy]["name"] === type) {
 				return JSON.parse(JSON.stringify(msProperties[policy]["jsonRepresentation"]));
 			}
 		}
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
new file mode 100644
index 000000000..f59f45763
--- /dev/null
+++ b/ui-react/src/api/LoopService.js
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class LoopService {
+	static getLoopNames() {
+		const url = '/restservices/clds/v2/loop/getAllNames';
+		const options = {
+			method: 'GET'
+		};
+		return fetch(url,options)
+		.then(function (response) {
+			if (response.ok) {
+				console.log("GetLoopNames response received: ", response.status);
+				return response.json();
+			} else {
+				let errorMsg = "GetLoopNames failed with status code: " + response.status;
+				console.error(errorMsg);
+				return Promise.reject(errorMsg);
+			}
+		})
+		.then(function (data) {
+			return data;
+		})
+		.catch(function(error) {
+			console.error("GetLoopNames error received",error);
+			return Promise.reject(error);
+		});
+	}
+
+	static getLoop(loopName) {
+		const url = '/restservices/clds/v2/loop/' + loopName;
+		const options = {
+			method: 'GET',
+			headers: {
+				"Content-Type": "application/json"
+			}
+		};
+		return fetch(url,options)
+		.then(function (response) {
+			if (response.ok) {
+				console.log("GetLoop response received: ", response.status);
+				return response.json();
+			} else {
+				let errorMsg = "GetLoop failed with status code: " + response.status;
+				console.error(errorMsg);
+				return Promise.reject(errorMsg);
+			}
+		})
+		.then(function (data) {
+			return data;
+		})
+		.catch(function(error) {
+			console.error("GetLoop error received",error);
+			return Promise.reject(error);
+		});
+	}
+}
diff --git a/ui-react/src/components/dialogs/LoopModal.js b/ui-react/src/components/dialogs/LoopModal.js
new file mode 100644
index 000000000..6dc04d19c
--- /dev/null
+++ b/ui-react/src/components/dialogs/LoopModal.js
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Select from 'react-select';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import FormCheck from 'react-bootstrap/FormCheck'
+import styled from 'styled-components';
+import LoopService from '../../api/LoopService';
+import LoopCache from '../../api/LoopCache';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const CheckBoxStyled = styled(FormCheck.Input)`
+	margin-left:3rem;
+`
+
+export default class LoopModal extends React.Component {
+	constructor(props, context) {
+		super(props, context);
+
+		this.getLoopNames = this.getLoopNames.bind(this);
+		this.openModel = this.openModel.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.state = {
+			show: true,
+			chosenLoopName: '',
+			loopNames:[]
+		};
+	}
+	componentDidMount() {
+		 this.getLoopNames();
+	 }
+	handleClose() {
+		this.setState({ show: false });
+			this.props.history.push('/');
+	}
+	handleDropdownListChange(e) {
+		this.setState({ chosenLoopName: e.value});
+	}
+	getLoopNames() {
+		LoopService.getLoopNames().then(loopNames => {
+			const loopOptions = loopNames.map((loopName) => { return {label: loopName,  value: loopName}});
+			this.setState({loopNames:loopOptions})
+		});
+	}
+	openModel() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+		// Open selected model
+		console.log("Loop " + this.state.chosenLoopName + " is chosen");
+		LoopService.getLoop(this.state.chosenLoopName).then(loop => {
+			console.log("Initialize the loop cache");
+			new LoopCache(loop);
+		});
+	}
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Open Model</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Form.Label column sm="2">Model Name</Form.Label>
+						<Col sm="10">
+							<Select onChange={this.handleDropdownListChange} options={ this.state.loopNames } />
+						</Col>
+					</Form.Group>
+					<Form.Group controlId="formBasicChecbox">
+	 					<Form.Check>
+							<FormCheck.Label>Read Only</FormCheck.Label>
+							<CheckBoxStyled type="checkbox" />
+						</Form.Check>
+ 					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
+					<Button variant="primary" type="submit" onClick={this.openModel}>OK</Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 7d339313e..fd53300d6 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -60,7 +60,7 @@ export default class OperationalPolicyModal extends React.Component {
 			this.allPolicies = LOOP_CACHE.getOperationalPolicyProperty();
 		}
 		// Provision all policies ID first
-		if (this.policyIds.length == 0 && this.allPolicies['operational_policy'] != undefined) {
+		if (this.policyIds.length === 0 && this.allPolicies['operational_policy'] !== undefined) {
 
 			for (let i = 0; i < this.allPolicies['operational_policy']['policies'].length; i++) {
 				this.policyIds.push(this.allPolicies['operational_policy']['policies'][i]['id']);
@@ -536,7 +536,7 @@ export default class OperationalPolicyModal extends React.Component {
 							</span>
 						</div>
 					</div>
-		
+
 				</Modal.Body>
 				<Modal.Footer>
 					<Button variant="secondary" onClick={this.handleClose}>
diff --git a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
index 709cec96a..ef7a3aefe 100644
--- a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
+++ b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
@@ -22,7 +22,6 @@
  */
 import React from 'react';
 import Table from 'react-bootstrap/Table';
-import './ClosedLoopLogs.css';
 
 export default class ClosedLoopViewLogs extends React.Component {
   render() {
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 85d32c539..1a7c5d4e4 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -40,7 +40,7 @@ export default class MenuBar extends React.Component {
 	   return (
 		  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
 		      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
-		        <StyledNavDropdownItem href="#action/3.1">Open CL</StyledNavDropdownItem>
+		        <StyledNavDropdownItem href="/openLoop">Open CL</StyledNavDropdownItem>
 		        <StyledNavDropdownItem href="#action/3.2">Properties CL</StyledNavDropdownItem>
 		        <StyledNavDropdownItem href="#action/3.3">Close Model</StyledNavDropdownItem>
 		      </NavDropdown>
@@ -64,4 +64,3 @@ export default class MenuBar extends React.Component {
 	   );
   }
 }
-
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index 1b2f2f595..eed3935e1 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -24,13 +24,14 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import OnapClamp from './OnapClamp';
 import { Route, BrowserRouter } from 'react-router-dom'
-
+import LoopModal from './components/dialogs/LoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 
 const routing = (
 	<BrowserRouter >
 		<OnapClamp />
 		<Route path="/operationalPolicyModal" render={() => <OperationalPolicyModal />} />
+		<Route path="/openLoop" component={ LoopModal } />
 	</BrowserRouter>
 );
 
-- 
cgit 1.2.3-korg


From 493c3839fb6807512218165fd8a3a6efe1933fb9 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 15 Jul 2019 17:26:18 +0200
Subject: SVG Rendering

SVG rendering draft for Config and operational policies management +
call to back-end

Issue-ID: CLAMP-422
Change-Id: Ia3ca4223e283d0cd56d98fb1871fd3b2880940ec
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/package.json                              |   2 +-
 ui-react/src/LoopUI.js                             |  81 ++--
 ui-react/src/api/LoopCache.js                      |  31 +-
 ui-react/src/api/LoopService.js                    |  91 +++--
 ui-react/src/api/UserService.js                    |  17 +-
 ui-react/src/api/example.json                      |   2 +-
 .../ConfigurationPolicyModal.js                    |  77 ++++
 ui-react/src/components/dialogs/LoopModal.js       | 110 -----
 .../components/dialogs/OpenLoop/OpenLoopModal.js   | 119 ++++++
 .../OperationalPolicy/OperationalPolicyModal.js    | 119 +++---
 .../components/loop_viewer/logs/ClosedLoopLogs.js  |  54 ---
 .../loop_viewer/status/ClosedLoopStatus.css        |  19 -
 .../loop_viewer/status/ClosedLoopStatus.js         |  55 ---
 .../components/loop_viewer/status/LoopStatus.css   |  19 +
 .../components/loop_viewer/status/LoopStatus.js    |  55 +++
 .../components/loop_viewer/svg/ClosedLoopSvg.js    |  43 --
 ui-react/src/components/loop_viewer/svg/LoopSvg.js | 100 +++++
 .../src/components/loop_viewer/svg/example.svg     | 445 +--------------------
 ui-react/src/index.js                              |   7 +-
 ui-react/src/theme/globalStyle.js                  |   8 +
 20 files changed, 558 insertions(+), 896 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
 delete mode 100644 ui-react/src/components/dialogs/LoopModal.js
 create mode 100644 ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
 delete mode 100644 ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
 delete mode 100644 ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css
 delete mode 100644 ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js
 create mode 100644 ui-react/src/components/loop_viewer/status/LoopStatus.css
 create mode 100644 ui-react/src/components/loop_viewer/status/LoopStatus.js
 delete mode 100644 ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js
 create mode 100644 ui-react/src/components/loop_viewer/svg/LoopSvg.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 1b98d0f12..f1ae2bc9d 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -13,7 +13,7 @@
   "author": "ONAP Clamp Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "json-editor": "0.7.28",
+    "@json-editor/json-editor": "1.3.5",
     "react": "16.8.0",
     "react-dom": "16.8.0",
     "react-scripts": "3.0.1",
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 997f94b18..a1aff3d61 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -28,10 +28,16 @@ import Navbar from 'react-bootstrap/Navbar';
 import logo from './logo.png';
 import { GlobalClampStyle } from './theme/globalStyle.js';
 
-import ClosedLoopSvg from './components/loop_viewer/svg/ClosedLoopSvg';
-import ClosedLoopLogs from './components/loop_viewer/logs/ClosedLoopLogs';
-import ClosedLoopStatus from './components/loop_viewer/status/ClosedLoopStatus';
+import LoopSvg from './components/loop_viewer/svg/LoopSvg';
+import LoopLogs from './components/loop_viewer/logs/LoopLogs';
+import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
+import LoopCache from './api/LoopCache';
+
+import { Route } from 'react-router-dom'
+import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
+import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
+import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -71,26 +77,29 @@ const LoopViewLoopNameSpanStyled = styled.span`
 `
 
 export default class LoopUI extends React.Component {
+
 	state = {
 		userName: null,
 		loopName: "Empty (NO loop loaded yet)",
+		loopCache: new LoopCache({}),
 	};
 
 	constructor() {
 		super();
 		this.getUser = this.getUser.bind(this);
+		this.updateLoopCache = this.updateLoopCache.bind(this);
+	}
+
+	componentDidMount() {
+		this.getUser();
 	}
-	
- 	componentDidMount() {
-		 this.getUser();
-	 }
 
 	getUser() {
-		UserService.LOGIN().then(user => {
-			this.setState({userName:user})
+		UserService.login().then(user => {
+			this.setState({ userName: user })
 		});
 	}
-		
+
 	renderMenuNavBar() {
 		return (
 			<MenuBar />
@@ -108,7 +117,7 @@ export default class LoopUI extends React.Component {
 	renderLogoNavBar() {
 		return (
 			<Navbar.Brand>
-				<img height="50px" width="234px" src={logo} alt=""/>
+				<img height="50px" width="234px" src={logo} alt="" />
 				<ProjectNameStyled>CLAMP</ProjectNameStyled>
 			</Navbar.Brand>
 		);
@@ -116,48 +125,56 @@ export default class LoopUI extends React.Component {
 
 	renderNavBar() {
 		return (
-		<Navbar expand="lg">
-			{this.renderLogoNavBar()}
-			{this.renderMenuNavBar()}
-			{this.renderUserLoggedNavBar()}
-		</Navbar>
-	);
+			<Navbar expand="lg">
+				{this.renderLogoNavBar()}
+				{this.renderMenuNavBar()}
+				{this.renderUserLoggedNavBar()}
+			</Navbar>
+		);
 	}
-	
+
 	renderLoopViewHeader() {
 		return (
 			<LoopViewHeaderDivStyled>
-				Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled> 
+				Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled>
 			</LoopViewHeaderDivStyled>
 		);
 	}
-	
+
 	renderLoopViewBody() {
 		return (
 			<LoopViewBodyDivStyled>
-				<ClosedLoopSvg />
-				<ClosedLoopLogs />
-				<ClosedLoopStatus />
+				<LoopSvg loopCache={this.state.loopCache} />
+				<LoopLogs />
+				<LoopStatus />
 			</LoopViewBodyDivStyled>
 		);
 	}
-	
+
 	renderLoopViewer() {
 		return (
 			<LoopViewDivStyled>
-					{this.renderLoopViewHeader()}
-					{this.renderLoopViewBody()}
+				{this.renderLoopViewHeader()}
+				{this.renderLoopViewBody()}
 			</LoopViewDivStyled>
-	 		);
+		);
 	}
-	
+
+	updateLoopCache(loopJson) {
+		this.setState({ loopCache: new LoopCache(loopJson) });
+	}
+
 	render() {
 		return (
 			<div id="main_div">
-				 	<GlobalClampStyle />
-					{this.renderNavBar()}
-					{this.renderLoopViewer()}
-				</div>
+				<GlobalClampStyle />
+				{this.renderNavBar()}
+				{this.renderLoopViewer()}
+				<Route path="/operationalPolicyModal"
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
+				<Route path="/configurationPolicyModal" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
+				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
+			</div>
 		);
 	}
 }
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index d44b5cfd8..4c8f68c23 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -21,15 +21,14 @@
  *
  */
 
-class LoopCache {
+export default class LoopCache {
 	loopJsonCache;
 
 	constructor(loopJson) {
 		this.loopJsonCache=loopJson;
-		//LoopCache.SET_LOOP_JSON_CACHE(require('./example.json');
 	}
 
-	updateMsProperties(type, newMsProperties) {
+	updateMicroServiceProperties(type, newMsProperties) {
 		if (newMsProperties["name"] === type) {
 			for (var policy in this.loopJsonCache["microServicePolicies"]) {
 				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === type) {
@@ -43,7 +42,7 @@ class LoopCache {
 		this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
 	}
 
-	updateOpPolicyProperties(newOpProperties) {
+	updateOperationalPolicyProperties(newOpProperties) {
 		this.loopJsonCache["operationalPolicies"] = newOpProperties;
 	}
 
@@ -51,7 +50,7 @@ class LoopCache {
 		return this.loopJsonCache["name"];
 	}
 
-	getOperationalPolicyProperty() {
+	getOperationalPolicyConfigurationJson() {
 		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
 	}
 
@@ -59,15 +58,15 @@ class LoopCache {
 		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
 	}
 
-	getGlobalProperty() {
+	getGlobalProperties() {
 		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
 	}
 
-	getDeploymentProperties() {
+	getDcaeDeploymentProperties() {
 		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
 	}
 
-	getMsJson(type) {
+	getMicroServicesJsonForType(type) {
 		var msProperties = this.loopJsonCache["microServicePolicies"];
 		for (var policy in msProperties) {
 			if (msProperties[policy]["name"] === type) {
@@ -77,7 +76,7 @@ class LoopCache {
 		return null;
 	}
 
-	getMsProperty(type) {
+	getMicroServiceProperties(type) {
 		var msProperties = this.loopJsonCache["microServicePolicies"];
 		for (var policy in msProperties) {
 			if (msProperties[policy]["name"] === type) {
@@ -89,7 +88,7 @@ class LoopCache {
 		return null;
 	}
 
-	getMsUI(type) {
+	getMicroServiceJsonRepresentationForType(type) {
 		var msProperties = this.loopJsonCache["microServicePolicies"];
 		for (var policy in msProperties) {
 			if (msProperties[policy]["name"] === type) {
@@ -114,16 +113,4 @@ class LoopCache {
 	getComponentStates() {
 		return this.loopJsonCache.components;
 	}
-
-	get getLoopJsonCache() {
-		return this.loopJsonCache;
-	}
-
-	set setLoopJsonCache(newJson) {
-		this.loopJsonCache = newJson;
-	}
 }
-
-export const LOOP_CACHE = new LoopCache(require('./example.json'));
-
-export default LoopCache;
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index f59f45763..2813a7c08 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -22,55 +22,62 @@
 
 export default class LoopService {
 	static getLoopNames() {
-		const url = '/restservices/clds/v2/loop/getAllNames';
-		const options = {
-			method: 'GET'
-		};
-		return fetch(url,options)
-		.then(function (response) {
-			if (response.ok) {
-				console.log("GetLoopNames response received: ", response.status);
-				return response.json();
-			} else {
-				let errorMsg = "GetLoopNames failed with status code: " + response.status;
-				console.error(errorMsg);
-				return Promise.reject(errorMsg);
-			}
-		})
-		.then(function (data) {
-			return data;
-		})
-		.catch(function(error) {
-			console.error("GetLoopNames error received",error);
-			return Promise.reject(error);
-		});
+		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'include', })
+			.then(function (response) {
+				console.debug("GetLoopNames response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("GetLoopNames query failed");
+					return {};
+				}
+			})
+			.catch(function (error) {
+				console.error("GetLoopNames error received", error);
+				return {};
+			});
 	}
 
 	static getLoop(loopName) {
-		const url = '/restservices/clds/v2/loop/' + loopName;
-		const options = {
+		return fetch('/restservices/clds/v2/loop/' + loopName, {
 			method: 'GET',
 			headers: {
 				"Content-Type": "application/json"
-			}
-		};
-		return fetch(url,options)
-		.then(function (response) {
-			if (response.ok) {
-				console.log("GetLoop response received: ", response.status);
-				return response.json();
-			} else {
-				let errorMsg = "GetLoop failed with status code: " + response.status;
-				console.error(errorMsg);
-				return Promise.reject(errorMsg);
-			}
+			},
+			credentials: 'include',
 		})
-		.then(function (data) {
-			return data;
+			.then(function (response) {
+				console.debug("GetLoop response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("GetLoop query failed");
+					return {};
+				}
+			})
+			.catch(function (error) {
+				console.error("GetLoop error received", error);
+				return {};
+			});
+	}
+
+	static getSvg(loopName) {
+		return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, {
+			method: 'GET',
+			credentials: 'include',
 		})
-		.catch(function(error) {
-			console.error("GetLoop error received",error);
-			return Promise.reject(error);
-		});
+			.then(function (response) {
+				console.debug("svgRepresentation response received: ", response.status);
+				if (response.ok) {
+					return response.text();
+				} else {
+					console.error("svgRepresentation query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("svgRepresentation error received", error);
+				return "";
+			});
 	}
 }
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 814539551..8f53d7b8a 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -22,28 +22,29 @@
  */
 
 export default class UserService {
-
-	static LOGIN() {
+	static notLoggedUserName='Anonymous';
+	static login() {
 		return fetch('/restservices/clds/v1/user/getUser', {
 				method: 'GET',
 				credentials: 'include',
 			})
 		.then(function (response) {
+			console.debug("getUser response received, status code:", response.status);
 			if (response.ok) {
-				console.log("getUser response received: ", response.status);
 				return response.text();
 			} else {
-				console.error("getUser failed with status code: ",response.status);
-				return "Anonymous";
+				console.error("getUser response is nok");
+				return UserService.notLoggedUserName;
 			}
 		})
 		.then(function (data) {
-			console.log ("User connected:",data)
+			console.info ("User connected:",data)
 			return data;
 		})
 		.catch(function(error) {
-			console.error("getUser error received",error);
-			return "Anonymous";
+			console.warn("getUser error received, user set to: ",UserService.notLoggedUserName);
+			console.error("getUser error:",error);
+			return UserService.notLoggedUserName;
 		});
 	}
 }
diff --git a/ui-react/src/api/example.json b/ui-react/src/api/example.json
index f3cc9e189..108cf78e2 100644
--- a/ui-react/src/api/example.json
+++ b/ui-react/src/api/example.json
@@ -1,5 +1,5 @@
 {
-  "name": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
+  "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
   "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
   "globalPropertiesJson": {
     "dcaeDeployParameters": {
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
new file mode 100644
index 000000000..1a8b6e2c5
--- /dev/null
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -0,0 +1,77 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import { LOOP_CACHE } from '../../../api/LoopCache'
+import styled from 'styled-components';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class ConfigurationPolicyModal extends React.Component {
+
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleClose = this.handleClose.bind(this);
+
+		this.state = {
+			show: true,
+		};
+
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/')
+	}
+
+
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Configuration policies</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+
+
+
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" onClick={this.handleClose}>
+						Close
+	            </Button>
+					<Button variant="primary" onClick={this.handleClose}>
+						Save Changes
+	            </Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/LoopModal.js b/ui-react/src/components/dialogs/LoopModal.js
deleted file mode 100644
index 6dc04d19c..000000000
--- a/ui-react/src/components/dialogs/LoopModal.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Select from 'react-select';
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import Form from 'react-bootstrap/Form';
-import Row from 'react-bootstrap/Row';
-import Col from 'react-bootstrap/Col';
-import FormCheck from 'react-bootstrap/FormCheck'
-import styled from 'styled-components';
-import LoopService from '../../api/LoopService';
-import LoopCache from '../../api/LoopCache';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-const CheckBoxStyled = styled(FormCheck.Input)`
-	margin-left:3rem;
-`
-
-export default class LoopModal extends React.Component {
-	constructor(props, context) {
-		super(props, context);
-
-		this.getLoopNames = this.getLoopNames.bind(this);
-		this.openModel = this.openModel.bind(this);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
-		this.state = {
-			show: true,
-			chosenLoopName: '',
-			loopNames:[]
-		};
-	}
-	componentDidMount() {
-		 this.getLoopNames();
-	 }
-	handleClose() {
-		this.setState({ show: false });
-			this.props.history.push('/');
-	}
-	handleDropdownListChange(e) {
-		this.setState({ chosenLoopName: e.value});
-	}
-	getLoopNames() {
-		LoopService.getLoopNames().then(loopNames => {
-			const loopOptions = loopNames.map((loopName) => { return {label: loopName,  value: loopName}});
-			this.setState({loopNames:loopOptions})
-		});
-	}
-	openModel() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-		// Open selected model
-		console.log("Loop " + this.state.chosenLoopName + " is chosen");
-		LoopService.getLoop(this.state.chosenLoopName).then(loop => {
-			console.log("Initialize the loop cache");
-			new LoopCache(loop);
-		});
-	}
-	render() {
-		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
-				<Modal.Header closeButton>
-					<Modal.Title>Open Model</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<Form.Group as={Row} controlId="formPlaintextEmail">
-						<Form.Label column sm="2">Model Name</Form.Label>
-						<Col sm="10">
-							<Select onChange={this.handleDropdownListChange} options={ this.state.loopNames } />
-						</Col>
-					</Form.Group>
-					<Form.Group controlId="formBasicChecbox">
-	 					<Form.Check>
-							<FormCheck.Label>Read Only</FormCheck.Label>
-							<CheckBoxStyled type="checkbox" />
-						</Form.Check>
- 					</Form.Group>
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
-					<Button variant="primary" type="submit" onClick={this.openModel}>OK</Button>
-				</Modal.Footer>
-			</ModalStyled>
-
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
new file mode 100644
index 000000000..6986209d4
--- /dev/null
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
@@ -0,0 +1,119 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Select from 'react-select';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import FormCheck from 'react-bootstrap/FormCheck'
+import styled from 'styled-components';
+import LoopService from '../../../api/LoopService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const CheckBoxStyled = styled(FormCheck.Input)`
+	margin-left:3rem;
+`
+
+export default class OpenLoopModal extends React.Component {
+	constructor(props, context) {
+		super(props, context);
+
+		this.getLoopNames = this.getLoopNames.bind(this);
+		this.handleOpen = this.handleOpen.bind(this);
+		this.getModel = this.getModel.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.state = {
+			show: true,
+			chosenLoopName: '',
+			loopNames: []
+		};
+	}
+
+	componentDidMount() {
+		this.getLoopNames();
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	handleDropdownListChange(e) {
+		this.setState({ chosenLoopName: e.value });
+	}
+
+	getLoopNames() {
+		LoopService.getLoopNames().then(loopNames => {
+			const loopOptions = loopNames.map((loopName) => { return { label: loopName, value: loopName } });
+			this.setState({ loopNames: loopOptions })
+		});
+	}
+
+	getModel() {
+		LoopService.getLoop(this.state.chosenLoopName).then(loop => {
+			console.debug("Settingloop cache with json");
+			this.props.updateLoopCacheFunction(loop);
+		});
+	}
+
+	handleOpen() {
+		console.info("Loop " + this.state.chosenLoopName + " is chosen");
+		this.setState({ show: false });
+		this.props.history.push('/');
+		this.getModel();
+	}
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Open Model</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Form.Label column sm="2">Model Name</Form.Label>
+						<Col sm="10">
+							<Select onChange={this.handleDropdownListChange} options={this.state.loopNames} />
+						</Col>
+					</Form.Group>
+					<Form.Group controlId="formBasicChecbox">
+						<Form.Check>
+							<FormCheck.Label>Read Only</FormCheck.Label>
+							<CheckBoxStyled type="checkbox" />
+						</Form.Check>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+					<Button variant="primary" type="submit" onClick={this.handleOpen}>OK</Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index fd53300d6..6822f3ff3 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -24,7 +24,6 @@
 import React from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
-import { LOOP_CACHE } from '../../../api/LoopCache'
 import './OperationalPolicy.css'
 import styled from 'styled-components';
 
@@ -34,30 +33,30 @@ const ModalStyled = styled(Modal)`
 
 export default class OperationalPolicyModal extends React.Component {
 
+	state = {
+		show: true,
+		loopCache: this.props.loopCache,
+	};
+
+	allPolicies = [];
+	policyIds = [];
+
 	constructor(props, context) {
 		super(props, context);
 
 		this.handleClose = this.handleClose.bind(this);
 		this.initPolicySelect = this.initPolicySelect.bind(this);
-
-		this.allPolicies = [];
-		this.policyIds = [];
-
 		this.initPolicySelect();
-
-		this.state = {
-			show: true,
-		};
-
 	}
 
 	handleClose() {
 		this.setState({ show: false });
+		this.props.history.push('/')
 	}
 
 	initPolicySelect() {
 		if (this.allPolicies['operational_policy'] === undefined || this.allPolicies['operational_policy'] === null) {
-			this.allPolicies = LOOP_CACHE.getOperationalPolicyProperty();
+			this.allPolicies = this.state.loopCache.getOperationalPolicyConfigurationJson();
 		}
 		// Provision all policies ID first
 		if (this.policyIds.length === 0 && this.allPolicies['operational_policy'] !== undefined) {
@@ -94,7 +93,7 @@ export default class OperationalPolicyModal extends React.Component {
 	}
 
 	// When we change the name of a policy
-	isDuplicatedId (event) {
+	isDuplicatedId(event) {
 		// update policy id structure
 		var formNum = document.getElementById(event.target).closest('.formId').attr('id').substring(6);
 		var policyId = document.getElementById(event.target).val();
@@ -111,51 +110,51 @@ export default class OperationalPolicyModal extends React.Component {
 	}
 
 	configureComponents() {
-		    console.log("Load properties to op policy");
-		    // Set the header
-		    document.getElementsByClassName('form-control').forEach(function() {
-			    this.val(this.allPolicies['operational_policy']['controlLoop'][this.id]);
-		    });
-		    // Set the sub-policies
-		    this.allPolicies['operational_policy']['policies'].forEach(function(opPolicyElemIndex, opPolicyElemValue) {
-
-/*			    var formNum = add_one_more();
-			    forEach(document.getElementsByClassName('policyProperties').find('.form-control'), function(opPolicyPropIndex, opPolicyPropValue) {
-
-				    $("#formId" + formNum + " .policyProperties").find("#" + opPolicyPropValue.id).val(
-				    allPolicies['operational_policy']['policies'][opPolicyElemIndex][opPolicyPropValue.id]);
-			    });
-
-			    // Initial TargetResourceId options
-			    initTargetResourceIdOptions(allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target']['type'], formNum);
-			    $.each($('.policyTarget').find('.form-control'), function(opPolicyTargetPropIndex, opPolicyTargetPropValue) {
-
-				    $("#formId" + formNum + " .policyTarget").find("#" + opPolicyTargetPropValue.id).val(
-				    allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target'][opPolicyTargetPropValue.id]);
-			    });
-
-			    // update the current tab label
-			    $("#go_properties_tab" + formNum).text(
-			    allPolicies['operational_policy']['policies'][opPolicyElemIndex]['id']);
-			    // Check if there is a guard set for it
-			    $.each(allPolicies['guard_policies'], function(guardElemId, guardElemValue) {
-
-				    if (guardElemValue.recipe === $($("#formId" + formNum + " #recipe")[0]).val()) {
-					    // Found one, set all guard prop
-					    $.each($('.guardProperties').find('.form-control'), function(guardPropElemIndex,
-					                                                                 guardPropElemValue) {
-
-						    guardElemValue['id'] = guardElemId;
-						    $("#formId" + formNum + " .guardProperties").find("#" + guardPropElemValue.id).val(
-						    guardElemValue[guardPropElemValue.id]);
-					    });
-					    iniGuardPolicyType(guardElemId, formNum);
-					    // And finally enable the flag
-					    $("#formId" + formNum + " #enableGuardPolicy").prop("checked", true);
-				    }
-			    });*/
-			});
-	    }
+		console.log("Load properties to op policy");
+		// Set the header
+		document.getElementsByClassName('form-control').forEach(function () {
+			this.val(this.allPolicies['operational_policy']['controlLoop'][this.id]);
+		});
+		// Set the sub-policies
+		this.allPolicies['operational_policy']['policies'].forEach(function (opPolicyElemIndex, opPolicyElemValue) {
+
+			/*			    var formNum = add_one_more();
+							forEach(document.getElementsByClassName('policyProperties').find('.form-control'), function(opPolicyPropIndex, opPolicyPropValue) {
+			
+								$("#formId" + formNum + " .policyProperties").find("#" + opPolicyPropValue.id).val(
+								allPolicies['operational_policy']['policies'][opPolicyElemIndex][opPolicyPropValue.id]);
+							});
+			
+							// Initial TargetResourceId options
+							initTargetResourceIdOptions(allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target']['type'], formNum);
+							$.each($('.policyTarget').find('.form-control'), function(opPolicyTargetPropIndex, opPolicyTargetPropValue) {
+			
+								$("#formId" + formNum + " .policyTarget").find("#" + opPolicyTargetPropValue.id).val(
+								allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target'][opPolicyTargetPropValue.id]);
+							});
+			
+							// update the current tab label
+							$("#go_properties_tab" + formNum).text(
+							allPolicies['operational_policy']['policies'][opPolicyElemIndex]['id']);
+							// Check if there is a guard set for it
+							$.each(allPolicies['guard_policies'], function(guardElemId, guardElemValue) {
+			
+								if (guardElemValue.recipe === $($("#formId" + formNum + " #recipe")[0]).val()) {
+									// Found one, set all guard prop
+									$.each($('.guardProperties').find('.form-control'), function(guardPropElemIndex,
+																								 guardPropElemValue) {
+			
+										guardElemValue['id'] = guardElemId;
+										$("#formId" + formNum + " .guardProperties").find("#" + guardPropElemValue.id).val(
+										guardElemValue[guardPropElemValue.id]);
+									});
+									iniGuardPolicyType(guardElemId, formNum);
+									// And finally enable the flag
+									$("#formId" + formNum + " #enableGuardPolicy").prop("checked", true);
+								}
+							});*/
+		});
+	}
 
 	render() {
 		return (
@@ -195,7 +194,7 @@ export default class OperationalPolicyModal extends React.Component {
 										<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
 										<div className="col-sm-8">
 											<input type="text" className="form-control" name="controlLoopName"
-												readOnly="readonly" id="clname" value={LOOP_CACHE.getLoopName()} />
+												readOnly="readonly" id="clname" value={this.state.loopCache.getLoopName()} />
 										</div>
 									</div>
 								</form>
@@ -225,7 +224,7 @@ export default class OperationalPolicyModal extends React.Component {
 										<label className="col-sm-4 control-label" htmlFor="id">ID</label>
 										<div className="col-sm-8">
 											<input type="text" className="form-control" name="id" id="id"
-										onKeyUp="updateTabLabel($event)" />
+												onKeyUp="updateTabLabel($event)" />
 											<span >ID must be unique</span>
 										</div>
 									</div>
@@ -550,4 +549,4 @@ export default class OperationalPolicyModal extends React.Component {
 
 		);
 	}
-}
+}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
deleted file mode 100644
index ef7a3aefe..000000000
--- a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import Table from 'react-bootstrap/Table';
-
-export default class ClosedLoopViewLogs extends React.Component {
-  render() {
-    return (
-      <div className="log_div">
-        <div className="log_table">
-          <label className="table_header">Loop Logs</label>
-          <Table striped hover id="loop-log-div">
-            <thead>
-  							<tr>
-  								<th><span align="left" className="text">Date</span></th>
-  								<th><span align="left" className="text">Type</span></th>
-  								<th><span align="left" className="text">Component</span></th>
-  								<th><span align="right" className="text">Log</span></th>
-  							</tr>
-  						</thead>
-  						<tbody>
-  							<tr>
-  								<td className="row_10_per">test</td>
-  								<td className="row_10_per">test</td>
-  								<td className="row_10_per">test</td>
-  								<td className="row_70_per">test</td>
-  							</tr>
-  						</tbody>
-            </Table>
-          </div>
-        </div>
-    );
-  }
-}
diff --git a/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css b/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css
deleted file mode 100644
index 14add0f53..000000000
--- a/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.css
+++ /dev/null
@@ -1,19 +0,0 @@
-
-.status_title{
-	position: absolute;
-	left: 61%;
-	top: 151px;
-	font-size:20px;
-}
-.status{
-	background-color: gray;
-	-moz-border-radius: 50px;
-	-webkit-border-radius: 50px;
-	border-radius: 50px;
-}
-.status_table {
-	position: absolute;
-	left: 61%;
-	top: 191px;
-	font-size:10px;
-}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js b/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js
deleted file mode 100644
index da5969e46..000000000
--- a/ui-react/src/components/loop_viewer/status/ClosedLoopStatus.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
-* ============LICENSE_START=======================================================
-* ONAP CLAMP
-* ================================================================================
-* Copyright (C) 2019 AT&T Intellectual Property. All rights
-*                             reserved.
-* ================================================================================
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-* ============LICENSE_END============================================
-* ===================================================================
-*
-*/
-import React from 'react';
-import Table from 'react-bootstrap/Table';
-import './ClosedLoopStatus.css';
-
-export default class ClosedLoopStatus extends React.Component {
-  render() {
-  	return (
-      <div>
-        <span id="status_clds" className="status_title">Status:
-          <span className="status">&nbsp;&nbsp;&nbsp;TestStatus&nbsp;&nbsp;&nbsp;</span>
-        </span>
-
-        <div className="status_table">
-          <Table striped hover>
-            <thead>
-                <tr>
-                  <th><span align="left" className="text">ComponentState</span></th>
-                  <th><span align="left" className="text">Description</span></th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td className="row_30_per">long test State</td>
-                  <td className="row_70_per">test description very very very long description</td>
-                </tr>
-              </tbody>
-            </Table>
-          </div>
-      </div>
-  	);
-  }
-}
-
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.css b/ui-react/src/components/loop_viewer/status/LoopStatus.css
new file mode 100644
index 000000000..14add0f53
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/status/LoopStatus.css
@@ -0,0 +1,19 @@
+
+.status_title{
+	position: absolute;
+	left: 61%;
+	top: 151px;
+	font-size:20px;
+}
+.status{
+	background-color: gray;
+	-moz-border-radius: 50px;
+	-webkit-border-radius: 50px;
+	border-radius: 50px;
+}
+.status_table {
+	position: absolute;
+	left: 61%;
+	top: 191px;
+	font-size:10px;
+}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.js b/ui-react/src/components/loop_viewer/status/LoopStatus.js
new file mode 100644
index 000000000..f904d6740
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/status/LoopStatus.js
@@ -0,0 +1,55 @@
+/*-
+* ============LICENSE_START=======================================================
+* ONAP CLAMP
+* ================================================================================
+* Copyright (C) 2019 AT&T Intellectual Property. All rights
+*                             reserved.
+* ================================================================================
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ============LICENSE_END============================================
+* ===================================================================
+*
+*/
+import React from 'react';
+import Table from 'react-bootstrap/Table';
+import './LoopStatus.css';
+
+export default class LoopStatus extends React.Component {
+  render() {
+  	return (
+      <div>
+        <span id="status_clds" className="status_title">Status:
+          <span className="status">&nbsp;&nbsp;&nbsp;TestStatus&nbsp;&nbsp;&nbsp;</span>
+        </span>
+
+        <div className="status_table">
+          <Table striped hover>
+            <thead>
+                <tr>
+                  <th><span align="left" className="text">ComponentState</span></th>
+                  <th><span align="left" className="text">Description</span></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td className="row_30_per">long test State</td>
+                  <td className="row_70_per">test description very very very long description</td>
+                </tr>
+              </tbody>
+            </Table>
+          </div>
+      </div>
+  	);
+  }
+}
+
diff --git a/ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js b/ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js
deleted file mode 100644
index d9f5eaf80..000000000
--- a/ui-react/src/components/loop_viewer/svg/ClosedLoopSvg.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import styled from 'styled-components';
-import { ReactComponent as SvgExample } from './example.svg';
-const LoopViewSvgDivStyle = styled.div`
-
-	overflow: hidden;
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
-	border: 1px solid transparent;
-	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-`
-
-export default class ClosedLoopViewSvg extends React.Component {
-  render() {
-    return (
-    	<LoopViewSvgDivStyle id="loop_svg">
-    		<SvgExample />
-    	</LoopViewSvgDivStyle>
-    );
-  }
-}
-
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
new file mode 100644
index 000000000..2858ccd8a
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -0,0 +1,100 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import styled from 'styled-components';
+import { withRouter } from "react-router";
+import LoopCache from '../../../api/LoopCache'
+import LoopService from '../../../api/LoopService'
+
+const LoopViewSvgDivStyled = styled.div`
+	overflow: hidden;
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	border: 1px solid;
+	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	height: 50%;
+`
+
+class LoopViewSvg extends React.Component {
+
+	static emptySvg = "<svg><text x=\"20\" y=\"40\">No LOOP (SVG)</text></svg>";
+	static operationalPolicyDataElementId = "OperationalPolicy";
+
+
+	state = {
+		svgContent: LoopViewSvg.emptySvg,
+		loopCache: this.props.loopCache,
+	}
+
+	constructor(props) {
+		super(props);
+		this.state.loopCache = props.loopCache;
+		this.handleSvgClick = this.handleSvgClick.bind(this);
+		this.getSvg = this.getSvg.bind(this);
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		return this.state.svgContent !== nextState.svgContent;
+	}
+
+	componentWillReceiveProps(newProps) {
+		this.state.loopCache = newProps.loopCache;
+		this.getSvg();
+	}
+
+	componentDidMount() {
+		this.getSvg();
+	}
+
+	getSvg() {
+		LoopService.getSvg(this.state.loopCache.getLoopName()).then(svgXml => {
+			if (svgXml.length != 0) {
+				this.setState({ svgContent: svgXml })
+			} else {
+				this.setState({ svgContent: LoopViewSvg.emptySvg })
+			}
+		});
+	}
+
+	handleSvgClick(event) {
+		console.debug("svg click event received");
+		var elementName = event.target.parentNode.parentNode.parentNode.getAttribute('data-element-id');
+		console.info("SVG element clicked", elementName);
+		if (typeof elementName === "undefined" || elementName === "VES") {
+			return;
+		} else if (elementName === LoopViewSvg.operationalPolicyDataElementId) {
+			this.props.history.push('/operationalPolicyModal');
+		} else {
+			this.props.history.push('/configurationPolicyModal');
+		}
+	}
+
+	render() {
+		return (
+			<LoopViewSvgDivStyled id="loop_svg" dangerouslySetInnerHTML={{ __html: this.state.svgContent }} onClick={this.handleSvgClick}>
+
+			</LoopViewSvgDivStyled>
+		);
+	}
+}
+
+export default withRouter(LoopViewSvg);
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/svg/example.svg b/ui-react/src/components/loop_viewer/svg/example.svg
index 2f5ebd037..a7c40ee27 100644
--- a/ui-react/src/components/loop_viewer/svg/example.svg
+++ b/ui-react/src/components/loop_viewer/svg/example.svg
@@ -1,444 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="start-circle"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<circle
-					fill="none"
-					r="17"
-					cx="18"
-					cy="41" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="Arrow-411c11ec-37fe-40bc-8544-417c2c05e4a7"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<line
-					y2="41"
-					fill="none"
-					x1="35"
-					x2="123"
-					y1="41" />
-				<polygon
-					fill="none"
-					points=" 121 39 121 43 125 41" />
-				<polygon
-					points=" 121 39 121 43 125 41"
-					stroke="none" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="VES"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<rect
-					fill="none"
-					x="127"
-					width="123"
-					y="1"
-					height="82" />
-			</g>
-			<g
-				fill-opacity="0"
-				fill="rgb(0,0,0)"
-				text-rendering="optimizeQuality"
-				shape-rendering="geometricPrecision"
-				stroke="rgb(0,0,0)"
-				stroke-opacity="0"
-				stroke-width="2">
-				<rect
-					x="127"
-					width="123"
-					y="1"
-					height="82"
-					stroke="none" />
-			</g>
-			<g
-				text-rendering="optimizeQuality"
-				stroke-width="2"
-				shape-rendering="geometricPrecision"
-				font-family="sans-serif">
-				<text
-					x="176.5"
-					xml:space="preserve"
-					y="46.5"
-					stroke="none">VES</text>
-				<line
-					y2="83"
-					fill="none"
-					x1="147"
-					x2="147"
-					y1="1" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="Arrow-17086665-1142-4cbf-9681-cf4462954c96"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<line
-					y2="41"
-					fill="none"
-					x1="250"
-					x2="338"
-					y1="41" />
-				<polygon
-					fill="none"
-					points=" 336 39 336 43 340 41" />
-				<polygon
-					points=" 336 39 336 43 340 41"
-					stroke="none" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="tca_k8s_aLs74_v1_0_ResourceInstanceName2_tca_2"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<rect
-					fill="none"
-					x="342"
-					width="123"
-					y="1"
-					height="82" />
-			</g>
-			<g
-				fill-opacity="0"
-				fill="rgb(0,0,0)"
-				text-rendering="optimizeQuality"
-				shape-rendering="geometricPrecision"
-				stroke="rgb(0,0,0)"
-				stroke-opacity="0"
-				stroke-width="2">
-				<rect
-					x="342"
-					width="123"
-					y="1"
-					height="82"
-					stroke="none" />
-			</g>
-			<g
-				text-rendering="optimizeQuality"
-				stroke-width="2"
-				shape-rendering="geometricPrecision"
-				font-family="sans-serif">
-				<text
-					x="379.5"
-					xml:space="preserve"
-					y="46.5"
-					stroke="none">tca_k8s</text>
-				<line
-					y2="61"
-					fill="none"
-					x1="342"
-					x2="465"
-					y1="61" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="Arrow-d48a7f5f-643d-4550-8045-ee46bb05ddfa"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<line
-					y2="41"
-					fill="none"
-					x1="465"
-					x2="553"
-					y1="41" />
-				<polygon
-					fill="none"
-					points=" 551 39 551 43 555 41" />
-				<polygon
-					points=" 551 39 551 43 555 41"
-					stroke="none" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="OperationalPolicy"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<rect
-					fill="none"
-					x="557"
-					width="123"
-					y="1"
-					height="82" />
-			</g>
-			<g
-				fill-opacity="0"
-				fill="rgb(0,0,0)"
-				text-rendering="optimizeQuality"
-				shape-rendering="geometricPrecision"
-				stroke="rgb(0,0,0)"
-				stroke-opacity="0"
-				stroke-width="2">
-				<rect
-					x="557"
-					width="123"
-					y="1"
-					height="82"
-					stroke="none" />
-			</g>
-			<g
-				text-rendering="optimizeQuality"
-				stroke-width="2"
-				shape-rendering="geometricPrecision"
-				font-family="sans-serif">
-				<text
-					x="564.5"
-					xml:space="preserve"
-					y="46.5"
-					stroke="none">OperationalPolicy</text>
-				<line
-					y2="1"
-					fill="none"
-					x1="557"
-					x2="618"
-					y1="42" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="Arrow-79f11b91-5a48-4945-9d2c-18a423105a7d"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="2">
-				<line
-					y2="41"
-					fill="none"
-					x1="680"
-					x2="768"
-					y1="41" />
-				<polygon
-					fill="none"
-					points=" 766 39 766 43 770 41" />
-				<polygon
-					points=" 766 39 766 43 770 41"
-					stroke="none" />
-			</g>
-		</g>
-	</g>
-	<g
-		fill-opacity="1"
-		color-rendering="auto"
-		color-interpolation="auto"
-		text-rendering="auto"
-		stroke="black"
-		stroke-linecap="square"
-		stroke-miterlimit="10"
-		shape-rendering="auto"
-		stroke-opacity="1"
-		fill="black"
-		stroke-dasharray="none"
-		font-weight="normal"
-		stroke-width="1"
-		font-family="'Dialog'"
-		font-style="normal"
-		data-element-id="stop-circle"
-		stroke-linejoin="miter"
-		font-size="12px"
-		image-rendering="auto"
-		stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator -->
-		<defs id="genericDefs" />
-		<g>
-			<g
-				shape-rendering="geometricPrecision"
-				text-rendering="optimizeQuality"
-				stroke-width="4">
-				<circle
-					fill="none"
-					r="17"
-					cx="789"
-					cy="41" />
-			</g>
-		</g>
-	</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg"><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="start-circle" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><circle fill="none" r="17" cx="18" cy="41"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-82c14603-02fc-4df7-8977-9b10e4c775d1" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="35" x2="123" y1="41"/><polygon fill="none" points=" 121 39 121 43 125 41"/><polygon points=" 121 39 121 43 125 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="VES" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><rect fill="none" x="127" width="123" y="1" height="82"/></g><g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"><rect x="127" width="123" y="1" height="82" stroke="none"/></g><g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"><text x="176.5" xml:space="preserve" y="46.5" stroke="none">VES</text><line y2="83" fill="none" x1="147" x2="147" y1="1"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-dbbb2d5a-e9c4-446d-92b9-c71908854434" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="250" x2="338" y1="41"/><polygon fill="none" points=" 336 39 336 43 340 41"/><polygon points=" 336 39 336 43 340 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="TCA_Jbv1z_v1_0_ResourceInstanceName1_tca" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><rect fill="none" x="342" width="123" y="1" height="82"/></g><g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"><rect x="342" width="123" y="1" height="82" stroke="none"/></g><g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"><text x="392" xml:space="preserve" y="46.5" stroke="none">TCA</text><line y2="61" fill="none" x1="342" x2="465" y1="61"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-3892abbc-c49c-40df-984b-8959b6df44e6" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="465" x2="553" y1="41"/><polygon fill="none" points=" 551 39 551 43 555 41"/><polygon points=" 551 39 551 43 555 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="OperationalPolicy" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><rect fill="none" x="557" width="123" y="1" height="82"/></g><g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"><rect x="557" width="123" y="1" height="82" stroke="none"/></g><g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"><text x="564.5" xml:space="preserve" y="46.5" stroke="none">OperationalPolicy</text><line y2="1" fill="none" x1="557" x2="618" y1="42"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-44a8b77e-d0eb-4c0d-82b6-0822ff35573f" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="680" x2="768" y1="41"/><polygon fill="none" points=" 766 39 766 43 770 41"/><polygon points=" 766 39 766 43 770 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="stop-circle" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="4"><circle fill="none" r="17" cx="789" cy="41"/></g></g></g></svg>
\ No newline at end of file
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index eed3935e1..8a62b5a2c 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -24,14 +24,11 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import OnapClamp from './OnapClamp';
 import { Route, BrowserRouter } from 'react-router-dom'
-import LoopModal from './components/dialogs/LoopModal';
-import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
+
 
 const routing = (
 	<BrowserRouter >
-		<OnapClamp />
-		<Route path="/operationalPolicyModal" render={() => <OperationalPolicyModal />} />
-		<Route path="/openLoop" component={ LoopModal } />
+		<Route path="/" component={OnapClamp}/>
 	</BrowserRouter>
 );
 
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index df9126296..1630c5074 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -58,6 +58,14 @@ export const GlobalClampStyle = createGlobalStyle`
   	color: ${props => props.theme.fontNormal};
     background-color: ${props => (props.theme.backgroundColor)};
   }
+  
+  svg {
+  	padding: 10px;
+	overflow: hidden;
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	width: 100%;
+	height: 100%;
+  }
 `
 
 export const DefaultClampTheme = {
-- 
cgit 1.2.3-korg


From 2dacb9bd185db2c05de435d2bd446865e158e483 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 17 Jul 2019 13:48:44 +0200
Subject: Draft of Config policy

Initial code of the config policy window using the Json Editor version
from NPM

Issue-ID: CLAMP-426
Change-Id: I4ff3e63c463320706031c703afa22417b321faa3
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             | 10 +++--
 ui-react/src/api/LoopService.js                    |  6 +--
 ui-react/src/api/UserService.js                    |  2 +-
 .../ConfigurationPolicyModal.js                    | 43 +++++++++++++++++-----
 .../components/dialogs/OpenLoop/OpenLoopModal.js   |  2 +-
 ui-react/src/components/loop_viewer/svg/LoopSvg.js |  4 --
 ui-react/src/components/menu/MenuBar.js            |  2 +-
 7 files changed, 47 insertions(+), 22 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index a1aff3d61..4271f1037 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -34,7 +34,7 @@ import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
 import LoopCache from './api/LoopCache';
 
-import { Route } from 'react-router-dom'
+import { Route, Redirect } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
@@ -78,9 +78,11 @@ const LoopViewLoopNameSpanStyled = styled.span`
 
 export default class LoopUI extends React.Component {
 
+	static defaultLoopName="Empty (NO loop loaded yet)";
+
 	state = {
 		userName: null,
-		loopName: "Empty (NO loop loaded yet)",
+		loopName: LoopUI.defaultLoopName,
 		loopCache: new LoopCache({}),
 	};
 
@@ -90,7 +92,7 @@ export default class LoopUI extends React.Component {
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 	}
 
-	componentDidMount() {
+	componentWillMount() {
 		this.getUser();
 	}
 
@@ -162,6 +164,7 @@ export default class LoopUI extends React.Component {
 
 	updateLoopCache(loopJson) {
 		this.setState({ loopCache: new LoopCache(loopJson) });
+		this.setState({ loopName: this.state.loopCache.getLoopName() });
 	}
 
 	render() {
@@ -174,6 +177,7 @@ export default class LoopUI extends React.Component {
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
 				<Route path="/configurationPolicyModal" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
+				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
 			</div>
 		);
 	}
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 2813a7c08..fa7cd2e48 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -22,7 +22,7 @@
 
 export default class LoopService {
 	static getLoopNames() {
-		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'include', })
+		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin', })
 			.then(function (response) {
 				console.debug("GetLoopNames response received: ", response.status);
 				if (response.ok) {
@@ -44,7 +44,7 @@ export default class LoopService {
 			headers: {
 				"Content-Type": "application/json"
 			},
-			credentials: 'include',
+			credentials: 'same-origin',
 		})
 			.then(function (response) {
 				console.debug("GetLoop response received: ", response.status);
@@ -64,7 +64,7 @@ export default class LoopService {
 	static getSvg(loopName) {
 		return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, {
 			method: 'GET',
-			credentials: 'include',
+			credentials: 'same-origin',			
 		})
 			.then(function (response) {
 				console.debug("svgRepresentation response received: ", response.status);
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 8f53d7b8a..22168d41b 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -26,7 +26,7 @@ export default class UserService {
 	static login() {
 		return fetch('/restservices/clds/v1/user/getUser', {
 				method: 'GET',
-				credentials: 'include',
+				credentials: 'same-origin',
 			})
 		.then(function (response) {
 			console.debug("getUser response received, status code:", response.status);
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 1a8b6e2c5..453ca6bb4 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -24,24 +24,26 @@
 import React from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
-import { LOOP_CACHE } from '../../../api/LoopCache'
 import styled from 'styled-components';
 
+import JSONEditor from '@json-editor/json-editor';
+
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
 
 export default class ConfigurationPolicyModal extends React.Component {
 
+	state = {
+		show: true,
+		loopCache: this.props.loopCache,
+		jsonEditor: null,
+	};
+
 	constructor(props, context) {
 		super(props, context);
-
 		this.handleClose = this.handleClose.bind(this);
-
-		this.state = {
-			show: true,
-		};
-
+		this.renderJsonEditor = this.renderJsonEditor.bind(this);
 	}
 
 	handleClose() {
@@ -49,7 +51,31 @@ export default class ConfigurationPolicyModal extends React.Component {
 		this.props.history.push('/')
 	}
 
+	componentDidMount() {
+		this.renderJsonEditor();
+	}
+
+	renderJsonEditor() {
+		var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForType("TCA_Jbv1z_v1_0_ResourceInstanceName1_tca");
+		if (toscaModel == null) {
+			return;
+		}
+		var editorData = this.state.loopCache.getMicroServiceProperties("TCA_Jbv1z_v1_0_ResourceInstanceName1_tca");
+
+		JSONEditor.defaults.options.theme = 'bootstrap4';
+		//JSONEditor.defaults.options.iconlib = 'bootstrap2';
+		JSONEditor.defaults.options.object_layout = 'grid';
+		JSONEditor.defaults.options.disable_properties = true;
+		JSONEditor.defaults.options.disable_edit_json = false;
+		JSONEditor.defaults.options.disable_array_reorder = true;
+		JSONEditor.defaults.options.disable_array_delete_last_row = true;
+		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
+		JSONEditor.defaults.options.show_errors = 'always';
+
+		this.state.jsonEditor = new JSONEditor(document.getElementById("editor"),
+			{ schema: toscaModel.schema, startval: editorData });
 
+	}
 
 	render() {
 		return (
@@ -58,8 +84,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 					<Modal.Title>Configuration policies</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
-
-
+					<div id="editor" />
 
 				</Modal.Body>
 				<Modal.Footer>
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
index 6986209d4..f3bdeb683 100644
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
@@ -54,7 +54,7 @@ export default class OpenLoopModal extends React.Component {
 		};
 	}
 
-	componentDidMount() {
+	componentWillMount() {
 		this.getLoopNames();
 	}
 
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 2858ccd8a..44356c1c0 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -61,10 +61,6 @@ class LoopViewSvg extends React.Component {
 		this.getSvg();
 	}
 
-	componentDidMount() {
-		this.getSvg();
-	}
-
 	getSvg() {
 		LoopService.getSvg(this.state.loopCache.getLoopName()).then(svgXml => {
 			if (svgXml.length != 0) {
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 1a7c5d4e4..64aa6bc83 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -42,7 +42,7 @@ export default class MenuBar extends React.Component {
 		      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
 		        <StyledNavDropdownItem href="/openLoop">Open CL</StyledNavDropdownItem>
 		        <StyledNavDropdownItem href="#action/3.2">Properties CL</StyledNavDropdownItem>
-		        <StyledNavDropdownItem href="#action/3.3">Close Model</StyledNavDropdownItem>
+		        <StyledNavDropdownItem href="/closeLoop">Close Model</StyledNavDropdownItem>
 		      </NavDropdown>
 					<NavDropdown title="Manage" id="basic-nav-dropdown">
 						<StyledNavDropdownItem href="/operationalPolicyModal">Submit</StyledNavDropdownItem>
-- 
cgit 1.2.3-korg


From 5976c17b09b82db4d5dbce7cb7fe3b1b27891104 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 17 Jul 2019 13:59:33 +0200
Subject: Fix warnings

Fix reported javascript warnings by NodeJS when compiling

Issue-ID: CLAMP-426
Change-Id: Iebf369c0d3094fcbe83e9e5b1d6138b808105e46
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js         | 6 ++++--
 .../components/dialogs/OperationalPolicy/OperationalPolicyModal.js  | 6 +++---
 ui-react/src/components/loop_viewer/svg/LoopSvg.js                  | 5 ++---
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 453ca6bb4..da2d4230b 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -72,8 +72,10 @@ export default class ConfigurationPolicyModal extends React.Component {
 		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
 		JSONEditor.defaults.options.show_errors = 'always';
 
-		this.state.jsonEditor = new JSONEditor(document.getElementById("editor"),
-			{ schema: toscaModel.schema, startval: editorData });
+		this.setState({
+			jsonEditor: new JSONEditor(document.getElementById("editor"),
+				{ schema: toscaModel.schema, startval: editorData })
+		})
 
 	}
 
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 6822f3ff3..2a812c877 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -217,7 +217,7 @@ export default class OperationalPolicyModal extends React.Component {
 							</div>
 
 							<span id="formSpan" style={{ display: 'none' }}>
-								<form className="policyProperties" className="form-horizontal"
+								<form className="policyProperties form-horizontal"
 									style={{ border: '2px dotted gray' }}
 									title="Operational Policy Properties">
 									<div className="form-group clearfix">
@@ -350,7 +350,7 @@ export default class OperationalPolicyModal extends React.Component {
 										</div>
 									</div>
 								</form>
-								<form className="policyTarget" className="form-horizontal"
+								<form className="policyTarget form-horizontal"
 									title="Operational Policy Target" style={{ border: '2px dotted gray' }}>
 									<div className="form-group clearfix">
 										<label htmlFor="type" className="col-sm-4 control-label"> Target
@@ -437,7 +437,7 @@ export default class OperationalPolicyModal extends React.Component {
 										</select>
 									</div>
 								</div>
-								<form className="guardProperties" className="form-horizontal"
+								<form className="guardProperties form-horizontal"
 									title="Guard policy associated" style={{ border: '2px dotted gray' }}>
 
 									<div className="form-group clearfix withnote">
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 44356c1c0..fa028c0de 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -23,7 +23,6 @@
 import React from 'react';
 import styled from 'styled-components';
 import { withRouter } from "react-router";
-import LoopCache from '../../../api/LoopCache'
 import LoopService from '../../../api/LoopService'
 
 const LoopViewSvgDivStyled = styled.div`
@@ -57,13 +56,13 @@ class LoopViewSvg extends React.Component {
 	}
 
 	componentWillReceiveProps(newProps) {
-		this.state.loopCache = newProps.loopCache;
+		this.setState({ loopCache: newProps.loopCache });
 		this.getSvg();
 	}
 
 	getSvg() {
 		LoopService.getSvg(this.state.loopCache.getLoopName()).then(svgXml => {
-			if (svgXml.length != 0) {
+			if (svgXml.length !== 0) {
 				this.setState({ svgContent: svgXml })
 			} else {
 				this.setState({ svgContent: LoopViewSvg.emptySvg })
-- 
cgit 1.2.3-korg


From 5f6c178c3eaea6fffe7d46ca3c75dcb0ffa92755 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 18 Jul 2019 15:23:13 +0200
Subject: Add generic svg selection

Add a converter that maps each component to a dialog type, so that each
component in the SVG can be mapped to a dialog if needed

Issue-ID: CLAMP-423
Change-Id: I2dc2517048ffd911f70c64b07216aa988bcb4fe0
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |  2 +-
 ui-react/src/OnapClamp.js                          |  2 +-
 .../components/dialogs/OpenLoop/OpenLoopModal.js   |  2 +-
 .../loop_viewer/svg/LoopComponentConverter.js      | 18 +++++++++
 ui-react/src/components/loop_viewer/svg/LoopSvg.js | 47 ++++++++++++----------
 5 files changed, 46 insertions(+), 25 deletions(-)
 create mode 100644 ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 4271f1037..dd4923e3e 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -175,7 +175,7 @@ export default class LoopUI extends React.Component {
 				{this.renderLoopViewer()}
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
-				<Route path="/configurationPolicyModal" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
+				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
 				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
 			</div>
diff --git a/ui-react/src/OnapClamp.js b/ui-react/src/OnapClamp.js
index a8cc2154a..506f6e09d 100644
--- a/ui-react/src/OnapClamp.js
+++ b/ui-react/src/OnapClamp.js
@@ -29,7 +29,7 @@ import { DefaultClampTheme } from './theme/globalStyle.js';
 export default class OnapClamp extends LoopUI {
 	
 	render() {
-		console.log("Onap Clamp UI starting");
+		console.info("Onap Clamp UI starting");
 		return (
 		<ThemeProvider theme={DefaultClampTheme}>
 			{super.render()}
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
index f3bdeb683..0bf71580a 100644
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
@@ -110,7 +110,7 @@ export default class OpenLoopModal extends React.Component {
 				</Modal.Body>
 				<Modal.Footer>
 					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-					<Button variant="primary" type="submit" onClick={this.handleOpen}>OK</Button>
+					<Button variant="primary" type="submit" onClick={this.handleOpen}>Open</Button>
 				</Modal.Footer>
 			</ModalStyled>
 
diff --git a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
new file mode 100644
index 000000000..b737f3e19
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
@@ -0,0 +1,18 @@
+export default class LoopComponentConverter {
+
+	static buildMapOfComponents(loopCache) {
+		var componentsMap = new Map([]);
+		if (typeof (loopCache.getMicroServicePolicies()) !== "undefined") {
+			loopCache.getMicroServicePolicies().map(ms => {
+				componentsMap.set(ms.name, "/configurationPolicyModal/"+ms.name);
+			})
+		}
+		if (typeof (loopCache.getOperationalPolicies()) !== "undefined") {
+			loopCache.getOperationalPolicies().map(op => {
+				componentsMap.set(op.name, "/operationalPolicyModal");
+			})
+		}
+		componentsMap.set("OperationalPolicy","/operationalPolicyModal");
+		return componentsMap;
+	}
+}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index fa028c0de..91d74e4f0 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -22,8 +22,10 @@
  */
 import React from 'react';
 import styled from 'styled-components';
+import LoopCache from '../../../api/LoopCache';
 import { withRouter } from "react-router";
-import LoopService from '../../../api/LoopService'
+import LoopService from '../../../api/LoopService';
+import LoopComponentConverter from './LoopComponentConverter';
 
 const LoopViewSvgDivStyled = styled.div`
 	overflow: hidden;
@@ -36,19 +38,20 @@ const LoopViewSvgDivStyled = styled.div`
 class LoopViewSvg extends React.Component {
 
 	static emptySvg = "<svg><text x=\"20\" y=\"40\">No LOOP (SVG)</text></svg>";
-	static operationalPolicyDataElementId = "OperationalPolicy";
-
 
 	state = {
 		svgContent: LoopViewSvg.emptySvg,
-		loopCache: this.props.loopCache,
+		loopCache: new LoopCache({}),
+		componentModalMapping: new Map([]),
 	}
 
 	constructor(props) {
 		super(props);
-		this.state.loopCache = props.loopCache;
 		this.handleSvgClick = this.handleSvgClick.bind(this);
 		this.getSvg = this.getSvg.bind(this);
+		this.state.loopCache = props.loopCache;
+		this.state.componentModalMapping = LoopComponentConverter.buildMapOfComponents(props.loopCache);
+		this.getSvg(props.loopCache.getLoopName());
 	}
 
 	shouldComponentUpdate(nextProps, nextState) {
@@ -56,31 +59,31 @@ class LoopViewSvg extends React.Component {
 	}
 
 	componentWillReceiveProps(newProps) {
-		this.setState({ loopCache: newProps.loopCache });
-		this.getSvg();
-	}
+		this.setState({
+			loopCache: newProps.loopCache,
+			componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache),
 
-	getSvg() {
-		LoopService.getSvg(this.state.loopCache.getLoopName()).then(svgXml => {
-			if (svgXml.length !== 0) {
-				this.setState({ svgContent: svgXml })
-			} else {
-				this.setState({ svgContent: LoopViewSvg.emptySvg })
-			}
 		});
+		this.getSvg(newProps.loopCache.getLoopName());
+	}
+
+	getSvg(loopName) {
+		if (typeof loopName !== "undefined") {
+			LoopService.getSvg(loopName).then(svgXml => {
+				if (svgXml.length !== 0) {
+					this.setState({ svgContent: svgXml })
+				} else {
+					this.setState({ svgContent: LoopViewSvg.emptySvg })
+				}
+			});
+		}
 	}
 
 	handleSvgClick(event) {
 		console.debug("svg click event received");
 		var elementName = event.target.parentNode.parentNode.parentNode.getAttribute('data-element-id');
 		console.info("SVG element clicked", elementName);
-		if (typeof elementName === "undefined" || elementName === "VES") {
-			return;
-		} else if (elementName === LoopViewSvg.operationalPolicyDataElementId) {
-			this.props.history.push('/operationalPolicyModal');
-		} else {
-			this.props.history.push('/configurationPolicyModal');
-		}
+		this.props.history.push(this.state.componentModalMapping.get(elementName));
 	}
 
 	render() {
-- 
cgit 1.2.3-korg


From 2df6c083c5baad6ea36154715f7fdfa08bee1c24 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 18 Jul 2019 15:29:45 +0200
Subject: Add data saving

Add data saving operation to the configurationPolicyModal and rework of
the loopCache class

Issue-ID: CLAMP-426
Change-Id: I6ba5880254b15809313f3b809a65ab9e441cab30
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/api/LoopCache.js                      | 46 ++++++++++------------
 ui-react/src/api/LoopService.js                    | 28 ++++++++++++-
 .../ConfigurationPolicyModal.js                    | 33 +++++++++++++---
 3 files changed, 74 insertions(+), 33 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 4c8f68c23..b854c7c13 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -29,13 +29,11 @@ export default class LoopCache {
 	}
 
 	updateMicroServiceProperties(type, newMsProperties) {
-		if (newMsProperties["name"] === type) {
 			for (var policy in this.loopJsonCache["microServicePolicies"]) {
 				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === type) {
-					this.loopJsonCache["microServicePolicies"][policy] = newMsProperties;
+					this.loopJsonCache["microServicePolicies"][policy]["properties"] = newMsProperties;
 				}
 			}
-		}
 	}
 
 	updateGlobalProperties(newGlobalProperties) {
@@ -51,49 +49,47 @@ export default class LoopCache {
 	}
 
 	getOperationalPolicyConfigurationJson() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"]));
+		return this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"];
 	}
 
 	getOperationalPolicies() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
+		return this.loopJsonCache["operationalPolicies"];
 	}
 
 	getGlobalProperties() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]));
+		return this.loopJsonCache["globalPropertiesJson"];
 	}
 
 	getDcaeDeploymentProperties() {
-		return JSON.parse(JSON.stringify(this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"]));
+		return this.loopJsonCache["globalPropertiesJson"]["dcaeDeployParameters"];
+	}
+
+	getMicroServicePolicies() {
+		return this.loopJsonCache["microServicePolicies"];
 	}
 
-	getMicroServicesJsonForType(type) {
-		var msProperties = this.loopJsonCache["microServicePolicies"];
+	getMicroServiceForName(name) {
+		var msProperties=this.getMicroServicePolicies();
 		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] === type) {
-				return JSON.parse(JSON.stringify(msProperties[policy]));
+			if (msProperties[policy]["name"] === name) {
+				return msProperties[policy];
 			}
 		}
 		return null;
 	}
 
-	getMicroServiceProperties(type) {
-		var msProperties = this.loopJsonCache["microServicePolicies"];
-		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] === type) {
-				if (msProperties[policy]["properties"] !== null && msProperties[policy]["properties"] !== undefined) {
-					return JSON.parse(JSON.stringify(msProperties[policy]["properties"]));
-				}
-			}
+	getMicroServicePropertiesForName(name) {
+		var msConfig = this.getMicroServiceForName(name);
+		if (msConfig !== null) {
+			return msConfig["properties"];
 		}
 		return null;
 	}
 
-	getMicroServiceJsonRepresentationForType(type) {
-		var msProperties = this.loopJsonCache["microServicePolicies"];
-		for (var policy in msProperties) {
-			if (msProperties[policy]["name"] === type) {
-				return JSON.parse(JSON.stringify(msProperties[policy]["jsonRepresentation"]));
-			}
+	getMicroServiceJsonRepresentationForName(name) {
+		var msConfig = this.getMicroServiceForName(name);
+		if (msConfig !== null) {
+			return msConfig["jsonRepresentation"];
 		}
 		return null;
 	}
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index fa7cd2e48..020a3bf71 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -42,7 +42,7 @@ export default class LoopService {
 		return fetch('/restservices/clds/v2/loop/' + loopName, {
 			method: 'GET',
 			headers: {
-				"Content-Type": "application/json"
+				"Content-Type": "application/json",
 			},
 			credentials: 'same-origin',
 		})
@@ -64,7 +64,7 @@ export default class LoopService {
 	static getSvg(loopName) {
 		return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, {
 			method: 'GET',
-			credentials: 'same-origin',			
+			credentials: 'same-origin',
 		})
 			.then(function (response) {
 				console.debug("svgRepresentation response received: ", response.status);
@@ -80,4 +80,28 @@ export default class LoopService {
 				return "";
 			});
 	}
+
+	static setMicroServiceProperties(loopName, jsonData) {
+		return fetch('/restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, {
+			method: 'POST',
+			credentials: 'same-origin',
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(jsonData),
+		})
+			.then(function (response) {
+				console.debug("updateMicroservicePolicy response received: ", response.status);
+				if (response.ok) {
+					return response.text();
+				} else {
+					console.error("updateMicroservicePolicy query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("updateMicroservicePolicy error received", error);
+				return "";
+			});
+	}
 }
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index da2d4230b..8178bf47f 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -25,7 +25,7 @@ import React from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
-
+import LoopService from '../../../api/LoopService';
 import JSONEditor from '@json-editor/json-editor';
 
 const ModalStyled = styled(Modal)`
@@ -38,17 +38,38 @@ export default class ConfigurationPolicyModal extends React.Component {
 		show: true,
 		loopCache: this.props.loopCache,
 		jsonEditor: null,
+		componentName: "",
 	};
 
 	constructor(props, context) {
 		super(props, context);
 		this.handleClose = this.handleClose.bind(this);
+		this.handleSave = this.handleSave.bind(this);
 		this.renderJsonEditor = this.renderJsonEditor.bind(this);
+		this.state.componentName = props.match.params.componentName;
+	}
+
+	handleSave() {
+
+		var errors = this.state.jsonEditor.validate();
+		var editorData = this.state.jsonEditor.getValue();
+
+		if (errors.length !== 0) {
+			console.error("Errors detected during config policy data validation ", errors);
+		}
+		else {
+			console.info("NO validation errors found in config policy data");
+			this.state.loopCache.updateMicroServiceProperties(this.state.componentName, editorData[0]);
+			LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.componentName));
+		}
+
+		this.setState({ show: false });
+		this.props.history.push('/');
 	}
 
 	handleClose() {
 		this.setState({ show: false });
-		this.props.history.push('/')
+		this.props.history.push('/');
 	}
 
 	componentDidMount() {
@@ -56,11 +77,12 @@ export default class ConfigurationPolicyModal extends React.Component {
 	}
 
 	renderJsonEditor() {
-		var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForType("TCA_Jbv1z_v1_0_ResourceInstanceName1_tca");
+		console.debug("Rendering ConfigurationPolicyModal ", this.state.componentName);
+		var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.componentName);
 		if (toscaModel == null) {
 			return;
 		}
-		var editorData = this.state.loopCache.getMicroServiceProperties("TCA_Jbv1z_v1_0_ResourceInstanceName1_tca");
+		var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.componentName);
 
 		JSONEditor.defaults.options.theme = 'bootstrap4';
 		//JSONEditor.defaults.options.iconlib = 'bootstrap2';
@@ -76,7 +98,6 @@ export default class ConfigurationPolicyModal extends React.Component {
 			jsonEditor: new JSONEditor(document.getElementById("editor"),
 				{ schema: toscaModel.schema, startval: editorData })
 		})
-
 	}
 
 	render() {
@@ -93,7 +114,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 					<Button variant="secondary" onClick={this.handleClose}>
 						Close
 	            </Button>
-					<Button variant="primary" onClick={this.handleClose}>
+					<Button variant="primary" onClick={this.handleSave}>
 						Save Changes
 	            </Button>
 				</Modal.Footer>
-- 
cgit 1.2.3-korg


From d8bed32cb3f84d9cfb18332b07742701f5d57379 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Thu, 18 Jul 2019 17:45:34 +0200
Subject: Integrate testing framework

Integrate Jest and Enzyme testing framework.

Issue-ID: CLAMP-425
Change-Id: I50427a5171c77c2d064fe5e913a46f95c4eb43bc
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/package.json                              |   6 +-
 ui-react/src/__test__/LoopCache.test.js            | 217 +++++++++++++++++++++
 .../src/__test__/LoopCache_mokeLoopJsonCache.json  | 117 +++++++++++
 ui-react/src/__test__/OpenLoopModal.test.js        |  35 ++++
 ui-react/src/setupTests.js                         |   4 +
 5 files changed, 378 insertions(+), 1 deletion(-)
 create mode 100644 ui-react/src/__test__/LoopCache.test.js
 create mode 100644 ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json
 create mode 100644 ui-react/src/__test__/OpenLoopModal.test.js
 create mode 100644 ui-react/src/setupTests.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index f1ae2bc9d..de7cb26d1 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -28,5 +28,9 @@
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ]
+  ],
+  "devDependencies": {
+    "enzyme": "3.10.0",
+    "enzyme-adapter-react-16": "1.14.0"
+  }
 }
diff --git a/ui-react/src/__test__/LoopCache.test.js b/ui-react/src/__test__/LoopCache.test.js
new file mode 100644
index 000000000..e5b50259d
--- /dev/null
+++ b/ui-react/src/__test__/LoopCache.test.js
@@ -0,0 +1,217 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopCache from '../api/LoopCache';
+
+const json = require('./LoopCache_mokeLoopJsonCache.json');
+
+describe('Verify LoopCache functions', () => {
+    const loopCache = new LoopCache(json);
+		it('getLoopName', () => {
+      expect(loopCache.getLoopName()).toBe("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
+		});
+
+    it('getOperationalPolicyConfigurationJson', () => {
+      const opPolicyConfig = {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
+          }
+      };
+      expect(loopCache.getOperationalPolicyConfigurationJson()).toStrictEqual(opPolicyConfig);
+    });
+
+    it('getOperationalPolicies', () => {
+      const opPolicy = [{
+        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+        "configurationsJson": {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
+
+          }
+        }
+      }];
+      expect(loopCache.getOperationalPolicies()).toStrictEqual(opPolicy);
+    });
+
+    it('getGlobalProperties', () => {
+      const globelProp = {
+        "dcaeDeployParameters": {
+          "location_id": "",
+          "service_id": "",
+          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+        }
+      };
+      expect(loopCache.getGlobalProperties()).toStrictEqual(globelProp);
+    });
+
+    it('getDcaeDeploymentProperties', () => {
+      const deploymentProp = {
+          "location_id": "",
+          "service_id": "",
+          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+      };
+      expect(loopCache.getDcaeDeploymentProperties()).toStrictEqual(deploymentProp);
+    });
+
+    it('getMicroServicesJsonForType', () => {
+      const msJson = {
+          "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+          "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+          "properties": {"domain": "measurementsForVfScaling"},
+          "shared": false,
+          "jsonRepresentation": {"schema": {}}
+      };
+      expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJson);
+      expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
+    });
+
+    it('getMicroServiceProperties', () => {
+      const msProp = {"domain": "measurementsForVfScaling"};
+      expect(loopCache.getMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msProp);
+      expect(loopCache.getMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
+    });
+
+    it('getMicroServiceJsonRepresentationForType', () => {
+      const msJsonRepresentation = {"schema": {}};
+      expect(loopCache.getMicroServiceJsonRepresentationForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
+    });
+
+    it('getMicroServiceJsonRepresentationForType', () => {
+      const msJsonRepresentation = {"schema": {}};
+      expect(loopCache.getMicroServiceJsonRepresentationForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
+    });
+
+    it('getResourceDetailsVfProperty', () => {
+      const resourceVF = {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      };
+      expect(loopCache.getResourceDetailsVfProperty()).toStrictEqual(resourceVF);
+    });
+
+    it('getResourceDetailsVfModuleProperty', () => {
+      const vfModule = {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      };
+      expect(loopCache.getResourceDetailsVfModuleProperty()).toStrictEqual(vfModule);
+    });
+
+    it('getLoopLogsArray', () => {
+      const logs = [
+        {
+          "id": 1,
+          "logType": "INFO",
+          "logComponent": "CLAMP",
+          "message": "Operational and Guard policies UPDATED",
+          "logInstant": "2019-07-08T09:44:37Z"
+        }
+      ];
+      expect(loopCache.getLoopLogsArray()).toStrictEqual(logs);
+    });
+
+    it('getComponentStates', () => {
+      const component = {
+        "POLICY": {
+          "componentState": {
+            "stateName": "NOT_SENT",
+            "description": "The policies defined have NOT yet been created on the policy engine"
+          }
+        },
+        "DCAE": {
+          "componentState": {
+            "stateName": "BLUEPRINT_DEPLOYED",
+            "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+          }
+        }
+      };
+      expect(loopCache.getComponentStates()).toStrictEqual(component);
+    });
+
+    it('updateGlobalProperties', () => {
+      const newGlobalProps = {
+        "dcaeDeployParameters": {
+          "location_id": "newLocation",
+          "service_id": "newServiceId",
+          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2"
+        }
+      };
+      loopCache.updateGlobalProperties(newGlobalProps);
+      expect(loopCache.getGlobalProperties()).toStrictEqual(newGlobalProps);
+    });
+
+    it('updateOperationalPolicyProperties', () => {
+      const newOpPolicy = [{
+        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca_new",
+        "configurationsJson": {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
+          }
+        }
+      }];
+      loopCache.updateOperationalPolicyProperties(newOpPolicy);
+      expect(loopCache.getOperationalPolicies()).toStrictEqual(newOpPolicy);
+    });
+
+    it('updateMicroServiceProperties', () => {
+      const newMsPolicy = {
+          "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+          "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+          "properties": {"domain": "measurementsForVfScalingNew"},
+          "shared": true,
+          "jsonRepresentation": {"schema": {}}
+      };;
+      loopCache.updateMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", newMsPolicy);
+      expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newMsPolicy);
+    });
+ });
diff --git a/ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json b/ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json
new file mode 100644
index 000000000..184eaf7cd
--- /dev/null
+++ b/ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json
@@ -0,0 +1,117 @@
+{
+  "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
+  "globalPropertiesJson": {
+    "dcaeDeployParameters": {
+      "location_id": "",
+      "service_id": "",
+      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+    }
+  },
+  "modelPropertiesJson": {
+    "serviceDetails": {
+      "serviceType": "",
+      "namingPolicy": "",
+      "environmentContext": "General_Revenue-Bearing",
+      "serviceEcompNaming": "true",
+      "serviceRole": "",
+      "name": "vLoadBalancerMS",
+      "description": "vLBMS",
+      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+      "ecompGeneratedNaming": "true",
+      "category": "Network L4+",
+      "type": "Service",
+      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+      "instantiationType": "A-la-carte"
+    },
+    "resourceDetails": {
+      "CP": {},
+      "VL": {},
+      "VF": {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      },
+      "CR": {},
+      "VFC": {},
+      "PNF": {},
+      "Service": {},
+      "CVFC": {},
+      "Service Proxy": {},
+      "Configuration": {},
+      "AllottedResource": {},
+      "VFModule": {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      }
+    }
+  },
+  "lastComputedState": "DESIGN",
+  "components": {
+    "POLICY": {
+      "componentState": {
+        "stateName": "NOT_SENT",
+        "description": "The policies defined have NOT yet been created on the policy engine"
+      }
+    },
+    "DCAE": {
+      "componentState": {
+        "stateName": "BLUEPRINT_DEPLOYED",
+        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+      }
+    }
+  },
+  "operationalPolicies": [
+    {
+      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "configurationsJson": {
+        "guard_policies": {},
+        "operational_policy": {
+          "controlLoop": {},
+          "policies": []
+        }
+      }
+    }
+  ],
+  "microServicePolicies": [
+    {
+      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+      "properties": {"domain": "measurementsForVfScaling"},
+      "shared": false,
+      "jsonRepresentation": {"schema": {}}
+    }
+  ],
+  "loopLogs": [
+    {
+      "id": 1,
+      "logType": "INFO",
+      "logComponent": "CLAMP",
+      "message": "Operational and Guard policies UPDATED",
+      "logInstant": "2019-07-08T09:44:37Z"
+    }
+  ]
+}
diff --git a/ui-react/src/__test__/OpenLoopModal.test.js b/ui-react/src/__test__/OpenLoopModal.test.js
new file mode 100644
index 000000000..044eeda89
--- /dev/null
+++ b/ui-react/src/__test__/OpenLoopModal.test.js
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import OpenLoopModal from '../components/dialogs/OpenLoop/OpenLoopModal';
+
+describe('Verify OpenLoopModal', () => {
+
+  it('Test the render method', () => {
+    const component = shallow(<OpenLoopModal/>);
+    expect(component).toMatchSnapshot();
+  });
+
+
+});
diff --git a/ui-react/src/setupTests.js b/ui-react/src/setupTests.js
new file mode 100644
index 000000000..fc7b0dce1
--- /dev/null
+++ b/ui-react/src/setupTests.js
@@ -0,0 +1,4 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });
-- 
cgit 1.2.3-korg


From c1ccc5428cdb26b47dc6f6f5f8222808c3db3075 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 19 Jul 2019 09:50:33 +0200
Subject: Rework the logs

Provide data to logs viewer and rework the look and feel

Issue-ID: CLAMP-428
Change-Id: I7445c491faa7a061da4a959b4ca7646c7c14a88d
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .gitignore                                         |  1 -
 ui-react/src/LoopUI.js                             |  2 +-
 .../src/components/loop_viewer/logs/LoopLogs.js    | 95 ++++++++++++++++++++++
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 ui-react/src/components/loop_viewer/logs/LoopLogs.js

(limited to 'ui-react/src')

diff --git a/.gitignore b/.gitignore
index b6d49c75b..fbdcf4af5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ target
 ui-react/node_modules
 ui-react/build
 **/package-lock.json
-**/logs/
 **/.evosuite/
 **/debug-logs/
 *.log
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index dd4923e3e..1f79d39eb 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -147,7 +147,7 @@ export default class LoopUI extends React.Component {
 		return (
 			<LoopViewBodyDivStyled>
 				<LoopSvg loopCache={this.state.loopCache} />
-				<LoopLogs />
+				<LoopLogs loopCache={this.state.loopCache} />
 				<LoopStatus />
 			</LoopViewBodyDivStyled>
 		);
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
new file mode 100644
index 000000000..d7d983d6f
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import Table from 'react-bootstrap/Table';
+import LoopCache from '../../../api/LoopCache';
+import styled from 'styled-components';
+
+const TableRow = ({ logRow }) => (
+	<tr>
+		<td>{logRow.logInstant}</td>
+		<td>{logRow.logType}</td>
+		<td>{logRow.logComponent}</td>
+		<td>{logRow.message}</td>
+	</tr>
+
+)
+
+const LoopLogsHeaderDivStyled = styled.div`
+	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	padding: 10px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+	overflow: auto;
+`
+
+export default class LoopLogs extends React.Component {
+
+	state = {
+		loopCache: new LoopCache({}),
+	}
+	constructor(props) {
+		super(props);
+		this.renderLogs = this.renderLogs.bind(this);
+		this.state.loopCache=props.loopCache;
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		return this.state.loopCache !== nextState.loopCache;
+	}
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopCache: newProps.loopCache,
+		});
+	}
+
+	renderLogs() {
+		if (this.state.loopCache.getLoopLogsArray() != null) {
+		return (
+			this.state.loopCache.getLoopLogsArray().map(row => <TableRow logRow={row} />)
+		)
+	} 
+	}
+
+	render() {
+		return (
+			<LoopLogsHeaderDivStyled>
+				<label>Loop Logs</label>
+				<Table striped hover bordeless variant responsive>
+					<thead>
+						<tr>
+							<th><span align="left">Date</span></th>
+							<th><span align="left">Type</span></th>
+							<th><span align="left">Component</span></th>
+							<th><span align="right">Log</span></th>
+						</tr>
+					</thead>
+					<tbody>
+						{this.renderLogs()}
+					</tbody>
+				</Table>
+			</LoopLogsHeaderDivStyled>
+
+		);
+	}
+}
-- 
cgit 1.2.3-korg


From 190227aa1bbcdc164a17fbcc8de06f78c11ebdff Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 19 Jul 2019 16:51:19 +0200
Subject: Rework the status

Add status data when we load a loop + rework the look and feel of status
DIV

Issue-ID: CLAMP-429
Change-Id: Ibeb58e2653d603f29a0b71023d8afd49cf89aba1
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |   6 +-
 ui-react/src/api/LoopCache.js                      |   4 +
 .../src/components/loop_viewer/logs/LoopLogs.js    |  30 +++---
 .../components/loop_viewer/status/LoopStatus.js    | 104 +++++++++++++++------
 ui-react/src/components/loop_viewer/svg/LoopSvg.js |   7 +-
 ui-react/src/theme/globalStyle.js                  |  19 ++--
 6 files changed, 114 insertions(+), 56 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 1f79d39eb..40ae1379c 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -46,7 +46,7 @@ const ProjectNameStyled = styled.a`
 
 `
 const LoopViewDivStyled = styled.div`
-	height: 90vh;
+	height: 100%;
 	overflow: hidden;
 	margin-left: 10px;
 	margin-right: 10px;
@@ -138,7 +138,7 @@ export default class LoopUI extends React.Component {
 	renderLoopViewHeader() {
 		return (
 			<LoopViewHeaderDivStyled>
-				Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled>
+				Loop Viewer - {this.state.loopName}
 			</LoopViewHeaderDivStyled>
 		);
 	}
@@ -147,8 +147,8 @@ export default class LoopUI extends React.Component {
 		return (
 			<LoopViewBodyDivStyled>
 				<LoopSvg loopCache={this.state.loopCache} />
+				<LoopStatus loopCache={this.state.loopCache}/>
 				<LoopLogs loopCache={this.state.loopCache} />
-				<LoopStatus />
 			</LoopViewBodyDivStyled>
 		);
 	}
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index b854c7c13..3ee5acc68 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -106,6 +106,10 @@ export default class LoopCache {
 		return this.loopJsonCache.loopLogs;
 	}
 
+	getComputedState() {
+		return this.loopJsonCache.lastComputedState;
+	}
+
 	getComponentStates() {
 		return this.loopJsonCache.components;
 	}
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
index d7d983d6f..b6a777a40 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
@@ -25,6 +25,15 @@ import Table from 'react-bootstrap/Table';
 import LoopCache from '../../../api/LoopCache';
 import styled from 'styled-components';
 
+const LoopLogsHeaderDivStyled = styled.div`
+	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	padding: 10px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+const TableStyled = styled(Table)`
+    
+    overflow: auto;
+`
 const TableRow = ({ logRow }) => (
 	<tr>
 		<td>{logRow.logInstant}</td>
@@ -35,13 +44,6 @@ const TableRow = ({ logRow }) => (
 
 )
 
-const LoopLogsHeaderDivStyled = styled.div`
-	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-	padding: 10px 10px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
-	overflow: auto;
-`
-
 export default class LoopLogs extends React.Component {
 
 	state = {
@@ -50,7 +52,7 @@ export default class LoopLogs extends React.Component {
 	constructor(props) {
 		super(props);
 		this.renderLogs = this.renderLogs.bind(this);
-		this.state.loopCache=props.loopCache;
+		this.state.loopCache = props.loopCache;
 	}
 
 	shouldComponentUpdate(nextProps, nextState) {
@@ -65,17 +67,17 @@ export default class LoopLogs extends React.Component {
 
 	renderLogs() {
 		if (this.state.loopCache.getLoopLogsArray() != null) {
-		return (
-			this.state.loopCache.getLoopLogsArray().map(row => <TableRow logRow={row} />)
-		)
-	} 
+			return (
+				this.state.loopCache.getLoopLogsArray().map(row => <TableRow logRow={row} />)
+			)
+		}
 	}
 
 	render() {
 		return (
 			<LoopLogsHeaderDivStyled>
 				<label>Loop Logs</label>
-				<Table striped hover bordeless variant responsive>
+				<TableStyled striped hover variant responsive>
 					<thead>
 						<tr>
 							<th><span align="left">Date</span></th>
@@ -87,7 +89,7 @@ export default class LoopLogs extends React.Component {
 					<tbody>
 						{this.renderLogs()}
 					</tbody>
-				</Table>
+				</TableStyled>
 			</LoopLogsHeaderDivStyled>
 
 		);
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.js b/ui-react/src/components/loop_viewer/status/LoopStatus.js
index f904d6740..141a41f51 100644
--- a/ui-react/src/components/loop_viewer/status/LoopStatus.js
+++ b/ui-react/src/components/loop_viewer/status/LoopStatus.js
@@ -22,34 +22,84 @@
 */
 import React from 'react';
 import Table from 'react-bootstrap/Table';
-import './LoopStatus.css';
+import styled from 'styled-components';
+import LoopCache from '../../../api/LoopCache';
+
+const LoopStatusViewDivStyled = styled.div`
+	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	padding: 10px 10px;
+	color: ${props => props.theme.loopViewerHeaderFontColor};
+`
+
+const TableStyled = styled(Table)`
+    overflow: auto;
+`
+
+const TableRow = ({ statusRow }) => (
+	<tr>
+		<td>{statusRow.componentName}</td>
+		<td>{statusRow.stateName}</td>
+		<td>{statusRow.description}</td>
+	</tr>
+
+)
 
 export default class LoopStatus extends React.Component {
-  render() {
-  	return (
-      <div>
-        <span id="status_clds" className="status_title">Status:
-          <span className="status">&nbsp;&nbsp;&nbsp;TestStatus&nbsp;&nbsp;&nbsp;</span>
-        </span>
-
-        <div className="status_table">
-          <Table striped hover>
-            <thead>
-                <tr>
-                  <th><span align="left" className="text">ComponentState</span></th>
-                  <th><span align="left" className="text">Description</span></th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td className="row_30_per">long test State</td>
-                  <td className="row_70_per">test description very very very long description</td>
-                </tr>
-              </tbody>
-            </Table>
-          </div>
-      </div>
-  	);
-  }
+	state = {
+		loopCache: new LoopCache({}),
+	}
+
+	constructor(props) {
+		super(props);
+		this.renderStatus = this.renderStatus.bind(this);
+		this.state.loopCache = props.loopCache;
+	}
+
+
+	renderStatus() {
+		if (this.state.loopCache.getComponentStates() != null) {
+			return Object.keys(this.state.loopCache.getComponentStates()).map((key) => {
+				console.debug("Adding status for: ",key);
+				var res={}
+				res[key]=this.state.loopCache.getComponentStates()[key];
+				return (<TableRow statusRow={{'componentName':key,'stateName':this.state.loopCache.getComponentStates()[key].componentState.stateName,'description':this.state.loopCache.getComponentStates()[key].componentState.description}} />)
+			})
+
+		}
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		return this.state.loopCache !== nextState.loopCache;
+	}
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopCache: newProps.loopCache,
+		});
+	}
+
+	render() {
+		return (
+			<LoopStatusViewDivStyled>
+				<label>Loop Status: {this.state.loopCache.getComputedState()}
+				</label>
+
+				<div >
+					<TableStyled striped hover variant responsive>
+						<thead>
+							<tr>
+								<th><span align="left">Component Name</span></th>
+								<th><span align="left">Component State</span></th>
+								<th><span align="right">Description</span></th>
+							</tr>
+						</thead>
+						<tbody>
+							{this.renderStatus()}
+						</tbody>
+					</TableStyled>
+				</div>
+			</LoopStatusViewDivStyled>
+		);
+	}
 }
 
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 91d74e4f0..3ac2f31fd 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -32,7 +32,10 @@ const LoopViewSvgDivStyled = styled.div`
 	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	border: 1px solid;
 	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-	height: 50%;
+	margin-left: auto;
+	margin-right:auto;
+	text-align: center;
+
 `
 
 class LoopViewSvg extends React.Component {
@@ -88,7 +91,7 @@ class LoopViewSvg extends React.Component {
 
 	render() {
 		return (
-			<LoopViewSvgDivStyled id="loop_svg" dangerouslySetInnerHTML={{ __html: this.state.svgContent }} onClick={this.handleSvgClick}>
+			<LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.svgContent }} onClick={this.handleSvgClick}>
 
 			</LoopViewSvgDivStyled>
 		);
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index 1630c5074..08630cbd9 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -56,13 +56,12 @@ export const GlobalClampStyle = createGlobalStyle`
     font-size: ${props => props.theme.fontSize};
   	border-radius: 4px;
   	color: ${props => props.theme.fontNormal};
-    background-color: ${props => (props.theme.backgroundColor)};
+	background-color: ${props => (props.theme.backgroundColor)};
+	margin-top: 1px;
   }
-  
+
   svg {
-  	padding: 10px;
 	overflow: hidden;
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	width: 100%;
 	height: 100%;
   }
@@ -75,13 +74,13 @@ export const DefaultClampTheme = {
 	fontDark: '#888888',
 	fontHighlight: '#ffff00',
 	fontNormal: 'black',
-	
+
 	backgroundColor: '#eeeeee',
 	fontFamily: 'Arial, Sans-serif',
 	fontSize: '15px',
-	
-  	loopViewerBackgroundColor: 'white',
-  	loopViewerFontColor: 'yellow',
-  	loopViewerHeaderBackgroundColor: '#337ab7',
-  	loopViewerHeaderFontColor: 'white',
+
+	loopViewerBackgroundColor: 'white',
+	loopViewerFontColor: 'yellow',
+	loopViewerHeaderBackgroundColor: '#337ab7',
+	loopViewerHeaderFontColor: 'white',
 };
-- 
cgit 1.2.3-korg


From b09e7df8439398fc094a56ec33fa33950ac8fa9e Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 23 Jul 2019 14:13:06 +0200
Subject: Rework Loop properties window

Rework the loop properties window with React libraries.

Issue-ID: CLAMP-447
Change-Id: I5eba63aab39aeefe23d5fdc4732ce0d3d4a1682a
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/api/LoopService.js                    |  24 +++++
 ui-react/src/components/dialogs/LoopProperties.js  | 112 +++++++++++++++++++++
 .../loop_viewer/svg/LoopComponentConverter.js      |   6 +-
 ui-react/src/components/menu/MenuBar.js            |   3 +-
 4 files changed, 140 insertions(+), 5 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/LoopProperties.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 020a3bf71..031ec638f 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -104,4 +104,28 @@ export default class LoopService {
 				return "";
 			});
 	}
+
+	static updateGlobalProperties(loopName, jsonData) {
+		return fetch('/restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
+			method: 'POST',
+			credentials: 'same-origin',
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(jsonData),
+		})
+			.then(function (response) {
+				console.debug("updateGlobalProperties response received: ", response.status);
+				if (response.ok) {
+					return response.text();
+				} else {
+					console.error("updateGlobalProperties query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("updateGlobalProperties error received", error);
+				return "";
+			});
+	}
 }
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
new file mode 100644
index 000000000..2cde8d46b
--- /dev/null
+++ b/ui-react/src/components/dialogs/LoopProperties.js
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import styled from 'styled-components';
+import LoopService from '../../api/LoopService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class LoopProperties extends React.Component {
+
+	formProps = {dcaeDeployParameters: {
+			"location_id": "",
+			"service_id": "",
+			"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+	}};
+
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleClose = this.handleClose.bind(this);
+		this.handleChange = this.handleChange.bind(this);
+		this.saveProperties =  this.saveProperties.bind(this);
+		this.initialValues = this.initialValues.bind(this);
+		this.state = {
+			show: true,
+			loopName: 'LOOP_h2NMX_v1_0_ResourceInstanceName1_tca',
+			form: this.formProps
+		};
+
+	}
+	initialValues() {
+			const updatedForm = this.state.form;
+			Object.keys(updatedForm).forEach((key) => {
+			if (key === 'dcaeDeployParameters') {
+				updatedForm[key] = JSON.stringify(this.state.form[key]);
+			} else {
+				updatedForm[key] = this.state.form[key];
+			}
+			this.setState({ form: updatedForm });
+		});
+	}
+	handleClose() {
+			this.props.history.push('/');
+	}
+	handleChange(e) {
+			const formUpdated =  this.state.form;
+			formUpdated[e.target.name] = e.target.value;
+			this.setState({ form: formUpdated });
+   };
+	saveProperties(event) {
+		// translate the deploymentParameter into jsonFormat at submit time
+		const updatedForm = this.state.form;
+		Object.keys(updatedForm).forEach((key) => {
+			if (key === 'dcaeDeployParameters') {
+				try {
+				  let value = JSON.parse(updatedForm[key]);
+					updatedForm[key] = value;
+					// save Properties
+					this.setState( {form: updatedForm} );
+					LoopService.updateGlobalProperties(this.state.loopName, this.state.form);
+					this.props.history.push('/');
+				} catch (error) {
+				  alert("Deployment Parameters is not in good Json format. Please correct it.");
+				}
+			}
+		});
+	}
+	render() {
+		return (
+			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose} onEntered={this.initialValues}>
+				<Modal.Header closeButton>
+					<Modal.Title>Model Properties</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group controlId="exampleForm.ControlTextarea1">
+					<Form.Label>Deploy Parameters</Form.Label>
+					<Form.Control as="textarea" rows="3" name="dcaeDeployParameters" onChange={this.handleChange} defaultValue={this.state.form["dcaeDeployParameters"]}/>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
+					<Button variant="primary" type="submit" onClick={this.saveProperties}>Save</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
index b737f3e19..a409d2cd0 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
@@ -3,16 +3,16 @@ export default class LoopComponentConverter {
 	static buildMapOfComponents(loopCache) {
 		var componentsMap = new Map([]);
 		if (typeof (loopCache.getMicroServicePolicies()) !== "undefined") {
-			loopCache.getMicroServicePolicies().map(ms => {
+			loopCache.getMicroServicePolicies().forEach(ms => {
 				componentsMap.set(ms.name, "/configurationPolicyModal/"+ms.name);
 			})
 		}
 		if (typeof (loopCache.getOperationalPolicies()) !== "undefined") {
-			loopCache.getOperationalPolicies().map(op => {
+			loopCache.getOperationalPolicies().forEach(op => {
 				componentsMap.set(op.name, "/operationalPolicyModal");
 			})
 		}
 		componentsMap.set("OperationalPolicy","/operationalPolicyModal");
 		return componentsMap;
 	}
-}
\ No newline at end of file
+}
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 64aa6bc83..491cc675d 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -35,13 +35,12 @@ const StyledNavDropdownItem = styled(NavDropdown.Item)`
 `;
 
 export default class MenuBar extends React.Component {
-
 	render () {
 	   return (
 		  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
 		      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
 		        <StyledNavDropdownItem href="/openLoop">Open CL</StyledNavDropdownItem>
-		        <StyledNavDropdownItem href="#action/3.2">Properties CL</StyledNavDropdownItem>
+		        <StyledNavDropdownItem href="/loopProperties">Properties CL</StyledNavDropdownItem>
 		        <StyledNavDropdownItem href="/closeLoop">Close Model</StyledNavDropdownItem>
 		      </NavDropdown>
 					<NavDropdown title="Manage" id="basic-nav-dropdown">
-- 
cgit 1.2.3-korg


From e52d5727650590b9adaa43f5830c40913cebf348 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Thu, 25 Jul 2019 15:43:06 +0200
Subject: Rework user info window

Rework the user info window with react.

Issue-ID: CLAMP-449
Change-Id: I260bcb3c15cae73af0c180706928415ddc81dfbf
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js                      |  10 +-
 ui-react/src/api/UserService.js             |  23 +++-
 ui-react/src/components/dialogs/UserInfo.js | 161 ++++++++++++++++++++++++++++
 3 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/UserInfo.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 1f79d39eb..342f43dae 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -38,6 +38,8 @@ import { Route, Redirect } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
+import LoopProperties from './components/dialogs/LoopProperties';
+import UserInfo from './components/dialogs/UserInfo';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -104,7 +106,7 @@ export default class LoopUI extends React.Component {
 
 	renderMenuNavBar() {
 		return (
-			<MenuBar />
+			<MenuBar loopCache={this.state.loopCache}/>
 		);
 	}
 
@@ -153,6 +155,10 @@ export default class LoopUI extends React.Component {
 		);
 	}
 
+	getLoopCache() {
+		return this.state.loopCache;
+
+	}
 	renderLoopViewer() {
 		return (
 			<LoopViewDivStyled>
@@ -177,6 +183,8 @@ export default class LoopUI extends React.Component {
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
+				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} />)} />
+				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
 				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
 			</div>
 		);
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 22168d41b..be21e692a 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -47,5 +47,26 @@ export default class UserService {
 			return UserService.notLoggedUserName;
 		});
 	}
-}
 
+	static getUserInfo() {
+		return fetch('/restservices/clds/v1/clds/cldsInfo', {
+				method: 'GET',
+				credentials: 'same-origin',
+			})
+		.then(function (response) {
+			console.debug("getUserInfo response received, status code:", response.status);
+			if (response.ok) {
+				return response.json();
+			}
+		})
+		.then(function (data) {
+			console.info ("User info received:",data)
+			return data;
+		})
+		.catch(function(error) {
+			console.warn("getUserInfo error received, user set to: ",UserService.notLoggedUserName);
+			console.error("getUserInfo error:",error);
+			return;
+		});
+	}
+}
diff --git a/ui-react/src/components/dialogs/UserInfo.js b/ui-react/src/components/dialogs/UserInfo.js
new file mode 100644
index 000000000..a8ef717b3
--- /dev/null
+++ b/ui-react/src/components/dialogs/UserInfo.js
@@ -0,0 +1,161 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import styled from 'styled-components';
+import UserService from '../../api/UserService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class UserInfo extends React.Component {
+
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleClose = this.handleClose.bind(this);
+		this.initialValues = this.initialValues.bind(this);
+		this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this);
+		this.renderReadModelPermission = this.renderReadModelPermission.bind(this);
+		this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this);
+		this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this);
+		this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this);
+		this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this);
+		this.renderUserName = this.renderUserName.bind(this);
+		this.state = {
+			show: true,
+			userInfo: {permissionReadTemplate: true,
+						permissionReadCl: true,
+						permissionReadTosca: true,
+						permissionUpdateCl: true,
+						permissionUpdateTemplate: true,
+						permissionUpdateTosca: true,
+						userName: 'admin',
+						cldsVersion: '1.0.0'
+						}
+		};
+
+	}
+	initialValues() {
+		UserService.getUserInfo().then(userInfo => {
+			this.setState({ userInfo: userInfo })
+		});
+	}
+	handleClose() {
+			this.props.history.push('/');
+	}
+	renderReadTemplatePermission() {
+		if (this.state.userInfo["permissionReadTemplate"]) {
+			return <Form.Control plaintext readOnly defaultValue="Read Template" />
+		} else  {
+			return;
+		}
+	}
+	renderReadModelPermission() {
+		if (this.state.userInfo["permissionReadCl"]) {
+			return <Form.Control plaintext readOnly defaultValue="Read Model" />
+		} else  {
+			return;
+		}
+	}
+	renderReadToscaPermission() {
+		if (this.state.userInfo["permissionReadTosca"]) {
+			return <Form.Control plaintext readOnly defaultValue="Read Tosca" />
+		} else  {
+			return;
+		}
+	}
+	renderUpdateTemplatePermission() {
+		if (this.state.userInfo["permissionUpdateTemplate"]) {
+			return <Form.Control plaintext readOnly defaultValue="Edit Template" />
+		} else  {
+			return;
+		}
+	}
+	renderUpdateModelPermission() {
+		if (this.state.userInfo["permissionUpdateCl"]) {
+			return <Form.Control plaintext readOnly defaultValue="Edit Model" />
+		} else  {
+			return;
+		}
+	}
+	renderUpdateToscaPermission() {
+		if (this.state.userInfo["permissionUpdateTosca"]) {
+			return <Form.Control plaintext readOnly defaultValue="Edit Tosca" />
+		} else  {
+			return;
+		}
+	}
+	renderUserName() {
+		if (this.state.userInfo["userName"]) {
+			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["userName"]} />
+		} else  {
+			return;
+		}
+	}
+	renderVersion() {
+		if (this.state.userInfo["cldsVersion"]) {
+			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["cldsVersion"]} />
+		} else  {
+			return;
+		}
+	}
+	render() {
+		return (
+			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose} onEntered={this.initialValues}>
+				<Modal.Header closeButton>
+					<Modal.Title>User Info</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="userName">
+						<Form.Label column sm="3">Current User:</Form.Label>
+						<Col>{this.renderUserName()}</Col>
+					</Form.Group>
+					<Form.Group as={Row} controlId="cldsVersion">
+						<Form.Label column sm="3">CLDS Version:</Form.Label>
+						<Col>{this.renderVersion()}</Col>
+					</Form.Group>
+					<Form.Group as={Row} controlId="userPermissions">
+						<Form.Label column sm="3">User Permissions:</Form.Label>
+						<Col>
+							{this.renderReadTemplatePermission()}
+							{this.renderReadModelPermission()}
+							{this.renderReadToscaPermission()}
+							{this.renderUpdateTemplatePermission()}
+							{this.renderUpdateModelPermission()}
+							{this.renderUpdateToscaPermission()}
+						</Col>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
-- 
cgit 1.2.3-korg


From 8a02dd771961cc36b4436f9124657766674b5b76 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 31 Jul 2019 17:11:11 +0200
Subject: Fix loop prop window

Fix the loop Properties windows

Issue-ID: CLAMP-447
Change-Id: I0d4002267feab57457067df345f6b56542926e35
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |  14 +--
 .../ConfigurationPolicyModal.js                    |   4 +-
 ui-react/src/components/dialogs/LoopProperties.js  | 107 ++++++++++-----------
 ui-react/src/components/dialogs/UserInfo.js        |   2 +-
 .../components/loop_viewer/status/LoopStatus.css   |  19 ----
 ui-react/src/components/menu/MenuBar.js            |  68 ++++++++-----
 ui-react/src/index.js                              |   2 +-
 ui-react/src/theme/globalStyle.js                  |   5 +
 8 files changed, 113 insertions(+), 108 deletions(-)
 delete mode 100644 ui-react/src/components/loop_viewer/status/LoopStatus.css

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 7d8fcb5cf..9956e3c98 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -175,18 +175,18 @@ export default class LoopUI extends React.Component {
 
 	render() {
 		return (
-			<div id="main_div">
-				<GlobalClampStyle />
-				{this.renderNavBar()}
-				{this.renderLoopViewer()}
+				<div id="main_div">
 				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
-				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} />)} />
+				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} />)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} />)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
 				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
-			</div>
+					<GlobalClampStyle />
+					{this.renderNavBar()}
+					{this.renderLoopViewer()}
+				</div>
 		);
 	}
 }
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 8178bf47f..b3b7383ea 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -38,7 +38,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 		show: true,
 		loopCache: this.props.loopCache,
 		jsonEditor: null,
-		componentName: "",
+		componentName: this.props.match.params.componentName,
 	};
 
 	constructor(props, context) {
@@ -46,7 +46,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
 		this.renderJsonEditor = this.renderJsonEditor.bind(this);
-		this.state.componentName = props.match.params.componentName;
+		//this.state.componentName = props.match.params.componentName;
 	}
 
 	handleSave() {
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
index 2cde8d46b..1c0d015af 100644
--- a/ui-react/src/components/dialogs/LoopProperties.js
+++ b/ui-react/src/components/dialogs/LoopProperties.js
@@ -33,78 +33,77 @@ const ModalStyled = styled(Modal)`
 
 export default class LoopProperties extends React.Component {
 
-	formProps = {dcaeDeployParameters: {
-			"location_id": "",
-			"service_id": "",
-			"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-	}};
+	state = {
+		show: true,
+		loopCache: this.props.loopCache,
+	};
 
 	constructor(props, context) {
 		super(props, context);
 
 		this.handleClose = this.handleClose.bind(this);
-		this.handleChange = this.handleChange.bind(this);
-		this.saveProperties =  this.saveProperties.bind(this);
-		this.initialValues = this.initialValues.bind(this);
-		this.state = {
-			show: true,
-			loopName: 'LOOP_h2NMX_v1_0_ResourceInstanceName1_tca',
-			form: this.formProps
-		};
-
+		this.handleSave = this.handleSave.bind(this);
+		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
+		this.renderAllParameters = this.renderAllParameters.bind(this);
+		this.getDcaeParameters = this.getDcaeParameters.bind(this);
 	}
-	initialValues() {
-			const updatedForm = this.state.form;
-			Object.keys(updatedForm).forEach((key) => {
-			if (key === 'dcaeDeployParameters') {
-				updatedForm[key] = JSON.stringify(this.state.form[key]);
-			} else {
-				updatedForm[key] = this.state.form[key];
-			}
-			this.setState({ form: updatedForm });
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopCache: newProps.loopCache,
 		});
 	}
+
 	handleClose() {
-			this.props.history.push('/');
+		this.props.history.push('/');
 	}
-	handleChange(e) {
-			const formUpdated =  this.state.form;
-			formUpdated[e.target.name] = e.target.value;
-			this.setState({ form: formUpdated });
-   };
-	saveProperties(event) {
+
+	handleSave(event) {
 		// translate the deploymentParameter into jsonFormat at submit time
-		const updatedForm = this.state.form;
-		Object.keys(updatedForm).forEach((key) => {
-			if (key === 'dcaeDeployParameters') {
-				try {
-				  let value = JSON.parse(updatedForm[key]);
-					updatedForm[key] = value;
-					// save Properties
-					this.setState( {form: updatedForm} );
-					LoopService.updateGlobalProperties(this.state.loopName, this.state.form);
-					this.props.history.push('/');
-				} catch (error) {
-				  alert("Deployment Parameters is not in good Json format. Please correct it.");
-				}
-			}
-		});
+
 	}
+
+	saveAllProperties() {
+
+	}
+
+	renderAllParameters() {
+		return (<Modal.Body>
+			<Form>
+				{this.renderDcaeParameters()}
+			</Form>
+		</Modal.Body>
+		);
+	}
+
+	getDcaeParameters() {
+		if (typeof (this.state.loopCache.getGlobalProperties()) !== "undefined") {
+			return JSON.stringify(this.state.loopCache.getGlobalProperties()["dcaeDeployParameters"]);
+		} else {
+			return "";
+		}
+		
+	}
+
+	renderDcaeParameters() {
+		return (
+			<Form.Group >
+				<Form.Label>Deploy Parameters</Form.Label>
+				<Form.Control as="textarea" rows="3" name="dcaeDeployParameters">{this.getDcaeParameters()}</Form.Control>
+			</Form.Group>
+		);
+	}
+
 	render() {
 		return (
-			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose} onEntered={this.initialValues}>
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
 				<Modal.Header closeButton>
 					<Modal.Title>Model Properties</Modal.Title>
 				</Modal.Header>
-				<Modal.Body>
-					<Form.Group controlId="exampleForm.ControlTextarea1">
-					<Form.Label>Deploy Parameters</Form.Label>
-					<Form.Control as="textarea" rows="3" name="dcaeDeployParameters" onChange={this.handleChange} defaultValue={this.state.form["dcaeDeployParameters"]}/>
-					</Form.Group>
-				</Modal.Body>
+					{this.renderAllParameters()}
 				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
-					<Button variant="primary" type="submit" onClick={this.saveProperties}>Save</Button>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+					<Button variant="primary" type="submit" onClick={this.handleSave}>Save Changes</Button>
 				</Modal.Footer>
 			</ModalStyled>
 		);
diff --git a/ui-react/src/components/dialogs/UserInfo.js b/ui-react/src/components/dialogs/UserInfo.js
index a8ef717b3..b8d68b849 100644
--- a/ui-react/src/components/dialogs/UserInfo.js
+++ b/ui-react/src/components/dialogs/UserInfo.js
@@ -153,7 +153,7 @@ export default class UserInfo extends React.Component {
 					</Form.Group>
 				</Modal.Body>
 				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
 				</Modal.Footer>
 			</ModalStyled>
 		);
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.css b/ui-react/src/components/loop_viewer/status/LoopStatus.css
deleted file mode 100644
index 14add0f53..000000000
--- a/ui-react/src/components/loop_viewer/status/LoopStatus.css
+++ /dev/null
@@ -1,19 +0,0 @@
-
-.status_title{
-	position: absolute;
-	left: 61%;
-	top: 151px;
-	font-size:20px;
-}
-.status{
-	background-color: gray;
-	-moz-border-radius: 50px;
-	-webkit-border-radius: 50px;
-	border-radius: 50px;
-}
-.status_table {
-	position: absolute;
-	left: 61%;
-	top: 191px;
-	font-size:10px;
-}
\ No newline at end of file
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 491cc675d..811a48ba0 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -25,41 +25,61 @@ import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
 import 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
+import { Link } from 'react-router-dom'
 
 const StyledNavDropdownItem = styled(NavDropdown.Item)`
-	color: ${props => props.theme.fontNormal};
+	color: ${props => props.theme.menuFontColor};
+	background-color: ${props => props.theme.menuBackgroundColor};
 	:hover {
+			background-color: ${props => props.theme.menuHighlightedBackgroundColor};
+			color:  ${props => props.theme.menuHighlightedFontColor};
+	}
+`;
+
+const StyledLink = styled(Link)`
+	color: ${props => props.theme.menuColor};
+	background-color: ${props => props.theme.menuBackgroundColor};
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+			text-decoration: none;
 			background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-			color:  ${props => props.theme.loopViewerHeaderFontColor}
+			color:  ${props => props.theme.loopViewerHeaderFontColor};
 	}
 `;
 
 export default class MenuBar extends React.Component {
 	render () {
-	   return (
-		  <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
-		      <NavDropdown title="Closed Loop" id="basic-nav-dropdown">
-		        <StyledNavDropdownItem href="/openLoop">Open CL</StyledNavDropdownItem>
-		        <StyledNavDropdownItem href="/loopProperties">Properties CL</StyledNavDropdownItem>
-		        <StyledNavDropdownItem href="/closeLoop">Close Model</StyledNavDropdownItem>
-		      </NavDropdown>
+		return (
+				<Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
+					<NavDropdown title="Closed Loop" id="basic-nav-dropdown">
+						<StyledNavDropdownItem as={StyledLink} to="/openLoop">Open CL</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="/loopProperties">Properties CL</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="/closeLoop">Close Model</StyledNavDropdownItem>
+					</NavDropdown>
 					<NavDropdown title="Manage" id="basic-nav-dropdown">
-						<StyledNavDropdownItem href="/operationalPolicyModal">Submit</StyledNavDropdownItem>
-						<StyledNavDropdownItem href="#action/3.2">Stop</StyledNavDropdownItem>
-						<StyledNavDropdownItem href="#action/3.3">Restart</StyledNavDropdownItem>
-						<StyledNavDropdownItem href="#action/3.3">Delete</StyledNavDropdownItem>
-						<StyledNavDropdownItem href="#action/3.3">Deploy</StyledNavDropdownItem>
-						<StyledNavDropdownItem href="#action/3.3">UnDeploy</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="/operationalPolicyModal">Submit</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="#action/3.2">Stop</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">Restart</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">Delete</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">Deploy</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">UnDeploy</StyledNavDropdownItem>
 					</NavDropdown>
 					<NavDropdown title="View" id="basic-nav-dropdown">
-						<StyledNavDropdownItem href="#action/3.1">Refresh Status</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="#action/3.1">Refresh Status</StyledNavDropdownItem>
+					</NavDropdown>
+					<NavDropdown title="Help" id="basic-nav-dropdown">
+						<StyledNavDropdownItem href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavDropdownItem>
+						<StyledNavDropdownItem href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavDropdownItem>
+						<StyledNavDropdownItem as={StyledLink} to="/userInfo">User Info</StyledNavDropdownItem>
 					</NavDropdown>
-				<NavDropdown title="Help" id="basic-nav-dropdown">
-					<StyledNavDropdownItem href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavDropdownItem>
-					<StyledNavDropdownItem href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavDropdownItem>
-					<StyledNavDropdownItem href="#action/3.3">User Info</StyledNavDropdownItem>
-				</NavDropdown>
-		  </Navbar.Collapse>
-	   );
-  }
+				</Navbar.Collapse>
+		);
+	}
 }
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index 8a62b5a2c..39df36427 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -27,7 +27,7 @@ import { Route, BrowserRouter } from 'react-router-dom'
 
 
 const routing = (
-	<BrowserRouter >
+	<BrowserRouter forceRefresh={false}>
 		<Route path="/" component={OnapClamp}/>
 	</BrowserRouter>
 );
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index 08630cbd9..cbd86b199 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -83,4 +83,9 @@ export const DefaultClampTheme = {
 	loopViewerFontColor: 'yellow',
 	loopViewerHeaderBackgroundColor: '#337ab7',
 	loopViewerHeaderFontColor: 'white',
+	
+	menuBackgroundColor: 'white',
+	menuFontColor: 'black',
+	menuHighlightedBackgroundColor: '#337ab7',
+	menuHighlightedFontColor: 'white',
 };
-- 
cgit 1.2.3-korg


From 83ce0764646950d44355e5cb484e008913abeb5f Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 2 Aug 2019 14:53:59 +0200
Subject: Add saving + rework

Rework of the async calls to the backend + add saving of the properties
to backend + rework of the loop loading

Issue-ID: CLAMP-447
Change-Id: I126c88b3532613e6d4702e63c39a2735b98d132c
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             | 24 +++++++++++++---------
 .../ConfigurationPolicyModal.js                    | 13 ++++++------
 ui-react/src/components/dialogs/LoopProperties.js  | 22 +++++++++++++-------
 .../components/dialogs/OpenLoop/OpenLoopModal.js   | 10 +--------
 4 files changed, 37 insertions(+), 32 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 9956e3c98..643b32d14 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -40,6 +40,7 @@ import OperationalPolicyModal from './components/dialogs/OperationalPolicy/Opera
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
 import LoopProperties from './components/dialogs/LoopProperties';
 import UserInfo from './components/dialogs/UserInfo';
+import LoopService from './api/LoopService';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -72,12 +73,6 @@ const LoopViewBodyDivStyled = styled.div`
 	height: 95%;
 `
 
-const LoopViewLoopNameSpanStyled = styled.span`
-	font-weight: bold;
-	color: ${props => (props.theme.loopViewerHeaderFontColor)};
-	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
-`
-
 export default class LoopUI extends React.Component {
 
 	static defaultLoopName="Empty (NO loop loaded yet)";
@@ -92,6 +87,7 @@ export default class LoopUI extends React.Component {
 		super();
 		this.getUser = this.getUser.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
+		this.loadLoop = this.loadLoop.bind(this);
 	}
 
 	componentWillMount() {
@@ -171,16 +167,24 @@ export default class LoopUI extends React.Component {
 	updateLoopCache(loopJson) {
 		this.setState({ loopCache: new LoopCache(loopJson) });
 		this.setState({ loopName: this.state.loopCache.getLoopName() });
+		console.info(this.state.loopName+" loop loaded successfully");
+	}
+	
+	loadLoop(loopName) {
+		LoopService.getLoop(loopName).then(loop => {
+			console.debug("Updating loopCache");
+			this.updateLoopCache(loop);
+		});
 	}
 
 	render() {
 		return (
 				<div id="main_div">
 				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} />)} />
-				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} />)} />
-				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
-				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} />)} />
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
+				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
 				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
 					<GlobalClampStyle />
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index b3b7383ea..4fbb7832c 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -46,25 +46,26 @@ export default class ConfigurationPolicyModal extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
 		this.renderJsonEditor = this.renderJsonEditor.bind(this);
-		//this.state.componentName = props.match.params.componentName;
 	}
 
 	handleSave() {
-
 		var errors = this.state.jsonEditor.validate();
 		var editorData = this.state.jsonEditor.getValue();
 
 		if (errors.length !== 0) {
 			console.error("Errors detected during config policy data validation ", errors);
+			this.setState({ show: false });
+			this.props.history.push('/');
 		}
 		else {
 			console.info("NO validation errors found in config policy data");
 			this.state.loopCache.updateMicroServiceProperties(this.state.componentName, editorData[0]);
-			LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.componentName));
+			LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.componentName)).then(resp => {
+				this.setState({ show: false });
+				this.props.history.push('/');
+				this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+			});
 		}
-
-		this.setState({ show: false });
-		this.props.history.push('/');
 	}
 
 	handleClose() {
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
index 1c0d015af..dac77655f 100644
--- a/ui-react/src/components/dialogs/LoopProperties.js
+++ b/ui-react/src/components/dialogs/LoopProperties.js
@@ -36,6 +36,7 @@ export default class LoopProperties extends React.Component {
 	state = {
 		show: true,
 		loopCache: this.props.loopCache,
+		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
 	};
 
 	constructor(props, context) {
@@ -43,6 +44,8 @@ export default class LoopProperties extends React.Component {
 
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
+		this.handleChange = this.handleChange.bind(this);
+		
 		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
 		this.renderAllParameters = this.renderAllParameters.bind(this);
 		this.getDcaeParameters = this.getDcaeParameters.bind(this);
@@ -51,6 +54,8 @@ export default class LoopProperties extends React.Component {
 	componentWillReceiveProps(newProps) {
 		this.setState({
 			loopCache: newProps.loopCache,
+			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties())),
+			
 		});
 	}
 
@@ -59,12 +64,15 @@ export default class LoopProperties extends React.Component {
 	}
 
 	handleSave(event) {
-		// translate the deploymentParameter into jsonFormat at submit time
-
+		LoopService.updateGlobalProperties(this.state.loopCache.getLoopName(), this.state.temporaryPropertiesJson).then(resp => {
+			this.setState({ show: false });
+			this.props.history.push('/');
+			this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+		});
 	}
 
-	saveAllProperties() {
-
+	handleChange(event) {
+		this.setState({temporaryPropertiesJson:{[event.target.name]: JSON.parse(event.target.value)}});
 	}
 
 	renderAllParameters() {
@@ -77,8 +85,8 @@ export default class LoopProperties extends React.Component {
 	}
 
 	getDcaeParameters() {
-		if (typeof (this.state.loopCache.getGlobalProperties()) !== "undefined") {
-			return JSON.stringify(this.state.loopCache.getGlobalProperties()["dcaeDeployParameters"]);
+		if (typeof (this.state.temporaryPropertiesJson) !== "undefined") {
+			return JSON.stringify(this.state.temporaryPropertiesJson["dcaeDeployParameters"]);
 		} else {
 			return "";
 		}
@@ -89,7 +97,7 @@ export default class LoopProperties extends React.Component {
 		return (
 			<Form.Group >
 				<Form.Label>Deploy Parameters</Form.Label>
-				<Form.Control as="textarea" rows="3" name="dcaeDeployParameters">{this.getDcaeParameters()}</Form.Control>
+				<Form.Control as="textarea" rows="3" name="dcaeDeployParameters" onChange={this.handleChange} defaultValue={this.getDcaeParameters()}></Form.Control>
 			</Form.Group>
 		);
 	}
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
index 0bf71580a..fbfc727eb 100644
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
@@ -44,7 +44,6 @@ export default class OpenLoopModal extends React.Component {
 
 		this.getLoopNames = this.getLoopNames.bind(this);
 		this.handleOpen = this.handleOpen.bind(this);
-		this.getModel = this.getModel.bind(this);
 		this.handleClose = this.handleClose.bind(this);
 		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
 		this.state = {
@@ -74,18 +73,11 @@ export default class OpenLoopModal extends React.Component {
 		});
 	}
 
-	getModel() {
-		LoopService.getLoop(this.state.chosenLoopName).then(loop => {
-			console.debug("Settingloop cache with json");
-			this.props.updateLoopCacheFunction(loop);
-		});
-	}
-
 	handleOpen() {
 		console.info("Loop " + this.state.chosenLoopName + " is chosen");
 		this.setState({ show: false });
 		this.props.history.push('/');
-		this.getModel();
+		this.props.loadLoopFunction(this.state.chosenLoopName);
 	}
 
 	render() {
-- 
cgit 1.2.3-korg


From 5fe750cb519c88a5fd6c55a93670354b78b806dc Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 6 Aug 2019 13:03:53 +0200
Subject: Rework action itmes

Rework the submit, stop, restart, delete, undeploy and refresh status
actions.

Issue-ID: CLAMP-441,CLAMP-442,CLAMP-443,CLAMP-444,CLAMP-446,CLAMP-448
Change-Id: I38aed3a06fdcdf0f53fc9b8f8d2d9072f0932d55
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js                         |  15 ++++-
 ui-react/src/React-Spinner.jpg                 | Bin 0 -> 5140 bytes
 ui-react/src/api/LoopActionService.js          |  74 +++++++++++++--------
 ui-react/src/components/menu/MenuBar.js        |  58 +++++++++--------
 ui-react/src/components/menu/PerformActions.js |  85 +++++++++++++++++++++++++
 ui-react/src/components/menu/RefreshStatus.js  |  66 +++++++++++++++++++
 6 files changed, 240 insertions(+), 58 deletions(-)
 create mode 100644 ui-react/src/React-Spinner.jpg
 create mode 100644 ui-react/src/components/menu/PerformActions.js
 create mode 100644 ui-react/src/components/menu/RefreshStatus.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 643b32d14..c7080a2b6 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -41,6 +41,8 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C
 import LoopProperties from './components/dialogs/LoopProperties';
 import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
+import PerformAction from './components/menu/PerformActions';
+import RefreshStatus from './components/menu/RefreshStatus';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -80,7 +82,7 @@ export default class LoopUI extends React.Component {
 	state = {
 		userName: null,
 		loopName: LoopUI.defaultLoopName,
-		loopCache: new LoopCache({}),
+		loopCache: new LoopCache({})
 	};
 
 	constructor() {
@@ -102,7 +104,7 @@ export default class LoopUI extends React.Component {
 
 	renderMenuNavBar() {
 		return (
-			<MenuBar loopCache={this.state.loopCache}/>
+			<MenuBar/>
 		);
 	}
 
@@ -155,6 +157,7 @@ export default class LoopUI extends React.Component {
 		return this.state.loopCache;
 
 	}
+
 	renderLoopViewer() {
 		return (
 			<LoopViewDivStyled>
@@ -169,7 +172,7 @@ export default class LoopUI extends React.Component {
 		this.setState({ loopName: this.state.loopCache.getLoopName() });
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
-	
+
 	loadLoop(loopName) {
 		LoopService.getLoop(loopName).then(loop => {
 			console.debug("Updating loopCache");
@@ -187,6 +190,12 @@ export default class LoopUI extends React.Component {
 				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
 				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
+				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 					<GlobalClampStyle />
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
diff --git a/ui-react/src/React-Spinner.jpg b/ui-react/src/React-Spinner.jpg
new file mode 100644
index 000000000..227689764
Binary files /dev/null and b/ui-react/src/React-Spinner.jpg differ
diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js
index 9ce8ff0a9..6e45ce4b9 100644
--- a/ui-react/src/api/LoopActionService.js
+++ b/ui-react/src/api/LoopActionService.js
@@ -20,35 +20,55 @@
  * ===================================================================
  *
  */
-const loopActionService = {
-	submit
-};
 
+export default class LoopActionService{
 
-function submit(uiAction) {
-	const cl_name = "";
-	console.log("clActionServices perform action: " + uiAction + " closedloopName="
-		+ cl_name);
-	const svcAction = uiAction.toLowerCase();
-	const svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + cl_name;
+	static performAction(cl_name, uiAction) {
+		console.log("LoopActionService perform action: " + uiAction + " closedloopName=" + cl_name);
+		const svcAction = uiAction.toLowerCase();
+ 		return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, {
+ 				method: 'PUT',
+ 				credentials: 'same-origin',
+ 			})
+ 		.then(function (response) {
+ 			if (response.ok) {
+ 				return response.json();
+ 			} else {
+ 				return Promise.reject("Perform action failed with code:" + response.status);
+ 			}
+ 		})
+ 		.then(function (data) {
+			alert("Action Successful: " + uiAction);
+ 			return data;
+ 		})
+ 		.catch(function(error) {
+ 			console.log("Action Failure: " + uiAction);
+ 			return Promise.reject(error);
+ 		});
+ 	}
 
-	let options = {
-		method: 'GET'
-	};
-	return sendRequest(svcUrl, svcAction, options);
-}
-
-function sendRequest(svcUrl, svcAction) {
-	fetch(svcUrl, options)
-		.then(
-			response => {
-				alertService.alertMessage("Action Successful: " + svcAction, 1)
-			}).error(error => {
-				alertService.alertMessage("Action Failure: " + svcAction, 2);
-				return Promise.reject(error);
-			});
 
-	return response.json();
-};
+	static refreshStatus(cl_name) {
+		console.log("Refresh the status for closedloopName=" + cl_name);
 
-export default loopActionService;
\ No newline at end of file
+		return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, {
+			method: 'GET',
+			credentials: 'same-origin',
+		})
+		.then(function (response) {
+			if (response.ok) {
+				return response.json();
+			} else {
+				return Promise.reject("Refresh status failed with code:" + response.status);
+			}
+		})
+		.then(function (data) {
+			console.info ("Refresh status Successful");
+			return data;
+		})
+		.catch(function(error) {
+			console.info ("Refresh status failed:", error);
+			return Promise.reject(error);
+		});
+ 	}
+}
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 811a48ba0..5022152e3 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -21,21 +21,13 @@
  *
  */
 import React from 'react';
+import Nav from 'react-bootstrap/Nav';
 import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
 import 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom'
 
-const StyledNavDropdownItem = styled(NavDropdown.Item)`
-	color: ${props => props.theme.menuFontColor};
-	background-color: ${props => props.theme.menuBackgroundColor};
-	:hover {
-			background-color: ${props => props.theme.menuHighlightedBackgroundColor};
-			color:  ${props => props.theme.menuHighlightedFontColor};
-	}
-`;
-
 const StyledLink = styled(Link)`
 	color: ${props => props.theme.menuColor};
 	background-color: ${props => props.theme.menuBackgroundColor};
@@ -53,31 +45,41 @@ const StyledLink = styled(Link)`
 			color:  ${props => props.theme.loopViewerHeaderFontColor};
 	}
 `;
-
+const StyledNavLink = styled(Nav.Link)`
+	color: ${props => props.theme.menuColor};
+	background-color: ${props => props.theme.menuBackgroundColor};
+  font-weight: normal;
+	padding: .25rem 1.5rem;
+	:hover {
+			background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+			color:  ${props => props.theme.loopViewerHeaderFontColor}
+	}
+`;
 export default class MenuBar extends React.Component {
+
 	render () {
 		return (
-				<Navbar.Collapse id="basic-navbar-nav" className="justify-content-center">
-					<NavDropdown title="Closed Loop" id="basic-nav-dropdown">
-						<StyledNavDropdownItem as={StyledLink} to="/openLoop">Open CL</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="/loopProperties">Properties CL</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="/closeLoop">Close Model</StyledNavDropdownItem>
+				<Navbar.Collapse>
+					<NavDropdown title="Closed Loop">
+							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/loopProperties">Properties CL</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/closeLoop">Close Model</NavDropdown.Item>
 					</NavDropdown>
-					<NavDropdown title="Manage" id="basic-nav-dropdown">
-						<StyledNavDropdownItem as={StyledLink} to="/operationalPolicyModal">Submit</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="#action/3.2">Stop</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">Restart</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">Delete</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">Deploy</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="#action/3.3">UnDeploy</StyledNavDropdownItem>
+					<NavDropdown title="Manage">
+							<NavDropdown.Item as={StyledLink} to="/submit">Submit</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/stop">Stop</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/restart">Restart</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/delete">Delete</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/deploy">Deploy</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/undeploy">UnDeploy</NavDropdown.Item>
 					</NavDropdown>
-					<NavDropdown title="View" id="basic-nav-dropdown">
-						<StyledNavDropdownItem as={StyledLink} to="#action/3.1">Refresh Status</StyledNavDropdownItem>
+					<NavDropdown title="View">
+							<NavDropdown.Item as={StyledLink} to="/refreshStatus">Refresh Status</NavDropdown.Item>
 					</NavDropdown>
-					<NavDropdown title="Help" id="basic-nav-dropdown">
-						<StyledNavDropdownItem href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavDropdownItem>
-						<StyledNavDropdownItem href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavDropdownItem>
-						<StyledNavDropdownItem as={StyledLink} to="/userInfo">User Info</StyledNavDropdownItem>
+					<NavDropdown title="Help">
+							<StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>
+							<StyledNavLink href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavLink>
+							<NavDropdown.Item as={StyledLink} to="/userInfo">User Info</NavDropdown.Item>
 					</NavDropdown>
 				</Navbar.Collapse>
 		);
diff --git a/ui-react/src/components/menu/PerformActions.js b/ui-react/src/components/menu/PerformActions.js
new file mode 100644
index 000000000..9c34e141b
--- /dev/null
+++ b/ui-react/src/components/menu/PerformActions.js
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopActionService from '../../api/LoopActionService';
+import Spinner from 'react-bootstrap/Spinner'
+import styled from 'styled-components';
+
+const StyledSpinnerDiv = styled.div`
+	justify-content: center !important;
+	display: flex !important;
+`;
+
+export default class PerformActions extends React.Component {
+	state = {
+		loopName: this.props.loopCache.getLoopName(),
+		loopAction: this.props.loopAction
+	};
+	constructor(props, context) {
+		super(props, context);
+
+		this.refreshStatus = this.refreshStatus.bind(this);
+	}
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName(),
+			loopAction: newProps.loopAction
+		});
+	}
+
+	componentDidMount() {
+		const action = this.state.loopAction;
+		const loopName = this.state.loopName;
+		console.log("Perform action:" + action);
+		LoopActionService.performAction(loopName, action).then(pars => {
+			alert("Action " + action + " successfully performed");
+			// refresh status and update loop logs
+			this.refreshStatus(loopName);
+		})
+		.catch(error => {
+			alert("Action " + action + " failed");
+			// refresh status and update loop logs
+			this.refreshStatus(loopName);
+		});
+
+	}
+
+	refreshStatus(loopName) {
+		LoopActionService.refreshStatus(loopName).then(data => {
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+			.catch(error => {
+			this.props.history.push('/');
+		});
+	}
+
+	render() {
+		return (
+			<StyledSpinnerDiv>
+				<Spinner animation="border" role="status">
+				</Spinner>
+			</StyledSpinnerDiv>
+		);
+	}
+}
diff --git a/ui-react/src/components/menu/RefreshStatus.js b/ui-react/src/components/menu/RefreshStatus.js
new file mode 100644
index 000000000..cf08655ee
--- /dev/null
+++ b/ui-react/src/components/menu/RefreshStatus.js
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopActionService from '../../api/LoopActionService';
+import Spinner from 'react-bootstrap/Spinner'
+import styled from 'styled-components';
+
+const StyledSpinnerDiv = styled.div`
+	justify-content: center !important;
+	display: flex !important;
+`;
+
+export default class RefreshStatus extends React.Component {
+	state = {
+		loopName: this.props.loopCache.getLoopName()
+	};
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName()
+		});
+	}
+
+	componentDidMount() {
+		console.log("Refresh status for: " + this.state.loopName);
+		// refresh status and update loop logs
+		LoopActionService.refreshStatus(this.state.loopName).then(data => {
+			alert("Status successfully refreshed")
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+		.catch(error => {
+			alert("Status refreshing failed");
+			this.props.history.push('/');
+		});
+	}
+
+	render() {
+		return (
+			<StyledSpinnerDiv>
+				<Spinner animation="border" role="status">
+				</Spinner>
+			</StyledSpinnerDiv>
+		);
+	}
+}
-- 
cgit 1.2.3-korg


From 691e2b7a8bb16d224a0fbe30390152ea309e88e2 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Fri, 16 Aug 2019 11:07:24 +0200
Subject: Rework deploy action and close model

Rework the deploy action and the close model feature.

Issue-ID: CLAMP-445, CLAMP-451
Change-Id: Ic122a584b676d50b9bddcac6e5553266b2281a01
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js                             |  18 ++-
 ui-react/src/React-Spinner.jpg                     | Bin 5140 -> 0 bytes
 ui-react/src/components/dialogs/DeployLoop.js      | 128 +++++++++++++++++++++
 ui-react/src/components/dialogs/LoopProperties.js  |   7 +-
 ui-react/src/components/dialogs/PerformActions.js  |  85 ++++++++++++++
 ui-react/src/components/dialogs/RefreshStatus.js   |  66 +++++++++++
 ui-react/src/components/loop_viewer/svg/LoopSvg.js |  17 +--
 ui-react/src/components/menu/MenuBar.js            |  31 +++--
 ui-react/src/components/menu/PerformActions.js     |  85 --------------
 ui-react/src/components/menu/RefreshStatus.js      |  66 -----------
 10 files changed, 326 insertions(+), 177 deletions(-)
 delete mode 100644 ui-react/src/React-Spinner.jpg
 create mode 100644 ui-react/src/components/dialogs/DeployLoop.js
 create mode 100644 ui-react/src/components/dialogs/PerformActions.js
 create mode 100644 ui-react/src/components/dialogs/RefreshStatus.js
 delete mode 100644 ui-react/src/components/menu/PerformActions.js
 delete mode 100644 ui-react/src/components/menu/RefreshStatus.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index c7080a2b6..5b8283f8f 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -34,7 +34,7 @@ import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
 import LoopCache from './api/LoopCache';
 
-import { Route, Redirect } from 'react-router-dom'
+import { Route } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
@@ -43,6 +43,7 @@ import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
 import PerformAction from './components/menu/PerformActions';
 import RefreshStatus from './components/menu/RefreshStatus';
+import DeployLoop from './components/menu/DeployLoop';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -90,6 +91,7 @@ export default class LoopUI extends React.Component {
 		this.getUser = this.getUser.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
+		this.closeLoop = this.closeLoop.bind(this);
 	}
 
 	componentWillMount() {
@@ -104,7 +106,7 @@ export default class LoopUI extends React.Component {
 
 	renderMenuNavBar() {
 		return (
-			<MenuBar/>
+			<MenuBar loopName={this.state.loopName}/>
 		);
 	}
 
@@ -168,8 +170,7 @@ export default class LoopUI extends React.Component {
 	}
 
 	updateLoopCache(loopJson) {
-		this.setState({ loopCache: new LoopCache(loopJson) });
-		this.setState({ loopName: this.state.loopCache.getLoopName() });
+		this.setState({ loopCache: new LoopCache(loopJson), loopName: this.state.loopCache.getLoopName() });
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
 
@@ -180,7 +181,11 @@ export default class LoopUI extends React.Component {
 		});
 	}
 
-	render() {
+	closeLoop() {
+		this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
+		this.props.history.push('/');
+	}
+ render() {
 		return (
 				<div id="main_div">
 				<Route path="/operationalPolicyModal"
@@ -189,12 +194,13 @@ export default class LoopUI extends React.Component {
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
-				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
+				<Route path="/closeLoop" render={this.closeLoop} />
 				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 					<GlobalClampStyle />
 					{this.renderNavBar()}
diff --git a/ui-react/src/React-Spinner.jpg b/ui-react/src/React-Spinner.jpg
deleted file mode 100644
index 227689764..000000000
Binary files a/ui-react/src/React-Spinner.jpg and /dev/null differ
diff --git a/ui-react/src/components/dialogs/DeployLoop.js b/ui-react/src/components/dialogs/DeployLoop.js
new file mode 100644
index 000000000..2ec395d23
--- /dev/null
+++ b/ui-react/src/components/dialogs/DeployLoop.js
@@ -0,0 +1,128 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopActionService from '../../api/LoopActionService';
+import LoopService from '../../api/LoopService';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import styled from 'styled-components';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const FormStyled = styled(Form.Group)`
+	padding: .25rem 1.5rem;
+`
+export default class DeployLoop extends React.Component {
+	state = {
+		loopCache: this.props.loopCache,
+		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
+		show: true
+	};
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleSave = this.handleSave.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleChange = this.handleChange.bind(this);
+		this.refreshStatus = this.refreshStatus.bind(this);
+		this.renderDeployParam = this.renderDeployParam.bind(this);
+	}
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName(),
+			show: true
+		});
+	}
+	handleClose(){
+		this.props.history.push('/');
+	}
+	handleSave(e) {
+		const loopName = this.props.loopCache.getLoopName();
+		// save the global propserties
+		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
+			this.setState({ show: false });
+
+			console.log("Perform action: deploy");
+			LoopActionService.performAction(loopName, "deploy").then(pars => {
+				alert("Action deploy successfully performed");
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			})
+			.catch(error => {
+				alert("Action deploy failed");
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			});
+		});
+	}
+
+	refreshStatus(loopName) {
+		LoopActionService.refreshStatus(loopName).then(data => {
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+		.catch(error => {
+			alert("Refresh status failed");
+			this.props.history.push('/');
+		});
+	}
+	handleChange(event) {
+		let deploymentParam = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		deploymentParam[event.target.name] = event.target.value;
+
+		this.setState({temporaryPropertiesJson:{dcaeDeployParameters: deploymentParam}});
+	}
+	renderDeployParam() {
+		if (typeof (this.state.temporaryPropertiesJson) === "undefined") {
+			 return "";
+		}
+
+		const deployJson = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		var indents = [];
+		Object.keys(deployJson).map((item,key) =>
+		indents.push(<FormStyled>
+				<Form.Label>{item}</Form.Label>
+				<Form.Control type="text" name={item} onChange={this.handleChange} defaultValue={deployJson[item]}></Form.Control>
+			</FormStyled>));
+
+			return indents;
+	}
+
+
+	render() {
+		return (
+					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
+						<Modal.Header closeButton>
+							<Modal.Title>Deployment parameters</Modal.Title>
+						</Modal.Header>
+						{this.renderDeployParam()}
+						<Modal.Footer>
+							<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+							<Button variant="primary" type="submit" onClick={this.handleSave}>Deploy</Button>
+						</Modal.Footer>
+					</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
index dac77655f..fa82a7e48 100644
--- a/ui-react/src/components/dialogs/LoopProperties.js
+++ b/ui-react/src/components/dialogs/LoopProperties.js
@@ -30,7 +30,6 @@ import LoopService from '../../api/LoopService';
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-
 export default class LoopProperties extends React.Component {
 
 	state = {
@@ -45,7 +44,7 @@ export default class LoopProperties extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
 		this.handleChange = this.handleChange.bind(this);
-		
+
 		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
 		this.renderAllParameters = this.renderAllParameters.bind(this);
 		this.getDcaeParameters = this.getDcaeParameters.bind(this);
@@ -55,7 +54,7 @@ export default class LoopProperties extends React.Component {
 		this.setState({
 			loopCache: newProps.loopCache,
 			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties())),
-			
+
 		});
 	}
 
@@ -90,7 +89,7 @@ export default class LoopProperties extends React.Component {
 		} else {
 			return "";
 		}
-		
+
 	}
 
 	renderDcaeParameters() {
diff --git a/ui-react/src/components/dialogs/PerformActions.js b/ui-react/src/components/dialogs/PerformActions.js
new file mode 100644
index 000000000..9c34e141b
--- /dev/null
+++ b/ui-react/src/components/dialogs/PerformActions.js
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopActionService from '../../api/LoopActionService';
+import Spinner from 'react-bootstrap/Spinner'
+import styled from 'styled-components';
+
+const StyledSpinnerDiv = styled.div`
+	justify-content: center !important;
+	display: flex !important;
+`;
+
+export default class PerformActions extends React.Component {
+	state = {
+		loopName: this.props.loopCache.getLoopName(),
+		loopAction: this.props.loopAction
+	};
+	constructor(props, context) {
+		super(props, context);
+
+		this.refreshStatus = this.refreshStatus.bind(this);
+	}
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName(),
+			loopAction: newProps.loopAction
+		});
+	}
+
+	componentDidMount() {
+		const action = this.state.loopAction;
+		const loopName = this.state.loopName;
+		console.log("Perform action:" + action);
+		LoopActionService.performAction(loopName, action).then(pars => {
+			alert("Action " + action + " successfully performed");
+			// refresh status and update loop logs
+			this.refreshStatus(loopName);
+		})
+		.catch(error => {
+			alert("Action " + action + " failed");
+			// refresh status and update loop logs
+			this.refreshStatus(loopName);
+		});
+
+	}
+
+	refreshStatus(loopName) {
+		LoopActionService.refreshStatus(loopName).then(data => {
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+			.catch(error => {
+			this.props.history.push('/');
+		});
+	}
+
+	render() {
+		return (
+			<StyledSpinnerDiv>
+				<Spinner animation="border" role="status">
+				</Spinner>
+			</StyledSpinnerDiv>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/RefreshStatus.js b/ui-react/src/components/dialogs/RefreshStatus.js
new file mode 100644
index 000000000..cf08655ee
--- /dev/null
+++ b/ui-react/src/components/dialogs/RefreshStatus.js
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopActionService from '../../api/LoopActionService';
+import Spinner from 'react-bootstrap/Spinner'
+import styled from 'styled-components';
+
+const StyledSpinnerDiv = styled.div`
+	justify-content: center !important;
+	display: flex !important;
+`;
+
+export default class RefreshStatus extends React.Component {
+	state = {
+		loopName: this.props.loopCache.getLoopName()
+	};
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName()
+		});
+	}
+
+	componentDidMount() {
+		console.log("Refresh status for: " + this.state.loopName);
+		// refresh status and update loop logs
+		LoopActionService.refreshStatus(this.state.loopName).then(data => {
+			alert("Status successfully refreshed")
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+		.catch(error => {
+			alert("Status refreshing failed");
+			this.props.history.push('/');
+		});
+	}
+
+	render() {
+		return (
+			<StyledSpinnerDiv>
+				<Spinner animation="border" role="status">
+				</Spinner>
+			</StyledSpinnerDiv>
+		);
+	}
+}
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 3ac2f31fd..1b1e24280 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -61,13 +61,14 @@ class LoopViewSvg extends React.Component {
 		return this.state.svgContent !== nextState.svgContent;
 	}
 
-	componentWillReceiveProps(newProps) {
-		this.setState({
-			loopCache: newProps.loopCache,
-			componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache),
-
-		});
-		this.getSvg(newProps.loopCache.getLoopName());
+	componentWillReceiveProps(newProps) {	
+		if (this.state.loopCache !== newProps.loopCache) {
+			this.setState({
+				loopCache: newProps.loopCache,
+				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache),
+			});
+			this.getSvg(newProps.loopCache.getLoopName());
+		}
 	}
 
 	getSvg(loopName) {
@@ -79,6 +80,8 @@ class LoopViewSvg extends React.Component {
 					this.setState({ svgContent: LoopViewSvg.emptySvg })
 				}
 			});
+		} else {
+			this.setState({ svgContent: LoopViewSvg.emptySvg })
 		}
 	}
 
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 5022152e3..121787ffd 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -24,6 +24,7 @@ import React from 'react';
 import Nav from 'react-bootstrap/Nav';
 import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
+import LoopUI from '../../LoopUI';
 import 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom'
@@ -56,25 +57,37 @@ const StyledNavLink = styled(Nav.Link)`
 	}
 `;
 export default class MenuBar extends React.Component {
+	state = {
+		loopName: this.props.loopName,
+		disabled: true
+	};
+
+	componentWillReceiveProps(newProps) {
+		if (newProps.loopName !== LoopUI.defaultLoopName) {
+			this.setState({ disabled: false });
+		} else {
+			this.setState({ disabled: true });
+		}
+	}
 
 	render () {
 		return (
 				<Navbar.Collapse>
 					<NavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/loopProperties">Properties CL</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/closeLoop">Close Model</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties CL</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close Model</NavDropdown.Item>
 					</NavDropdown>
 					<NavDropdown title="Manage">
-							<NavDropdown.Item as={StyledLink} to="/submit">Submit</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/stop">Stop</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/restart">Restart</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/delete">Delete</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/deploy">Deploy</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/undeploy">UnDeploy</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Submit</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Stop</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>Restart</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy</NavDropdown.Item>
 					</NavDropdown>
 					<NavDropdown title="View">
-							<NavDropdown.Item as={StyledLink} to="/refreshStatus">Refresh Status</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
 					</NavDropdown>
 					<NavDropdown title="Help">
 							<StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>
diff --git a/ui-react/src/components/menu/PerformActions.js b/ui-react/src/components/menu/PerformActions.js
deleted file mode 100644
index 9c34e141b..000000000
--- a/ui-react/src/components/menu/PerformActions.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import LoopActionService from '../../api/LoopActionService';
-import Spinner from 'react-bootstrap/Spinner'
-import styled from 'styled-components';
-
-const StyledSpinnerDiv = styled.div`
-	justify-content: center !important;
-	display: flex !important;
-`;
-
-export default class PerformActions extends React.Component {
-	state = {
-		loopName: this.props.loopCache.getLoopName(),
-		loopAction: this.props.loopAction
-	};
-	constructor(props, context) {
-		super(props, context);
-
-		this.refreshStatus = this.refreshStatus.bind(this);
-	}
-	componentWillReceiveProps(newProps) {
-		this.setState({
-			loopName: newProps.loopCache.getLoopName(),
-			loopAction: newProps.loopAction
-		});
-	}
-
-	componentDidMount() {
-		const action = this.state.loopAction;
-		const loopName = this.state.loopName;
-		console.log("Perform action:" + action);
-		LoopActionService.performAction(loopName, action).then(pars => {
-			alert("Action " + action + " successfully performed");
-			// refresh status and update loop logs
-			this.refreshStatus(loopName);
-		})
-		.catch(error => {
-			alert("Action " + action + " failed");
-			// refresh status and update loop logs
-			this.refreshStatus(loopName);
-		});
-
-	}
-
-	refreshStatus(loopName) {
-		LoopActionService.refreshStatus(loopName).then(data => {
-			this.props.updateLoopFunction(data);
-			this.props.history.push('/');
-		})
-			.catch(error => {
-			this.props.history.push('/');
-		});
-	}
-
-	render() {
-		return (
-			<StyledSpinnerDiv>
-				<Spinner animation="border" role="status">
-				</Spinner>
-			</StyledSpinnerDiv>
-		);
-	}
-}
diff --git a/ui-react/src/components/menu/RefreshStatus.js b/ui-react/src/components/menu/RefreshStatus.js
deleted file mode 100644
index cf08655ee..000000000
--- a/ui-react/src/components/menu/RefreshStatus.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import LoopActionService from '../../api/LoopActionService';
-import Spinner from 'react-bootstrap/Spinner'
-import styled from 'styled-components';
-
-const StyledSpinnerDiv = styled.div`
-	justify-content: center !important;
-	display: flex !important;
-`;
-
-export default class RefreshStatus extends React.Component {
-	state = {
-		loopName: this.props.loopCache.getLoopName()
-	};
-
-	componentWillReceiveProps(newProps) {
-		this.setState({
-			loopName: newProps.loopCache.getLoopName()
-		});
-	}
-
-	componentDidMount() {
-		console.log("Refresh status for: " + this.state.loopName);
-		// refresh status and update loop logs
-		LoopActionService.refreshStatus(this.state.loopName).then(data => {
-			alert("Status successfully refreshed")
-			this.props.updateLoopFunction(data);
-			this.props.history.push('/');
-		})
-		.catch(error => {
-			alert("Status refreshing failed");
-			this.props.history.push('/');
-		});
-	}
-
-	render() {
-		return (
-			<StyledSpinnerDiv>
-				<Spinner animation="border" role="status">
-				</Spinner>
-			</StyledSpinnerDiv>
-		);
-	}
-}
-- 
cgit 1.2.3-korg


From f9e2ceeae29504505f631086e612fad4e1e16979 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 9 Aug 2019 18:36:09 +0200
Subject: Draft of op policy

First draft of the Operational policy based on JsonEditor, it's a wip
code

Issue-ID: CLAMP-430
Change-Id: I2c7970e94488f4020377fd9d4d00691a3590b13e
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 extra/sql/bulkload/create-tables.sql               |   1 +
 src/main/java/org/onap/clamp/loop/Loop.java        |  39 +-
 .../org/onap/clamp/loop/LoopCsarInstaller.java     |  68 +--
 .../operational/LegacyOperationalPolicy.java       |  37 +-
 .../policy/operational/OperationalPolicy.java      |  37 +-
 .../OperationalPolicyRepresentationBuilder.java    | 146 ++++++
 .../operational_policies/operational_policy.json   | 362 +++++++++++++
 .../microservice/OperationalPolicyPayloadTest.java |  20 +-
 ...OperationalPolicyRepresentationBuilderTest.java |  52 ++
 ...OperationalPolicyRepresentationBuilderTest.java |  52 ++
 .../resources/tosca/guard1-policy-payload.json     |  19 +-
 .../resources/tosca/guard2-policy-payload.json     |  20 +-
 .../tosca/operational-policy-json-schema.json      | 574 +++++++++++++++++++++
 .../tosca/operational-policy-payload-legacy.yaml   |  52 +-
 .../tosca/operational-policy-payload.json          |   2 +-
 .../tosca/operational-policy-payload.yaml          |  60 ++-
 .../tosca/operational-policy-properties.json       | 149 +++---
 .../resources/tosca/pdp-group-policy-payload.json  |   4 +-
 ui-react/package.json                              |   2 +-
 ui-react/src/LoopUI.js                             |   7 +-
 ui-react/src/api/LoopCache.js                      |   4 +
 ui-react/src/api/LoopService.js                    |  24 +
 .../ConfigurationPolicyModal.js                    |   2 +-
 .../OperationalPolicy/OperationalPolicyModal.js    | 533 +++----------------
 ui-react/src/index.js                              |   2 +-
 ui-react/src/theme/globalStyle.js                  |  13 +
 26 files changed, 1579 insertions(+), 702 deletions(-)
 create mode 100644 src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
 create mode 100644 src/main/resources/clds/json-schema/operational_policies/operational_policy.json
 create mode 100644 src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
 create mode 100644 src/test/resources/clds/OperationalPolicyRepresentationBuilderTest.java
 create mode 100644 src/test/resources/tosca/operational-policy-json-schema.json

(limited to 'ui-react/src')

diff --git a/extra/sql/bulkload/create-tables.sql b/extra/sql/bulkload/create-tables.sql
index 121c5e689..aef3a7e7d 100644
--- a/extra/sql/bulkload/create-tables.sql
+++ b/extra/sql/bulkload/create-tables.sql
@@ -24,6 +24,7 @@
         global_properties_json json,
         last_computed_state varchar(255) not null,
         model_properties_json json,
+        operational_policy_schema json not null,
         svg_representation MEDIUMTEXT,
         primary key (name)
     ) engine=InnoDB;
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index 2393f2498..37d597eeb 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -23,9 +23,13 @@
 
 package org.onap.clamp.loop;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.Expose;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -59,6 +63,7 @@ import org.onap.clamp.loop.components.external.PolicyComponent;
 import org.onap.clamp.loop.log.LoopLog;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
 
 @Entity
 @Table(name = "loops")
@@ -70,6 +75,9 @@ public class Loop implements Serializable {
      */
     private static final long serialVersionUID = -286522707701388642L;
 
+    @Transient
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(Loop.class);
+
     @Id
     @Expose
     @Column(nullable = false, name = "name", unique = true)
@@ -90,6 +98,11 @@ public class Loop implements Serializable {
     @Column(columnDefinition = "MEDIUMTEXT", name = "svg_representation")
     private String svgRepresentation;
 
+    @Expose
+    @Type(type = "json")
+    @Column(columnDefinition = "json", name = "operational_policy_schema")
+    private JsonObject operationalPolicySchema;
+
     @Expose
     @Type(type = "json")
     @Column(columnDefinition = "json", name = "global_properties_json")
@@ -131,6 +144,9 @@ public class Loop implements Serializable {
         this.addComponent(new DcaeComponent());
     }
 
+    /**
+     * Public constructor.
+     */
     public Loop() {
         initializeExternalComponents();
     }
@@ -256,6 +272,13 @@ public class Loop implements Serializable {
 
     void setModelPropertiesJson(JsonObject modelPropertiesJson) {
         this.modelPropertiesJson = modelPropertiesJson;
+        try {
+            this.operationalPolicySchema = OperationalPolicyRepresentationBuilder
+                    .generateOperationalPolicySchema(this.getModelPropertiesJson());
+        } catch (JsonSyntaxException | IOException | NullPointerException e) {
+            logger.error("Unable to generate the operational policy Schema ... ", e);
+            this.operationalPolicySchema = new JsonObject();
+        }
     }
 
     public Map<String, ExternalComponent> getComponents() {
@@ -273,20 +296,16 @@ public class Loop implements Serializable {
     /**
      * Generate the loop name.
      *
-     * @param serviceName
-     *        The service name
-     * @param serviceVersion
-     *        The service version
-     * @param resourceName
-     *        The resource name
-     * @param blueprintFileName
-     *        The blueprint file name
+     * @param serviceName       The service name
+     * @param serviceVersion    The service version
+     * @param resourceName      The resource name
+     * @param blueprintFileName The blueprint file name
      * @return The generated loop name
      */
     static String generateLoopName(String serviceName, String serviceVersion, String resourceName,
-        String blueprintFilename) {
+            String blueprintFilename) {
         StringBuilder buffer = new StringBuilder("LOOP_").append(serviceName).append("_v").append(serviceVersion)
-            .append("_").append(resourceName).append("_").append(blueprintFilename.replaceAll(".yaml", ""));
+                .append("_").append(resourceName).append("_").append(blueprintFilename.replaceAll(".yaml", ""));
         return buffer.toString().replace('.', '_').replaceAll(" ", "");
     }
 
diff --git a/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java b/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java
index ad13ad34d..41d34a224 100644
--- a/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java
+++ b/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java
@@ -99,10 +99,10 @@ public class LoopCsarInstaller implements CsarInstaller {
         boolean alreadyInstalled = true;
         for (Entry<String, BlueprintArtifact> blueprint : csar.getMapOfBlueprints().entrySet()) {
             alreadyInstalled = alreadyInstalled
-                && loopRepository.existsById(Loop.generateLoopName(csar.getSdcNotification().getServiceName(),
-                    csar.getSdcNotification().getServiceVersion(),
-                    blueprint.getValue().getResourceAttached().getResourceInstanceName(),
-                    blueprint.getValue().getBlueprintArtifactName()));
+                    && loopRepository.existsById(Loop.generateLoopName(csar.getSdcNotification().getServiceName(),
+                            csar.getSdcNotification().getServiceVersion(),
+                            blueprint.getValue().getResourceAttached().getResourceInstanceName(),
+                            blueprint.getValue().getBlueprintArtifactName()));
         }
         return alreadyInstalled;
     }
@@ -110,7 +110,7 @@ public class LoopCsarInstaller implements CsarInstaller {
     @Override
     @Transactional(propagation = Propagation.REQUIRED)
     public void installTheCsar(CsarHandler csar)
-        throws SdcArtifactInstallerException, InterruptedException, PolicyModelException {
+            throws SdcArtifactInstallerException, InterruptedException, PolicyModelException {
         try {
             logger.info("Installing the CSAR " + csar.getFilePath());
             for (Entry<String, BlueprintArtifact> blueprint : csar.getMapOfBlueprints().entrySet()) {
@@ -126,53 +126,53 @@ public class LoopCsarInstaller implements CsarInstaller {
     }
 
     private Loop createLoopFromBlueprint(CsarHandler csar, BlueprintArtifact blueprintArtifact)
-        throws IOException, ParseException, InterruptedException {
+            throws IOException, ParseException, InterruptedException {
         Loop newLoop = new Loop();
         newLoop.setBlueprint(blueprintArtifact.getDcaeBlueprint());
         newLoop.setName(Loop.generateLoopName(csar.getSdcNotification().getServiceName(),
-            csar.getSdcNotification().getServiceVersion(),
-            blueprintArtifact.getResourceAttached().getResourceInstanceName(),
-            blueprintArtifact.getBlueprintArtifactName()));
+                csar.getSdcNotification().getServiceVersion(),
+                blueprintArtifact.getResourceAttached().getResourceInstanceName(),
+                blueprintArtifact.getBlueprintArtifactName()));
         newLoop.setLastComputedState(LoopState.DESIGN);
 
         List<MicroService> microServicesChain = chainGenerator
-            .getChainOfMicroServices(blueprintParser.getMicroServices(blueprintArtifact.getDcaeBlueprint()));
+                .getChainOfMicroServices(blueprintParser.getMicroServices(blueprintArtifact.getDcaeBlueprint()));
         if (microServicesChain.isEmpty()) {
             microServicesChain = blueprintParser.fallbackToOneMicroService(blueprintArtifact.getDcaeBlueprint());
         }
-
-        newLoop
-            .setMicroServicePolicies(createMicroServicePolicies(microServicesChain, csar, blueprintArtifact, newLoop));
+        newLoop.setModelPropertiesJson(createModelPropertiesJson(csar));
+        newLoop.setMicroServicePolicies(
+                createMicroServicePolicies(microServicesChain, csar, blueprintArtifact, newLoop));
         newLoop.setOperationalPolicies(createOperationalPolicies(csar, blueprintArtifact, newLoop));
 
         newLoop.setSvgRepresentation(svgFacade.getSvgImage(microServicesChain));
         newLoop.setGlobalPropertiesJson(createGlobalPropertiesJson(blueprintArtifact, newLoop));
-        newLoop.setModelPropertiesJson(createModelPropertiesJson(csar));
+
         DcaeInventoryResponse dcaeResponse = queryDcaeToGetServiceTypeId(blueprintArtifact);
         newLoop.setDcaeBlueprintId(dcaeResponse.getTypeId());
         return newLoop;
     }
 
     private HashSet<OperationalPolicy> createOperationalPolicies(CsarHandler csar, BlueprintArtifact blueprintArtifact,
-        Loop newLoop) {
+            Loop newLoop) {
         return new HashSet<>(Arrays.asList(new OperationalPolicy(Policy.generatePolicyName("OPERATIONAL",
-            csar.getSdcNotification().getServiceName(), csar.getSdcNotification().getServiceVersion(),
-            blueprintArtifact.getResourceAttached().getResourceInstanceName(),
-            blueprintArtifact.getBlueprintArtifactName()), newLoop, new JsonObject())));
+                csar.getSdcNotification().getServiceName(), csar.getSdcNotification().getServiceVersion(),
+                blueprintArtifact.getResourceAttached().getResourceInstanceName(),
+                blueprintArtifact.getBlueprintArtifactName()), newLoop, new JsonObject())));
     }
 
     private HashSet<MicroServicePolicy> createMicroServicePolicies(List<MicroService> microServicesChain,
-        CsarHandler csar, BlueprintArtifact blueprintArtifact, Loop newLoop) throws IOException {
+            CsarHandler csar, BlueprintArtifact blueprintArtifact, Loop newLoop) throws IOException {
         HashSet<MicroServicePolicy> newSet = new HashSet<>();
 
         for (MicroService microService : microServicesChain) {
             MicroServicePolicy microServicePolicy = new MicroServicePolicy(
-                Policy.generatePolicyName(microService.getName(), csar.getSdcNotification().getServiceName(),
-                    csar.getSdcNotification().getServiceVersion(),
-                    blueprintArtifact.getResourceAttached().getResourceInstanceName(),
-                    blueprintArtifact.getBlueprintArtifactName()),
-                microService.getModelType(), csar.getPolicyModelYaml().orElse(""), false,
-                new HashSet<>(Arrays.asList(newLoop)));
+                    Policy.generatePolicyName(microService.getName(), csar.getSdcNotification().getServiceName(),
+                            csar.getSdcNotification().getServiceVersion(),
+                            blueprintArtifact.getResourceAttached().getResourceInstanceName(),
+                            blueprintArtifact.getBlueprintArtifactName()),
+                    microService.getModelType(), csar.getPolicyModelYaml().orElse(""), false,
+                    new HashSet<>(Arrays.asList(newLoop)));
 
             newSet.add(microServicePolicy);
             microService.setMappedNameJpa(microServicePolicy.getName());
@@ -191,8 +191,8 @@ public class LoopCsarInstaller implements CsarInstaller {
         // Loop on all Groups defined in the service (VFModule entries type:
         // org.openecomp.groups.VfModule)
         for (IEntityDetails entity : csar.getSdcCsarHelper().getEntity(
-            EntityQuery.newBuilder(EntityTemplateType.GROUP).build(),
-            TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE).build(), false)) {
+                EntityQuery.newBuilder(EntityTemplateType.GROUP).build(),
+                TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE).build(), false)) {
             // Get all metadata info
             JsonObject allVfProps = (JsonObject) JsonUtils.GSON.toJsonTree(entity.getMetadata().getAllProperties());
             vfModuleProps.add(entity.getMetadata().getAllProperties().get("vfModuleModelName"), allVfProps);
@@ -200,7 +200,7 @@ public class LoopCsarInstaller implements CsarInstaller {
             // volume_group, etc ... fields under the VFmodule name
             for (Entry<String, Property> additionalProp : entity.getProperties().entrySet()) {
                 allVfProps.add(additionalProp.getValue().getName(),
-                    JsonUtils.GSON.toJsonTree(additionalProp.getValue().getValue()));
+                        JsonUtils.GSON.toJsonTree(additionalProp.getValue().getValue()));
             }
         }
         return vfModuleProps;
@@ -214,7 +214,7 @@ public class LoopCsarInstaller implements CsarInstaller {
             // For each type, get the metadata of each nodetemplate
             for (NodeTemplate nodeTemplate : csar.getSdcCsarHelper().getServiceNodeTemplateBySdcType(type)) {
                 resourcesPropByType.add(nodeTemplate.getName(),
-                    JsonUtils.GSON.toJsonTree(nodeTemplate.getMetaData().getAllProperties()));
+                        JsonUtils.GSON.toJsonTree(nodeTemplate.getMetaData().getAllProperties()));
             }
             resourcesProp.add(type.getValue(), resourcesPropByType);
         }
@@ -225,7 +225,7 @@ public class LoopCsarInstaller implements CsarInstaller {
         JsonObject modelProperties = new JsonObject();
         // Add service details
         modelProperties.add("serviceDetails", JsonUtils.GSON.fromJson(
-            JsonUtils.GSON.toJson(csar.getSdcCsarHelper().getServiceMetadataAllProperties()), JsonObject.class));
+                JsonUtils.GSON.toJson(csar.getSdcCsarHelper().getServiceMetadataAllProperties()), JsonObject.class));
         // Add properties details for each type, VfModule, VF, VFC, ....
         JsonObject resourcesProp = createServicePropertiesByType(csar);
         resourcesProp.add("VFModule", createVfModuleProperties(csar));
@@ -237,7 +237,7 @@ public class LoopCsarInstaller implements CsarInstaller {
         JsonObject node = new JsonObject();
         Yaml yaml = new Yaml();
         Map<String, Object> inputsNodes = ((Map<String, Object>) ((Map<String, Object>) yaml
-            .load(blueprintArtifact.getDcaeBlueprint())).get("inputs"));
+                .load(blueprintArtifact.getDcaeBlueprint())).get("inputs"));
         inputsNodes.entrySet().stream().filter(e -> !e.getKey().contains("policy_id")).forEach(elem -> {
             Object defaultValue = ((Map<String, Object>) elem.getValue()).get("default");
             if (defaultValue != null) {
@@ -258,10 +258,10 @@ public class LoopCsarInstaller implements CsarInstaller {
      * @return The DcaeInventoryResponse object containing the dcae values
      */
     private DcaeInventoryResponse queryDcaeToGetServiceTypeId(BlueprintArtifact blueprintArtifact)
-        throws IOException, ParseException, InterruptedException {
+            throws IOException, ParseException, InterruptedException {
         return dcaeInventoryService.getDcaeInformation(blueprintArtifact.getBlueprintArtifactName(),
-            blueprintArtifact.getBlueprintInvariantServiceUuid(),
-            blueprintArtifact.getResourceAttached().getResourceInvariantUUID());
+                blueprintArtifact.getBlueprintInvariantServiceUuid(),
+                blueprintArtifact.getResourceAttached().getResourceInvariantUUID());
     }
 
     private void addPropertyToNode(JsonObject node, String key, Object value) {
diff --git a/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java
index 33148f0b6..dd156d8f3 100644
--- a/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java
@@ -25,6 +25,7 @@ package org.onap.clamp.policy.operational;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,16 +34,15 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.apache.commons.lang3.math.NumberUtils;
+import org.onap.clamp.loop.Loop;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.DumperOptions.ScalarStyle;
 import org.yaml.snakeyaml.Yaml;
 
 /**
- *
  * This class contains the code required to support the sending of Legacy
  * operational payload to policy engine. This will probably disappear in El
  * Alto.
- *
  */
 public class LegacyOperationalPolicy {
 
@@ -76,6 +76,13 @@ public class LegacyOperationalPolicy {
         return jsonElement;
     }
 
+    /**
+     * This method rework the payload attribute (yaml) that is normally wrapped in a
+     * string when coming from the UI.
+     * 
+     * @param policyJson The operational policy json config
+     * @return The same object reference but modified
+     */
     public static JsonElement reworkPayloadAttributes(JsonElement policyJson) {
         for (JsonElement policy : policyJson.getAsJsonObject().get("policies").getAsJsonArray()) {
             JsonElement payloadElem = policy.getAsJsonObject().get("payload");
@@ -135,9 +142,15 @@ public class LegacyOperationalPolicy {
         return mapResult;
     }
 
+    /**
+     * This method transforms the configuration json to a Yaml format.
+     * 
+     * @param operationalPolicyJsonElement The operational policy json config
+     * @return The Yaml as string
+     */
     public static String createPolicyPayloadYamlLegacy(JsonElement operationalPolicyJsonElement) {
         JsonElement opPolicy = fulfillPoliciesTreeField(
-            removeAllQuotes(reworkPayloadAttributes(operationalPolicyJsonElement.getAsJsonObject().deepCopy())));
+                removeAllQuotes(reworkPayloadAttributes(operationalPolicyJsonElement.getAsJsonObject().deepCopy())));
         Map<?, ?> jsonMap = createMap(opPolicy);
         DumperOptions options = new DumperOptions();
         options.setDefaultScalarStyle(ScalarStyle.PLAIN);
@@ -147,4 +160,22 @@ public class LegacyOperationalPolicy {
         options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         return (new Yaml(options)).dump(jsonMap);
     }
+
+    /**
+     * This method load mandatory field in the operational policy configuration
+     * JSON.
+     * 
+     * @param configurationsJson The operational policy JSON
+     * @param loop               The parent loop object
+     */
+    public static void preloadConfiguration(JsonObject configurationsJson, Loop loop) {
+        if (configurationsJson.entrySet().isEmpty()) {
+            JsonObject controlLoopName = new JsonObject();
+            controlLoopName.addProperty("controlLoopName",
+                    loop != null ? loop.getName() : "Empty (NO loop loaded yet)");
+            JsonObject controlLoop = new JsonObject();
+            controlLoop.add("controlLoop", controlLoopName);
+            configurationsJson.add("operational_policy", controlLoop);
+        }
+    }
 }
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 62c5a1e9f..86f8ac391 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -38,7 +38,6 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -91,17 +90,16 @@ public class OperationalPolicy implements Serializable, Policy {
     /**
      * The constructor.
      *
-     * @param name
-     *        The name of the operational policy
-     * @param loop
-     *        The loop that uses this operational policy
-     * @param configurationsJson
-     *        The operational policy property in the format of json
+     * @param name               The name of the operational policy
+     * @param loop               The loop that uses this operational policy
+     * @param configurationsJson The operational policy property in the format of
+     *                           json
      */
     public OperationalPolicy(String name, Loop loop, JsonObject configurationsJson) {
         this.name = name;
         this.loop = loop;
         this.configurationsJson = configurationsJson;
+        LegacyOperationalPolicy.preloadConfiguration(this.configurationsJson, loop);
     }
 
     @Override
@@ -117,11 +115,6 @@ public class OperationalPolicy implements Serializable, Policy {
         return loop;
     }
 
-    @Override
-    public JsonObject getJsonRepresentation() {
-        return configurationsJson;
-    }
-
     public JsonObject getConfigurationsJson() {
         return configurationsJson;
     }
@@ -130,6 +123,11 @@ public class OperationalPolicy implements Serializable, Policy {
         this.configurationsJson = configurationsJson;
     }
 
+    @Override
+    public JsonObject getJsonRepresentation() {
+        return null;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -184,7 +182,7 @@ public class OperationalPolicy implements Serializable, Policy {
         metadata.addProperty("policy-id", this.name);
 
         operationalPolicyDetails.add("properties", LegacyOperationalPolicy
-            .reworkPayloadAttributes(this.configurationsJson.get("operational_policy").deepCopy()));
+                .reworkPayloadAttributes(this.configurationsJson.get("operational_policy").deepCopy()));
 
         Gson gson = new GsonBuilder().create();
 
@@ -204,9 +202,8 @@ public class OperationalPolicy implements Serializable, Policy {
         // Now using the legacy payload fo Dublin
         JsonObject payload = new JsonObject();
         payload.addProperty("policy-id", this.getName());
-        payload.addProperty("content", URLEncoder.encode(
-            LegacyOperationalPolicy.createPolicyPayloadYamlLegacy(this.configurationsJson.get("operational_policy")),
-            StandardCharsets.UTF_8.toString()));
+        payload.addProperty("content", URLEncoder.encode(LegacyOperationalPolicy.createPolicyPayloadYamlLegacy(
+                this.configurationsJson.get("operational_policy")), StandardCharsets.UTF_8.toString()));
         String opPayload = new GsonBuilder().setPrettyPrinting().create().toJson(payload);
         logger.info("Operational policy payload: " + opPayload);
         return opPayload;
@@ -222,11 +219,9 @@ public class OperationalPolicy implements Serializable, Policy {
 
         JsonElement guardsList = this.getConfigurationsJson().get("guard_policies");
         if (guardsList != null) {
-            for (Entry<String, JsonElement> guardElem : guardsList.getAsJsonObject().entrySet()) {
-                JsonObject guard = new JsonObject();
-                guard.addProperty("policy-id", guardElem.getKey());
-                guard.add("content", guardElem.getValue());
-                result.put(guardElem.getKey(), new GsonBuilder().create().toJson(guard));
+            for (JsonElement guardElem : guardsList.getAsJsonArray()) {
+                result.put(guardElem.getAsJsonObject().get("policy-id").getAsString(),
+                        new GsonBuilder().create().toJson(guardElem));
             }
         }
         logger.info("Guard policy payload: " + result);
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
new file mode 100644
index 000000000..f6f3f498d
--- /dev/null
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy.operational;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
+
+import java.io.IOException;
+import java.util.Map.Entry;
+
+import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+
+public class OperationalPolicyRepresentationBuilder {
+
+    /**
+     * This method generates the operational policy json representation that will be
+     * used by ui for rendering. It uses the model (VF and VFModule) defined in the
+     * loop object to do so, so it's dynamic. It also uses the operational policy
+     * schema template defined in the resource folder.
+     * 
+     * @param modelJson The loop model json
+     * @return The json representation
+     * @throws JsonSyntaxException If the schema template cannot be parsed
+     * @throws IOException         In case of issue when opening the schema template
+     */
+    public static JsonObject generateOperationalPolicySchema(JsonObject modelJson)
+            throws JsonSyntaxException, IOException {
+        JsonObject jsonSchema = JsonUtils.GSON.fromJson(
+                ResourceFileUtil.getResourceAsString("clds/json-schema/operational_policies/operational_policy.json"),
+                JsonObject.class);
+        jsonSchema.get("schema").getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject()
+                .get("configurationsJson").getAsJsonObject().get("properties").getAsJsonObject()
+                .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
+                .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("target")
+                .getAsJsonObject().get("anyOf").getAsJsonArray().addAll(createAnyOfArray(modelJson));
+        return jsonSchema;
+    }
+
+    private static JsonObject createSchemaProperty(String title, String type, String defaultValue, String readOnlyFlag,
+            String[] enumArray) {
+        JsonObject property = new JsonObject();
+        property.addProperty("title", title);
+        property.addProperty("type", type);
+        property.addProperty("default", defaultValue);
+        property.addProperty("readOnly", readOnlyFlag);
+
+        if (enumArray != null) {
+            JsonArray jsonArray = new JsonArray();
+            property.add("enum", jsonArray);
+            for (String val : enumArray) {
+                jsonArray.add(val);
+            }
+        }
+        return property;
+    }
+
+    private static JsonArray createVnfSchema(JsonObject modelJson) {
+        JsonArray vnfSchemaArray = new JsonArray();
+        JsonObject modelVnfs = modelJson.get("resourceDetails").getAsJsonObject().get("VF").getAsJsonObject();
+
+        for (Entry<String, JsonElement> entry : modelVnfs.entrySet()) {
+            JsonObject vnfOneOfSchema = new JsonObject();
+            vnfOneOfSchema.addProperty("title", "VNF" + "-" + entry.getKey());
+            JsonObject properties = new JsonObject();
+            properties.add("type", createSchemaProperty("Type", "string", "VNF", "True", null));
+            properties.add("resourceID", createSchemaProperty("Resource ID", "string",
+                    modelVnfs.get(entry.getKey()).getAsJsonObject().get("name").getAsString(), "True", null));
+
+            vnfOneOfSchema.add("properties", properties);
+            vnfSchemaArray.add(vnfOneOfSchema);
+        }
+        return vnfSchemaArray;
+    }
+
+    private static JsonArray createVfModuleSchema(JsonObject modelJson) {
+        JsonArray vfModuleOneOfSchemaArray = new JsonArray();
+        JsonObject modelVfModules = modelJson.get("resourceDetails").getAsJsonObject().get("VFModule")
+                .getAsJsonObject();
+
+        for (Entry<String, JsonElement> entry : modelVfModules.entrySet()) {
+            JsonObject vfModuleOneOfSchema = new JsonObject();
+            vfModuleOneOfSchema.addProperty("title", "VFMODULE" + "-" + entry.getKey());
+            JsonObject properties = new JsonObject();
+            properties.add("type", createSchemaProperty("Type", "string", "VFMODULE", "True", null));
+            properties.add("resourceID",
+                    createSchemaProperty("Resource ID", "string",
+                            modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelName").getAsString(),
+                            "True", null));
+            properties.add("modelInvariantId",
+                    createSchemaProperty("Model Invariant Id (ModelInvariantUUID)", "string", modelVfModules
+                            .get(entry.getKey()).getAsJsonObject().get("vfModuleModelInvariantUUID").getAsString(),
+                            "True", null));
+            properties.add("modelVersionId",
+                    createSchemaProperty("Model Version Id (ModelUUID)", "string",
+                            modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelUUID").getAsString(),
+                            "True", null));
+            properties.add("modelName",
+                    createSchemaProperty("Model Name", "string",
+                            modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelName").getAsString(),
+                            "True", null));
+            properties.add("modelVersion", createSchemaProperty("Model Version", "string",
+                    modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelVersion").getAsString(),
+                    "True", null));
+            properties
+                    .add("modelCustomizationId",
+                            createSchemaProperty("Customization ID", "string", modelVfModules.get(entry.getKey())
+                                    .getAsJsonObject().get("vfModuleModelCustomizationUUID").getAsString(), "True",
+                                    null));
+
+            vfModuleOneOfSchema.add("properties", properties);
+            vfModuleOneOfSchemaArray.add(vfModuleOneOfSchema);
+        }
+        return vfModuleOneOfSchemaArray;
+    }
+
+    private static JsonArray createAnyOfArray(JsonObject modelJson) {
+        JsonArray targetOneOfStructure = new JsonArray();
+        targetOneOfStructure.addAll(createVnfSchema(modelJson));
+        targetOneOfStructure.addAll(createVfModuleSchema(modelJson));
+        return targetOneOfStructure;
+    }
+}
diff --git a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
new file mode 100644
index 000000000..93738c809
--- /dev/null
+++ b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
@@ -0,0 +1,362 @@
+{
+    "schema": {
+        "uniqueItems": "true",
+        "format": "tabs",
+        "type": "array",
+        "minItems": 1,
+        "maxItems": 1,
+        "title": "Operational policies",
+        "items": {
+            "type": "object",
+            "title": "Operational Policy Item",
+            "id": "operational_policy_item",
+            "headerTemplate": "{{self.name}}",
+            "required": [
+                "name",
+                "configurationsJson"
+            ],
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "title": "Operational policy name",
+                    "readOnly": "True"
+                },
+                "configurationsJson": {
+                    "type": "object",
+                    "title": "Configuration",
+                    "required": [
+                        "operational_policy",
+                        "guard_policies"
+                    ],
+                    "properties": {
+                        "operational_policy": {
+                            "type": "object",
+                            "title": "Related Parameters",
+                            "required": [
+                                "controlLoop",
+                                "policies"
+                            ],
+                            "properties": {
+                                "controlLoop": {
+                                    "type": "object",
+                                    "title": "Control Loop details",
+                                    "required": [
+                                        "timeout",
+                                        "abatement",
+                                        "trigger_policy",
+                                        "controlLoopName"
+                                    ],
+                                    "properties": {
+                                        "timeout": {
+                                            "type": "string",
+                                            "title": "Overall Time Limit",
+                                            "default": "0",
+                                            "format": "number"
+                                        },
+                                        "abatement": {
+                                            "type": "string",
+                                            "title": "Abatement",
+                                            "enum": [
+                                                "True",
+                                                "False"
+                                            ]
+                                        },
+                                        "trigger_policy": {
+                                            "type": "string",
+                                            "title": "Policy Decision Entry"
+                                        },
+                                        "controlLoopName": {
+                                            "type": "string",
+                                            "title": "Control loop name",
+                                            "readOnly": "True"
+                                        }
+                                    }
+                                },
+                                "policies": {
+                                    "uniqueItems": "true",
+                                    "id": "policies_array",
+                                    "type": "array",
+                                    "title": "Policy Decision Tree",
+                                    "format": "tabs-top",
+                                    "items": {
+                                        "title": "Policy Decision",
+                                        "type": "object",
+                                        "id": "policy_item",
+                                        "headerTemplate": "{{self.id}} - {{self.recipe}}",
+                                        "format": "categories",
+                                        "basicCategoryTitle": "recipe",
+                                        "required": [
+                                            "id",
+                                            "recipe",
+                                            "retry",
+                                            "timeout",
+                                            "actor",
+                                            "success",
+                                            "failure",
+                                            "failure_timeout",
+                                            "failure_retries",
+                                            "failure_exception",
+                                            "failure_guard",
+                                            "target"
+                                        ],
+                                        "properties": {
+                                            "id": {
+                                                "default": "Policy 1",
+                                                "title": "Policy ID",
+                                                "type": "string"
+                                            },
+                                            "recipe": {
+                                                "title": "Recipe",
+                                                "type": "string",
+                                                "enum": [
+                                                    "Restart",
+                                                    "Rebuild",
+                                                    "Migrate",
+                                                    "Health-Check",
+                                                    "ModifyConfig",
+                                                    "VF Module Create",
+                                                    "VF Module Delete",
+                                                    "Reroute"
+                                                ]
+                                            },
+                                            "retry": {
+                                                "default": "0",
+                                                "title": "Number of Retry",
+                                                "type": "string",
+                                                "format": "number"
+                                            },
+                                            "timeout": {
+                                                "default": "0",
+                                                "title": "Timeout",
+                                                "type": "string",
+                                                "format": "number"
+                                            },
+                                            "actor": {
+                                                "title": "Actor",
+                                                "type": "string",
+                                                "enum": [
+                                                    "APPC",
+                                                    "SO",
+                                                    "VFC",
+                                                    "SDNC",
+                                                    "SDNR"
+                                                ]
+                                            },
+                                            "payload": {
+                                                "title": "Payload (YAML)",
+                                                "type": "string",
+                                                "format": "textarea"
+                                            },
+                                            "success": {
+                                                "default": "final_success",
+                                                "title": "When Success",
+                                                "type": "string"
+                                            },
+                                            "failure": {
+                                                "default": "final_failure",
+                                                "title": "When Failure",
+                                                "type": "string"
+                                            },
+                                            "failure_timeout": {
+                                                "default": "final_failure_timeout",
+                                                "title": "When Failure Timeout",
+                                                "type": "string"
+                                            },
+                                            "failure_retries": {
+                                                "default": "final_failure_retries",
+                                                "title": "When Failure Retries",
+                                                "type": "string"
+                                            },
+                                            "failure_exception": {
+                                                "default": "final_failure_exception",
+                                                "title": "When Failure Exception",
+                                                "type": "string"
+                                            },
+                                            "failure_guard": {
+                                                "default": "final_failure_guard",
+                                                "title": "When Failure Guard",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "type": "object",
+                                                "required": [
+                                                    "type",
+                                                    "resourceID"
+                                                ],
+                                                "anyOf": [
+                                                    {
+                                                        "title": "User Defined",
+                                                        "additionalProperties":"True",
+                                                        "properties": {
+                                                            "type": {
+                                                                "title": "Target type",
+                                                                "type": "string",
+                                                                "default": "",
+                                                                "enum": [
+                                                                    "VNF",
+                                                                    "VFMODULE",
+                                                                    "VM"
+                                                                ]
+                                                            },
+                                                            "resourceID": {
+                                                                "title": "Target type",
+                                                                "type": "string",
+                                                                "default": ""
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "guard_policies": {
+                            "type": "array",
+                            "format": "tabs-top",
+                            "title": "Associated Guard policies",
+                            "items": {
+                                "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
+                                "anyOf": [
+                                    {
+                                        "title": "Guard MinMax",
+                                        "type": "object",
+                                        "properties": {
+                                            "policy-id": {
+                                                "type": "string",
+                                                "default": "guard.minmax.new",
+                                                "pattern": "^(guard.minmax\\..*)$"
+                                            },
+                                            "content": {
+                                                "properties": {
+                                                    "actor": {
+                                                        "type": "string",
+                                                        "enum": [
+                                                            "APPC",
+                                                            "SO",
+                                                            "VFC",
+                                                            "SDNC",
+                                                            "SDNR"
+                                                        ]
+                                                    },
+                                                    "recipe": {
+                                                        "type": "string",
+                                                        "enum": [
+                                                            "Restart",
+                                                            "Rebuild",
+                                                            "Migrate",
+                                                            "Health-Check",
+                                                            "ModifyConfig",
+                                                            "VF Module Create",
+                                                            "VF Module Delete",
+                                                            "Reroute"
+                                                        ]
+                                                    },
+                                                    "targets": {
+                                                        "type": "string",
+                                                        "default": ".*"
+                                                    },
+                                                    "clname": {
+                                                        "type": "string",
+                                                        "template": "{{loopName}}",
+                                                        "watch": {
+                                                            "loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
+                                                        }
+                                                    },
+                                                    "guardActiveStart": {
+                                                        "type": "string",
+                                                        "default": "00:00:00Z"
+                                                    },
+                                                    "guardActiveEnd": {
+                                                        "type": "string",
+                                                        "default": "10:00:00Z"
+                                                    },
+                                                    "min": {
+                                                        "type": "string",
+                                                        "default": "0"
+                                                    },
+                                                    "max": {
+                                                        "type": "string",
+                                                        "default": "1"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    },
+                                    {
+                                        "title": "Guard Frequency",
+                                        "type": "object",
+                                        "properties": {
+                                            "policy-id": {
+                                                "type": "string",
+                                                "default": "guard.frequency.new",
+                                                "pattern": "^(guard.frequency\\..*)$"
+                                            },
+                                            "content": {
+                                                "properties": {
+                                                    "actor": {
+                                                        "type": "string",
+                                                        "enum": [
+                                                            "APPC",
+                                                            "SO",
+                                                            "VFC",
+                                                            "SDNC",
+                                                            "SDNR"
+                                                        ]
+                                                    },
+                                                    "recipe": {
+                                                        "type": "string",
+                                                        "enum": [
+                                                            "Restart",
+                                                            "Rebuild",
+                                                            "Migrate",
+                                                            "Health-Check",
+                                                            "ModifyConfig",
+                                                            "VF Module Create",
+                                                            "VF Module Delete",
+                                                            "Reroute"
+                                                        ]
+                                                    },
+                                                    "targets": {
+                                                        "type": "string",
+                                                        "default": ".*"
+                                                    },
+                                                    "clname": {
+                                                        "type": "string",
+                                                        "template": "{{loopName}}",
+                                                        "watch": {
+                                                            "loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
+                                                        }
+                                                    },
+                                                    "guardActiveStart": {
+                                                        "type": "string",
+                                                        "default": "00:00:00Z"
+                                                    },
+                                                    "guardActiveEnd": {
+                                                        "type": "string",
+                                                        "default": "10:00:00Z"
+                                                    },
+                                                    "limit": {
+                                                        "type": "string"
+                                                    },
+                                                    "timeWindow": {
+                                                        "type": "string"
+                                                    },
+                                                    "timeUnits": {
+                                                        "type": "string",
+                                                        "enum":["minute","hour","day","week","month","year"]
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                ]
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
index 8972e5117..728b61cc9 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
@@ -42,29 +42,29 @@ public class OperationalPolicyPayloadTest {
     @Test
     public void testOperationalPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
-            ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
+                ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
         OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig);
 
         assertThat(policy.createPolicyPayloadYaml())
-            .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.yaml"));
+                .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.yaml"));
 
         assertThat(policy.createPolicyPayload())
-            .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.json"));
+                .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.json"));
     }
 
     @Test
     public void testLegacyOperationalPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
-            ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
+                ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
         assertThat(LegacyOperationalPolicy.createPolicyPayloadYamlLegacy(jsonConfig.get("operational_policy")))
-            .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload-legacy.yaml"));
+                .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload-legacy.yaml"));
     }
 
     @Test
     public void testGuardPolicyEmptyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
-            ResourceFileUtil.getResourceAsString("tosca/operational-policy-no-guard-properties.json"),
-            JsonObject.class);
+                ResourceFileUtil.getResourceAsString("tosca/operational-policy-no-guard-properties.json"),
+                JsonObject.class);
         OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig);
         Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
         assertThat(guardsMap).isEmpty();
@@ -74,15 +74,15 @@ public class OperationalPolicyPayloadTest {
     @Test
     public void testGuardPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
-            ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
+                ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
         OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig);
 
         Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
 
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/guard1-policy-payload.json"),
-            guardsMap.get("guard1"), false);
+                guardsMap.get("guard.minmax.new"), false);
 
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/guard2-policy-payload.json"),
-            guardsMap.get("guard2"), false);
+                guardsMap.get("guard.frequency.new"), false);
     }
 }
diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
new file mode 100644
index 000000000..904525bea
--- /dev/null
+++ b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy.operational;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.skyscreamer.jsonassert.JSONAssert;
+
+public class OperationalPolicyRepresentationBuilderTest {
+
+    @Test
+    public void testOperationalPolicyPayloadConstruction() throws IOException {
+        JsonObject jsonModel = new GsonBuilder().create()
+                .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"), JsonObject.class);
+
+        JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(jsonModel);
+
+        assertThat(jsonSchema).isNotNull();
+
+        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/operational-policy-json-schema.json"),
+                new GsonBuilder().create().toJson(jsonSchema), false);
+    }
+
+}
diff --git a/src/test/resources/clds/OperationalPolicyRepresentationBuilderTest.java b/src/test/resources/clds/OperationalPolicyRepresentationBuilderTest.java
new file mode 100644
index 000000000..904525bea
--- /dev/null
+++ b/src/test/resources/clds/OperationalPolicyRepresentationBuilderTest.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy.operational;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.skyscreamer.jsonassert.JSONAssert;
+
+public class OperationalPolicyRepresentationBuilderTest {
+
+    @Test
+    public void testOperationalPolicyPayloadConstruction() throws IOException {
+        JsonObject jsonModel = new GsonBuilder().create()
+                .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"), JsonObject.class);
+
+        JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(jsonModel);
+
+        assertThat(jsonSchema).isNotNull();
+
+        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/operational-policy-json-schema.json"),
+                new GsonBuilder().create().toJson(jsonSchema), false);
+    }
+
+}
diff --git a/src/test/resources/tosca/guard1-policy-payload.json b/src/test/resources/tosca/guard1-policy-payload.json
index b4e0809c9..1c03df306 100644
--- a/src/test/resources/tosca/guard1-policy-payload.json
+++ b/src/test/resources/tosca/guard1-policy-payload.json
@@ -1,16 +1,13 @@
 {
-	"policy-id": "guard1",
+	"policy-id": "guard.minmax.new",
 	"content": {
-		"recipe": "Rebuild",
-		"actor": "SO",
-		"clname": "testloop",
+		"actor": "APPC",
+		"recipe": "Restart",
 		"targets": ".*",
-		"min": "3",
-		"max": "7",
-		"limit": "",
-		"timeUnits": "",
-		"timeWindow": "",
-		"guardActiveStart": "00:00:01-05:00",
-		"guardActiveEnd": "23:59:01-05:00"
+		"clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
+		"guardActiveStart": "00:00:00Z",
+		"guardActiveEnd": "10:00:00Z",
+		"min": "0",
+		"max": "1"
 	}
 }
\ No newline at end of file
diff --git a/src/test/resources/tosca/guard2-policy-payload.json b/src/test/resources/tosca/guard2-policy-payload.json
index 29beb6b98..559a56840 100644
--- a/src/test/resources/tosca/guard2-policy-payload.json
+++ b/src/test/resources/tosca/guard2-policy-payload.json
@@ -1,16 +1,14 @@
 {
-	"policy-id": "guard2",
+	"policy-id": "guard.frequency.new",
 	"content": {
-		"recipe": "Migrate",
-		"actor": "SO",
-		"clname": "testloop",
+		"actor": "APPC",
+		"recipe": "Rebuild",
 		"targets": ".*",
-		"min": "1",
-		"max": "2",
-		"limit": "",
-		"timeUnits": "",
-		"timeWindow": "",
-		"guardActiveStart": "00:00:01-05:00",
-		"guardActiveEnd": "23:59:01-05:00"
+		"clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
+		"guardActiveStart": "00:00:00Z",
+		"guardActiveEnd": "10:00:00Z",
+		"limit": "1",
+		"timeWindow": "2",
+		"timeUnits": "minute"
 	}
 }
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
new file mode 100644
index 000000000..d6870dc9d
--- /dev/null
+++ b/src/test/resources/tosca/operational-policy-json-schema.json
@@ -0,0 +1,574 @@
+{
+	"schema": {
+		"uniqueItems": "true",
+		"format": "tabs",
+		"type": "array",
+		"minItems": 1,
+		"maxItems": 1,
+		"title": "Operational policies",
+		"items": {
+			"type": "object",
+			"title": "Operational Policy Item",
+			"id": "operational_policy_item",
+			"headerTemplate": "{{self.name}}",
+			"required": [
+				"name",
+				"configurationsJson"
+			],
+			"properties": {
+				"name": {
+					"type": "string",
+					"title": "Operational policy name",
+					"readOnly": "True"
+				},
+				"configurationsJson": {
+					"type": "object",
+					"title": "Configuration",
+					"required": [
+						"operational_policy",
+						"guard_policies"
+					],
+					"properties": {
+						"operational_policy": {
+							"type": "object",
+							"title": "Related Parameters",
+							"required": [
+								"controlLoop",
+								"policies"
+							],
+							"properties": {
+								"controlLoop": {
+									"type": "object",
+									"title": "Control Loop details",
+									"required": [
+										"timeout",
+										"abatement",
+										"trigger_policy",
+										"controlLoopName"
+									],
+									"properties": {
+										"timeout": {
+											"type": "string",
+											"title": "Overall Time Limit",
+											"default": "0",
+											"format": "number"
+										},
+										"abatement": {
+											"type": "string",
+											"title": "Abatement",
+											"enum": [
+												"True",
+												"False"
+											]
+										},
+										"trigger_policy": {
+											"type": "string",
+											"title": "Policy Decision Entry"
+										},
+										"controlLoopName": {
+											"type": "string",
+											"title": "Control loop name",
+											"readOnly": "True"
+										}
+									}
+								},
+								"policies": {
+									"uniqueItems": "true",
+									"id": "policies_array",
+									"type": "array",
+									"title": "Policy Decision Tree",
+									"format": "tabs-top",
+									"items": {
+										"title": "Policy Decision",
+										"type": "object",
+										"id": "policy_item",
+										"headerTemplate": "{{self.id}} - {{self.recipe}}",
+										"format": "categories",
+										"basicCategoryTitle": "recipe",
+										"required": [
+											"id",
+											"recipe",
+											"retry",
+											"timeout",
+											"actor",
+											"success",
+											"failure",
+											"failure_timeout",
+											"failure_retries",
+											"failure_exception",
+											"failure_guard",
+											"target"
+										],
+										"properties": {
+											"id": {
+												"default": "Policy 1",
+												"title": "Policy ID",
+												"type": "string"
+											},
+											"recipe": {
+												"title": "Recipe",
+												"type": "string",
+												"enum": [
+													"Restart",
+													"Rebuild",
+													"Migrate",
+													"Health-Check",
+													"ModifyConfig",
+													"VF Module Create",
+													"VF Module Delete",
+													"Reroute"
+												]
+											},
+											"retry": {
+												"default": "0",
+												"title": "Number of Retry",
+												"type": "string",
+												"format": "number"
+											},
+											"timeout": {
+												"default": "0",
+												"title": "Timeout",
+												"type": "string",
+												"format": "number"
+											},
+											"actor": {
+												"title": "Actor",
+												"type": "string",
+												"enum": [
+													"APPC",
+													"SO",
+													"VFC",
+													"SDNC",
+													"SDNR"
+												]
+											},
+											"payload": {
+												"title": "Payload (YAML)",
+												"type": "string",
+												"format": "textarea"
+											},
+											"success": {
+												"default": "final_success",
+												"title": "When Success",
+												"type": "string"
+											},
+											"failure": {
+												"default": "final_failure",
+												"title": "When Failure",
+												"type": "string"
+											},
+											"failure_timeout": {
+												"default": "final_failure_timeout",
+												"title": "When Failure Timeout",
+												"type": "string"
+											},
+											"failure_retries": {
+												"default": "final_failure_retries",
+												"title": "When Failure Retries",
+												"type": "string"
+											},
+											"failure_exception": {
+												"default": "final_failure_exception",
+												"title": "When Failure Exception",
+												"type": "string"
+											},
+											"failure_guard": {
+												"default": "final_failure_guard",
+												"title": "When Failure Guard",
+												"type": "string"
+											},
+											"target": {
+												"type": "object",
+												"required": [
+													"type",
+													"resourceID"
+												],
+												"anyOf": [
+													{
+														"title": "User Defined",
+														"additionalProperties": "True",
+														"properties": {
+															"type": {
+																"title": "Target type",
+																"type": "string",
+																"default": "",
+																"enum": [
+																	"VNF",
+																	"VFMODULE",
+																	"VM"
+																]
+															},
+															"resourceID": {
+																"title": "Target type",
+																"type": "string",
+																"default": ""
+															}
+														}
+													},
+													{
+														"title": "VNF-vLoadBalancerMS 0",
+														"properties": {
+															"type": {
+																"title": "Type",
+																"type": "string",
+																"default": "VNF",
+																"readOnly": "True"
+															},
+															"resourceID": {
+																"title": "Resource ID",
+																"type": "string",
+																"default": "vLoadBalancerMS",
+																"readOnly": "True"
+															}
+														}
+													},
+													{
+														"title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
+														"properties": {
+															"type": {
+																"title": "Type",
+																"type": "string",
+																"default": "VFMODULE",
+																"readOnly": "True"
+															},
+															"resourceID": {
+																"title": "Resource ID",
+																"type": "string",
+																"default": "Vloadbalancerms..vpkg..module-1",
+																"readOnly": "True"
+															},
+															"modelInvariantId": {
+																"title": "Model Invariant Id (ModelInvariantUUID)",
+																"type": "string",
+																"default": "ca052563-eb92-4b5b-ad41-9111768ce043",
+																"readOnly": "True"
+															},
+															"modelVersionId": {
+																"title": "Model Version Id (ModelUUID)",
+																"type": "string",
+																"default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+																"readOnly": "True"
+															},
+															"modelName": {
+																"title": "Model Name",
+																"type": "string",
+																"default": "Vloadbalancerms..vpkg..module-1",
+																"readOnly": "True"
+															},
+															"modelVersion": {
+																"title": "Model Version",
+																"type": "string",
+																"default": "1",
+																"readOnly": "True"
+															},
+															"modelCustomizationId": {
+																"title": "Customization ID",
+																"type": "string",
+																"default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+																"readOnly": "True"
+															}
+														}
+													},
+													{
+														"title": "VFMODULE-Vloadbalancerms..vdns..module-3",
+														"properties": {
+															"type": {
+																"title": "Type",
+																"type": "string",
+																"default": "VFMODULE",
+																"readOnly": "True"
+															},
+															"resourceID": {
+																"title": "Resource ID",
+																"type": "string",
+																"default": "Vloadbalancerms..vdns..module-3",
+																"readOnly": "True"
+															},
+															"modelInvariantId": {
+																"title": "Model Invariant Id (ModelInvariantUUID)",
+																"type": "string",
+																"default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+																"readOnly": "True"
+															},
+															"modelVersionId": {
+																"title": "Model Version Id (ModelUUID)",
+																"type": "string",
+																"default": "4fa73b49-8a6c-493e-816b-eb401567b720",
+																"readOnly": "True"
+															},
+															"modelName": {
+																"title": "Model Name",
+																"type": "string",
+																"default": "Vloadbalancerms..vdns..module-3",
+																"readOnly": "True"
+															},
+															"modelVersion": {
+																"title": "Model Version",
+																"type": "string",
+																"default": "1",
+																"readOnly": "True"
+															},
+															"modelCustomizationId": {
+																"title": "Customization ID",
+																"type": "string",
+																"default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+																"readOnly": "True"
+															}
+														}
+													},
+													{
+														"title": "VFMODULE-Vloadbalancerms..base_template..module-0",
+														"properties": {
+															"type": {
+																"title": "Type",
+																"type": "string",
+																"default": "VFMODULE",
+																"readOnly": "True"
+															},
+															"resourceID": {
+																"title": "Resource ID",
+																"type": "string",
+																"default": "Vloadbalancerms..base_template..module-0",
+																"readOnly": "True"
+															},
+															"modelInvariantId": {
+																"title": "Model Invariant Id (ModelInvariantUUID)",
+																"type": "string",
+																"default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+																"readOnly": "True"
+															},
+															"modelVersionId": {
+																"title": "Model Version Id (ModelUUID)",
+																"type": "string",
+																"default": "63734409-f745-4e4d-a38b-131638a0edce",
+																"readOnly": "True"
+															},
+															"modelName": {
+																"title": "Model Name",
+																"type": "string",
+																"default": "Vloadbalancerms..base_template..module-0",
+																"readOnly": "True"
+															},
+															"modelVersion": {
+																"title": "Model Version",
+																"type": "string",
+																"default": "1",
+																"readOnly": "True"
+															},
+															"modelCustomizationId": {
+																"title": "Customization ID",
+																"type": "string",
+																"default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+																"readOnly": "True"
+															}
+														}
+													},
+													{
+														"title": "VFMODULE-Vloadbalancerms..vlb..module-2",
+														"properties": {
+															"type": {
+																"title": "Type",
+																"type": "string",
+																"default": "VFMODULE",
+																"readOnly": "True"
+															},
+															"resourceID": {
+																"title": "Resource ID",
+																"type": "string",
+																"default": "Vloadbalancerms..vlb..module-2",
+																"readOnly": "True"
+															},
+															"modelInvariantId": {
+																"title": "Model Invariant Id (ModelInvariantUUID)",
+																"type": "string",
+																"default": "a772a1f4-0064-412c-833d-4749b15828dd",
+																"readOnly": "True"
+															},
+															"modelVersionId": {
+																"title": "Model Version Id (ModelUUID)",
+																"type": "string",
+																"default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+																"readOnly": "True"
+															},
+															"modelName": {
+																"title": "Model Name",
+																"type": "string",
+																"default": "Vloadbalancerms..vlb..module-2",
+																"readOnly": "True"
+															},
+															"modelVersion": {
+																"title": "Model Version",
+																"type": "string",
+																"default": "1",
+																"readOnly": "True"
+															},
+															"modelCustomizationId": {
+																"title": "Customization ID",
+																"type": "string",
+																"default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+																"readOnly": "True"
+															}
+														}
+													}
+												]
+											}
+										}
+									}
+								}
+							}
+						},
+						"guard_policies": {
+							"type": "array",
+							"format": "tabs-top",
+							"title": "Associated Guard policies",
+							"items": {
+								"headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
+								"anyOf": [
+									{
+										"title": "Guard MinMax",
+										"type": "object",
+										"properties": {
+											"policy-id": {
+												"type": "string",
+												"default": "guard.minmax.new",
+												"pattern": "^(guard.minmax\\..*)$"
+											},
+											"content": {
+												"properties": {
+													"actor": {
+														"type": "string",
+														"enum": [
+															"APPC",
+															"SO",
+															"VFC",
+															"SDNC",
+															"SDNR"
+														]
+													},
+													"recipe": {
+														"type": "string",
+														"enum": [
+															"Restart",
+															"Rebuild",
+															"Migrate",
+															"Health-Check",
+															"ModifyConfig",
+															"VF Module Create",
+															"VF Module Delete",
+															"Reroute"
+														]
+													},
+													"targets": {
+														"type": "string",
+														"default": ".*"
+													},
+													"clname": {
+														"type": "string",
+														"template": "{{loopName}}",
+														"watch": {
+															"loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
+														}
+													},
+													"guardActiveStart": {
+														"type": "string",
+														"default": "00:00:00Z"
+													},
+													"guardActiveEnd": {
+														"type": "string",
+														"default": "10:00:00Z"
+													},
+													"min": {
+														"type": "string",
+														"default": "0"
+													},
+													"max": {
+														"type": "string",
+														"default": "1"
+													}
+												}
+											}
+										}
+									},
+									{
+										"title": "Guard Frequency",
+										"type": "object",
+										"properties": {
+											"policy-id": {
+												"type": "string",
+												"default": "guard.frequency.new",
+												"pattern": "^(guard.frequency\\..*)$"
+											},
+											"content": {
+												"properties": {
+													"actor": {
+														"type": "string",
+														"enum": [
+															"APPC",
+															"SO",
+															"VFC",
+															"SDNC",
+															"SDNR"
+														]
+													},
+													"recipe": {
+														"type": "string",
+														"enum": [
+															"Restart",
+															"Rebuild",
+															"Migrate",
+															"Health-Check",
+															"ModifyConfig",
+															"VF Module Create",
+															"VF Module Delete",
+															"Reroute"
+														]
+													},
+													"targets": {
+														"type": "string",
+														"default": ".*"
+													},
+													"clname": {
+														"type": "string",
+														"template": "{{loopName}}",
+														"watch": {
+															"loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
+														}
+													},
+													"guardActiveStart": {
+														"type": "string",
+														"default": "00:00:00Z"
+													},
+													"guardActiveEnd": {
+														"type": "string",
+														"default": "10:00:00Z"
+													},
+													"limit": {
+														"type": "string"
+													},
+													"timeWindow": {
+														"type": "string"
+													},
+													"timeUnits": {
+														"type": "string",
+														"enum": [
+															"minute",
+															"hour",
+															"day",
+															"week",
+															"month",
+															"year"
+														]
+													}
+												}
+											}
+										}
+									}
+								]
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-payload-legacy.yaml b/src/test/resources/tosca/operational-policy-payload-legacy.yaml
index 41184c9c9..4d2b9f361 100644
--- a/src/test/resources/tosca/operational-policy-payload-legacy.yaml
+++ b/src/test/resources/tosca/operational-policy-payload-legacy.yaml
@@ -1,39 +1,43 @@
 controlLoop:
   abatement: true
-  controlLoopName: control loop
-  timeout: 30
-  trigger_policy: new1
-  version: 2.0.0
+  controlLoopName: LOOP_ASJOy_v1_0_ResourceInstanceName1_tca
+  timeout: 0
+  trigger_policy: policy1
 policies:
-- actor: SO
-  failure: new2
-  failure_exception: new2
-  failure_guard: new2
-  failure_retries: new2
-  failure_timeout: new2
-  id: new1
+- actor: APPC
+  failure: policy2
+  failure_exception: final_failure_exception
+  failure_guard: final_failure_guard
+  failure_retries: final_failure_retries
+  failure_timeout: final_failure_timeout
+  id: policy1
   payload:
     configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[10].value","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[15].value","enabled":"$.vf-module-topology.vf-module-parameters.param[22].value"}]'
     requestParameters: '{"usePreload":true,"userParams":[]}'
-  recipe: Rebuild
-  retry: 10
-  success: new2
+  recipe: Restart
+  retry: 0
+  success: final_success
   target:
-    resourceTargetId: test
-    type: VFC
-  timeout: 20
-- actor: SDNC
+    resourceID: vLoadBalancerMS
+    type: VNF
+  timeout: 0
+- actor: SO
   failure: final_failure
   failure_exception: final_failure_exception
   failure_guard: final_failure_guard
   failure_retries: final_failure_retries
   failure_timeout: final_failure_timeout
-  id: new2
+  id: policy2
   payload: ''
-  recipe: Migrate
-  retry: 30
+  recipe: VF Module Create
+  retry: 0
   success: final_success
   target:
-    resourceTargetId: test
-    type: VFC
-  timeout: 40
+    modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52
+    modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043
+    modelName: Vloadbalancerms..vpkg..module-1
+    modelVersion: 1
+    modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc
+    resourceID: Vloadbalancerms..vpkg..module-1
+    type: VFMODULE
+  timeout: 0
diff --git a/src/test/resources/tosca/operational-policy-payload.json b/src/test/resources/tosca/operational-policy-payload.json
index 5097654da..ed0197606 100644
--- a/src/test/resources/tosca/operational-policy-payload.json
+++ b/src/test/resources/tosca/operational-policy-payload.json
@@ -1,4 +1,4 @@
 {
   "policy-id": "testPolicy",
-  "content": "controlLoop%3A%0A++abatement%3A+true%0A++controlLoopName%3A+control+loop%0A++timeout%3A+30%0A++trigger_policy%3A+new1%0A++version%3A+2.0.0%0Apolicies%3A%0A-+actor%3A+SO%0A++failure%3A+new2%0A++failure_exception%3A+new2%0A++failure_guard%3A+new2%0A++failure_retries%3A+new2%0A++failure_timeout%3A+new2%0A++id%3A+new1%0A++payload%3A%0A++++configurationParameters%3A+%27%5B%7B%22ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B10%5D.value%22%2C%22oam-ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B15%5D.value%22%2C%22enabled%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B22%5D.value%22%7D%5D%27%0A++++requestParameters%3A+%27%7B%22usePreload%22%3Atrue%2C%22userParams%22%3A%5B%5D%7D%27%0A++recipe%3A+Rebuild%0A++retry%3A+10%0A++success%3A+new2%0A++target%3A%0A++++resourceTargetId%3A+test%0A++++type%3A+VFC%0A++timeout%3A+20%0A-+actor%3A+SDNC%0A++failure%3A+final_failure%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+new2%0A++payload%3A+%27%27%0A++recipe%3A+Migrate%0A++retry%3A+30%0A++success%3A+final_success%0A++target%3A%0A++++resourceTargetId%3A+test%0A++++type%3A+VFC%0A++timeout%3A+40%0A"
+  "content": "controlLoop%3A%0A++abatement%3A+true%0A++controlLoopName%3A+LOOP_ASJOy_v1_0_ResourceInstanceName1_tca%0A++timeout%3A+0%0A++trigger_policy%3A+policy1%0Apolicies%3A%0A-+actor%3A+APPC%0A++failure%3A+policy2%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy1%0A++payload%3A%0A++++configurationParameters%3A+%27%5B%7B%22ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B10%5D.value%22%2C%22oam-ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B15%5D.value%22%2C%22enabled%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B22%5D.value%22%7D%5D%27%0A++++requestParameters%3A+%27%7B%22usePreload%22%3Atrue%2C%22userParams%22%3A%5B%5D%7D%27%0A++recipe%3A+Restart%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++resourceID%3A+vLoadBalancerMS%0A++++type%3A+VNF%0A++timeout%3A+0%0A-+actor%3A+SO%0A++failure%3A+final_failure%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy2%0A++payload%3A+%27%27%0A++recipe%3A+VF+Module+Create%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++modelCustomizationId%3A+1bffdc31-a37d-4dee-b65c-dde623a76e52%0A++++modelInvariantId%3A+ca052563-eb92-4b5b-ad41-9111768ce043%0A++++modelName%3A+Vloadbalancerms..vpkg..module-1%0A++++modelVersion%3A+1%0A++++modelVersionId%3A+1e725ccc-b823-4f67-82b9-4f4367070dbc%0A++++resourceID%3A+Vloadbalancerms..vpkg..module-1%0A++++type%3A+VFMODULE%0A++timeout%3A+0%0A"
 }
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-payload.yaml b/src/test/resources/tosca/operational-policy-payload.yaml
index c3a6b5c23..ed03842f5 100644
--- a/src/test/resources/tosca/operational-policy-payload.yaml
+++ b/src/test/resources/tosca/operational-policy-payload.yaml
@@ -8,35 +8,45 @@ topology_template:
         policy-id: testPolicy
       properties:
         controlLoop:
-          controlLoopName: control loop
-          version: 2.0.0
-          trigger_policy: new1
-          timeout: '30'
-          abatement: 'true'
+          timeout: '0'
+          abatement: 'True'
+          trigger_policy: policy1
+          controlLoopName: LOOP_ASJOy_v1_0_ResourceInstanceName1_tca
         policies:
-        - id: new1
-          recipe: Rebuild
-          retry: '10'
-          timeout: '20'
-          actor: SO
+        - id: policy1
+          recipe: Restart
+          retry: '0'
+          timeout: '0'
+          actor: APPC
           payload:
             requestParameters: '{"usePreload":true,"userParams":[]}'
             configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[10].value","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[15].value","enabled":"$.vf-module-topology.vf-module-parameters.param[22].value"}]'
-          success: new2
-          failure: new2
-          failure_timeout: new2
-          failure_retries: new2
-          failure_exception: new2
-          failure_guard: new2
+          success: final_success
+          failure: policy2
+          failure_timeout: final_failure_timeout
+          failure_retries: final_failure_retries
+          failure_exception: final_failure_exception
+          failure_guard: final_failure_guard
           target:
-            type: VFC
-            resourceTargetId: test
-        - id: new2
-          recipe: Migrate
-          retry: '30'
-          timeout: '40'
-          actor: SDNC
+            type: VNF
+            resourceID: vLoadBalancerMS
+        - id: policy2
+          recipe: VF Module Create
+          retry: '0'
+          timeout: '0'
+          actor: SO
           payload: ''
+          success: final_success
+          failure: final_failure
+          failure_timeout: final_failure_timeout
+          failure_retries: final_failure_retries
+          failure_exception: final_failure_exception
+          failure_guard: final_failure_guard
           target:
-            type: VFC
-            resourceTargetId: test
+            type: VFMODULE
+            resourceID: Vloadbalancerms..vpkg..module-1
+            modelInvariantId: ca052563-eb92-4b5b-ad41-9111768ce043
+            modelVersionId: 1e725ccc-b823-4f67-82b9-4f4367070dbc
+            modelName: Vloadbalancerms..vpkg..module-1
+            modelVersion: '1'
+            modelCustomizationId: 1bffdc31-a37d-4dee-b65c-dde623a76e52
diff --git a/src/test/resources/tosca/operational-policy-properties.json b/src/test/resources/tosca/operational-policy-properties.json
index bfce6b331..ac1314ecb 100644
--- a/src/test/resources/tosca/operational-policy-properties.json
+++ b/src/test/resources/tosca/operational-policy-properties.json
@@ -1,71 +1,82 @@
 {
-	"guard_policies": {
-		"guard1":{
-			"recipe": "Rebuild",
-			"actor": "SO",
-			"clname": "testloop",
-			"targets": ".*",
-			"min": "3",
-			"max": "7",
-			"limit": "",
-			"timeUnits": "",
-			"timeWindow": "",
-			"guardActiveStart": "00:00:01-05:00",
-			"guardActiveEnd": "23:59:01-05:00"
-		},
-		"guard2":{
-			"recipe": "Migrate",
-			"actor": "SO",
-			"clname": "testloop",
-			"targets": ".*",
-			"min": "1",
-			"max": "2",
-			"limit": "",
-			"timeUnits": "",
-			"timeWindow": "",
-			"guardActiveStart": "00:00:01-05:00",
-			"guardActiveEnd": "23:59:01-05:00"
-		}
-	},
-	"operational_policy": {
-		"controlLoop": {
-			"controlLoopName": "control loop",
-			"version": "2.0.0",
-			"trigger_policy": "new1",
-			"timeout": "30",
-			"abatement": "true"
-		},
-		"policies": [
-			{
-				"id": "new1",
-				"recipe": "Rebuild",
-				"retry": "10",
-				"timeout": "20",
-				"actor": "SO",
-				"payload": "requestParameters: '{\"usePreload\":true,\"userParams\":[]}'\r\nconfigurationParameters: '[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[10].value\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[15].value\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[22].value\"}]'",
-				"success": "new2",
-				"failure": "new2",
-				"failure_timeout": "new2",
-				"failure_retries": "new2",
-				"failure_exception": "new2",
-				"failure_guard": "new2",
-				"target": {
-					"type": "VFC",
-					"resourceTargetId": "test"
-				}
-			},
-			{
-				"id": "new2",
-				"recipe": "Migrate",
-				"retry": "30",
-				"timeout": "40",
-				"actor": "SDNC",
-				"payload": "",
-				"target": {
-					"type": "VFC",
-					"resourceTargetId": "test"
-				}
-			}
-		]
-	}
+  "operational_policy": {
+    "controlLoop": {
+      "timeout": "0",
+      "abatement": "True",
+      "trigger_policy": "policy1",
+      "controlLoopName": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca"
+    },
+    "policies": [
+      {
+        "id": "policy1",
+        "recipe": "Restart",
+        "retry": "0",
+        "timeout": "0",
+        "actor": "APPC",
+        "payload": "requestParameters: '{\"usePreload\":true,\"userParams\":[]}'\r\nconfigurationParameters: '[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[10].value\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[15].value\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[22].value\"}]'",
+        "success": "final_success",
+        "failure": "policy2",
+        "failure_timeout": "final_failure_timeout",
+        "failure_retries": "final_failure_retries",
+        "failure_exception": "final_failure_exception",
+        "failure_guard": "final_failure_guard",
+        "target": {
+          "type": "VNF",
+          "resourceID": "vLoadBalancerMS"
+        }
+      },
+    {
+        "id": "policy2",
+        "recipe": "VF Module Create",
+        "retry": "0",
+        "timeout": "0",
+        "actor": "SO",
+        "payload": "",
+        "success": "final_success",
+        "failure": "final_failure",
+        "failure_timeout": "final_failure_timeout",
+        "failure_retries": "final_failure_retries",
+        "failure_exception": "final_failure_exception",
+        "failure_guard": "final_failure_guard",
+        "target": {
+          "type": "VFMODULE",
+          "resourceID": "Vloadbalancerms..vpkg..module-1",
+          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "modelName": "Vloadbalancerms..vpkg..module-1",
+          "modelVersion": "1",
+          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
+        }
+      }
+    ]
+  },
+  "guard_policies": [
+    {
+      "policy-id": "guard.minmax.new",
+      "content": {
+        "actor": "APPC",
+        "recipe": "Restart",
+        "targets": ".*",
+        "clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
+        "guardActiveStart": "00:00:00Z",
+        "guardActiveEnd": "10:00:00Z",
+        "min": "0",
+        "max": "1"
+      }
+    },
+    {
+      "policy-id": "guard.frequency.new",
+      "content": {
+        "actor": "APPC",
+        "recipe": "Rebuild",
+        "targets": ".*",
+        "clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
+        "guardActiveStart": "00:00:00Z",
+        "guardActiveEnd": "10:00:00Z",
+        "limit": "1",
+        "timeWindow": "2",
+        "timeUnits": "minute"
+      }
+    }
+  ]
 }
diff --git a/src/test/resources/tosca/pdp-group-policy-payload.json b/src/test/resources/tosca/pdp-group-policy-payload.json
index bf941e516..ad3a5b4c3 100644
--- a/src/test/resources/tosca/pdp-group-policy-payload.json
+++ b/src/test/resources/tosca/pdp-group-policy-payload.json
@@ -4,10 +4,10 @@
       "policy-id": "GuardOpPolicyTest"
     },
     {
-      "policy-id": "guard2"
+      "policy-id": "guard.minmax.new"
     },
     {
-      "policy-id": "guard1"
+      "policy-id": "guard.frequency.new"
     },
     {
       "policy-id": "configPolicyTest"
diff --git a/ui-react/package.json b/ui-react/package.json
index de7cb26d1..9c94ccc3f 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -13,7 +13,7 @@
   "author": "ONAP Clamp Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "@json-editor/json-editor": "1.3.5",
+    "@json-editor/json-editor": "1.4.0-beta.0",
     "react": "16.8.0",
     "react-dom": "16.8.0",
     "react-scripts": "3.0.1",
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 5b8283f8f..b64cfbaa3 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -41,9 +41,9 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C
 import LoopProperties from './components/dialogs/LoopProperties';
 import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
-import PerformAction from './components/menu/PerformActions';
-import RefreshStatus from './components/menu/RefreshStatus';
-import DeployLoop from './components/menu/DeployLoop';
+import PerformAction from './components/dialogs/PerformActions';
+import RefreshStatus from './components/dialogs/RefreshStatus';
+import DeployLoop from './components/dialogs/DeployLoop';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -185,6 +185,7 @@ export default class LoopUI extends React.Component {
 		this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
 		this.props.history.push('/');
 	}
+	
  render() {
 		return (
 				<div id="main_div">
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 3ee5acc68..d83e3ce9d 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -51,6 +51,10 @@ export default class LoopCache {
 	getOperationalPolicyConfigurationJson() {
 		return this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"];
 	}
+	
+	getOperationalPolicyJsonSchema() {
+		return this.loopJsonCache["operationalPolicySchema"];
+	}
 
 	getOperationalPolicies() {
 		return this.loopJsonCache["operationalPolicies"];
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 031ec638f..eece20c96 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -104,6 +104,30 @@ export default class LoopService {
 				return "";
 			});
 	}
+	
+	static setOperationalPolicyProperties(loopName, jsonData) {
+		return fetch('/restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, {
+			method: 'POST',
+			credentials: 'same-origin',
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(jsonData),
+		})
+			.then(function (response) {
+				console.debug("updateOperationalPolicies response received: ", response.status);
+				if (response.ok) {
+					return response.text();
+				} else {
+					console.error("updateOperationalPolicies query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("updateOperationalPolicies error received", error);
+				return "";
+			});
+	}
 
 	static updateGlobalProperties(loopName, jsonData) {
 		return fetch('/restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 4fbb7832c..9863ef721 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -103,7 +103,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>Configuration policies</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 2a812c877..6db38fd23 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -24,8 +24,9 @@
 import React from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
-import './OperationalPolicy.css'
 import styled from 'styled-components';
+import LoopService from '../../../api/LoopService';
+import JSONEditor from '@json-editor/json-editor';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -36,512 +37,94 @@ export default class OperationalPolicyModal extends React.Component {
 	state = {
 		show: true,
 		loopCache: this.props.loopCache,
+		jsonEditor: null,
 	};
 
-	allPolicies = [];
-	policyIds = [];
-
 	constructor(props, context) {
 		super(props, context);
-
 		this.handleClose = this.handleClose.bind(this);
-		this.initPolicySelect = this.initPolicySelect.bind(this);
-		this.initPolicySelect();
+		this.handleSave = this.handleSave.bind(this);
+		this.renderJsonEditor = this.renderJsonEditor.bind(this);
+		this.setDefaultJsonEditorOptions();
 	}
 
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/')
-	}
+	handleSave() {
+		var errors = this.state.jsonEditor.validate();
+		var editorData = this.state.jsonEditor.getValue();
 
-	initPolicySelect() {
-		if (this.allPolicies['operational_policy'] === undefined || this.allPolicies['operational_policy'] === null) {
-			this.allPolicies = this.state.loopCache.getOperationalPolicyConfigurationJson();
+		if (errors.length !== 0) {
+			console.error("Errors detected during config policy data validation ", errors);
+			alert(errors);
 		}
-		// Provision all policies ID first
-		if (this.policyIds.length === 0 && this.allPolicies['operational_policy'] !== undefined) {
-
-			for (let i = 0; i < this.allPolicies['operational_policy']['policies'].length; i++) {
-				this.policyIds.push(this.allPolicies['operational_policy']['policies'][i]['id']);
-			}
+		else {
+			console.info("NO validation errors found in config policy data");
+			this.state.loopCache.updateOperationalPolicyProperties(editorData);
+			LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()).then(resp => {
+				this.setState({ show: false });
+				this.props.history.push('/');
+				this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+			});
 		}
 	}
 
-	renderPolicyIdSelect() {
-		return (
-			<select type="text" id="trigger_policy" name="trigger_policy"
-				className="form-control">
-				<option value="">-- choose an option --</option>
-				{this.policyIds.map(policyId => (<option key={policyId}>{policyId}</option>))}
-			</select>
-		);
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
 	}
 
-	serializeElement(element) {
-		var o = {};
-		element.serializeArray().forEach(function () {
-			if (o[this.name]) {
-				if (!o[this.name].push) {
-					o[this.name] = [o[this.name]];
-				}
-				o[this.name].push(this.value || '');
-			} else {
-				o[this.name] = this.value || '';
-			}
-		});
-		return o;
+	componentDidMount() {
+		this.renderJsonEditor();
 	}
 
-	// When we change the name of a policy
-	isDuplicatedId(event) {
-		// update policy id structure
-		var formNum = document.getElementById(event.target).closest('.formId').attr('id').substring(6);
-		var policyId = document.getElementById(event.target).val();
-		if (this.policyIds.includes(policyId)) {
-			console.log("Duplicated ID, cannot proceed");
-			return true;
-		} else {
-			this.duplicated = false;
-			this.policyIds.splice(this.policyIds.indexOf(document.getElementById("#formId" + formNum + " #id").val()), 1);
-			this.policyIds.push(document.getElementById(event.target).val());
-			// Update the tab now
-			document.getElementById("#go_properties_tab" + formNum).text(document.getElementById(event.target).val());
-		}
+	setDefaultJsonEditorOptions() {
+		JSONEditor.defaults.options.theme = 'bootstrap4';
+		// JSONEditor.defaults.options.iconlib = 'bootstrap2';
+
+		JSONEditor.defaults.options.object_layout = 'grid';
+		JSONEditor.defaults.options.disable_properties = true;
+		JSONEditor.defaults.options.disable_edit_json = false;
+		JSONEditor.defaults.options.disable_array_reorder = true;
+		JSONEditor.defaults.options.disable_array_delete_last_row = true;
+		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
+		JSONEditor.defaults.options.array_controls_top=true;
+		JSONEditor.defaults.options.show_errors = 'always';
+		JSONEditor.defaults.options.keep_oneof_values=false;
+		JSONEditor.defaults.options.ajax=true;
+		JSONEditor.defaults.options.collapsed=true;
+		//JSONEditor.defaults.options.template = 'default';
 	}
+	
+	renderJsonEditor() {
+		console.debug("Rendering OperationalPolicyModal");
+		var schema_json = this.state.loopCache.getOperationalPolicyJsonSchema();
+		
+		if (schema_json == null) {
+			console.error("NO Operational policy schema found");
+			return;
+		}
+		var operationalPoliciesData = this.state.loopCache.getOperationalPolicies();
 
-	configureComponents() {
-		console.log("Load properties to op policy");
-		// Set the header
-		document.getElementsByClassName('form-control').forEach(function () {
-			this.val(this.allPolicies['operational_policy']['controlLoop'][this.id]);
-		});
-		// Set the sub-policies
-		this.allPolicies['operational_policy']['policies'].forEach(function (opPolicyElemIndex, opPolicyElemValue) {
-
-			/*			    var formNum = add_one_more();
-							forEach(document.getElementsByClassName('policyProperties').find('.form-control'), function(opPolicyPropIndex, opPolicyPropValue) {
-			
-								$("#formId" + formNum + " .policyProperties").find("#" + opPolicyPropValue.id).val(
-								allPolicies['operational_policy']['policies'][opPolicyElemIndex][opPolicyPropValue.id]);
-							});
-			
-							// Initial TargetResourceId options
-							initTargetResourceIdOptions(allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target']['type'], formNum);
-							$.each($('.policyTarget').find('.form-control'), function(opPolicyTargetPropIndex, opPolicyTargetPropValue) {
-			
-								$("#formId" + formNum + " .policyTarget").find("#" + opPolicyTargetPropValue.id).val(
-								allPolicies['operational_policy']['policies'][opPolicyElemIndex]['target'][opPolicyTargetPropValue.id]);
-							});
-			
-							// update the current tab label
-							$("#go_properties_tab" + formNum).text(
-							allPolicies['operational_policy']['policies'][opPolicyElemIndex]['id']);
-							// Check if there is a guard set for it
-							$.each(allPolicies['guard_policies'], function(guardElemId, guardElemValue) {
-			
-								if (guardElemValue.recipe === $($("#formId" + formNum + " #recipe")[0]).val()) {
-									// Found one, set all guard prop
-									$.each($('.guardProperties').find('.form-control'), function(guardPropElemIndex,
-																								 guardPropElemValue) {
-			
-										guardElemValue['id'] = guardElemId;
-										$("#formId" + formNum + " .guardProperties").find("#" + guardPropElemValue.id).val(
-										guardElemValue[guardPropElemValue.id]);
-									});
-									iniGuardPolicyType(guardElemId, formNum);
-									// And finally enable the flag
-									$("#formId" + formNum + " #enableGuardPolicy").prop("checked", true);
-								}
-							});*/
-		});
+		this.setState({
+				jsonEditor: new JSONEditor(document.getElementById("editor"),
+					{ schema: schema_json.schema, startval: operationalPoliciesData })
+			})
 	}
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>Operational policies</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
-					<div attribute-test="policywindowproperties" id="configure-widgets"
-						className="disabled-block-container">
-						<div attribute-test="policywindowpropertiesb" className="modal-body row">
-							<div className="panel panel-default col-sm-10 policyPanel">
-								<form id="operationalPolicyHeaderForm" className="form-horizontal">
-									<div className="form-group clearfix">
-										<label className="col-sm-2">Parent policy</label>
-										<div className="col-sm-3" style={{ padding: '0px' }}>
-											{this.renderPolicyIdSelect()}
-										</div>
-
-										<label htmlFor="timeout" className="col-sm-3"
-											style={{ paddingLeft: '5px', paddingRight: '10px' }}>Overall
-	        									Time Limit</label>
-										<div className="col-sm-2" style={{ paddingLeft: '0px' }}>
-											<input type="text" ng-pattern="/^[0-9]*$/" ng-model="number"
-												className="form-control" id="timeout" name="timeout" />
-										</div>
-
-										<label htmlFor="abatement" className="col-sm-2">Abatement</label>
-										<div className="col-sm-2" style={{ paddingLeft: '0px' }}>
-											<select className="form-control" id="abatement" name="abatement">
-												<option value="false">False</option>
-												<option value="true">True</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix row">
-										<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
-										<div className="col-sm-8">
-											<input type="text" className="form-control" name="controlLoopName"
-												readOnly="readonly" id="clname" value={this.state.loopCache.getLoopName()} />
-										</div>
-									</div>
-								</form>
-								<div className="panel-heading" style={{ backgroundColor: 'white' }}>
-									<ul id="nav_Tabs" className="nav nav-tabs">
-										<li>
-											<a id="add_one_more" href="#desc_tab">
-												<span
-													className="glyphicon glyphicon-plus" aria-hidden="true">
-												</span>
-											</a>
-										</li>
-									</ul>
-								</div>
-								<div className="panel-body">
-									<div className="tab-content">
-										<div id="properties_tab" className="tab-pane fade in active"></div>
-									</div>
-								</div>
-							</div>
-
-							<span id="formSpan" style={{ display: 'none' }}>
-								<form className="policyProperties form-horizontal"
-									style={{ border: '2px dotted gray' }}
-									title="Operational Policy Properties">
-									<div className="form-group clearfix">
-										<label className="col-sm-4 control-label" htmlFor="id">ID</label>
-										<div className="col-sm-8">
-											<input type="text" className="form-control" name="id" id="id"
-												onKeyUp="updateTabLabel($event)" />
-											<span >ID must be unique</span>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
-										<div className="col-sm-8">
-											<select className="form-control" name="recipe" id="recipe"
-												ng-model="recipe" ng-click="updateGuardRecipe($event)">
-												<option value="">-- choose an option --</option>
-												<option value="Restart">Restart</option>
-												<option value="Rebuild">Rebuild</option>
-												<option value="Migrate">Migrate</option>
-												<option value="Health-Check">Health-Check</option>
-												<option value="ModifyConfig">ModifyConfig</option>
-												<option value="VF Module Create">VF Module Create</option>
-												<option value="VF Module Delete">VF Module Delete</option>
-												<option value="Reroute">Reroute</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="retry" className="col-sm-4 control-label"> Retry</label>
-										<div className="col-sm-8">
-											<input type="text" maxLength="5" className="form-control" id="retry"
-												ng-pattern="/^[0-9]*$/" ng-model="number" name="retry">
-											</input>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="timeout" className="col-sm-4 control-label">
-											Timeout</label>
-										<div className="col-sm-8">
-											<input type="text" maxLength="5" className="form-control"
-												id="timeout" ng-pattern="/^[0-9]*$/" ng-model="number"
-												name="timeout"></input>
-										</div>
-									</div>
-
-									<div className="form-group clearfix">
-										<label htmlFor="actor" className="col-sm-4 control-label"> Actor</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="actor" name="actor" ng-click="updateGuardActor($event)" ng-model="actor">
-												<option value="">-- choose an option --</option>
-												<option value="APPC">APPC</option>
-												<option value="SO">SO</option>
-												<option value="VFC">VFC</option>
-												<option value="SDNC">SDNC</option>°
-	        									<option value="SDNR">SDNR</option>°
-	        								</select>
-										</div>
-
-										<label htmlFor="payload" className="col-sm-4 control-label">
-											Payload (YAML)</label>
-										<div className="col-sm-8">
-											<textarea className="form-control" id="payload" name="payload"></textarea>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="success" className="col-sm-4 control-label">When
-	        								Success</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="success" name="success"
-												ng-model="null_dump"
-												ng-options="policy for policy in policy_ids track by policy">
-												<option value="">-- choose an option --</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="failure" className="col-sm-4 control-label">When
-	        								Failure</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="failure" name="failure"
-												ng-model="null_dump"
-												ng-options="policy for policy in policy_ids track by policy">
-												<option value="">-- choose an option --</option>
-											</select>
-
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="failure_timeout" className="col-sm-4 control-label">When
-	        								Failure Timeout</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="failure_timeout"
-												name="failure_timeout" ng-model="null_dump"
-												ng-options="policy for policy in policy_ids track by policy">
-												<option value="">-- choose an option --</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="failure_retries" className="col-sm-4 control-label">When
-	        								Failure Retries</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="failure_retries"
-												name="failure_retries" ng-model="null_dump"
-												ng-options="policy for policy in policy_ids track by policy">
-												<option value="">-- choose an option --</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="failure_exception" className="col-sm-4 control-label">When
-	        								Failure Exception</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="failure_exception"
-												name="failure_exception" ng-model="null_dump"
-												ng-options="policy for policy in policy_ids track by policy">
-												<option value="">-- choose an option --</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="failure_guard" className="col-sm-4 control-label">When
-	        								Failure Guard</label>
-										<div className="col-sm-8">
-											<select className="form-control" id="failure_guard"
-												name="failure_guard" ng-model="null_dump"
-												ng-options="policy for policy in policy_ids track by policy">
-												<option value="">-- choose an option --</option>
-											</select>
-										</div>
-									</div>
-								</form>
-								<form className="policyTarget form-horizontal"
-									title="Operational Policy Target" style={{ border: '2px dotted gray' }}>
-									<div className="form-group clearfix">
-										<label htmlFor="type" className="col-sm-4 control-label"> Target
-	        								Type</label>
-										<div className="col-sm-8">
-											<select className="form-control" name="type" id="type"
-												ng-click="initTargetResourceId($event)" ng-model="type">
-												<option value="">-- choose an option --</option>
-												<option value="VFMODULE">VFMODULE</option>
-												<option value="VM">VM</option>
-												<option value="VNF">VNF</option>
-											</select>
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="resourceID" className="col-sm-4 control-label">
-											Target ResourceId</label>
-										<div className="col-sm-8">
-											<select className="form-control" name="resourceID" id="resourceID"
-												ng-click="changeTargetResourceId($event)"
-												ng-model="resourceId">
-												<option value="">-- choose an option --</option>
-											</select>
-										</div>
-									</div>
-									<div id="metadata">
-										<div className="form-group clearfix">
-											<label htmlFor="modelInvariantId" className="col-sm-4 control-label">
-												Model Invariant Id</label>
-											<div className="col-sm-8">
-												<input className="form-control" name="modelInvariantId"
-													id="modelInvariantId" readOnly />
-											</div>
-										</div>
-										<div className="form-group clearfix">
-											<label htmlFor="modelVersionId" className="col-sm-4 control-label">
-												Model Version Id</label>
-											<div className="col-sm-8">
-												<input className="form-control" name="modelVersionId"
-													id="modelVersionId" readOnly />
-											</div>
-										</div>
-										<div className="form-group clearfix">
-											<label htmlFor="modelName" className="col-sm-4 control-label">
-												Model Name</label>
-											<div className="col-sm-8">
-												<input className="form-control" name="modelName" id="modelName"
-													readOnly />
-											</div>
-										</div>
-										<div className="form-group clearfix">
-											<label htmlFor="modelVersion" className="col-sm-4 control-label">
-												Model Version</label>
-											<div className="col-sm-8">
-												<input className="form-control" name="modelVersion"
-													id="modelVersion" readOnly />
-											</div>
-										</div>
-										<div className="form-group clearfix">
-											<label htmlFor="modelCustomizationId" className="col-sm-4 control-label">
-												Model Customization Id</label>
-											<div className="col-sm-8">
-												<input className="form-control" name="modelCustomizationId"
-													id="modelCustomizationId" readOnly />
-											</div>
-										</div>
-									</div>
-								</form>
-								<div className="form-group clearfix">
-									<label htmlFor="enableGuardPolicy" className="col-sm-4 control-label">
-										Enable Guard Policy</label>
-									<div className="col-sm-8">
-										<input type="checkbox" className="form-control"
-											name="enableGuardPolicy" id="enableGuardPolicy" />
-									</div>
-
-									<div className="col-sm-8">
-										<label htmlFor="guardPolicyType" className="col-sm-4 control-label">
-											Guard Policy Type</label> <select className="form-control"
-												name="guardPolicyType" id="guardPolicyType"
-												ng-click="changeGuardPolicyType()" ng-model="guardType">
-											<option value="GUARD_MIN_MAX">MinMax</option>
-											<option value="GUARD_YAML">FrequencyLimiter</option>
-										</select>
-									</div>
-								</div>
-								<form className="guardProperties form-horizontal"
-									title="Guard policy associated" style={{ border: '2px dotted gray' }}>
-
-									<div className="form-group clearfix withnote">
-										<label className="col-sm-4 control-label" htmlFor="id">Guard Policy ID</label>
-										<div className="col-sm-8">
-											<input type="text" className="form-control" name="id" id="id" ng-blur="changeGuardId()" ng-model="id" />
-										</div>
-									</div>
-									<div>
-										<label className="form-group note">Note: Prefix will be added to Guard Policy ID automatically based on Guard Policy Type</label>
-									</div>
-									<div className="form-group clearfix">
-										<label className="col-sm-4 control-label" htmlFor="recipe">Recipe</label>
-										<div className="col-sm-8">
-											<input type="text" className="form-control" name="recipe"
-												readOnly="readonly" id="recipe" />
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label className="col-sm-4 control-label" htmlFor="clname">ControlLoopName</label>
-										<div className="col-sm-8">
-											<input type="text" className="form-control" name="clname"
-												readOnly="readonly" id="clname" ng-model="clname" />
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="actor" className="col-sm-4 control-label">Actor</label>
-										<div className="col-sm-8">
-											<input type="text" className="form-control" name="actor"
-												readOnly="readonly" id="actor" />
-										</div>
-									</div>
-									<div className="form-group clearfix">
-
-										<label htmlFor="targets" className="col-sm-4 control-label">Guard
-	        								targets</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="targets" id="targets" />
-										</div>
-									</div>
-
-									<div className="form-group clearfix" id="minMaxGuardPolicyDiv">
-										<label htmlFor="min" className="col-sm-4 control-label"> Min
-	        								Guard</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="min" id="min" />
-										</div>
-										<label htmlFor="max" className="col-sm-4 control-label"> Max
-	        								Guard</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="max" id="max" />
-										</div>
-									</div>
-									<div className="form-group clearfix"
-										id="frequencyLimiterGuardPolicyDiv" style={{ display: 'none' }}>
-										<label htmlFor="limit" className="col-sm-4 control-label">Limit</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="limit" id="limit" />
-										</div>
-										<label htmlFor="timeUnits" className="col-sm-4 control-label">Time Units</label>
-										<div className="col-sm-8">
-											<select className="form-control" name="timeUnits"
-												id="timeUnits">
-												<option value=""></option>
-												<option value="minute">minute</option>
-												<option value="hour">hour</option>
-												<option value="day">day</option>
-												<option value="week">week</option>
-												<option value="month">month</option>
-												<option value="year">year</option>
-											</select>
-										</div>
-										<label htmlFor="timeWindow" className="col-sm-4 control-label">Time	Window</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="timeWindow" id="timeWindow" />
-										</div>
-									</div>
-									<div className="form-group clearfix">
-										<label htmlFor="guardActiveStart" className="col-sm-4 control-label">
-											Guard Active Start</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="guardActiveStart"
-												id="guardActiveStart" value="00:00:00Z" />
-										</div>
-										<label htmlFor="guardActiveEnd" className="col-sm-4 control-label">
-											Guard Active End</label>
-										<div className="col-sm-8">
-											<input className="form-control" name="guardActiveEnd"
-												id="guardActiveEnd" value="00:00:01Z" />
-										</div>
-									</div>
-
-								</form>
-
-							</span>
-						</div>
-					</div>
+					<div id="editor" />
 
 				</Modal.Body>
 				<Modal.Footer>
 					<Button variant="secondary" onClick={this.handleClose}>
 						Close
 	            </Button>
-					<Button variant="primary" onClick={this.handleClose}>
+					<Button variant="primary" onClick={this.handleSave}>
 						Save Changes
 	            </Button>
 				</Modal.Footer>
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index 39df36427..cbbdc65ef 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -32,7 +32,7 @@ const routing = (
 	</BrowserRouter>
 );
 
-ReactDOM.render(
+export var mainClamp = ReactDOM.render(
 	routing,
 	document.getElementById('root')
 )
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index cbd86b199..0f6fb91c6 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -65,6 +65,19 @@ export const GlobalClampStyle = createGlobalStyle`
 	width: 100%;
 	height: 100%;
   }
+  
+  button {
+  	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
+  	border: 1px;
+  	color: white;
+  	padding: 15px 32px;
+  	text-align: center;
+  	text-decoration: none;
+  	display: inline-block;
+  	font-size: ${props => props.theme.fontSize};
+  	font-family: ${props => props.theme.fontFamily};
+
+  }
 `
 
 export const DefaultClampTheme = {
-- 
cgit 1.2.3-korg


From 4aedf73ee896f8bac3dce6d728cb40a9519b76d7 Mon Sep 17 00:00:00 2001
From: TedHumphrey <Thomas.Humphrey@att.com>
Date: Tue, 13 Aug 2019 15:56:33 +0000
Subject: Changes to support npm publish of reactjs components

Modify the pom.xml to copy ui-react sources to target, add
maven-exec-plugin to run the "npm publish" step, update the package.json
to include where to publish

Issue-ID: CLAMP-450
Change-Id: Id0d15e71924867d1d4329a377661d125b21fee6c
Signed-off-by: TedHumphrey <Thomas.Humphrey@att.com>
---
 .gitignore                              |     1 -
 pom.xml                                 |    41 +-
 ui-react/package-lock.json              | 13635 ++++++++++++++++++++++++++++++
 ui-react/package.json                   |    26 +-
 ui-react/src/__test__/LoopCache.test.js |     6 +-
 5 files changed, 13684 insertions(+), 25 deletions(-)
 create mode 100644 ui-react/package-lock.json

(limited to 'ui-react/src')

diff --git a/.gitignore b/.gitignore
index fbdcf4af5..235ece273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ target
 *.iml
 ui-react/node_modules
 ui-react/build
-**/package-lock.json
 **/.evosuite/
 **/debug-logs/
 *.log
diff --git a/pom.xml b/pom.xml
index 841917b3d..b341f134d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP CLAMP
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,6 +87,8 @@
 				<skip.staging.artifacts>false</skip.staging.artifacts>
 				<python.http.proxy.param/>
 				<tomcat.version>9.0.20</tomcat.version>
+				<ui.react.src>ui-react</ui.react.src>
+				<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
 		</properties>
 
 		<profiles>
@@ -700,11 +702,15 @@
 								</includes>
 						</resource>
 						<resource>
-								<directory>src/main/docker</directory>
-								<includes>
-										<include>**/*</include>
-								</includes>
-								<filtering>true</filtering>
+							<directory>${ui.react.src}</directory>
+							<includes>
+								<include>src/**</include>
+								<include>public/**</include>
+								<include>package.json</include>
+								<include>package-lock.json</include>
+							</includes>
+							<filtering>false</filtering>
+							<targetPath>${project.build.directory}/${ui.react.src}</targetPath>
 						</resource>
 				</resources>
 
@@ -1218,18 +1224,16 @@
 						<artifactId>frontend-maven-plugin</artifactId>
 						<version>1.6</version>
 						<configuration>
-							<installDirectory>${project.build.directory}/clamp-ui</installDirectory>
-							<workingDirectory>${project.build.directory}/clamp-ui</workingDirectory>
-							<skip>${maven.test.skip}</skip>
+							<installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
+							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
 						</configuration>
-
 						<executions>
 							<execution>
 								<id>install_node_and_npm</id>
 								<goals>
 									<goal>install-node-and-npm</goal>
 								</goals>
-								<phase>test</phase>
+								<phase>generate-sources</phase>
 								<configuration>
 									<nodeVersion>v8.11.1</nodeVersion>
 									<npmVersion>5.6.0</npmVersion>
@@ -1240,7 +1244,7 @@
 								<goals>
 									<goal>npm</goal>
 								</goals>
-								<phase>test</phase>
+								<phase>compile</phase>
 								<configuration>
 									<arguments>install</arguments>
 								</configuration>
@@ -1252,10 +1256,19 @@
 								</goals>
 								<phase>test</phase>
 								<configuration>
-									<arguments>run-script test:coverage</arguments>
+									<arguments>run-script test</arguments>
 								</configuration>
 							</execution>
-
+								<execution>
+									<id>npm_publish</id>
+									<goals>
+										<goal>npm</goal>
+									</goals>
+									<phase>deploy</phase>
+									<configuration>
+										<arguments>publish --registry ${npm.publish.url}</arguments>
+									</configuration>
+								</execution>
 						</executions>
 					</plugin>
 				</plugins>
diff --git a/ui-react/package-lock.json b/ui-react/package-lock.json
new file mode 100644
index 000000000..2f8074447
--- /dev/null
+++ b/ui-react/package-lock.json
@@ -0,0 +1,13635 @@
+{
+  "name": "onap-clamp-ui",
+  "version": "${project.version}",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.3.tgz",
+      "integrity": "sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.4.0",
+        "@babel/helpers": "^7.4.3",
+        "@babel/parser": "^7.4.3",
+        "@babel/template": "^7.4.0",
+        "@babel/traverse": "^7.4.3",
+        "@babel/types": "^7.4.0",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.11",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+      "requires": {
+        "@babel/types": "^7.5.5",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
+      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
+      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-builder-react-jsx": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz",
+      "integrity": "sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==",
+      "requires": {
+        "@babel/types": "^7.3.0",
+        "esutils": "^2.0.0"
+      }
+    },
+    "@babel/helper-call-delegate": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
+      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz",
+      "integrity": "sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==",
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-member-expression-to-functions": "^7.5.5",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5",
+        "@babel/helper-split-export-declaration": "^7.4.4"
+      }
+    },
+    "@babel/helper-define-map": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
+      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
+      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
+      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
+      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+      "requires": {
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
+      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
+      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
+      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="
+    },
+    "@babel/helper-regex": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
+      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+      "requires": {
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
+      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
+      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.5.5",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
+      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "requires": {
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
+      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
+      "requires": {
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+      "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g=="
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
+      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz",
+      "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.5.5",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-proposal-decorators": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz",
+      "integrity": "sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-decorators": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
+      "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz",
+      "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
+      "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-decorators": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz",
+      "integrity": "sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
+      "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-flow": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz",
+      "integrity": "sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz",
+      "integrity": "sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz",
+      "integrity": "sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
+      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz",
+      "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
+      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.5.5",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz",
+      "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
+      "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
+      "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-flow-strip-types": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz",
+      "integrity": "sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-flow": "^7.2.0"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
+      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
+      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
+      "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz",
+      "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
+      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
+      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "requires": {
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
+      "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
+      "requires": {
+        "regexp-tree": "^0.1.6"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
+      "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
+      "requires": {
+        "@babel/helper-call-delegate": "^7.4.4",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
+      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-react-constant-elements": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz",
+      "integrity": "sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-react-display-name": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz",
+      "integrity": "sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-react-jsx": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz",
+      "integrity": "sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==",
+      "requires": {
+        "@babel/helper-builder-react-jsx": "^7.3.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.2.0"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-self": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz",
+      "integrity": "sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.2.0"
+      }
+    },
+    "@babel/plugin-transform-react-jsx-source": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz",
+      "integrity": "sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.2.0"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
+      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "requires": {
+        "regenerator-transform": "^0.14.0"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
+      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz",
+      "integrity": "sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
+      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
+    "@babel/plugin-transform-typescript": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz",
+      "integrity": "sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.5.5",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-typescript": "^7.2.0"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
+      "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz",
+      "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-dynamic-import": "^7.5.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.5.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.5.5",
+        "@babel/plugin-transform-classes": "^7.5.5",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.5.0",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/plugin-transform-duplicate-keys": "^7.5.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.5.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.5.0",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-new-target": "^7.4.4",
+        "@babel/plugin-transform-object-super": "^7.5.5",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "@babel/preset-react": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0.tgz",
+      "integrity": "sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-transform-react-display-name": "^7.0.0",
+        "@babel/plugin-transform-react-jsx": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-source": "^7.0.0"
+      }
+    },
+    "@babel/preset-typescript": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz",
+      "integrity": "sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-transform-typescript": "^7.3.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
+      "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
+    "@babel/template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+      "requires": {
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.5.5",
+        "@babel/types": "^7.5.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/types": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@cnakazawa/watch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
+      "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
+      "requires": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      }
+    },
+    "@csstools/convert-colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
+      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
+    },
+    "@csstools/normalize.css": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-9.0.1.tgz",
+      "integrity": "sha512-6It2EVfGskxZCQhuykrfnALg7oVeiI6KclWSmGDqB0AiInVrTGB9Jp9i4/Ad21u9Jde/voVQz6eFX/eSg/UsPA=="
+    },
+    "@emotion/cache": {
+      "version": "10.0.15",
+      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.15.tgz",
+      "integrity": "sha512-8VthgeKhlGeTXSW1JN7I14AnAaiFPbOrqNqg3dPoGCZ3bnMjkrmRU0zrx0BtBw9esBaPaQgDB9y0tVgAGT2Mrg==",
+      "requires": {
+        "@emotion/sheet": "0.9.3",
+        "@emotion/stylis": "0.8.4",
+        "@emotion/utils": "0.11.2",
+        "@emotion/weak-memoize": "0.2.3"
+      }
+    },
+    "@emotion/core": {
+      "version": "10.0.15",
+      "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.15.tgz",
+      "integrity": "sha512-VHwwl3k/ddMfQOHYgOJryXOs2rGJ5AfKLQGm5AVolNonnr6tkmDI4nzIMNaPpveoXVs7sP0OrF24UunIPxveQw==",
+      "requires": {
+        "@babel/runtime": "^7.4.3",
+        "@emotion/cache": "^10.0.15",
+        "@emotion/css": "^10.0.14",
+        "@emotion/serialize": "^0.11.9",
+        "@emotion/sheet": "0.9.3",
+        "@emotion/utils": "0.11.2"
+      }
+    },
+    "@emotion/css": {
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.14.tgz",
+      "integrity": "sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==",
+      "requires": {
+        "@emotion/serialize": "^0.11.8",
+        "@emotion/utils": "0.11.2",
+        "babel-plugin-emotion": "^10.0.14"
+      }
+    },
+    "@emotion/hash": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.2.tgz",
+      "integrity": "sha512-RMtr1i6E8MXaBWwhXL3yeOU8JXRnz8GNxHvaUfVvwxokvayUY0zoBeWbKw1S9XkufmGEEdQd228pSZXFkAln8Q=="
+    },
+    "@emotion/is-prop-valid": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.2.tgz",
+      "integrity": "sha512-ZQIMAA2kLUWiUeMZNJDTeCwYRx1l8SQL0kHktze4COT22occKpDML1GDUXP5/sxhOMrZO8vZw773ni4H5Snrsg==",
+      "requires": {
+        "@emotion/memoize": "0.7.2"
+      }
+    },
+    "@emotion/memoize": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.2.tgz",
+      "integrity": "sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w=="
+    },
+    "@emotion/serialize": {
+      "version": "0.11.9",
+      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.9.tgz",
+      "integrity": "sha512-/Cn4V81z3ZyFiDQRw8nhGFaHkxHtmCSSBUit4vgTuLA1BqxfJUYiqSq97tq/vV8z9LfIoqs6a9v6QrUFWZpK7A==",
+      "requires": {
+        "@emotion/hash": "0.7.2",
+        "@emotion/memoize": "0.7.2",
+        "@emotion/unitless": "0.7.4",
+        "@emotion/utils": "0.11.2",
+        "csstype": "^2.5.7"
+      }
+    },
+    "@emotion/sheet": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.3.tgz",
+      "integrity": "sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A=="
+    },
+    "@emotion/stylis": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.4.tgz",
+      "integrity": "sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ=="
+    },
+    "@emotion/unitless": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.4.tgz",
+      "integrity": "sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ=="
+    },
+    "@emotion/utils": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.2.tgz",
+      "integrity": "sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA=="
+    },
+    "@emotion/weak-memoize": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz",
+      "integrity": "sha512-zVgvPwGK7c1aVdUVc9Qv7SqepOGRDrqCw7KZPSZziWGxSlbII3gmvGLPzLX4d0n0BMbamBacUrN22zOMyFFEkQ=="
+    },
+    "@hapi/address": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz",
+      "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw=="
+    },
+    "@hapi/hoek": {
+      "version": "6.2.4",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz",
+      "integrity": "sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A=="
+    },
+    "@hapi/joi": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz",
+      "integrity": "sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==",
+      "requires": {
+        "@hapi/address": "2.x.x",
+        "@hapi/hoek": "6.x.x",
+        "@hapi/marker": "1.x.x",
+        "@hapi/topo": "3.x.x"
+      }
+    },
+    "@hapi/marker": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz",
+      "integrity": "sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA=="
+    },
+    "@hapi/topo": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz",
+      "integrity": "sha512-JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==",
+      "requires": {
+        "@hapi/hoek": "8.x.x"
+      },
+      "dependencies": {
+        "@hapi/hoek": {
+          "version": "8.2.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.0.tgz",
+          "integrity": "sha512-pR2ZgiP562aiaQvQ98WgfqfTrm+xG+7hwHRPEiYZ+7U1OHAAb4OVZJIalCP03bMqYSioQzflzVTVrybSwDBn1Q=="
+        }
+      }
+    },
+    "@jest/console": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
+      "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
+      "requires": {
+        "@jest/source-map": "^24.3.0",
+        "chalk": "^2.0.1",
+        "slash": "^2.0.0"
+      }
+    },
+    "@jest/core": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.8.0.tgz",
+      "integrity": "sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==",
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/reporters": "^24.8.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/transform": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.1.15",
+        "jest-changed-files": "^24.8.0",
+        "jest-config": "^24.8.0",
+        "jest-haste-map": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-resolve-dependencies": "^24.8.0",
+        "jest-runner": "^24.8.0",
+        "jest-runtime": "^24.8.0",
+        "jest-snapshot": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "jest-validate": "^24.8.0",
+        "jest-watcher": "^24.8.0",
+        "micromatch": "^3.1.10",
+        "p-each-series": "^1.0.0",
+        "pirates": "^4.0.1",
+        "realpath-native": "^1.1.0",
+        "rimraf": "^2.5.4",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "@jest/environment": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.8.0.tgz",
+      "integrity": "sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==",
+      "requires": {
+        "@jest/fake-timers": "^24.8.0",
+        "@jest/transform": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "jest-mock": "^24.8.0"
+      }
+    },
+    "@jest/fake-timers": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.8.0.tgz",
+      "integrity": "sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-mock": "^24.8.0"
+      }
+    },
+    "@jest/reporters": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.8.0.tgz",
+      "integrity": "sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==",
+      "requires": {
+        "@jest/environment": "^24.8.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/transform": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "chalk": "^2.0.1",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "istanbul-lib-coverage": "^2.0.2",
+        "istanbul-lib-instrument": "^3.0.1",
+        "istanbul-lib-report": "^2.0.4",
+        "istanbul-lib-source-maps": "^3.0.1",
+        "istanbul-reports": "^2.1.1",
+        "jest-haste-map": "^24.8.0",
+        "jest-resolve": "^24.8.0",
+        "jest-runtime": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "jest-worker": "^24.6.0",
+        "node-notifier": "^5.2.1",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^2.0.0"
+      },
+      "dependencies": {
+        "jest-resolve": {
+          "version": "24.8.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
+          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "requires": {
+            "@jest/types": "^24.8.0",
+            "browser-resolve": "^1.11.3",
+            "chalk": "^2.0.1",
+            "jest-pnp-resolver": "^1.2.1",
+            "realpath-native": "^1.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "@jest/source-map": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz",
+      "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==",
+      "requires": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.1.15",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "@jest/test-result": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.8.0.tgz",
+      "integrity": "sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==",
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/types": "^24.8.0",
+        "@types/istanbul-lib-coverage": "^2.0.0"
+      }
+    },
+    "@jest/test-sequencer": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz",
+      "integrity": "sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==",
+      "requires": {
+        "@jest/test-result": "^24.8.0",
+        "jest-haste-map": "^24.8.0",
+        "jest-runner": "^24.8.0",
+        "jest-runtime": "^24.8.0"
+      }
+    },
+    "@jest/transform": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.8.0.tgz",
+      "integrity": "sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==",
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^24.8.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "chalk": "^2.0.1",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.1.15",
+        "jest-haste-map": "^24.8.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-util": "^24.8.0",
+        "micromatch": "^3.1.10",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "2.4.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "@jest/types": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.8.0.tgz",
+      "integrity": "sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^12.0.9"
+      }
+    },
+    "@json-editor/json-editor": {
+      "version": "1.4.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@json-editor/json-editor/-/json-editor-1.4.0-beta.0.tgz",
+      "integrity": "sha512-8fF7IqaT/KegVVsoe/Ewf1uwvGcRTF2jzlaJ+BzD5MrLu5l4IOxK5H6u+sl3nx0gWnLSZeSoNXCTJpnLLLEGcg=="
+    },
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
+    },
+    "@react-bootstrap/react-popper": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@react-bootstrap/react-popper/-/react-popper-1.2.1.tgz",
+      "integrity": "sha512-4l3q7LcZEhrSkI4d3Ie3g4CdrXqqTexXX4PFT45CB0z5z2JUbaxgRwKNq7r5j2bLdVpZm+uvUGqxJw8d9vgbJQ==",
+      "requires": {
+        "babel-runtime": "6.x.x",
+        "create-react-context": "^0.2.1",
+        "popper.js": "^1.14.4",
+        "prop-types": "^15.6.1",
+        "typed-styles": "^0.0.5",
+        "warning": "^3.0.0"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
+          "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
+    "@restart/context": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
+      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
+    },
+    "@restart/hooks": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.11.tgz",
+      "integrity": "sha512-EcKbmMEMJBGNXl2u5WLpwmQnH47+USJW4wIQlwkStmsdt/igq+EUJX7tp0fha0GGIliJoxg69FSe06i5/B6HpA=="
+    },
+    "@svgr/babel-plugin-add-jsx-attribute": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
+      "integrity": "sha512-j7KnilGyZzYr/jhcrSYS3FGWMZVaqyCG0vzMCwzvei0coIkczuYMcniK07nI0aHJINciujjH11T72ICW5eL5Ig=="
+    },
+    "@svgr/babel-plugin-remove-jsx-attribute": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.2.0.tgz",
+      "integrity": "sha512-3XHLtJ+HbRCH4n28S7y/yZoEQnRpl0tvTZQsHqvaeNXPra+6vE5tbRliH3ox1yZYPCxrlqaJT/Mg+75GpDKlvQ=="
+    },
+    "@svgr/babel-plugin-remove-jsx-empty-expression": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.2.0.tgz",
+      "integrity": "sha512-yTr2iLdf6oEuUE9MsRdvt0NmdpMBAkgK8Bjhl6epb+eQWk6abBaX3d65UZ3E3FWaOwePyUgNyNCMVG61gGCQ7w=="
+    },
+    "@svgr/babel-plugin-replace-jsx-attribute-value": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz",
+      "integrity": "sha512-U9m870Kqm0ko8beHawRXLGLvSi/ZMrl89gJ5BNcT452fAjtF2p4uRzXkdzvGJJJYBgx7BmqlDjBN/eCp5AAX2w=="
+    },
+    "@svgr/babel-plugin-svg-dynamic-title": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz",
+      "integrity": "sha512-p6z6JJroP989jHWcuraeWpzdejehTmLUpyC9smhTBWyPN0VVGe2phbYxpPTV7Vh8XzmFrcG55idrnfWn/2oQEw=="
+    },
+    "@svgr/babel-plugin-svg-em-dimensions": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.2.0.tgz",
+      "integrity": "sha512-C0Uy+BHolCHGOZ8Dnr1zXy/KgpBOkEUYY9kI/HseHVPeMbluaX3CijJr7D4C5uR8zrc1T64nnq/k63ydQuGt4w=="
+    },
+    "@svgr/babel-plugin-transform-react-native-svg": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.2.0.tgz",
+      "integrity": "sha512-7YvynOpZDpCOUoIVlaaOUU87J4Z6RdD6spYN4eUb5tfPoKGSF9OG2NuhgYnq4jSkAxcpMaXWPf1cePkzmqTPNw=="
+    },
+    "@svgr/babel-plugin-transform-svg-component": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz",
+      "integrity": "sha512-hYfYuZhQPCBVotABsXKSCfel2slf/yvJY8heTVX1PCTaq/IgASq1IyxPPKJ0chWREEKewIU/JMSsIGBtK1KKxw=="
+    },
+    "@svgr/babel-preset": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-4.3.1.tgz",
+      "integrity": "sha512-rPFKLmyhlh6oeBv3j2vEAj2nd2QbWqpoJLKzBLjwQVt+d9aeXajVaPNEqrES2spjXKR4OxfgSs7U0NtmAEkr0Q==",
+      "requires": {
+        "@svgr/babel-plugin-add-jsx-attribute": "^4.2.0",
+        "@svgr/babel-plugin-remove-jsx-attribute": "^4.2.0",
+        "@svgr/babel-plugin-remove-jsx-empty-expression": "^4.2.0",
+        "@svgr/babel-plugin-replace-jsx-attribute-value": "^4.2.0",
+        "@svgr/babel-plugin-svg-dynamic-title": "^4.3.1",
+        "@svgr/babel-plugin-svg-em-dimensions": "^4.2.0",
+        "@svgr/babel-plugin-transform-react-native-svg": "^4.2.0",
+        "@svgr/babel-plugin-transform-svg-component": "^4.2.0"
+      }
+    },
+    "@svgr/core": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-4.3.2.tgz",
+      "integrity": "sha512-N+tP5CLFd1hP9RpO83QJPZY3NL8AtrdqNbuhRgBkjE/49RnMrrRsFm1wY8pueUfAGvzn6tSXUq29o6ah8RuR5w==",
+      "requires": {
+        "@svgr/plugin-jsx": "^4.3.2",
+        "camelcase": "^5.3.1",
+        "cosmiconfig": "^5.2.1"
+      }
+    },
+    "@svgr/hast-util-to-babel-ast": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz",
+      "integrity": "sha512-JioXclZGhFIDL3ddn4Kiq8qEqYM2PyDKV0aYno8+IXTLuYt6TOgHUbUAAFvqtb0Xn37NwP0BTHglejFoYr8RZg==",
+      "requires": {
+        "@babel/types": "^7.4.4"
+      }
+    },
+    "@svgr/plugin-jsx": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz",
+      "integrity": "sha512-+1GW32RvmNmCsOkMoclA/TppNjHPLMnNZG3/Ecscxawp051XJ2MkO09Hn11VcotdC2EPrDfT8pELGRo+kbZ1Eg==",
+      "requires": {
+        "@babel/core": "^7.4.5",
+        "@svgr/babel-preset": "^4.3.1",
+        "@svgr/hast-util-to-babel-ast": "^4.3.2",
+        "svg-parser": "^2.0.0"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+          "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.5.5",
+            "@babel/helpers": "^7.5.5",
+            "@babel/parser": "^7.5.5",
+            "@babel/template": "^7.4.4",
+            "@babel/traverse": "^7.5.5",
+            "@babel/types": "^7.5.5",
+            "convert-source-map": "^1.1.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "@svgr/plugin-svgo": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-4.3.1.tgz",
+      "integrity": "sha512-PrMtEDUWjX3Ea65JsVCwTIXuSqa3CG9px+DluF1/eo9mlDrgrtFE7NE/DjdhjJgSM9wenlVBzkzneSIUgfUI/w==",
+      "requires": {
+        "cosmiconfig": "^5.2.1",
+        "merge-deep": "^3.0.2",
+        "svgo": "^1.2.2"
+      }
+    },
+    "@svgr/webpack": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.1.0.tgz",
+      "integrity": "sha512-d09ehQWqLMywP/PT/5JvXwPskPK9QCXUjiSkAHehreB381qExXf5JFCBWhfEyNonRbkIneCeYM99w+Ud48YIQQ==",
+      "requires": {
+        "@babel/core": "^7.1.6",
+        "@babel/plugin-transform-react-constant-elements": "^7.0.0",
+        "@babel/preset-env": "^7.1.6",
+        "@babel/preset-react": "^7.0.0",
+        "@svgr/core": "^4.1.0",
+        "@svgr/plugin-jsx": "^4.1.0",
+        "@svgr/plugin-svgo": "^4.0.3",
+        "loader-utils": "^1.1.0"
+      }
+    },
+    "@types/babel__core": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz",
+      "integrity": "sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==",
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "@types/babel__generator": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz",
+      "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==",
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__template": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
+      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@types/babel__traverse": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz",
+      "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
+      "requires": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
+      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="
+    },
+    "@types/istanbul-lib-report": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
+      "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "@types/istanbul-reports": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
+      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/node": {
+      "version": "12.7.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.1.tgz",
+      "integrity": "sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw=="
+    },
+    "@types/q": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
+    },
+    "@types/stack-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
+    },
+    "@types/yargs": {
+      "version": "12.0.12",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
+      "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw=="
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.6.0.tgz",
+      "integrity": "sha512-U224c29E2lo861TQZs6GSmyC0OYeRNg6bE9UVIiFBxN2MlA0nq2dCrgIVyyRbC05UOcrgf2Wk/CF2gGOPQKUSQ==",
+      "requires": {
+        "@typescript-eslint/parser": "1.6.0",
+        "@typescript-eslint/typescript-estree": "1.6.0",
+        "requireindex": "^1.2.0",
+        "tsutils": "^3.7.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.6.0.tgz",
+      "integrity": "sha512-VB9xmSbfafI+/kI4gUK3PfrkGmrJQfh0N4EScT1gZXSZyUxpsBirPL99EWZg9MmPG0pzq/gMtgkk7/rAHj4aQw==",
+      "requires": {
+        "@typescript-eslint/typescript-estree": "1.6.0",
+        "eslint-scope": "^4.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.6.0.tgz",
+      "integrity": "sha512-A4CanUwfaG4oXobD5y7EXbsOHjCwn8tj1RDd820etpPAjH+Icjc2K9e/DQM1Hac5zH2BSy+u6bjvvF2wwREvYA==",
+      "requires": {
+        "lodash.unescape": "4.0.1",
+        "semver": "5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+        }
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "abab": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
+      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "acorn": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+    },
+    "acorn-dynamic-import": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="
+    },
+    "acorn-globals": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
+      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
+      "requires": {
+        "acorn": "^6.0.1",
+        "acorn-walk": "^6.0.1"
+      }
+    },
+    "acorn-jsx": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
+      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg=="
+    },
+    "acorn-walk": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
+    },
+    "address": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.1.0.tgz",
+      "integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ=="
+    },
+    "airbnb-prop-types": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.14.0.tgz",
+      "integrity": "sha512-Yb09vUkr3KP9r9NqfRuYtDYZG76wt8mhTUi2Vfzsghk+qkg01/gOc9NU8n63ZcMCLzpAdMEXyKjCHlxV62yN1A==",
+      "requires": {
+        "array.prototype.find": "^2.1.0",
+        "function.prototype.name": "^1.1.1",
+        "has": "^1.0.3",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.0",
+        "prop-types": "^15.7.2",
+        "prop-types-exact": "^1.2.0",
+        "react-is": "^16.8.6"
+      }
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
+    },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="
+    },
+    "ansi-escapes": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz",
+      "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==",
+      "requires": {
+        "type-fest": "^0.5.2"
+      }
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
+    },
+    "ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "^2.11.0"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+    },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+    },
+    "array.prototype.find": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz",
+      "integrity": "sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.13.0"
+      }
+    },
+    "array.prototype.flat": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz",
+      "integrity": "sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.10.0",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
+    },
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "autoprefixer": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
+      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
+      "requires": {
+        "browserslist": "^4.6.3",
+        "caniuse-lite": "^1.0.30000980",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.17",
+        "postcss-value-parser": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ=="
+        }
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+    },
+    "axobject-query": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "babel-eslint": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
+      "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.0.0",
+        "@babel/traverse": "^7.0.0",
+        "@babel/types": "^7.0.0",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "^1.0.0"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "3.7.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+          "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        }
+      }
+    },
+    "babel-extract-comments": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz",
+      "integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==",
+      "requires": {
+        "babylon": "^6.18.0"
+      }
+    },
+    "babel-jest": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz",
+      "integrity": "sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==",
+      "requires": {
+        "@jest/transform": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "@types/babel__core": "^7.1.0",
+        "babel-plugin-istanbul": "^5.1.0",
+        "babel-preset-jest": "^24.6.0",
+        "chalk": "^2.4.2",
+        "slash": "^2.0.0"
+      }
+    },
+    "babel-loader": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz",
+      "integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==",
+      "requires": {
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "util.promisify": "^1.0.0"
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-plugin-emotion": {
+      "version": "10.0.15",
+      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.15.tgz",
+      "integrity": "sha512-E3W68Zk8EcKpRUDW2tsFKi4gsavapMRjfr2/KKgG3l7l2zZpiKk0BxB59Ul9C0w0ekv6my/ylGOk2WroaqKXPw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@emotion/hash": "0.7.2",
+        "@emotion/memoize": "0.7.2",
+        "@emotion/serialize": "^0.11.9",
+        "babel-plugin-macros": "^2.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "convert-source-map": "^1.5.0",
+        "escape-string-regexp": "^1.0.5",
+        "find-root": "^1.1.0",
+        "source-map": "^0.5.7"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
+      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "find-up": "^3.0.0",
+        "istanbul-lib-instrument": "^3.3.0",
+        "test-exclude": "^5.2.3"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz",
+      "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==",
+      "requires": {
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
+    "babel-plugin-macros": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz",
+      "integrity": "sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==",
+      "requires": {
+        "@babel/runtime": "^7.4.2",
+        "cosmiconfig": "^5.2.0",
+        "resolve": "^1.10.0"
+      }
+    },
+    "babel-plugin-named-asset-import": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz",
+      "integrity": "sha512-1XDRysF4894BUdMChT+2HHbtJYiO7zx5Be7U6bT8dISy7OdyETMGIAQBMPQCsY1YRf0xcubwnKKaDr5bk15JTA=="
+    },
+    "babel-plugin-styled-components": {
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.6.tgz",
+      "integrity": "sha512-gyQj/Zf1kQti66100PhrCRjI5ldjaze9O0M3emXRPAN80Zsf8+e1thpTpaXJXVHXtaM4/+dJEgZHyS9Its+8SA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-module-imports": "^7.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "lodash": "^4.17.11"
+      }
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+        "babel-runtime": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-remove-prop-types": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
+      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
+    },
+    "babel-preset-jest": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz",
+      "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==",
+      "requires": {
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+        "babel-plugin-jest-hoist": "^24.6.0"
+      }
+    },
+    "babel-preset-react-app": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-9.0.1.tgz",
+      "integrity": "sha512-v7MeY+QxdBhM9oU5uOQCIHLsErYkEbbjctXsb10II+KAnttbe0rvprvP785dRxfa9dI4ZbsGXsRU07Qdi5BtOw==",
+      "requires": {
+        "@babel/core": "7.5.5",
+        "@babel/plugin-proposal-class-properties": "7.5.5",
+        "@babel/plugin-proposal-decorators": "7.4.4",
+        "@babel/plugin-proposal-object-rest-spread": "7.5.5",
+        "@babel/plugin-syntax-dynamic-import": "7.2.0",
+        "@babel/plugin-transform-destructuring": "7.5.0",
+        "@babel/plugin-transform-flow-strip-types": "7.4.4",
+        "@babel/plugin-transform-react-display-name": "7.2.0",
+        "@babel/plugin-transform-runtime": "7.5.5",
+        "@babel/preset-env": "7.5.5",
+        "@babel/preset-react": "7.0.0",
+        "@babel/preset-typescript": "7.3.3",
+        "@babel/runtime": "7.5.5",
+        "babel-plugin-dynamic-import-node": "2.3.0",
+        "babel-plugin-macros": "2.6.1",
+        "babel-plugin-transform-react-remove-prop-types": "0.4.24"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+          "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.5.5",
+            "@babel/helpers": "^7.5.5",
+            "@babel/parser": "^7.5.5",
+            "@babel/template": "^7.4.4",
+            "@babel/traverse": "^7.5.5",
+            "@babel/types": "^7.5.5",
+            "convert-source-map": "^1.1.0",
+            "debug": "^4.1.0",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        }
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
+    },
+    "bluebird": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+    },
+    "bootstrap-css-only": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-css-only/-/bootstrap-css-only-4.3.1.tgz",
+      "integrity": "sha512-xPQNmTR6skX7boM3Q/K2vWDL8RFhfHm5PbTcn/vd7nZtkzg9tc6ScNreIIsMaP9QLUxeqvUx+OGnDaiK4KBRiQ=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+    },
+    "browser-process-hrtime": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
+      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
+    },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+        }
+      }
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
+      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+      "requires": {
+        "caniuse-lite": "^1.0.30000984",
+        "electron-to-chromium": "^1.3.191",
+        "node-releases": "^1.1.25"
+      }
+    },
+    "bser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
+      "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        }
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "cacache": {
+      "version": "11.3.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
+      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+    },
+    "camelize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+    },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000989",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
+      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw=="
+    },
+    "capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "requires": {
+        "rsvp": "^4.8.4"
+      }
+    },
+    "case-sensitive-paths-webpack-plugin": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz",
+      "integrity": "sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g=="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+    },
+    "cheerio": {
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
+      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
+      "requires": {
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.1",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash": "^4.15.0",
+        "parse5": "^3.0.1"
+      },
+      "dependencies": {
+        "css-select": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+          "requires": {
+            "boolbase": "~1.0.0",
+            "css-what": "2.1",
+            "domutils": "1.5.1",
+            "nth-check": "~1.0.1"
+          }
+        },
+        "dom-serializer": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+          "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+          "requires": {
+            "domelementtype": "^1.3.0",
+            "entities": "^1.1.1"
+          }
+        },
+        "domutils": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        },
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+        },
+        "parse5": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+          "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+          "requires": {
+            "@types/node": "*"
+          }
+        }
+      }
+    },
+    "chokidar": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+      "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "dependencies": {
+        "fsevents": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+          "optional": true,
+          "requires": {
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "4.1.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.3",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.2.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.3.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "debug": "^4.1.0",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.12.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.0.6",
+              "bundled": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.3",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.0",
+              "bundled": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.8",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.3.4",
+                "minizlib": "^1.1.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.2"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+        }
+      }
+    },
+    "chownr": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
+      "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "classnames": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+    },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "requires": {
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "cliui": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+      "requires": {
+        "string-width": "^2.1.1",
+        "strip-ansi": "^4.0.0",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        }
+      }
+    },
+    "clone-deep": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+      "requires": {
+        "for-own": "^0.1.3",
+        "is-plain-object": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "lazy-cache": "^1.0.3",
+        "shallow-clone": "^0.1.2"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "requires": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+    },
+    "common-tags": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
+      "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+    },
+    "compressible": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "requires": {
+        "mime-db": ">= 1.40.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "confusing-browser-globals": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz",
+      "integrity": "sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTsblowlZg=="
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+    },
+    "core-js": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
+      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
+    },
+    "core-js-compat": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
+      "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
+      "requires": {
+        "browserslist": "^4.6.6",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "requires": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "create-react-context": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
+      "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
+      "requires": {
+        "fbjs": "^0.8.0",
+        "gud": "^1.0.0"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-blank-pseudo": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
+      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
+    },
+    "css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "requires": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-has-pseudo": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
+      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^5.0.0-rc.4"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "css-loader": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
+      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
+      "requires": {
+        "camelcase": "^5.2.0",
+        "icss-utils": "^4.1.0",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.14",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^2.0.6",
+        "postcss-modules-scope": "^2.1.0",
+        "postcss-modules-values": "^2.0.0",
+        "postcss-value-parser": "^3.3.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+        }
+      }
+    },
+    "css-prefers-color-scheme": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
+      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "css-select": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
+      "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^2.1.2",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
+    },
+    "css-to-react-native": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.1.tgz",
+      "integrity": "sha512-yO+oEx1Lf+hDKasqQRVrAvzMCz825Huh1VMlEEDlRWyAhFb/FWb6I0KpEF1PkyKQ7NEdcx9d5M2ZEWgJAsgPvQ==",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.33",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz",
+      "integrity": "sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==",
+      "requires": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.5.3"
+      }
+    },
+    "css-unit-converter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
+      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY="
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
+    },
+    "cssdb": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
+      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+    },
+    "cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-preset-default": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "requires": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
+      }
+    },
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8="
+    },
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0="
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="
+    },
+    "csso": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
+      "integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
+      "requires": {
+        "css-tree": "1.0.0-alpha.29"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.0.0-alpha.29",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
+          "integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
+          "requires": {
+            "mdn-data": "~1.1.0",
+            "source-map": "^0.5.3"
+          }
+        },
+        "mdn-data": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
+          "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="
+        }
+      }
+    },
+    "cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "cssstyle": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
+    "csstype": {
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.6.tgz",
+      "integrity": "sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg=="
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
+      "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA=="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "data-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "requires": {
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.2.0",
+        "whatwg-url": "^7.0.0"
+      },
+      "dependencies": {
+        "whatwg-url": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        }
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "requires": {
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+            }
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "detect-newline": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
+    },
+    "detect-port-alt": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
+      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+      "requires": {
+        "address": "^1.0.1",
+        "debug": "^2.6.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "diff-sequences": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.3.0.tgz",
+      "integrity": "sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw=="
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+      "requires": {
+        "arrify": "^1.0.1",
+        "path-type": "^3.0.0"
+      }
+    },
+    "discontinuous-range": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
+      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo="
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "requires": {
+        "utila": "~0.4"
+      }
+    },
+    "dom-helpers": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
+      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "domexception": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "requires": {
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
+    "dotenv": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
+      "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="
+    },
+    "dotenv-expand": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz",
+      "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU="
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "electron-to-chromium": {
+      "version": "1.3.224",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.224.tgz",
+      "integrity": "sha512-vTH9UcMbi53x/pZKQrEcD83obE8agqQwUIx/G03/mpE1vzLm0KA3cHwuZXCysvxI1gXfNjV7Nu7Vjtp89kDzmg=="
+    },
+    "elliptic": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
+      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
+    },
+    "enzyme": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.10.0.tgz",
+      "integrity": "sha512-p2yy9Y7t/PFbPoTvrWde7JIYB2ZyGC+NgTNbVEGvZ5/EyoYSr9aG/2rSbVvyNvMHEhw9/dmGUJHWtfQIEiX9pg==",
+      "dev": true,
+      "requires": {
+        "array.prototype.flat": "^1.2.1",
+        "cheerio": "^1.0.0-rc.2",
+        "function.prototype.name": "^1.1.0",
+        "has": "^1.0.3",
+        "html-element-map": "^1.0.0",
+        "is-boolean-object": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-number-object": "^1.0.3",
+        "is-regex": "^1.0.4",
+        "is-string": "^1.0.4",
+        "is-subset": "^0.1.1",
+        "lodash.escape": "^4.0.1",
+        "lodash.isequal": "^4.5.0",
+        "object-inspect": "^1.6.0",
+        "object-is": "^1.0.1",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.0.4",
+        "object.values": "^1.0.4",
+        "raf": "^3.4.0",
+        "rst-selector-parser": "^2.2.3",
+        "string.prototype.trim": "^1.1.2"
+      }
+    },
+    "enzyme-adapter-react-16": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.14.0.tgz",
+      "integrity": "sha512-7PcOF7pb4hJUvjY7oAuPGpq3BmlCig3kxXGi2kFx0YzJHppqX1K8IIV9skT1IirxXlu8W7bneKi+oQ10QRnhcA==",
+      "dev": true,
+      "requires": {
+        "enzyme-adapter-utils": "^1.12.0",
+        "has": "^1.0.3",
+        "object.assign": "^4.1.0",
+        "object.values": "^1.1.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^16.8.6",
+        "react-test-renderer": "^16.0.0-0",
+        "semver": "^5.7.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        }
+      }
+    },
+    "enzyme-adapter-utils": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz",
+      "integrity": "sha512-wkZvE0VxcFx/8ZsBw0iAbk3gR1d9hK447ebnSYBf95+r32ezBq+XDSAvRErkc4LZosgH8J7et7H7/7CtUuQfBA==",
+      "requires": {
+        "airbnb-prop-types": "^2.13.2",
+        "function.prototype.name": "^1.1.0",
+        "object.assign": "^4.1.0",
+        "object.fromentries": "^2.0.0",
+        "prop-types": "^15.7.2",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-keys": "^1.0.12"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "escodegen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
+      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "requires": {
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
+        }
+      }
+    },
+    "eslint": {
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.9.1",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^5.0.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "import-fresh": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
+          "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
+          "requires": {
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "eslint-config-react-app": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-4.0.1.tgz",
+      "integrity": "sha512-ZsaoXUIGsK8FCi/x4lT2bZR5mMkL/Kgj+Lnw690rbvvUr/uiwgFiD8FcfAhkCycm7Xte6O5lYz4EqMx2vX7jgw==",
+      "requires": {
+        "confusing-browser-globals": "^1.0.7"
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "eslint-loader": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.1.2.tgz",
+      "integrity": "sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg==",
+      "requires": {
+        "loader-fs-cache": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "object-assign": "^4.0.1",
+        "object-hash": "^1.1.4",
+        "rimraf": "^2.6.1"
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
+      "requires": {
+        "debug": "^2.6.8",
+        "pkg-dir": "^2.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "requires": {
+            "find-up": "^2.1.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-flowtype": {
+      "version": "2.50.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.1.tgz",
+      "integrity": "sha512-9kRxF9hfM/O6WGZcZPszOVPd2W0TLHBtceulLTsGfwMPtiCCLnCW0ssRiOOiXyqrCA20pm1iXdXm7gQeN306zQ==",
+      "requires": {
+        "lodash": "^4.17.10"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz",
+      "integrity": "sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==",
+      "requires": {
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.2",
+        "eslint-module-utils": "^2.3.0",
+        "has": "^1.0.3",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.9.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-jsx-a11y": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz",
+      "integrity": "sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZoOEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w==",
+      "requires": {
+        "aria-query": "^3.0.0",
+        "array-includes": "^3.0.3",
+        "ast-types-flow": "^0.0.7",
+        "axobject-query": "^2.0.2",
+        "damerau-levenshtein": "^1.0.4",
+        "emoji-regex": "^7.0.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^2.0.1"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        }
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "7.12.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz",
+      "integrity": "sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ==",
+      "requires": {
+        "array-includes": "^3.0.3",
+        "doctrine": "^2.1.0",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^2.0.1",
+        "object.fromentries": "^2.0.0",
+        "prop-types": "^15.6.2",
+        "resolve": "^1.9.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        }
+      }
+    },
+    "eslint-plugin-react-hooks": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz",
+      "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA=="
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
+      "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
+      "requires": {
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
+    },
+    "espree": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "eventemitter3": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
+    },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "exec-sh": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
+      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "expect": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-24.8.0.tgz",
+      "integrity": "sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "ansi-styles": "^3.2.0",
+        "jest-get-type": "^24.8.0",
+        "jest-matcher-utils": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-regex-util": "^24.3.0"
+      }
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "path-to-regexp": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+    },
+    "fast-glob": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.3",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "faye-websocket": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "fb-watchman": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "requires": {
+        "bser": "^2.0.0"
+      }
+    },
+    "fbjs": {
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
+      "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+      "requires": {
+        "core-js": "^1.0.0",
+        "isomorphic-fetch": "^2.1.1",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^0.7.18"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        }
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
+    },
+    "figures": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",
+      "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
+    "file-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "filesize": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      }
+    },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "requires": {
+        "debug": "^3.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "fork-ts-checker-webpack-plugin": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz",
+      "integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==",
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^2.4.1",
+        "chokidar": "^2.0.4",
+        "micromatch": "^3.1.10",
+        "minimatch": "^3.0.4",
+        "semver": "^5.6.0",
+        "tapable": "^1.0.0",
+        "worker-rpc": "^0.1.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.6.tgz",
+      "integrity": "sha512-vfmKZp3XPM36DNF0qhW+Cdxk7xm7gTEHY1clv1Xq1arwRQuKZgAhw+NZNWbJBtuaNxzNXwhfdPYRrvIbjfS33A==",
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.1.tgz",
+      "integrity": "sha512-e1NzkiJuw6xqVH7YSdiW/qDHebcmMhPNe6w+4ZYYEg0VA+LaLzx37RimbPLuonHhYGFGPx1ME2nSi74JiaCr/Q==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1",
+        "functions-have-names": "^1.1.1",
+        "is-callable": "^1.1.4"
+      }
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "functions-have-names": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.1.1.tgz",
+      "integrity": "sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw=="
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-own-enumerable-property-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
+      "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg=="
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
+    },
+    "global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "requires": {
+        "global-prefix": "^3.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "requires": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    },
+    "globby": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+      "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "2.0.0",
+        "fast-glob": "^2.0.2",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "3.3.10",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+        },
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
+      "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
+    },
+    "gud": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
+      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
+    },
+    "gzip-size": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+      "requires": {
+        "duplexer": "^0.1.1",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
+      }
+    },
+    "handle-thing": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="
+    },
+    "handlebars": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
+      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+      "requires": {
+        "neo-async": "^2.6.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "harmony-reflect": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz",
+      "integrity": "sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA=="
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        }
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+    },
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
+    },
+    "history": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz",
+      "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^2.2.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^0.4.0"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoist-non-react-statics": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+      "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz",
+      "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==",
+      "requires": {
+        "lru-cache": "^5.1.1"
+      }
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
+    },
+    "html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
+    },
+    "html-element-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.1.0.tgz",
+      "integrity": "sha512-iqiG3dTZmy+uUaTmHarTL+3/A2VW9ox/9uasKEZC+R/wAtUrTcRlXPSaPqsnWPfIu8wqn09jQNwMRqzL54jSYA==",
+      "requires": {
+        "array-filter": "^1.0.0"
+      },
+      "dependencies": {
+        "array-filter": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
+          "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
+        }
+      }
+    },
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "requires": {
+        "whatwg-encoding": "^1.0.1"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
+    },
+    "html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "requires": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.2.x",
+        "commander": "2.17.x",
+        "he": "1.2.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "4.0.0-beta.5",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz",
+      "integrity": "sha512-y5l4lGxOW3pz3xBTFdfB9rnnrWRPVxlAhX6nrBYIcW+2k2zC3mSp/3DxlWVCMBfnO6UAnoF8OcFn0IMy6kaKAQ==",
+      "requires": {
+        "html-minifier": "^3.5.20",
+        "loader-utils": "^1.1.0",
+        "lodash": "^4.17.11",
+        "pretty-error": "^2.1.1",
+        "tapable": "^1.1.0",
+        "util.promisify": "1.0.0"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+        },
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q="
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "requires": {
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
+    },
+    "icss-utils": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
+    "identity-obj-proxy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
+      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
+      "requires": {
+        "harmony-reflect": "^1.4.6"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+    },
+    "immer": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
+      "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
+    "inquirer": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz",
+      "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==",
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "requires": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      }
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
+    },
+    "ipaddr.js": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
+      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M="
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+    },
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "requires": {
+        "ci-info": "^2.0.0"
+      }
+    },
+    "is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "requires": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-number-object": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
+      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k="
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "is-root": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
+      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-string": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
+      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
+    },
+    "is-subset": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
+    },
+    "is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-what": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.3.1.tgz",
+      "integrity": "sha512-seFn10yAXy+yJlTRO+8VfiafC+0QJanGLMPTBWLrJm/QPauuchy0UXh8B6H5o9VA8BAzk0iYievt6mNp6gfaqA=="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+    },
+    "isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "^1.0.1",
+        "whatwg-fetch": ">=0.10.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "istanbul-lib-coverage": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="
+    },
+    "istanbul-lib-instrument": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
+      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
+      "requires": {
+        "@babel/generator": "^7.4.0",
+        "@babel/parser": "^7.4.3",
+        "@babel/template": "^7.4.0",
+        "@babel/traverse": "^7.4.3",
+        "@babel/types": "^7.4.0",
+        "istanbul-lib-coverage": "^2.0.5",
+        "semver": "^6.0.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
+      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
+      "requires": {
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
+      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "rimraf": "^2.6.3",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
+      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
+      "requires": {
+        "handlebars": "^4.1.2"
+      }
+    },
+    "jest": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-24.7.1.tgz",
+      "integrity": "sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA==",
+      "requires": {
+        "import-local": "^2.0.0",
+        "jest-cli": "^24.7.1"
+      },
+      "dependencies": {
+        "jest-cli": {
+          "version": "24.8.0",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.8.0.tgz",
+          "integrity": "sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==",
+          "requires": {
+            "@jest/core": "^24.8.0",
+            "@jest/test-result": "^24.8.0",
+            "@jest/types": "^24.8.0",
+            "chalk": "^2.0.1",
+            "exit": "^0.1.2",
+            "import-local": "^2.0.0",
+            "is-ci": "^2.0.0",
+            "jest-config": "^24.8.0",
+            "jest-util": "^24.8.0",
+            "jest-validate": "^24.8.0",
+            "prompts": "^2.0.1",
+            "realpath-native": "^1.1.0",
+            "yargs": "^12.0.2"
+          }
+        }
+      }
+    },
+    "jest-changed-files": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.8.0.tgz",
+      "integrity": "sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "execa": "^1.0.0",
+        "throat": "^4.0.0"
+      }
+    },
+    "jest-config": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.8.0.tgz",
+      "integrity": "sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==",
+      "requires": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "babel-jest": "^24.8.0",
+        "chalk": "^2.0.1",
+        "glob": "^7.1.1",
+        "jest-environment-jsdom": "^24.8.0",
+        "jest-environment-node": "^24.8.0",
+        "jest-get-type": "^24.8.0",
+        "jest-jasmine2": "^24.8.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-resolve": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "jest-validate": "^24.8.0",
+        "micromatch": "^3.1.10",
+        "pretty-format": "^24.8.0",
+        "realpath-native": "^1.1.0"
+      },
+      "dependencies": {
+        "jest-resolve": {
+          "version": "24.8.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
+          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "requires": {
+            "@jest/types": "^24.8.0",
+            "browser-resolve": "^1.11.3",
+            "chalk": "^2.0.1",
+            "jest-pnp-resolver": "^1.2.1",
+            "realpath-native": "^1.1.0"
+          }
+        }
+      }
+    },
+    "jest-diff": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.8.0.tgz",
+      "integrity": "sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==",
+      "requires": {
+        "chalk": "^2.0.1",
+        "diff-sequences": "^24.3.0",
+        "jest-get-type": "^24.8.0",
+        "pretty-format": "^24.8.0"
+      }
+    },
+    "jest-docblock": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz",
+      "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==",
+      "requires": {
+        "detect-newline": "^2.1.0"
+      }
+    },
+    "jest-each": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.8.0.tgz",
+      "integrity": "sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "chalk": "^2.0.1",
+        "jest-get-type": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "pretty-format": "^24.8.0"
+      }
+    },
+    "jest-environment-jsdom": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz",
+      "integrity": "sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==",
+      "requires": {
+        "@jest/environment": "^24.8.0",
+        "@jest/fake-timers": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "jest-mock": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "jsdom": "^11.5.1"
+      }
+    },
+    "jest-environment-jsdom-fourteen": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz",
+      "integrity": "sha512-4vtoRMg7jAstitRzL4nbw83VmGH8Rs13wrND3Ud2o1fczDhMUF32iIrNKwYGgeOPUdfvZU4oy8Bbv+ni1fgVCA==",
+      "requires": {
+        "jest-mock": "^24.5.0",
+        "jest-util": "^24.5.0",
+        "jsdom": "^14.0.0"
+      },
+      "dependencies": {
+        "jsdom": {
+          "version": "14.1.0",
+          "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz",
+          "integrity": "sha512-O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==",
+          "requires": {
+            "abab": "^2.0.0",
+            "acorn": "^6.0.4",
+            "acorn-globals": "^4.3.0",
+            "array-equal": "^1.0.0",
+            "cssom": "^0.3.4",
+            "cssstyle": "^1.1.1",
+            "data-urls": "^1.1.0",
+            "domexception": "^1.0.1",
+            "escodegen": "^1.11.0",
+            "html-encoding-sniffer": "^1.0.2",
+            "nwsapi": "^2.1.3",
+            "parse5": "5.1.0",
+            "pn": "^1.1.0",
+            "request": "^2.88.0",
+            "request-promise-native": "^1.0.5",
+            "saxes": "^3.1.9",
+            "symbol-tree": "^3.2.2",
+            "tough-cookie": "^2.5.0",
+            "w3c-hr-time": "^1.0.1",
+            "w3c-xmlserializer": "^1.1.2",
+            "webidl-conversions": "^4.0.2",
+            "whatwg-encoding": "^1.0.5",
+            "whatwg-mimetype": "^2.3.0",
+            "whatwg-url": "^7.0.0",
+            "ws": "^6.1.2",
+            "xml-name-validator": "^3.0.0"
+          }
+        },
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
+        },
+        "whatwg-url": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+          "requires": {
+            "lodash.sortby": "^4.7.0",
+            "tr46": "^1.0.1",
+            "webidl-conversions": "^4.0.2"
+          }
+        },
+        "ws": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
+      }
+    },
+    "jest-environment-node": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.8.0.tgz",
+      "integrity": "sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==",
+      "requires": {
+        "@jest/environment": "^24.8.0",
+        "@jest/fake-timers": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "jest-mock": "^24.8.0",
+        "jest-util": "^24.8.0"
+      }
+    },
+    "jest-get-type": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.8.0.tgz",
+      "integrity": "sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ=="
+    },
+    "jest-haste-map": {
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.1.tgz",
+      "integrity": "sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "anymatch": "^2.0.0",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^1.2.7",
+        "graceful-fs": "^4.1.15",
+        "invariant": "^2.2.4",
+        "jest-serializer": "^24.4.0",
+        "jest-util": "^24.8.0",
+        "jest-worker": "^24.6.0",
+        "micromatch": "^3.1.10",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "dependencies": {
+        "fsevents": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+          "optional": true,
+          "requires": {
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "4.1.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.3",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.2.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.3.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "debug": "^4.1.0",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.12.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.0.6",
+              "bundled": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.3",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.0",
+              "bundled": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.8",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.3.4",
+                "minizlib": "^1.1.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.2"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        }
+      }
+    },
+    "jest-jasmine2": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz",
+      "integrity": "sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==",
+      "requires": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^24.8.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "chalk": "^2.0.1",
+        "co": "^4.6.0",
+        "expect": "^24.8.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^24.8.0",
+        "jest-matcher-utils": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-runtime": "^24.8.0",
+        "jest-snapshot": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "pretty-format": "^24.8.0",
+        "throat": "^4.0.0"
+      }
+    },
+    "jest-leak-detector": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz",
+      "integrity": "sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==",
+      "requires": {
+        "pretty-format": "^24.8.0"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz",
+      "integrity": "sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==",
+      "requires": {
+        "chalk": "^2.0.1",
+        "jest-diff": "^24.8.0",
+        "jest-get-type": "^24.8.0",
+        "pretty-format": "^24.8.0"
+      }
+    },
+    "jest-message-util": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.8.0.tgz",
+      "integrity": "sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "@types/stack-utils": "^1.0.1",
+        "chalk": "^2.0.1",
+        "micromatch": "^3.1.10",
+        "slash": "^2.0.0",
+        "stack-utils": "^1.0.1"
+      }
+    },
+    "jest-mock": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.8.0.tgz",
+      "integrity": "sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==",
+      "requires": {
+        "@jest/types": "^24.8.0"
+      }
+    },
+    "jest-pnp-resolver": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
+      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ=="
+    },
+    "jest-regex-util": {
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz",
+      "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg=="
+    },
+    "jest-resolve": {
+      "version": "24.7.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.7.1.tgz",
+      "integrity": "sha512-Bgrc+/UUZpGJ4323sQyj85hV9d+ANyPNu6XfRDUcyFNX1QrZpSoM0kE4Mb2vZMAYTJZsBFzYe8X1UaOkOELSbw==",
+      "requires": {
+        "@jest/types": "^24.7.0",
+        "browser-resolve": "^1.11.3",
+        "chalk": "^2.0.1",
+        "jest-pnp-resolver": "^1.2.1",
+        "realpath-native": "^1.1.0"
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz",
+      "integrity": "sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-snapshot": "^24.8.0"
+      }
+    },
+    "jest-runner": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.8.0.tgz",
+      "integrity": "sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==",
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/environment": "^24.8.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "chalk": "^2.4.2",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.1.15",
+        "jest-config": "^24.8.0",
+        "jest-docblock": "^24.3.0",
+        "jest-haste-map": "^24.8.0",
+        "jest-jasmine2": "^24.8.0",
+        "jest-leak-detector": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-resolve": "^24.8.0",
+        "jest-runtime": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "jest-worker": "^24.6.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^4.0.0"
+      },
+      "dependencies": {
+        "jest-resolve": {
+          "version": "24.8.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
+          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "requires": {
+            "@jest/types": "^24.8.0",
+            "browser-resolve": "^1.11.3",
+            "chalk": "^2.0.1",
+            "jest-pnp-resolver": "^1.2.1",
+            "realpath-native": "^1.1.0"
+          }
+        }
+      }
+    },
+    "jest-runtime": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.8.0.tgz",
+      "integrity": "sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==",
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/environment": "^24.8.0",
+        "@jest/source-map": "^24.3.0",
+        "@jest/transform": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "@types/yargs": "^12.0.2",
+        "chalk": "^2.0.1",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "jest-config": "^24.8.0",
+        "jest-haste-map": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-mock": "^24.8.0",
+        "jest-regex-util": "^24.3.0",
+        "jest-resolve": "^24.8.0",
+        "jest-snapshot": "^24.8.0",
+        "jest-util": "^24.8.0",
+        "jest-validate": "^24.8.0",
+        "realpath-native": "^1.1.0",
+        "slash": "^2.0.0",
+        "strip-bom": "^3.0.0",
+        "yargs": "^12.0.2"
+      },
+      "dependencies": {
+        "jest-resolve": {
+          "version": "24.8.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
+          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "requires": {
+            "@jest/types": "^24.8.0",
+            "browser-resolve": "^1.11.3",
+            "chalk": "^2.0.1",
+            "jest-pnp-resolver": "^1.2.1",
+            "realpath-native": "^1.1.0"
+          }
+        }
+      }
+    },
+    "jest-serializer": {
+      "version": "24.4.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz",
+      "integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q=="
+    },
+    "jest-snapshot": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.8.0.tgz",
+      "integrity": "sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==",
+      "requires": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^24.8.0",
+        "chalk": "^2.0.1",
+        "expect": "^24.8.0",
+        "jest-diff": "^24.8.0",
+        "jest-matcher-utils": "^24.8.0",
+        "jest-message-util": "^24.8.0",
+        "jest-resolve": "^24.8.0",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^24.8.0",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "jest-resolve": {
+          "version": "24.8.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
+          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "requires": {
+            "@jest/types": "^24.8.0",
+            "browser-resolve": "^1.11.3",
+            "chalk": "^2.0.1",
+            "jest-pnp-resolver": "^1.2.1",
+            "realpath-native": "^1.1.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "jest-util": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.8.0.tgz",
+      "integrity": "sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==",
+      "requires": {
+        "@jest/console": "^24.7.1",
+        "@jest/fake-timers": "^24.8.0",
+        "@jest/source-map": "^24.3.0",
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "callsites": "^3.0.0",
+        "chalk": "^2.0.1",
+        "graceful-fs": "^4.1.15",
+        "is-ci": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "slash": "^2.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "jest-validate": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.8.0.tgz",
+      "integrity": "sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "camelcase": "^5.0.0",
+        "chalk": "^2.0.1",
+        "jest-get-type": "^24.8.0",
+        "leven": "^2.1.0",
+        "pretty-format": "^24.8.0"
+      }
+    },
+    "jest-watch-typeahead": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.3.0.tgz",
+      "integrity": "sha512-+uOtlppt9ysST6k6ZTqsPI0WNz2HLa8bowiZylZoQCQaAVn7XsVmHhZREkz73FhKelrFrpne4hQQjdq42nFEmA==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.4.1",
+        "jest-watcher": "^24.3.0",
+        "slash": "^2.0.0",
+        "string-length": "^2.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "jest-watcher": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.8.0.tgz",
+      "integrity": "sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==",
+      "requires": {
+        "@jest/test-result": "^24.8.0",
+        "@jest/types": "^24.8.0",
+        "@types/yargs": "^12.0.9",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.1",
+        "jest-util": "^24.8.0",
+        "string-length": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+        }
+      }
+    },
+    "jest-worker": {
+      "version": "24.6.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
+      "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+      "requires": {
+        "merge-stream": "^1.0.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "jsdom": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+      "requires": {
+        "abab": "^2.0.0",
+        "acorn": "^5.5.3",
+        "acorn-globals": "^4.1.0",
+        "array-equal": "^1.0.0",
+        "cssom": ">= 0.3.2 < 0.4.0",
+        "cssstyle": "^1.0.0",
+        "data-urls": "^1.0.0",
+        "domexception": "^1.0.1",
+        "escodegen": "^1.9.1",
+        "html-encoding-sniffer": "^1.0.2",
+        "left-pad": "^1.3.0",
+        "nwsapi": "^2.0.7",
+        "parse5": "4.0.0",
+        "pn": "^1.1.0",
+        "request": "^2.87.0",
+        "request-promise-native": "^1.0.5",
+        "sax": "^1.2.4",
+        "symbol-tree": "^3.2.2",
+        "tough-cookie": "^2.3.4",
+        "w3c-hr-time": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "whatwg-encoding": "^1.0.3",
+        "whatwg-mimetype": "^2.1.0",
+        "whatwg-url": "^6.4.1",
+        "ws": "^5.2.0",
+        "xml-name-validator": "^3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+        }
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="
+    },
+    "json5": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
+      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz",
+      "integrity": "sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==",
+      "requires": {
+        "array-includes": "^3.0.3",
+        "object.assign": "^4.1.0"
+      }
+    },
+    "keycode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
+    },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
+    },
+    "last-call-webpack-plugin": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
+      "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
+      "requires": {
+        "lodash": "^4.17.5",
+        "webpack-sources": "^1.1.0"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "left-pad": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
+    },
+    "leven": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "loader-fs-cache": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
+      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
+      "requires": {
+        "find-cache-dir": "^0.1.1",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
+          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+          "requires": {
+            "commondir": "^1.0.1",
+            "mkdirp": "^0.5.1",
+            "pkg-dir": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+          "requires": {
+            "find-up": "^1.0.0"
+          }
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+    },
+    "lodash.escape": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
+      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg="
+    },
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI="
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ="
+    },
+    "lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "lodash.unescape": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
+      "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw="
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+    },
+    "loglevel": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
+      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA=="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw="
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      }
+    },
+    "memoize-one": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.5.tgz",
+      "integrity": "sha512-ey6EpYv0tEaIbM/nTDOpHciXUvd+ackQrJgEzBwemhZZIWZjcyodqEcrmqDy2BKRTM3a65kKBV4WtLXJDt26SQ=="
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "merge-anything": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.0.tgz",
+      "integrity": "sha512-MhJcPOEcDUIbwU0LnEfx5S9s9dfQ/KPu4g2UA5T5G1LRKS0XmpDvJ9+UUfTkfhge+nA1gStE4tJAvx6lXLs+rg==",
+      "requires": {
+        "is-what": "^3.2.4"
+      }
+    },
+    "merge-deep": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
+      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "clone-deep": "^0.2.4",
+        "kind-of": "^3.0.2"
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "merge2": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz",
+      "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A=="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "microevent.ts": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
+      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+    },
+    "mini-create-react-context": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz",
+      "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==",
+      "requires": {
+        "@babel/runtime": "^7.4.0",
+        "gud": "^1.0.0",
+        "tiny-warning": "^1.0.2"
+      }
+    },
+    "mini-css-extract-plugin": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
+      "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "requires": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE="
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        }
+      }
+    },
+    "moo": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
+      "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw=="
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+    },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "nearley": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.18.0.tgz",
+      "integrity": "sha512-/zQOMCeJcioI0xJtd5RpBiWw2WP7wLe6vq8/3Yu0rEwgus/G/+pViX80oA87JdVgjRt2895mZSv2VfZmy4W1uw==",
+      "requires": {
+        "commander": "^2.19.0",
+        "moo": "^0.4.3",
+        "railroad-diagrams": "^1.0.0",
+        "randexp": "0.4.6",
+        "semver": "^5.4.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "requires": {
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
+      }
+    },
+    "node-forge": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        }
+      }
+    },
+    "node-modules-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA="
+    },
+    "node-notifier": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.1.tgz",
+      "integrity": "sha512-p52B+onAEHKW1OF9MGO/S7k/ahGEHfhP5/tvwYzog/5XLYOd8ZuD6vdNZdUuWMONRnKPneXV43v3s6Snx1wsCQ==",
+      "requires": {
+        "growly": "^1.3.0",
+        "is-wsl": "^1.1.0",
+        "semver": "^5.5.0",
+        "shellwords": "^0.1.1",
+        "which": "^1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz",
+      "integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==",
+      "requires": {
+        "semver": "^5.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+    },
+    "normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "nwsapi": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
+      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "object-hash": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
+      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
+    },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+    },
+    "object-is": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.entries": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+      "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz",
+      "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.11.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "object.values": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+      "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.12.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "open": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+        },
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+        }
+      }
+    },
+    "optimize-css-assets-webpack-plugin": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.1.tgz",
+      "integrity": "sha512-Rqm6sSjWtx9FchdP0uzTQDc7GXDKnwVEGoSxjezPkzMewx7gEWE9IMUYKmigTRC4U3RaNSwYVnUDLuIdtTpm0A==",
+      "requires": {
+        "cssnano": "^4.1.0",
+        "last-call-webpack-plugin": "^3.0.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+    },
+    "os-locale": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "requires": {
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+    },
+    "p-each-series": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
+      "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
+      "requires": {
+        "p-reduce": "^1.0.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+    },
+    "p-limit": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
+    },
+    "p-reduce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
+      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo="
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "requires": {
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "requires": {
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+        }
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "requires": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      }
+    },
+    "parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
+    "path-to-regexp": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "requires": {
+        "isarray": "0.0.1"
+      }
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "requires": {
+        "node-modules-regexp": "^1.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "requires": {
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+        }
+      }
+    },
+    "pn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
+    },
+    "pnp-webpack-plugin": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.2.1.tgz",
+      "integrity": "sha512-W6GctK7K2qQiVR+gYSv/Gyt6jwwIH4vwdviFqx+Y2jAtVf5eZyYIDf5Ac2NCDMBiX5yWscBLZElPTsyA1UtVVA==",
+      "requires": {
+        "ts-pnp": "^1.0.0"
+      }
+    },
+    "popper.js": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz",
+      "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA=="
+    },
+    "portfinder": {
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz",
+      "integrity": "sha512-ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==",
+      "requires": {
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+    },
+    "postcss": {
+      "version": "7.0.17",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
+      "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-attribute-case-insensitive": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz",
+      "integrity": "sha512-L2YKB3vF4PetdTIthQVeT+7YiSzMoNMLLYxPXXppOOP7NoazEAy45sh2LvJ8leCQjfBcfkYQs8TtCcQjeZTp8A==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-browser-comments": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz",
+      "integrity": "sha512-xGG0UvoxwBc4Yx4JX3gc0RuDl1kc4bVihCzzk6UC72YPfq5fu3c717Nu8Un3nvnq1BJ31gBnFXIG/OaUTnpHgA==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-calc": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz",
+      "integrity": "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==",
+      "requires": {
+        "css-unit-converter": "^1.1.1",
+        "postcss": "^7.0.5",
+        "postcss-selector-parser": "^5.0.0-rc.4",
+        "postcss-value-parser": "^3.3.1"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-color-functional-notation": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
+      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-color-gray": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
+      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
+      "requires": {
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.5",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-color-hex-alpha": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
+      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
+      "requires": {
+        "postcss": "^7.0.14",
+        "postcss-values-parser": "^2.0.1"
+      }
+    },
+    "postcss-color-mod-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
+      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
+      "requires": {
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-color-rebeccapurple": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
+      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "requires": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-custom-media": {
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
+      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
+    "postcss-custom-properties": {
+      "version": "8.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
+      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+      "requires": {
+        "postcss": "^7.0.17",
+        "postcss-values-parser": "^2.0.1"
+      }
+    },
+    "postcss-custom-selectors": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
+      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-dir-pseudo-class": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
+      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-double-position-gradients": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
+      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
+      "requires": {
+        "postcss": "^7.0.5",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-env-function": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
+      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-flexbugs-fixes": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.1.0.tgz",
+      "integrity": "sha512-jr1LHxQvStNNAHlgco6PzY308zvLklh7SJVYuWUwyUQncofaAlD2l+P/gxKHOdqWKe7xJSkVLFF/2Tp+JqMSZA==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-focus-visible": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
+      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-focus-within": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
+      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-font-variant": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
+      "integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-gap-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
+      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-image-set-function": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
+      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-initial": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.1.tgz",
+      "integrity": "sha512-I2Sz83ZSHybMNh02xQDK609lZ1/QOyYeuizCjzEhlMgeV/HcDJapQiH4yTqLjZss0X6/6VvKFXUeObaHpJoINw==",
+      "requires": {
+        "lodash.template": "^4.5.0",
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-lab-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
+      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+      "requires": {
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "postcss-logical": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
+      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-media-minmax": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
+      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "requires": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "requires": {
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "requires": {
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
+      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0",
+        "postcss-value-parser": "^3.3.1"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
+      "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
+      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
+      "requires": {
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-nesting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
+      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-normalize": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-7.0.1.tgz",
+      "integrity": "sha512-NOp1fwrG+6kVXWo7P9SizCHX6QvioxFD/hZcI2MLxPmVnFJFC0j0DDpIuNw2tUDeCFMni59gCVgeJ1/hYhj2OQ==",
+      "requires": {
+        "@csstools/normalize.css": "^9.0.1",
+        "browserslist": "^4.1.1",
+        "postcss": "^7.0.2",
+        "postcss-browser-comments": "^2.0.0"
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "requires": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-overflow-shorthand": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
+      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-page-break": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
+      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-place": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
+      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      }
+    },
+    "postcss-preset-env": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.6.0.tgz",
+      "integrity": "sha512-I3zAiycfqXpPIFD6HXhLfWXIewAWO8emOKz+QSsxaUZb9Dp8HbF5kUf+4Wy/AxR33o+LRoO8blEWCHth0ZsCLA==",
+      "requires": {
+        "autoprefixer": "^9.4.9",
+        "browserslist": "^4.4.2",
+        "caniuse-lite": "^1.0.30000939",
+        "css-blank-pseudo": "^0.1.4",
+        "css-has-pseudo": "^0.10.0",
+        "css-prefers-color-scheme": "^3.1.1",
+        "cssdb": "^4.3.0",
+        "postcss": "^7.0.14",
+        "postcss-attribute-case-insensitive": "^4.0.1",
+        "postcss-color-functional-notation": "^2.0.1",
+        "postcss-color-gray": "^5.0.0",
+        "postcss-color-hex-alpha": "^5.0.2",
+        "postcss-color-mod-function": "^3.0.3",
+        "postcss-color-rebeccapurple": "^4.0.1",
+        "postcss-custom-media": "^7.0.7",
+        "postcss-custom-properties": "^8.0.9",
+        "postcss-custom-selectors": "^5.1.2",
+        "postcss-dir-pseudo-class": "^5.0.0",
+        "postcss-double-position-gradients": "^1.0.0",
+        "postcss-env-function": "^2.0.2",
+        "postcss-focus-visible": "^4.0.0",
+        "postcss-focus-within": "^3.0.0",
+        "postcss-font-variant": "^4.0.0",
+        "postcss-gap-properties": "^2.0.0",
+        "postcss-image-set-function": "^3.0.1",
+        "postcss-initial": "^3.0.0",
+        "postcss-lab-function": "^2.0.1",
+        "postcss-logical": "^3.0.0",
+        "postcss-media-minmax": "^4.0.0",
+        "postcss-nesting": "^7.0.0",
+        "postcss-overflow-shorthand": "^2.0.0",
+        "postcss-page-break": "^2.0.0",
+        "postcss-place": "^4.0.1",
+        "postcss-pseudo-class-any-link": "^6.0.0",
+        "postcss-replace-overflow-wrap": "^3.0.0",
+        "postcss-selector-matches": "^4.0.0",
+        "postcss-selector-not": "^4.0.0"
+      }
+    },
+    "postcss-pseudo-class-any-link": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
+      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
+      },
+      "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      }
+    },
+    "postcss-replace-overflow-wrap": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
+      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
+      "requires": {
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-safe-parser": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz",
+      "integrity": "sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==",
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-selector-matches": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
+      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-selector-not": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz",
+      "integrity": "sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.2"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "requires": {
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    },
+    "postcss-values-parser": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
+      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
+      "requires": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "pretty-bytes": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz",
+      "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "pretty-format": {
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.8.0.tgz",
+      "integrity": "sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==",
+      "requires": {
+        "@jest/types": "^24.8.0",
+        "ansi-regex": "^4.0.0",
+        "ansi-styles": "^3.2.0",
+        "react-is": "^16.8.4"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+    },
+    "prompts": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
+      "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
+      "requires": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.3"
+      }
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "prop-types-exact": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
+      "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
+      "requires": {
+        "has": "^1.0.3",
+        "object.assign": "^4.1.0",
+        "reflect.ownkeys": "^0.2.0"
+      }
+    },
+    "prop-types-extra": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz",
+      "integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==",
+      "requires": {
+        "react-is": "^16.3.2",
+        "warning": "^3.0.0"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
+          "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.0"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+    },
+    "psl": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
+      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "requires": {
+        "performance-now": "^2.1.0"
+      }
+    },
+    "railroad-diagrams": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
+      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234="
+    },
+    "randexp": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
+      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "requires": {
+        "discontinuous-range": "1.0.0",
+        "ret": "~0.1.10"
+      }
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+        }
+      }
+    },
+    "react": {
+      "version": "16.8.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.8.0.tgz",
+      "integrity": "sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.13.0"
+      }
+    },
+    "react-app-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-1.0.2.tgz",
+      "integrity": "sha512-yZcpLnIr0FOIzrOOz9JC37NWAWEuCaQWmYn9EWjEzlCW4cOmA5MkT5L3iP8QuUeFnoqVCTJgjIWYbXEJgNXhGA==",
+      "requires": {
+        "core-js": "3.1.4",
+        "object-assign": "4.1.1",
+        "promise": "8.0.3",
+        "raf": "3.4.1",
+        "regenerator-runtime": "0.13.3",
+        "whatwg-fetch": "3.0.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
+          "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="
+        },
+        "promise": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz",
+          "integrity": "sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==",
+          "requires": {
+            "asap": "~2.0.6"
+          }
+        }
+      }
+    },
+    "react-bootstrap": {
+      "version": "1.0.0-beta.9",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.9.tgz",
+      "integrity": "sha512-M0BYLuuUdMITJ16+DDDb1p4vWV87csEBi/uOxZYODuDZh7hvbrJVahfvPXcqeqq4eEpNL+PKSlqb9fNaY0HZyA==",
+      "requires": {
+        "@babel/runtime": "^7.4.2",
+        "@react-bootstrap/react-popper": "1.2.1",
+        "@restart/context": "^2.1.4",
+        "@restart/hooks": "^0.3.0",
+        "classnames": "^2.2.6",
+        "dom-helpers": "^3.4.0",
+        "invariant": "^2.2.4",
+        "keycode": "^2.2.0",
+        "popper.js": "^1.14.7",
+        "prop-types": "^15.7.2",
+        "prop-types-extra": "^1.1.0",
+        "react-overlays": "^1.2.0",
+        "react-transition-group": "^4.0.0",
+        "uncontrollable": "^6.1.0",
+        "warning": "^4.0.3"
+      }
+    },
+    "react-context-toolbox": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/react-context-toolbox/-/react-context-toolbox-2.0.2.tgz",
+      "integrity": "sha512-tY4j0imkYC3n5ZlYSgFkaw7fmlCp3IoQQ6DxpqeNHzcD0hf+6V+/HeJxviLUZ1Rv1Yn3N3xyO2EhkkZwHn0m1A=="
+    },
+    "react-dev-utils": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.0.2.tgz",
+      "integrity": "sha512-AHVfRepMzZJyJHCNFAsrAG4El1H5v+27c1XkeDoX6pSmdhT/ZDdAN3Mf7DKYcrbIFlubzVYof6NZDnPBjd0CNA==",
+      "requires": {
+        "@babel/code-frame": "7.5.5",
+        "address": "1.1.0",
+        "browserslist": "4.6.6",
+        "chalk": "2.4.2",
+        "cross-spawn": "6.0.5",
+        "detect-port-alt": "1.1.6",
+        "escape-string-regexp": "1.0.5",
+        "filesize": "3.6.1",
+        "find-up": "3.0.0",
+        "fork-ts-checker-webpack-plugin": "1.5.0",
+        "global-modules": "2.0.0",
+        "globby": "8.0.2",
+        "gzip-size": "5.1.1",
+        "immer": "1.10.0",
+        "inquirer": "6.5.0",
+        "is-root": "2.1.0",
+        "loader-utils": "1.2.3",
+        "open": "^6.3.0",
+        "pkg-up": "2.0.0",
+        "react-error-overlay": "^6.0.0",
+        "recursive-readdir": "2.2.2",
+        "shell-quote": "1.6.1",
+        "sockjs-client": "1.3.0",
+        "strip-ansi": "5.2.0",
+        "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+          "requires": {
+            "restore-cursor": "^2.0.0"
+          }
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "inquirer": {
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz",
+          "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==",
+          "requires": {
+            "ansi-escapes": "^3.2.0",
+            "chalk": "^2.4.2",
+            "cli-cursor": "^2.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^2.0.0",
+            "lodash": "^4.17.12",
+            "mute-stream": "0.0.7",
+            "run-async": "^2.2.0",
+            "rxjs": "^6.4.0",
+            "string-width": "^2.1.0",
+            "strip-ansi": "^5.1.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "requires": {
+            "onetime": "^2.0.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+            }
+          }
+        }
+      }
+    },
+    "react-dom": {
+      "version": "16.8.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.0.tgz",
+      "integrity": "sha512-dBzoAGYZpW9Yggp+CzBPC7q1HmWSeRc93DWrwbskmG1eHJWznZB/p0l/Sm+69leIGUS91AXPB/qB3WcPnKx8Sw==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.13.0"
+      }
+    },
+    "react-error-overlay": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.0.tgz",
+      "integrity": "sha512-oHf3b1J2Pxu03apiHvP21qBCkj6fG6A3c3ahya3fX0VXEZUTzIRLwZI9eZ/6cuOO+kvnzdVdGBxZlo+Tjh+hfQ=="
+    },
+    "react-input-autosize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.1.tgz",
+      "integrity": "sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==",
+      "requires": {
+        "prop-types": "^15.5.8"
+      }
+    },
+    "react-is": {
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
+      "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
+    },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "react-overlays": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-1.2.0.tgz",
+      "integrity": "sha512-i/FCV8wR6aRaI+Kz/dpJhOdyx+ah2tN1RhT9InPrexyC4uzf3N4bNayFTGtUeQVacj57j1Mqh1CwV60/5153Iw==",
+      "requires": {
+        "classnames": "^2.2.6",
+        "dom-helpers": "^3.4.0",
+        "prop-types": "^15.6.2",
+        "prop-types-extra": "^1.1.0",
+        "react-context-toolbox": "^2.0.2",
+        "react-popper": "^1.3.2",
+        "uncontrollable": "^6.0.0",
+        "warning": "^4.0.2"
+      }
+    },
+    "react-popper": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.3.tgz",
+      "integrity": "sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "create-react-context": "<=0.2.2",
+        "popper.js": "^1.14.4",
+        "prop-types": "^15.6.1",
+        "typed-styles": "^0.0.7",
+        "warning": "^4.0.2"
+      },
+      "dependencies": {
+        "create-react-context": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz",
+          "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==",
+          "requires": {
+            "fbjs": "^0.8.0",
+            "gud": "^1.0.0"
+          }
+        },
+        "typed-styles": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
+          "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
+        }
+      }
+    },
+    "react-router": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.1.tgz",
+      "integrity": "sha512-EM7suCPNKb1NxcTZ2LEOWFtQBQRQXecLxVpdsP4DW4PbbqYWeRiLyV/Tt1SdCrvT2jcyXAXmVTmzvSzrPR63Bg==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "mini-create-react-context": "^0.3.0",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      }
+    },
+    "react-router-dom": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.1.tgz",
+      "integrity": "sha512-zaVHSy7NN0G91/Bz9GD4owex5+eop+KvgbxXsP/O+iW1/Ln+BrJ8QiIR5a6xNPtrdTvLkxqlDClx13QO1uB8CA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.0.1",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      }
+    },
+    "react-scripts": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.0.1.tgz",
+      "integrity": "sha512-LKEjBhVpEB+c312NeJhzF+NATxF7JkHNr5GhtwMeRS1cMeLElMeIu8Ye7WGHtDP7iz7ra4ryy48Zpo6G/cwWUw==",
+      "requires": {
+        "@babel/core": "7.4.3",
+        "@svgr/webpack": "4.1.0",
+        "@typescript-eslint/eslint-plugin": "1.6.0",
+        "@typescript-eslint/parser": "1.6.0",
+        "babel-eslint": "10.0.1",
+        "babel-jest": "^24.8.0",
+        "babel-loader": "8.0.5",
+        "babel-plugin-named-asset-import": "^0.3.2",
+        "babel-preset-react-app": "^9.0.0",
+        "camelcase": "^5.2.0",
+        "case-sensitive-paths-webpack-plugin": "2.2.0",
+        "css-loader": "2.1.1",
+        "dotenv": "6.2.0",
+        "dotenv-expand": "4.2.0",
+        "eslint": "^5.16.0",
+        "eslint-config-react-app": "^4.0.1",
+        "eslint-loader": "2.1.2",
+        "eslint-plugin-flowtype": "2.50.1",
+        "eslint-plugin-import": "2.16.0",
+        "eslint-plugin-jsx-a11y": "6.2.1",
+        "eslint-plugin-react": "7.12.4",
+        "eslint-plugin-react-hooks": "^1.5.0",
+        "file-loader": "3.0.1",
+        "fs-extra": "7.0.1",
+        "fsevents": "2.0.6",
+        "html-webpack-plugin": "4.0.0-beta.5",
+        "identity-obj-proxy": "3.0.0",
+        "is-wsl": "^1.1.0",
+        "jest": "24.7.1",
+        "jest-environment-jsdom-fourteen": "0.1.0",
+        "jest-resolve": "24.7.1",
+        "jest-watch-typeahead": "0.3.0",
+        "mini-css-extract-plugin": "0.5.0",
+        "optimize-css-assets-webpack-plugin": "5.0.1",
+        "pnp-webpack-plugin": "1.2.1",
+        "postcss-flexbugs-fixes": "4.1.0",
+        "postcss-loader": "3.0.0",
+        "postcss-normalize": "7.0.1",
+        "postcss-preset-env": "6.6.0",
+        "postcss-safe-parser": "4.0.1",
+        "react-app-polyfill": "^1.0.1",
+        "react-dev-utils": "^9.0.1",
+        "resolve": "1.10.0",
+        "sass-loader": "7.1.0",
+        "semver": "6.0.0",
+        "style-loader": "0.23.1",
+        "terser-webpack-plugin": "1.2.3",
+        "ts-pnp": "1.1.2",
+        "url-loader": "1.1.2",
+        "webpack": "4.29.6",
+        "webpack-dev-server": "3.2.1",
+        "webpack-manifest-plugin": "2.0.4",
+        "workbox-webpack-plugin": "4.2.0"
+      }
+    },
+    "react-select": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.0.4.tgz",
+      "integrity": "sha512-fbVISKa/lSUlLsltuatfUiKcWCNvdLXxFFyrzVQCBUsjxJZH/m7UMPdw/ywmRixAmwXAP++MdbNNZypOsiDEfA==",
+      "requires": {
+        "@babel/runtime": "^7.4.4",
+        "@emotion/cache": "^10.0.9",
+        "@emotion/core": "^10.0.9",
+        "@emotion/css": "^10.0.9",
+        "classnames": "^2.2.5",
+        "memoize-one": "^5.0.0",
+        "prop-types": "^15.6.0",
+        "raf": "^3.4.0",
+        "react-input-autosize": "^2.2.1",
+        "react-transition-group": "^2.2.1"
+      },
+      "dependencies": {
+        "react-transition-group": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+          "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+          "requires": {
+            "dom-helpers": "^3.4.0",
+            "loose-envify": "^1.4.0",
+            "prop-types": "^15.6.2",
+            "react-lifecycles-compat": "^3.0.4"
+          }
+        }
+      }
+    },
+    "react-test-renderer": {
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.9.0.tgz",
+      "integrity": "sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.9.0",
+        "scheduler": "^0.15.0"
+      },
+      "dependencies": {
+        "scheduler": {
+          "version": "0.15.0",
+          "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
+          "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
+          "requires": {
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1"
+          }
+        }
+      }
+    },
+    "react-transition-group": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.2.2.tgz",
+      "integrity": "sha512-uP0tjqewtvjb7kGZFpZYPoD/NlVZmIgts9eTt1w35pAaEApPxQGv94lD3VkqyXf2aMqrSGwhs6EV/DLaoKbLSw==",
+      "requires": {
+        "@babel/runtime": "^7.4.5",
+        "dom-helpers": "^3.4.0",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      }
+    },
+    "read-pkg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "requires": {
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
+      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
+      "requires": {
+        "find-up": "^3.0.0",
+        "read-pkg": "^3.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        }
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "realpath-native": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
+      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
+      "requires": {
+        "util.promisify": "^1.0.0"
+      }
+    },
+    "recursive-readdir": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
+    "reflect.ownkeys": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
+      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA="
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+    },
+    "regenerator-transform": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+      "requires": {
+        "private": "^0.1.6"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexp-tree": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz",
+      "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg=="
+    },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
+    },
+    "regexpu-core": {
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz",
+      "integrity": "sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==",
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.1.0",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
+      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA=="
+    },
+    "regjsparser": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+        }
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+    },
+    "renderkid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
+      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "^0.2",
+        "htmlparser2": "^3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "^0.4.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "css-select": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+          "requires": {
+            "boolbase": "~1.0.0",
+            "css-what": "2.1",
+            "domutils": "1.5.1",
+            "nth-check": "~1.0.1"
+          }
+        },
+        "domutils": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
+      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
+      "requires": {
+        "lodash": "^4.17.11"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
+      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
+      "requires": {
+        "request-promise-core": "1.1.2",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
+    "requireindex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww=="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "resolve": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
+    },
+    "resolve-pathname": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
+      "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "rst-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
+      "requires": {
+        "lodash.flattendeep": "^4.4.0",
+        "nearley": "^2.7.10"
+      }
+    },
+    "rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rxjs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
+      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      }
+    },
+    "sass-loader": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
+      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "requires": {
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "clone-deep": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+          "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+          "requires": {
+            "for-own": "^1.0.0",
+            "is-plain-object": "^2.0.4",
+            "kind-of": "^6.0.0",
+            "shallow-clone": "^1.0.0"
+          }
+        },
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+          "requires": {
+            "for-in": "^1.0.1"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        },
+        "shallow-clone": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+          "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+          "requires": {
+            "is-extendable": "^0.1.1",
+            "kind-of": "^5.0.0",
+            "mixin-object": "^2.0.1"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+            }
+          }
+        }
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "saxes": {
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
+      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+      "requires": {
+        "xmlchars": "^2.1.1"
+      }
+    },
+    "scheduler": {
+      "version": "0.13.6",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
+      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
+    },
+    "selfsigned": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "requires": {
+        "node-forge": "0.7.5"
+      }
+    },
+    "semver": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+      "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="
+    },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
+          }
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "requires": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^2.0.1",
+        "lazy-cache": "^0.2.3",
+        "mixin-object": "^2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+          "requires": {
+            "is-buffer": "^1.0.2"
+          }
+        },
+        "lazy-cache": {
+          "version": "0.2.7",
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U="
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "shell-quote": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+      "requires": {
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
+      }
+    },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+        }
+      }
+    },
+    "sisteransi": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
+      "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg=="
+    },
+    "slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
+    },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        }
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "requires": {
+        "kind-of": "^3.2.0"
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+          "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        }
+      }
+    },
+    "sockjs-client": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+      "requires": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+    },
+    "spdy": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
+      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      }
+    },
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
+    },
+    "stack-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
+      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+    },
+    "string-length": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
+      "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+      "requires": {
+        "astral-regex": "^1.0.0",
+        "strip-ansi": "^4.0.0"
+      }
+    },
+    "string-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz",
+      "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==",
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^5.2.0"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trim": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz",
+      "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.13.0",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "requires": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        }
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-comments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz",
+      "integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==",
+      "requires": {
+        "babel-extract-comments": "^1.0.0",
+        "babel-plugin-transform-object-rest-spread": "^6.26.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "style-loader": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "styled-components": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.3.2.tgz",
+      "integrity": "sha512-NppHzIFavZ3TsIU3R1omtddJ0Bv1+j50AKh3ZWyXHuFvJq1I8qkQ5mZ7uQgD89Y8zJNx2qRo6RqAH1BmoVafHw==",
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/traverse": "^7.0.0",
+        "@emotion/is-prop-valid": "^0.8.1",
+        "@emotion/unitless": "^0.7.0",
+        "babel-plugin-styled-components": ">= 1",
+        "css-to-react-native": "^2.2.2",
+        "memoize-one": "^5.0.0",
+        "merge-anything": "^2.2.4",
+        "prop-types": "^15.5.4",
+        "react-is": "^16.6.0",
+        "stylis": "^3.5.0",
+        "stylis-rule-sheet": "^0.0.10",
+        "supports-color": "^5.5.0"
+      }
+    },
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "requires": {
+            "dot-prop": "^4.1.1",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "stylis": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
+      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
+    },
+    "stylis-rule-sheet": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
+      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "svg-parser": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.2.tgz",
+      "integrity": "sha512-1gtApepKFweigFZj3sGO8KT8LvVZK8io146EzXrpVuWCDAbISz/yMucco3hWTkpZNoPabM+dnMOpy6Swue68Zg=="
+    },
+    "svgo": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz",
+      "integrity": "sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==",
+      "requires": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.33",
+        "csso": "^3.5.1",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      }
+    },
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+    },
+    "table": {
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.5.tgz",
+      "integrity": "sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==",
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
+    },
+    "terser": {
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
+      "requires": {
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "requires": {
+        "cacache": "^11.0.2",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.16.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "test-exclude": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
+      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
+      "requires": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "read-pkg-up": "^4.0.0",
+        "require-main-filename": "^2.0.0"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "throat": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
+      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "thunky": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow=="
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
+    },
+    "tiny-invariant": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz",
+      "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA=="
+    },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
+    },
+    "ts-pnp": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.2.tgz",
+      "integrity": "sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA=="
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+    },
+    "tsutils": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-fest": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz",
+      "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typed-styles": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.5.tgz",
+      "integrity": "sha512-ht+rEe5UsdEBAa3gr64+QjUOqjOLJfWLvl5HZR5Ev9uo/OnD3p43wPeFSB1hNFc13GXQF/JU1Bn0YHLUqBRIlw=="
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "ua-parser-js": {
+      "version": "0.7.20",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
+      "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
+    },
+    "uglify-js": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "requires": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "uncontrollable": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-6.2.3.tgz",
+      "integrity": "sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==",
+      "requires": {
+        "@babel/runtime": "^7.4.5",
+        "invariant": "^2.2.4"
+      }
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
+    "url-loader": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
+      "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "mime": "^2.0.3",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "value-equal": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz",
+      "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "vendors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
+      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
+    },
+    "w3c-hr-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
+      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
+      "requires": {
+        "browser-process-hrtime": "^0.1.2"
+      }
+    },
+    "w3c-xmlserializer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "requires": {
+        "domexception": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "xml-name-validator": "^3.0.0"
+      }
+    },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "webpack": {
+      "version": "4.29.6",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
+      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.2",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
+      "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.0.0",
+        "compression": "^1.5.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "debug": "^4.1.1",
+        "del": "^3.0.0",
+        "express": "^4.16.2",
+        "html-entities": "^1.2.0",
+        "http-proxy-middleware": "^0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.2.0",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.9.1",
+        "semver": "^5.6.0",
+        "serve-index": "^1.7.2",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.3.0",
+        "spdy": "^4.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.5.1",
+        "webpack-log": "^2.0.0",
+        "yargs": "12.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "decamelize": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+          "requires": {
+            "xregexp": "4.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "yargs": {
+          "version": "12.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^2.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^10.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "webpack-manifest-plugin": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz",
+      "integrity": "sha512-nejhOHexXDBKQOj/5v5IZSfCeTO3x1Dt1RZEcGfBSul891X/eLIcIVH31gwxPDdsi2Z8LKKFGpM4w9+oTBOSCg==",
+      "requires": {
+        "fs-extra": "^7.0.0",
+        "lodash": ">=3.5 <5",
+        "tapable": "^1.0.0"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "requires": {
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
+    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "whatwg-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+    },
+    "whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+    },
+    "whatwg-url": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "workbox-background-sync": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz",
+      "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-broadcast-update": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz",
+      "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-build": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz",
+      "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==",
+      "requires": {
+        "@babel/runtime": "^7.3.4",
+        "@hapi/joi": "^15.0.0",
+        "common-tags": "^1.8.0",
+        "fs-extra": "^4.0.2",
+        "glob": "^7.1.3",
+        "lodash.template": "^4.4.0",
+        "pretty-bytes": "^5.1.0",
+        "stringify-object": "^3.3.0",
+        "strip-comments": "^1.0.2",
+        "workbox-background-sync": "^4.3.1",
+        "workbox-broadcast-update": "^4.3.1",
+        "workbox-cacheable-response": "^4.3.1",
+        "workbox-core": "^4.3.1",
+        "workbox-expiration": "^4.3.1",
+        "workbox-google-analytics": "^4.3.1",
+        "workbox-navigation-preload": "^4.3.1",
+        "workbox-precaching": "^4.3.1",
+        "workbox-range-requests": "^4.3.1",
+        "workbox-routing": "^4.3.1",
+        "workbox-strategies": "^4.3.1",
+        "workbox-streams": "^4.3.1",
+        "workbox-sw": "^4.3.1",
+        "workbox-window": "^4.3.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        }
+      }
+    },
+    "workbox-cacheable-response": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz",
+      "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-core": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz",
+      "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg=="
+    },
+    "workbox-expiration": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz",
+      "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-google-analytics": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz",
+      "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==",
+      "requires": {
+        "workbox-background-sync": "^4.3.1",
+        "workbox-core": "^4.3.1",
+        "workbox-routing": "^4.3.1",
+        "workbox-strategies": "^4.3.1"
+      }
+    },
+    "workbox-navigation-preload": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz",
+      "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-precaching": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz",
+      "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-range-requests": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz",
+      "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-routing": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz",
+      "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-strategies": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz",
+      "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-streams": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz",
+      "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "workbox-sw": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz",
+      "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w=="
+    },
+    "workbox-webpack-plugin": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.2.0.tgz",
+      "integrity": "sha512-YZsiA+y/ns/GdWRaBsfYv8dln1ebWtGnJcTOg1ppO0pO1tScAHX0yGtHIjndxz3L/UUhE8b0NQE9KeLNwJwA5A==",
+      "requires": {
+        "@babel/runtime": "^7.0.0",
+        "json-stable-stringify": "^1.0.1",
+        "workbox-build": "^4.2.0"
+      }
+    },
+    "workbox-window": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz",
+      "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==",
+      "requires": {
+        "workbox-core": "^4.3.1"
+      }
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "worker-rpc": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz",
+      "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==",
+      "requires": {
+        "microevent.ts": "~0.1.1"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "write-file-atomic": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
+      "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ws": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+    },
+    "xmlchars": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
+      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
+    },
+    "xregexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg=="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+    },
+    "yallist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
+    },
+    "yargs": {
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+      "requires": {
+        "cliui": "^4.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^3.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1 || ^4.0.0",
+        "yargs-parser": "^11.1.1"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+      "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    }
+  }
+}
diff --git a/ui-react/package.json b/ui-react/package.json
index de7cb26d1..a51812271 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -1,17 +1,29 @@
 {
-  "name": "clamp-ui",
-  "version": "0.0.1",
-  "description": "ONAP Clamp Designer UI",
+  "name": "onap-clamp-ui",
+  "version": "4.1.0-SNAPSHOT",
+  "description": "ONAP Clamp Loop Designer UI",
+  "author": "ONAP Clamp Team",
+  "license": "Apache-2.0",
+  "homepage": "wiki.onap.org",
+  "publishConfig": {
+    "registry": "https://nexus3.onap.org/repository/npm.snapshot/"
+  },
   "main": "index.js",
   "proxy": "http://localhost:8080",
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject"
+    "test": "react-scripts test --env=jsdom --watchAll=false",
+    "eject": "react-scripts eject",
+    "publish": "npm run publish"
   },
-  "author": "ONAP Clamp Team",
-  "license": "Apache-2.0",
+  "files": [
+    "src/*.js",
+    "src/*.png",
+    "src/api",
+    "src/components",
+    "src/theme"
+  ],
   "dependencies": {
     "@json-editor/json-editor": "1.3.5",
     "react": "16.8.0",
diff --git a/ui-react/src/__test__/LoopCache.test.js b/ui-react/src/__test__/LoopCache.test.js
index e5b50259d..101f864aa 100644
--- a/ui-react/src/__test__/LoopCache.test.js
+++ b/ui-react/src/__test__/LoopCache.test.js
@@ -77,7 +77,7 @@ describe('Verify LoopCache functions', () => {
       expect(loopCache.getDcaeDeploymentProperties()).toStrictEqual(deploymentProp);
     });
 
-    it('getMicroServicesJsonForType', () => {
+    it('getMicroServiceForName', () => {
       const msJson = {
           "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
           "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
@@ -89,7 +89,7 @@ describe('Verify LoopCache functions', () => {
       expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
     });
 
-    it('getMicroServiceProperties', () => {
+    it('getMicroServicePropertiesForName', () => {
       const msProp = {"domain": "measurementsForVfScaling"};
       expect(loopCache.getMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msProp);
       expect(loopCache.getMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
@@ -100,7 +100,7 @@ describe('Verify LoopCache functions', () => {
       expect(loopCache.getMicroServiceJsonRepresentationForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
     });
 
-    it('getMicroServiceJsonRepresentationForType', () => {
+    it('getMicroServiceJsonRepresentationForName', () => {
       const msJsonRepresentation = {"schema": {}};
       expect(loopCache.getMicroServiceJsonRepresentationForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
     });
-- 
cgit 1.2.3-korg


From b65f1215e7dfab5630c0e2c1da8afec4cd08173f Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 23 Aug 2019 07:49:25 -0700
Subject: Update react

Update react compo to latest ones

Issue-ID: CLAMP-477
Change-Id: I108b31c7e25595d96bc598f394590f23436335a1
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/package-lock.json                         | 2279 +++++++++++---------
 ui-react/package.json                              |   10 +-
 ui-react/src/__test__/LoopCache.test.js            |   27 +-
 .../__snapshots__/OpenLoopModal.test.js.snap       |    3 +
 ui-react/src/api/LoopCache.js                      |    4 +-
 5 files changed, 1299 insertions(+), 1024 deletions(-)
 create mode 100644 ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/package-lock.json b/ui-react/package-lock.json
index 2f8074447..886130424 100644
--- a/ui-react/package-lock.json
+++ b/ui-react/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "onap-clamp-ui",
-  "version": "${project.version}",
+  "version": "4.1.0-SNAPSHOT",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -13,30 +13,30 @@
       }
     },
     "@babel/core": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.3.tgz",
-      "integrity": "sha512-oDpASqKFlbspQfzAE7yaeTmdljSH2ADIvBlb0RwbStltTuWa0+7CCI1fYVINNv9saHPa1W7oaKeuNuKj+RQCvA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.0",
-        "@babel/helpers": "^7.4.3",
-        "@babel/parser": "^7.4.3",
-        "@babel/template": "^7.4.0",
-        "@babel/traverse": "^7.4.3",
-        "@babel/types": "^7.4.0",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
         "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
         "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -710,9 +710,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -836,9 +836,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -1020,83 +1020,77 @@
       "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz",
       "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw=="
     },
+    "@hapi/bourne": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
+      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
+    },
     "@hapi/hoek": {
-      "version": "6.2.4",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-6.2.4.tgz",
-      "integrity": "sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A=="
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.1.tgz",
+      "integrity": "sha512-JPiBy+oSmsq3St7XlipfN5pNA6bDJ1kpa73PrK/zR29CVClDVqy04AanM/M/qx5bSF+I61DdCfAvRrujau+zRg=="
     },
     "@hapi/joi": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.0.tgz",
-      "integrity": "sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
       "requires": {
         "@hapi/address": "2.x.x",
-        "@hapi/hoek": "6.x.x",
-        "@hapi/marker": "1.x.x",
+        "@hapi/bourne": "1.x.x",
+        "@hapi/hoek": "8.x.x",
         "@hapi/topo": "3.x.x"
       }
     },
-    "@hapi/marker": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/marker/-/marker-1.0.0.tgz",
-      "integrity": "sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA=="
-    },
     "@hapi/topo": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz",
       "integrity": "sha512-JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==",
       "requires": {
         "@hapi/hoek": "8.x.x"
-      },
-      "dependencies": {
-        "@hapi/hoek": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.0.tgz",
-          "integrity": "sha512-pR2ZgiP562aiaQvQ98WgfqfTrm+xG+7hwHRPEiYZ+7U1OHAAb4OVZJIalCP03bMqYSioQzflzVTVrybSwDBn1Q=="
-        }
       }
     },
     "@jest/console": {
-      "version": "24.7.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.7.1.tgz",
-      "integrity": "sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
+      "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
       "requires": {
-        "@jest/source-map": "^24.3.0",
+        "@jest/source-map": "^24.9.0",
         "chalk": "^2.0.1",
         "slash": "^2.0.0"
       }
     },
     "@jest/core": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.8.0.tgz",
-      "integrity": "sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
+      "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
       "requires": {
         "@jest/console": "^24.7.1",
-        "@jest/reporters": "^24.8.0",
-        "@jest/test-result": "^24.8.0",
-        "@jest/transform": "^24.8.0",
-        "@jest/types": "^24.8.0",
+        "@jest/reporters": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/transform": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "ansi-escapes": "^3.0.0",
         "chalk": "^2.0.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.1.15",
-        "jest-changed-files": "^24.8.0",
-        "jest-config": "^24.8.0",
-        "jest-haste-map": "^24.8.0",
-        "jest-message-util": "^24.8.0",
+        "jest-changed-files": "^24.9.0",
+        "jest-config": "^24.9.0",
+        "jest-haste-map": "^24.9.0",
+        "jest-message-util": "^24.9.0",
         "jest-regex-util": "^24.3.0",
-        "jest-resolve-dependencies": "^24.8.0",
-        "jest-runner": "^24.8.0",
-        "jest-runtime": "^24.8.0",
-        "jest-snapshot": "^24.8.0",
-        "jest-util": "^24.8.0",
-        "jest-validate": "^24.8.0",
-        "jest-watcher": "^24.8.0",
+        "jest-resolve": "^24.9.0",
+        "jest-resolve-dependencies": "^24.9.0",
+        "jest-runner": "^24.9.0",
+        "jest-runtime": "^24.9.0",
+        "jest-snapshot": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-validate": "^24.9.0",
+        "jest-watcher": "^24.9.0",
         "micromatch": "^3.1.10",
         "p-each-series": "^1.0.0",
-        "pirates": "^4.0.1",
         "realpath-native": "^1.1.0",
         "rimraf": "^2.5.4",
+        "slash": "^2.0.0",
         "strip-ansi": "^5.0.0"
       },
       "dependencies": {
@@ -1105,46 +1099,50 @@
           "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
           "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "jest-resolve": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "@jest/types": "^24.9.0",
+            "browser-resolve": "^1.11.3",
+            "chalk": "^2.0.1",
+            "jest-pnp-resolver": "^1.2.1",
+            "realpath-native": "^1.1.0"
           }
         }
       }
     },
     "@jest/environment": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.8.0.tgz",
-      "integrity": "sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
+      "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
       "requires": {
-        "@jest/fake-timers": "^24.8.0",
-        "@jest/transform": "^24.8.0",
-        "@jest/types": "^24.8.0",
-        "jest-mock": "^24.8.0"
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/transform": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "jest-mock": "^24.9.0"
       }
     },
     "@jest/fake-timers": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.8.0.tgz",
-      "integrity": "sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
+      "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
       "requires": {
-        "@jest/types": "^24.8.0",
-        "jest-message-util": "^24.8.0",
-        "jest-mock": "^24.8.0"
+        "@jest/types": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-mock": "^24.9.0"
       }
     },
     "@jest/reporters": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.8.0.tgz",
-      "integrity": "sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==",
-      "requires": {
-        "@jest/environment": "^24.8.0",
-        "@jest/test-result": "^24.8.0",
-        "@jest/transform": "^24.8.0",
-        "@jest/types": "^24.8.0",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
+      "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
+      "requires": {
+        "@jest/environment": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/transform": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "chalk": "^2.0.1",
         "exit": "^0.1.2",
         "glob": "^7.1.2",
@@ -1152,24 +1150,24 @@
         "istanbul-lib-instrument": "^3.0.1",
         "istanbul-lib-report": "^2.0.4",
         "istanbul-lib-source-maps": "^3.0.1",
-        "istanbul-reports": "^2.1.1",
-        "jest-haste-map": "^24.8.0",
-        "jest-resolve": "^24.8.0",
-        "jest-runtime": "^24.8.0",
-        "jest-util": "^24.8.0",
+        "istanbul-reports": "^2.2.6",
+        "jest-haste-map": "^24.9.0",
+        "jest-resolve": "^24.9.0",
+        "jest-runtime": "^24.9.0",
+        "jest-util": "^24.9.0",
         "jest-worker": "^24.6.0",
-        "node-notifier": "^5.2.1",
+        "node-notifier": "^5.4.2",
         "slash": "^2.0.0",
         "source-map": "^0.6.0",
         "string-length": "^2.0.0"
       },
       "dependencies": {
         "jest-resolve": {
-          "version": "24.8.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
           "requires": {
-            "@jest/types": "^24.8.0",
+            "@jest/types": "^24.9.0",
             "browser-resolve": "^1.11.3",
             "chalk": "^2.0.1",
             "jest-pnp-resolver": "^1.2.1",
@@ -1184,9 +1182,9 @@
       }
     },
     "@jest/source-map": {
-      "version": "24.3.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz",
-      "integrity": "sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
+      "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
       "requires": {
         "callsites": "^3.0.0",
         "graceful-fs": "^4.1.15",
@@ -1206,42 +1204,43 @@
       }
     },
     "@jest/test-result": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.8.0.tgz",
-      "integrity": "sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
+      "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
       "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/types": "^24.8.0",
+        "@jest/console": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "@types/istanbul-lib-coverage": "^2.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz",
-      "integrity": "sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
+      "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
       "requires": {
-        "@jest/test-result": "^24.8.0",
-        "jest-haste-map": "^24.8.0",
-        "jest-runner": "^24.8.0",
-        "jest-runtime": "^24.8.0"
+        "@jest/test-result": "^24.9.0",
+        "jest-haste-map": "^24.9.0",
+        "jest-runner": "^24.9.0",
+        "jest-runtime": "^24.9.0"
       }
     },
     "@jest/transform": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.8.0.tgz",
-      "integrity": "sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
+      "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "babel-plugin-istanbul": "^5.1.0",
         "chalk": "^2.0.1",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.1.15",
-        "jest-haste-map": "^24.8.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-util": "^24.8.0",
+        "jest-haste-map": "^24.9.0",
+        "jest-regex-util": "^24.9.0",
+        "jest-util": "^24.9.0",
         "micromatch": "^3.1.10",
+        "pirates": "^4.0.1",
         "realpath-native": "^1.1.0",
         "slash": "^2.0.0",
         "source-map": "^0.6.1",
@@ -1256,13 +1255,13 @@
       }
     },
     "@jest/types": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.8.0.tgz",
-      "integrity": "sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
+      "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^12.0.9"
+        "@types/yargs": "^13.0.0"
       }
     },
     "@json-editor/json-editor": {
@@ -1313,9 +1312,9 @@
       "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
     },
     "@restart/hooks": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.11.tgz",
-      "integrity": "sha512-EcKbmMEMJBGNXl2u5WLpwmQnH47+USJW4wIQlwkStmsdt/igq+EUJX7tp0fha0GGIliJoxg69FSe06i5/B6HpA=="
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.12.tgz",
+      "integrity": "sha512-nltMFo5JkYcnntf0Cs3Kq7jskrKeGcftAKOqbEEa74sxlx0bfO3RjBly2aiRb7hnsYJCB8/99l+acQcl2lnq1w=="
     },
     "@svgr/babel-plugin-add-jsx-attribute": {
       "version": "4.2.0",
@@ -1399,34 +1398,6 @@
         "@svgr/babel-preset": "^4.3.1",
         "@svgr/hast-util-to-babel-ast": "^4.3.2",
         "svg-parser": "^2.0.0"
-      },
-      "dependencies": {
-        "@babel/core": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
-          "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
-          "requires": {
-            "@babel/code-frame": "^7.5.5",
-            "@babel/generator": "^7.5.5",
-            "@babel/helpers": "^7.5.5",
-            "@babel/parser": "^7.5.5",
-            "@babel/template": "^7.4.4",
-            "@babel/traverse": "^7.5.5",
-            "@babel/types": "^7.5.5",
-            "convert-source-map": "^1.1.0",
-            "debug": "^4.1.0",
-            "json5": "^2.1.0",
-            "lodash": "^4.17.13",
-            "resolve": "^1.3.2",
-            "semver": "^5.4.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
-        }
       }
     },
     "@svgr/plugin-svgo": {
@@ -1440,18 +1411,18 @@
       }
     },
     "@svgr/webpack": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.1.0.tgz",
-      "integrity": "sha512-d09ehQWqLMywP/PT/5JvXwPskPK9QCXUjiSkAHehreB381qExXf5JFCBWhfEyNonRbkIneCeYM99w+Ud48YIQQ==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.3.2.tgz",
+      "integrity": "sha512-F3VE5OvyOWBEd2bF7BdtFRyI6E9it3mN7teDw0JQTlVtc4HZEYiiLSl+Uf9Uub6IYHVGc+qIrxxDyeedkQru2w==",
       "requires": {
-        "@babel/core": "^7.1.6",
+        "@babel/core": "^7.4.5",
         "@babel/plugin-transform-react-constant-elements": "^7.0.0",
-        "@babel/preset-env": "^7.1.6",
+        "@babel/preset-env": "^7.4.5",
         "@babel/preset-react": "^7.0.0",
-        "@svgr/core": "^4.1.0",
-        "@svgr/plugin-jsx": "^4.1.0",
-        "@svgr/plugin-svgo": "^4.0.3",
-        "loader-utils": "^1.1.0"
+        "@svgr/core": "^4.3.2",
+        "@svgr/plugin-jsx": "^4.3.2",
+        "@svgr/plugin-svgo": "^4.3.1",
+        "loader-utils": "^1.2.3"
       }
     },
     "@types/babel__core": {
@@ -1491,6 +1462,11 @@
         "@babel/types": "^7.3.0"
       }
     },
+    "@types/eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag=="
+    },
     "@types/istanbul-lib-coverage": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
@@ -1513,10 +1489,16 @@
         "@types/istanbul-lib-report": "*"
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz",
+      "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A=="
+    },
     "@types/node": {
       "version": "12.7.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.1.tgz",
-      "integrity": "sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw=="
+      "integrity": "sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==",
+      "dev": true
     },
     "@types/q": {
       "version": "1.5.2",
@@ -1529,35 +1511,55 @@
       "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
     },
     "@types/yargs": {
-      "version": "12.0.12",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-12.0.12.tgz",
-      "integrity": "sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw=="
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
+      "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz",
+      "integrity": "sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw=="
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.6.0.tgz",
-      "integrity": "sha512-U224c29E2lo861TQZs6GSmyC0OYeRNg6bE9UVIiFBxN2MlA0nq2dCrgIVyyRbC05UOcrgf2Wk/CF2gGOPQKUSQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz",
+      "integrity": "sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g==",
       "requires": {
-        "@typescript-eslint/parser": "1.6.0",
-        "@typescript-eslint/typescript-estree": "1.6.0",
-        "requireindex": "^1.2.0",
+        "@typescript-eslint/experimental-utils": "1.13.0",
+        "eslint-utils": "^1.3.1",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^2.0.1",
         "tsutils": "^3.7.0"
       }
     },
+    "@typescript-eslint/experimental-utils": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz",
+      "integrity": "sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==",
+      "requires": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/typescript-estree": "1.13.0",
+        "eslint-scope": "^4.0.0"
+      }
+    },
     "@typescript-eslint/parser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.6.0.tgz",
-      "integrity": "sha512-VB9xmSbfafI+/kI4gUK3PfrkGmrJQfh0N4EScT1gZXSZyUxpsBirPL99EWZg9MmPG0pzq/gMtgkk7/rAHj4aQw==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz",
+      "integrity": "sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==",
       "requires": {
-        "@typescript-eslint/typescript-estree": "1.6.0",
-        "eslint-scope": "^4.0.0",
+        "@types/eslint-visitor-keys": "^1.0.0",
+        "@typescript-eslint/experimental-utils": "1.13.0",
+        "@typescript-eslint/typescript-estree": "1.13.0",
         "eslint-visitor-keys": "^1.0.0"
       }
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.6.0.tgz",
-      "integrity": "sha512-A4CanUwfaG4oXobD5y7EXbsOHjCwn8tj1RDd820etpPAjH+Icjc2K9e/DQM1Hac5zH2BSy+u6bjvvF2wwREvYA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz",
+      "integrity": "sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==",
       "requires": {
         "lodash.unescape": "4.0.1",
         "semver": "5.5.0"
@@ -1753,14 +1755,9 @@
       }
     },
     "acorn": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
-    },
-    "acorn-dynamic-import": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
-      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
+      "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ=="
     },
     "acorn-globals": {
       "version": "4.3.3",
@@ -1769,12 +1766,19 @@
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+        }
       }
     },
     "acorn-jsx": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
-      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg=="
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
+      "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw=="
     },
     "acorn-walk": {
       "version": "6.2.0",
@@ -1786,10 +1790,30 @@
       "resolved": "https://registry.npmjs.org/address/-/address-1.1.0.tgz",
       "integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ=="
     },
+    "adjust-sourcemap-loader": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
+      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+      "requires": {
+        "assert": "1.4.1",
+        "camelcase": "5.0.0",
+        "loader-utils": "1.2.3",
+        "object-path": "0.11.4",
+        "regex-parser": "2.2.10"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
+        }
+      }
+    },
     "airbnb-prop-types": {
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.14.0.tgz",
       "integrity": "sha512-Yb09vUkr3KP9r9NqfRuYtDYZG76wt8mhTUi2Vfzsghk+qkg01/gOc9NU8n63ZcMCLzpAdMEXyKjCHlxV62yN1A==",
+      "dev": true,
       "requires": {
         "array.prototype.find": "^2.1.0",
         "function.prototype.name": "^1.1.1",
@@ -1891,6 +1915,11 @@
         "commander": "^2.11.0"
       }
     },
+    "arity-n": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
+      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U="
+    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -1962,6 +1991,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz",
       "integrity": "sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==",
+      "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.13.0"
@@ -1971,6 +2001,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz",
       "integrity": "sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==",
+      "dev": true,
       "requires": {
         "define-properties": "^1.1.2",
         "es-abstract": "^1.10.0",
@@ -2006,27 +2037,11 @@
       }
     },
     "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
       "requires": {
-        "object-assign": "^4.1.1",
         "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
       }
     },
     "assert-plus": {
@@ -2166,9 +2181,9 @@
       }
     },
     "babel-eslint": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz",
-      "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz",
+      "integrity": "sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "@babel/parser": "^7.0.0",
@@ -2198,28 +2213,35 @@
       }
     },
     "babel-jest": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.8.0.tgz",
-      "integrity": "sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
+      "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
       "requires": {
-        "@jest/transform": "^24.8.0",
-        "@jest/types": "^24.8.0",
+        "@jest/transform": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "@types/babel__core": "^7.1.0",
         "babel-plugin-istanbul": "^5.1.0",
-        "babel-preset-jest": "^24.6.0",
+        "babel-preset-jest": "^24.9.0",
         "chalk": "^2.4.2",
         "slash": "^2.0.0"
       }
     },
     "babel-loader": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz",
-      "integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "requires": {
         "find-cache-dir": "^2.0.0",
         "loader-utils": "^1.0.2",
         "mkdirp": "^0.5.1",
-        "util.promisify": "^1.0.0"
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        }
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -2259,9 +2281,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "24.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz",
-      "integrity": "sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
+      "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
       "requires": {
         "@types/babel__traverse": "^7.0.6"
       }
@@ -2317,12 +2339,12 @@
       "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
     },
     "babel-preset-jest": {
-      "version": "24.6.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz",
-      "integrity": "sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
+      "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
       "requires": {
         "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "babel-plugin-jest-hoist": "^24.6.0"
+        "babel-plugin-jest-hoist": "^24.9.0"
       }
     },
     "babel-preset-react-app": {
@@ -2346,34 +2368,6 @@
         "babel-plugin-dynamic-import-node": "2.3.0",
         "babel-plugin-macros": "2.6.1",
         "babel-plugin-transform-react-remove-prop-types": "0.4.24"
-      },
-      "dependencies": {
-        "@babel/core": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
-          "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
-          "requires": {
-            "@babel/code-frame": "^7.5.5",
-            "@babel/generator": "^7.5.5",
-            "@babel/helpers": "^7.5.5",
-            "@babel/parser": "^7.5.5",
-            "@babel/template": "^7.4.4",
-            "@babel/traverse": "^7.5.5",
-            "@babel/types": "^7.5.5",
-            "convert-source-map": "^1.1.0",
-            "debug": "^4.1.0",
-            "json5": "^2.1.0",
-            "lodash": "^4.17.13",
-            "resolve": "^1.3.2",
-            "semver": "^5.4.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
-        }
       }
     },
     "babel-runtime": {
@@ -2747,15 +2741,16 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "cacache": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
       "requires": {
         "bluebird": "^3.5.5",
         "chownr": "^1.1.1",
         "figgy-pudding": "^3.5.1",
         "glob": "^7.1.4",
         "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
         "lru-cache": "^5.1.1",
         "mississippi": "^3.0.0",
         "mkdirp": "^0.5.1",
@@ -2881,6 +2876,7 @@
       "version": "1.0.0-rc.3",
       "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
       "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
+      "dev": true,
       "requires": {
         "css-select": "~1.2.0",
         "dom-serializer": "~0.1.1",
@@ -2894,6 +2890,7 @@
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
           "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+          "dev": true,
           "requires": {
             "boolbase": "~1.0.0",
             "css-what": "2.1",
@@ -2905,6 +2902,7 @@
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
           "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+          "dev": true,
           "requires": {
             "domelementtype": "^1.3.0",
             "entities": "^1.1.1"
@@ -2914,6 +2912,7 @@
           "version": "1.5.1",
           "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
           "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+          "dev": true,
           "requires": {
             "dom-serializer": "0",
             "domelementtype": "1"
@@ -2922,12 +2921,14 @@
         "entities": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
         },
         "parse5": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
           "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+          "dev": true,
           "requires": {
             "@types/node": "*"
           }
@@ -2935,9 +2936,9 @@
       }
     },
     "chokidar": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-      "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -3434,6 +3435,25 @@
             }
           }
         },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3523,27 +3543,33 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
     },
     "cliui": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "requires": {
-        "string-width": "^2.1.1",
-        "strip-ansi": "^4.0.0",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
       },
       "dependencies": {
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
         },
         "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
+            "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "strip-ansi": "^5.1.0"
           }
         }
       }
@@ -3648,6 +3674,14 @@
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
     },
+    "compose-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
+      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+      "requires": {
+        "arity-n": "^1.0.4"
+      }
+    },
     "compressible": {
       "version": "2.0.17",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
@@ -3790,13 +3824,6 @@
       "requires": {
         "browserslist": "^4.6.6",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
       }
     },
     "core-util-is": {
@@ -3871,9 +3898,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -3895,6 +3922,24 @@
         "randomfill": "^1.0.3"
       }
     },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
+      }
+    },
     "css-blank-pseudo": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
@@ -4154,6 +4199,15 @@
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
       "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
     },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
     "damerau-levenshtein": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
@@ -4374,9 +4428,9 @@
       }
     },
     "diff-sequences": {
-      "version": "24.3.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.3.0.tgz",
-      "integrity": "sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw=="
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
+      "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew=="
     },
     "diffie-hellman": {
       "version": "5.0.3",
@@ -4400,7 +4454,8 @@
     "discontinuous-range": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo="
+      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
+      "dev": true
     },
     "dns-equal": {
       "version": "1.0.0",
@@ -4548,9 +4603,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.224",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.224.tgz",
-      "integrity": "sha512-vTH9UcMbi53x/pZKQrEcD83obE8agqQwUIx/G03/mpE1vzLm0KA3cHwuZXCysvxI1gXfNjV7Nu7Vjtp89kDzmg=="
+      "version": "1.3.237",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz",
+      "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg=="
     },
     "elliptic": {
       "version": "6.5.0",
@@ -4669,6 +4724,7 @@
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz",
       "integrity": "sha512-wkZvE0VxcFx/8ZsBw0iAbk3gR1d9hK447ebnSYBf95+r32ezBq+XDSAvRErkc4LZosgH8J7et7H7/7CtUuQfBA==",
+      "dev": true,
       "requires": {
         "airbnb-prop-types": "^2.13.2",
         "function.prototype.name": "^1.1.0",
@@ -4681,7 +4737,8 @@
         "semver": {
           "version": "5.7.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
         }
       }
     },
@@ -4724,6 +4781,35 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "es5-ext": {
+      "version": "0.10.50",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
+      "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -4735,9 +4821,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
-      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
       "requires": {
         "esprima": "^3.1.3",
         "estraverse": "^4.2.0",
@@ -4760,48 +4846,58 @@
       }
     },
     "eslint": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
-      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.2.1.tgz",
+      "integrity": "sha512-ES7BzEzr0Q6m5TK9i+/iTpKjclXitOdDK4vT07OqbkBT2/VcN/gO9EL1C4HlK3TAOXYv2ItcmbVR9jO1MR0fJg==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.9.1",
+        "ajv": "^6.10.0",
         "chalk": "^2.1.0",
         "cross-spawn": "^6.0.5",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^4.0.3",
-        "eslint-utils": "^1.3.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.2",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.0",
         "esquery": "^1.0.1",
         "esutils": "^2.0.2",
         "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
+        "glob-parent": "^5.0.0",
         "globals": "^11.7.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^6.2.2",
-        "js-yaml": "^3.13.0",
+        "inquirer": "^6.4.1",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.14",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
         "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
         "progress": "^2.0.0",
         "regexpp": "^2.0.1",
-        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
         "table": "^5.2.3",
-        "text-table": "^0.2.0"
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
+        "eslint-scope": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+          "requires": {
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
+          }
+        },
         "import-fresh": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
@@ -4815,20 +4911,15 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
         }
       }
     },
     "eslint-config-react-app": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-4.0.1.tgz",
-      "integrity": "sha512-ZsaoXUIGsK8FCi/x4lT2bZR5mMkL/Kgj+Lnw690rbvvUr/uiwgFiD8FcfAhkCycm7Xte6O5lYz4EqMx2vX7jgw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.0.1.tgz",
+      "integrity": "sha512-GYXP3F/0PSHlYfGHhahqnJze8rYKxzXgrzXVqRRd4rDO40ga4NA3aHM7/HKbwceDN0/C1Ij3BoAWFawJgRbXEw==",
       "requires": {
-        "confusing-browser-globals": "^1.0.7"
+        "confusing-browser-globals": "^1.0.8"
       }
     },
     "eslint-import-resolver-node": {
@@ -4856,9 +4947,9 @@
       }
     },
     "eslint-loader": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.1.2.tgz",
-      "integrity": "sha512-rA9XiXEOilLYPOIInvVH5S/hYfyTPyxag6DZhoQOduM+3TkghAEQ3VcFO8VnX4J4qg/UIBzp72aOf/xvYmpmsg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
+      "integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
       "requires": {
         "loader-fs-cache": "^1.0.0",
         "loader-utils": "^1.0.2",
@@ -4938,28 +5029,29 @@
       }
     },
     "eslint-plugin-flowtype": {
-      "version": "2.50.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.1.tgz",
-      "integrity": "sha512-9kRxF9hfM/O6WGZcZPszOVPd2W0TLHBtceulLTsGfwMPtiCCLnCW0ssRiOOiXyqrCA20pm1iXdXm7gQeN306zQ==",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz",
+      "integrity": "sha512-bhewp36P+t7cEV0b6OdmoRWJCBYRiHFlqPZAG1oS3SF+Y0LQkeDvFSM4oxoxvczD1OdONCXMlJfQFiWLcV9urw==",
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.15"
       }
     },
     "eslint-plugin-import": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz",
-      "integrity": "sha512-z6oqWlf1x5GkHIFgrSvtmudnqM6Q60KM4KvpWi5ubonMjycLjndvd5+8VAZIsTlHC03djdgJuyKG6XO577px6A==",
+      "version": "2.18.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+      "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
       "requires": {
+        "array-includes": "^3.0.3",
         "contains-path": "^0.1.0",
         "debug": "^2.6.9",
         "doctrine": "1.5.0",
         "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.3.0",
+        "eslint-module-utils": "^2.4.0",
         "has": "^1.0.3",
-        "lodash": "^4.17.11",
         "minimatch": "^3.0.4",
+        "object.values": "^1.1.0",
         "read-pkg-up": "^2.0.0",
-        "resolve": "^1.9.0"
+        "resolve": "^1.11.0"
       },
       "dependencies": {
         "debug": {
@@ -5077,14 +5169,23 @@
             "find-up": "^2.0.0",
             "read-pkg": "^2.0.0"
           }
+        },
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
         }
       }
     },
     "eslint-plugin-jsx-a11y": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz",
-      "integrity": "sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZoOEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz",
+      "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==",
       "requires": {
+        "@babel/runtime": "^7.4.5",
         "aria-query": "^3.0.0",
         "array-includes": "^3.0.3",
         "ast-types-flow": "^0.0.7",
@@ -5092,7 +5193,7 @@
         "damerau-levenshtein": "^1.0.4",
         "emoji-regex": "^7.0.2",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^2.0.1"
+        "jsx-ast-utils": "^2.2.1"
       },
       "dependencies": {
         "emoji-regex": {
@@ -5103,17 +5204,19 @@
       }
     },
     "eslint-plugin-react": {
-      "version": "7.12.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.12.4.tgz",
-      "integrity": "sha512-1puHJkXJY+oS1t467MjbqjvX53uQ05HXwjqDgdbGBqf5j9eeydI54G3KwiJmWciQ0HTBacIKw2jgwSBSH3yfgQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz",
+      "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==",
       "requires": {
         "array-includes": "^3.0.3",
         "doctrine": "^2.1.0",
         "has": "^1.0.3",
-        "jsx-ast-utils": "^2.0.1",
+        "jsx-ast-utils": "^2.1.0",
+        "object.entries": "^1.1.0",
         "object.fromentries": "^2.0.0",
-        "prop-types": "^15.6.2",
-        "resolve": "^1.9.0"
+        "object.values": "^1.1.0",
+        "prop-types": "^15.7.2",
+        "resolve": "^1.10.1"
       },
       "dependencies": {
         "doctrine": {
@@ -5123,6 +5226,14 @@
           "requires": {
             "esutils": "^2.0.2"
           }
+        },
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
         }
       }
     },
@@ -5141,26 +5252,26 @@
       }
     },
     "eslint-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
-      "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
       "requires": {
         "eslint-visitor-keys": "^1.0.0"
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
     },
     "espree": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.0.tgz",
+      "integrity": "sha512-boA7CHRLlVWUSg3iL5Kmlt/xT3Q+sXnKoRYYzj1YeM10A76TEJBbotV5pKbnK42hEUIr121zTv+QLRM5LsCPXQ==",
       "requires": {
-        "acorn": "^6.0.7",
+        "acorn": "^7.0.0",
         "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.0.0"
+        "eslint-visitor-keys": "^1.1.0"
       }
     },
     "esprima": {
@@ -5185,9 +5296,9 @@
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
@@ -5296,16 +5407,16 @@
       }
     },
     "expect": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-24.8.0.tgz",
-      "integrity": "sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
+      "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
       "requires": {
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "ansi-styles": "^3.2.0",
-        "jest-get-type": "^24.8.0",
-        "jest-matcher-utils": "^24.8.0",
-        "jest-message-util": "^24.8.0",
-        "jest-regex-util": "^24.3.0"
+        "jest-get-type": "^24.9.0",
+        "jest-matcher-utils": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-regex-util": "^24.9.0"
       }
     },
     "express": {
@@ -5494,6 +5605,27 @@
         "is-glob": "^4.0.0",
         "merge2": "^1.2.3",
         "micromatch": "^3.1.10"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        }
       }
     },
     "fast-json-stable-stringify": {
@@ -5732,9 +5864,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -5802,9 +5934,9 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.6.tgz",
-      "integrity": "sha512-vfmKZp3XPM36DNF0qhW+Cdxk7xm7gTEHY1clv1Xq1arwRQuKZgAhw+NZNWbJBtuaNxzNXwhfdPYRrvIbjfS33A==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz",
+      "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==",
       "optional": true
     },
     "function-bind": {
@@ -5816,6 +5948,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.1.tgz",
       "integrity": "sha512-e1NzkiJuw6xqVH7YSdiW/qDHebcmMhPNe6w+4ZYYEg0VA+LaLzx37RimbPLuonHhYGFGPx1ME2nSi74JiaCr/Q==",
+      "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
         "function-bind": "^1.1.1",
@@ -5831,12 +5964,13 @@
     "functions-have-names": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.1.1.tgz",
-      "integrity": "sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw=="
+      "integrity": "sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw==",
+      "dev": true
     },
     "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
     "get-own-enumerable-property-symbols": {
       "version": "3.0.0",
@@ -5878,22 +6012,11 @@
       }
     },
     "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
+      "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
+        "is-glob": "^4.0.1"
       }
     },
     "glob-to-regexp": {
@@ -5958,9 +6081,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
-      "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
     },
     "growly": {
       "version": "1.3.0",
@@ -6152,12 +6275,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz",
-      "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==",
-      "requires": {
-        "lru-cache": "^5.1.1"
-      }
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
+      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
     },
     "hpack.js": {
       "version": "2.1.6",
@@ -6189,6 +6309,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.1.0.tgz",
       "integrity": "sha512-iqiG3dTZmy+uUaTmHarTL+3/A2VW9ox/9uasKEZC+R/wAtUrTcRlXPSaPqsnWPfIu8wqn09jQNwMRqzL54jSYA==",
+      "dev": true,
       "requires": {
         "array-filter": "^1.0.0"
       },
@@ -6196,7 +6317,8 @@
         "array-filter": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
-          "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
+          "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=",
+          "dev": true
         }
       }
     },
@@ -6435,6 +6557,11 @@
       "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
     },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -6472,16 +6599,6 @@
         "string-width": "^4.1.0",
         "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
       }
     },
     "internal-ip": {
@@ -6550,7 +6667,8 @@
     "is-boolean-object": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
-      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M="
+      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
+      "dev": true
     },
     "is-buffer": {
       "version": "1.1.6",
@@ -6657,7 +6775,8 @@
     "is-number-object": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
-      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k="
+      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
+      "dev": true
     },
     "is-obj": {
       "version": "1.0.1",
@@ -6729,12 +6848,14 @@
     "is-string": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ="
+      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
+      "dev": true
     },
     "is-subset": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
+      "dev": true
     },
     "is-svg": {
       "version": "3.0.0",
@@ -6868,76 +6989,76 @@
       }
     },
     "jest": {
-      "version": "24.7.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-24.7.1.tgz",
-      "integrity": "sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA==",
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz",
+      "integrity": "sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==",
       "requires": {
         "import-local": "^2.0.0",
-        "jest-cli": "^24.7.1"
+        "jest-cli": "^24.8.0"
       },
       "dependencies": {
         "jest-cli": {
-          "version": "24.8.0",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.8.0.tgz",
-          "integrity": "sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
+          "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
           "requires": {
-            "@jest/core": "^24.8.0",
-            "@jest/test-result": "^24.8.0",
-            "@jest/types": "^24.8.0",
+            "@jest/core": "^24.9.0",
+            "@jest/test-result": "^24.9.0",
+            "@jest/types": "^24.9.0",
             "chalk": "^2.0.1",
             "exit": "^0.1.2",
             "import-local": "^2.0.0",
             "is-ci": "^2.0.0",
-            "jest-config": "^24.8.0",
-            "jest-util": "^24.8.0",
-            "jest-validate": "^24.8.0",
+            "jest-config": "^24.9.0",
+            "jest-util": "^24.9.0",
+            "jest-validate": "^24.9.0",
             "prompts": "^2.0.1",
             "realpath-native": "^1.1.0",
-            "yargs": "^12.0.2"
+            "yargs": "^13.3.0"
           }
         }
       }
     },
     "jest-changed-files": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.8.0.tgz",
-      "integrity": "sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
+      "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
       "requires": {
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "execa": "^1.0.0",
         "throat": "^4.0.0"
       }
     },
     "jest-config": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.8.0.tgz",
-      "integrity": "sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
+      "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^24.8.0",
-        "@jest/types": "^24.8.0",
-        "babel-jest": "^24.8.0",
+        "@jest/test-sequencer": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "babel-jest": "^24.9.0",
         "chalk": "^2.0.1",
         "glob": "^7.1.1",
-        "jest-environment-jsdom": "^24.8.0",
-        "jest-environment-node": "^24.8.0",
-        "jest-get-type": "^24.8.0",
-        "jest-jasmine2": "^24.8.0",
+        "jest-environment-jsdom": "^24.9.0",
+        "jest-environment-node": "^24.9.0",
+        "jest-get-type": "^24.9.0",
+        "jest-jasmine2": "^24.9.0",
         "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.8.0",
-        "jest-util": "^24.8.0",
-        "jest-validate": "^24.8.0",
+        "jest-resolve": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-validate": "^24.9.0",
         "micromatch": "^3.1.10",
-        "pretty-format": "^24.8.0",
+        "pretty-format": "^24.9.0",
         "realpath-native": "^1.1.0"
       },
       "dependencies": {
         "jest-resolve": {
-          "version": "24.8.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
           "requires": {
-            "@jest/types": "^24.8.0",
+            "@jest/types": "^24.9.0",
             "browser-resolve": "^1.11.3",
             "chalk": "^2.0.1",
             "jest-pnp-resolver": "^1.2.1",
@@ -6947,46 +7068,46 @@
       }
     },
     "jest-diff": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.8.0.tgz",
-      "integrity": "sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
+      "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
       "requires": {
         "chalk": "^2.0.1",
-        "diff-sequences": "^24.3.0",
-        "jest-get-type": "^24.8.0",
-        "pretty-format": "^24.8.0"
+        "diff-sequences": "^24.9.0",
+        "jest-get-type": "^24.9.0",
+        "pretty-format": "^24.9.0"
       }
     },
     "jest-docblock": {
-      "version": "24.3.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.3.0.tgz",
-      "integrity": "sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz",
+      "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
       "requires": {
         "detect-newline": "^2.1.0"
       }
     },
     "jest-each": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.8.0.tgz",
-      "integrity": "sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
+      "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
       "requires": {
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "chalk": "^2.0.1",
-        "jest-get-type": "^24.8.0",
-        "jest-util": "^24.8.0",
-        "pretty-format": "^24.8.0"
+        "jest-get-type": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "pretty-format": "^24.9.0"
       }
     },
     "jest-environment-jsdom": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz",
-      "integrity": "sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==",
-      "requires": {
-        "@jest/environment": "^24.8.0",
-        "@jest/fake-timers": "^24.8.0",
-        "@jest/types": "^24.8.0",
-        "jest-mock": "^24.8.0",
-        "jest-util": "^24.8.0",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
+      "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
+      "requires": {
+        "@jest/environment": "^24.9.0",
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "jest-mock": "^24.9.0",
+        "jest-util": "^24.9.0",
         "jsdom": "^11.5.1"
       }
     },
@@ -7000,6 +7121,11 @@
         "jsdom": "^14.0.0"
       },
       "dependencies": {
+        "acorn": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+        },
         "jsdom": {
           "version": "14.1.0",
           "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz",
@@ -7059,36 +7185,36 @@
       }
     },
     "jest-environment-node": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.8.0.tgz",
-      "integrity": "sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
+      "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
       "requires": {
-        "@jest/environment": "^24.8.0",
-        "@jest/fake-timers": "^24.8.0",
-        "@jest/types": "^24.8.0",
-        "jest-mock": "^24.8.0",
-        "jest-util": "^24.8.0"
+        "@jest/environment": "^24.9.0",
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "jest-mock": "^24.9.0",
+        "jest-util": "^24.9.0"
       }
     },
     "jest-get-type": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.8.0.tgz",
-      "integrity": "sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ=="
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
+      "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="
     },
     "jest-haste-map": {
-      "version": "24.8.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.1.tgz",
-      "integrity": "sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
+      "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
       "requires": {
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "anymatch": "^2.0.0",
         "fb-watchman": "^2.0.0",
         "fsevents": "^1.2.7",
         "graceful-fs": "^4.1.15",
         "invariant": "^2.2.4",
-        "jest-serializer": "^24.4.0",
-        "jest-util": "^24.8.0",
-        "jest-worker": "^24.6.0",
+        "jest-serializer": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-worker": "^24.9.0",
         "micromatch": "^3.1.10",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
@@ -7578,55 +7704,56 @@
       }
     },
     "jest-jasmine2": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz",
-      "integrity": "sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
+      "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^24.8.0",
-        "@jest/test-result": "^24.8.0",
-        "@jest/types": "^24.8.0",
+        "@jest/environment": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "chalk": "^2.0.1",
         "co": "^4.6.0",
-        "expect": "^24.8.0",
+        "expect": "^24.9.0",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^24.8.0",
-        "jest-matcher-utils": "^24.8.0",
-        "jest-message-util": "^24.8.0",
-        "jest-runtime": "^24.8.0",
-        "jest-snapshot": "^24.8.0",
-        "jest-util": "^24.8.0",
-        "pretty-format": "^24.8.0",
+        "jest-each": "^24.9.0",
+        "jest-matcher-utils": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-runtime": "^24.9.0",
+        "jest-snapshot": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "pretty-format": "^24.9.0",
         "throat": "^4.0.0"
       }
     },
     "jest-leak-detector": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz",
-      "integrity": "sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
+      "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
       "requires": {
-        "pretty-format": "^24.8.0"
+        "jest-get-type": "^24.9.0",
+        "pretty-format": "^24.9.0"
       }
     },
     "jest-matcher-utils": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz",
-      "integrity": "sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
+      "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
       "requires": {
         "chalk": "^2.0.1",
-        "jest-diff": "^24.8.0",
-        "jest-get-type": "^24.8.0",
-        "pretty-format": "^24.8.0"
+        "jest-diff": "^24.9.0",
+        "jest-get-type": "^24.9.0",
+        "pretty-format": "^24.9.0"
       }
     },
     "jest-message-util": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.8.0.tgz",
-      "integrity": "sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
+      "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/test-result": "^24.8.0",
-        "@jest/types": "^24.8.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "@types/stack-utils": "^1.0.1",
         "chalk": "^2.0.1",
         "micromatch": "^3.1.10",
@@ -7635,11 +7762,11 @@
       }
     },
     "jest-mock": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.8.0.tgz",
-      "integrity": "sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
+      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
       "requires": {
-        "@jest/types": "^24.8.0"
+        "@jest/types": "^24.9.0"
       }
     },
     "jest-pnp-resolver": {
@@ -7648,16 +7775,16 @@
       "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ=="
     },
     "jest-regex-util": {
-      "version": "24.3.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.3.0.tgz",
-      "integrity": "sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg=="
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
+      "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA=="
     },
     "jest-resolve": {
-      "version": "24.7.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.7.1.tgz",
-      "integrity": "sha512-Bgrc+/UUZpGJ4323sQyj85hV9d+ANyPNu6XfRDUcyFNX1QrZpSoM0kE4Mb2vZMAYTJZsBFzYe8X1UaOkOELSbw==",
+      "version": "24.8.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
+      "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
       "requires": {
-        "@jest/types": "^24.7.0",
+        "@jest/types": "^24.8.0",
         "browser-resolve": "^1.11.3",
         "chalk": "^2.0.1",
         "jest-pnp-resolver": "^1.2.1",
@@ -7665,47 +7792,47 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz",
-      "integrity": "sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
+      "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
       "requires": {
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "jest-regex-util": "^24.3.0",
-        "jest-snapshot": "^24.8.0"
+        "jest-snapshot": "^24.9.0"
       }
     },
     "jest-runner": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.8.0.tgz",
-      "integrity": "sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
+      "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
       "requires": {
         "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.8.0",
-        "@jest/test-result": "^24.8.0",
-        "@jest/types": "^24.8.0",
+        "@jest/environment": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "chalk": "^2.4.2",
         "exit": "^0.1.2",
         "graceful-fs": "^4.1.15",
-        "jest-config": "^24.8.0",
+        "jest-config": "^24.9.0",
         "jest-docblock": "^24.3.0",
-        "jest-haste-map": "^24.8.0",
-        "jest-jasmine2": "^24.8.0",
-        "jest-leak-detector": "^24.8.0",
-        "jest-message-util": "^24.8.0",
-        "jest-resolve": "^24.8.0",
-        "jest-runtime": "^24.8.0",
-        "jest-util": "^24.8.0",
+        "jest-haste-map": "^24.9.0",
+        "jest-jasmine2": "^24.9.0",
+        "jest-leak-detector": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-resolve": "^24.9.0",
+        "jest-runtime": "^24.9.0",
+        "jest-util": "^24.9.0",
         "jest-worker": "^24.6.0",
         "source-map-support": "^0.5.6",
         "throat": "^4.0.0"
       },
       "dependencies": {
         "jest-resolve": {
-          "version": "24.8.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
           "requires": {
-            "@jest/types": "^24.8.0",
+            "@jest/types": "^24.9.0",
             "browser-resolve": "^1.11.3",
             "chalk": "^2.0.1",
             "jest-pnp-resolver": "^1.2.1",
@@ -7715,41 +7842,41 @@
       }
     },
     "jest-runtime": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.8.0.tgz",
-      "integrity": "sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
+      "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
       "requires": {
         "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.8.0",
+        "@jest/environment": "^24.9.0",
         "@jest/source-map": "^24.3.0",
-        "@jest/transform": "^24.8.0",
-        "@jest/types": "^24.8.0",
-        "@types/yargs": "^12.0.2",
+        "@jest/transform": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "@types/yargs": "^13.0.0",
         "chalk": "^2.0.1",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.1.15",
-        "jest-config": "^24.8.0",
-        "jest-haste-map": "^24.8.0",
-        "jest-message-util": "^24.8.0",
-        "jest-mock": "^24.8.0",
+        "jest-config": "^24.9.0",
+        "jest-haste-map": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-mock": "^24.9.0",
         "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.8.0",
-        "jest-snapshot": "^24.8.0",
-        "jest-util": "^24.8.0",
-        "jest-validate": "^24.8.0",
+        "jest-resolve": "^24.9.0",
+        "jest-snapshot": "^24.9.0",
+        "jest-util": "^24.9.0",
+        "jest-validate": "^24.9.0",
         "realpath-native": "^1.1.0",
         "slash": "^2.0.0",
         "strip-bom": "^3.0.0",
-        "yargs": "^12.0.2"
+        "yargs": "^13.3.0"
       },
       "dependencies": {
         "jest-resolve": {
-          "version": "24.8.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
           "requires": {
-            "@jest/types": "^24.8.0",
+            "@jest/types": "^24.9.0",
             "browser-resolve": "^1.11.3",
             "chalk": "^2.0.1",
             "jest-pnp-resolver": "^1.2.1",
@@ -7759,58 +7886,54 @@
       }
     },
     "jest-serializer": {
-      "version": "24.4.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz",
-      "integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q=="
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
+      "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ=="
     },
     "jest-snapshot": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.8.0.tgz",
-      "integrity": "sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
+      "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "chalk": "^2.0.1",
-        "expect": "^24.8.0",
-        "jest-diff": "^24.8.0",
-        "jest-matcher-utils": "^24.8.0",
-        "jest-message-util": "^24.8.0",
-        "jest-resolve": "^24.8.0",
+        "expect": "^24.9.0",
+        "jest-diff": "^24.9.0",
+        "jest-get-type": "^24.9.0",
+        "jest-matcher-utils": "^24.9.0",
+        "jest-message-util": "^24.9.0",
+        "jest-resolve": "^24.9.0",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^24.8.0",
-        "semver": "^5.5.0"
+        "pretty-format": "^24.9.0",
+        "semver": "^6.2.0"
       },
       "dependencies": {
         "jest-resolve": {
-          "version": "24.8.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-          "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
+          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
           "requires": {
-            "@jest/types": "^24.8.0",
+            "@jest/types": "^24.9.0",
             "browser-resolve": "^1.11.3",
             "chalk": "^2.0.1",
             "jest-pnp-resolver": "^1.2.1",
             "realpath-native": "^1.1.0"
           }
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
         }
       }
     },
     "jest-util": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.8.0.tgz",
-      "integrity": "sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==",
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/fake-timers": "^24.8.0",
-        "@jest/source-map": "^24.3.0",
-        "@jest/test-result": "^24.8.0",
-        "@jest/types": "^24.8.0",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
+      "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
+      "requires": {
+        "@jest/console": "^24.9.0",
+        "@jest/fake-timers": "^24.9.0",
+        "@jest/source-map": "^24.9.0",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
         "callsites": "^3.0.0",
         "chalk": "^2.0.1",
         "graceful-fs": "^4.1.15",
@@ -7833,22 +7956,22 @@
       }
     },
     "jest-validate": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.8.0.tgz",
-      "integrity": "sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
+      "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
       "requires": {
-        "@jest/types": "^24.8.0",
-        "camelcase": "^5.0.0",
+        "@jest/types": "^24.9.0",
+        "camelcase": "^5.3.1",
         "chalk": "^2.0.1",
-        "jest-get-type": "^24.8.0",
-        "leven": "^2.1.0",
-        "pretty-format": "^24.8.0"
+        "jest-get-type": "^24.9.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^24.9.0"
       }
     },
     "jest-watch-typeahead": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.3.0.tgz",
-      "integrity": "sha512-+uOtlppt9ysST6k6ZTqsPI0WNz2HLa8bowiZylZoQCQaAVn7XsVmHhZREkz73FhKelrFrpne4hQQjdq42nFEmA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.3.1.tgz",
+      "integrity": "sha512-cDIko96c4Yqg/7mfye1eEYZ6Pvugo9mnOOhGQod3Es7/KptNv1b+9gFVaotzdqNqTlwbkA80BnWHtzV4dc+trA==",
       "requires": {
         "ansi-escapes": "^3.0.0",
         "chalk": "^2.4.1",
@@ -7862,28 +7985,20 @@
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
           "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
     "jest-watcher": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.8.0.tgz",
-      "integrity": "sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
+      "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
       "requires": {
-        "@jest/test-result": "^24.8.0",
-        "@jest/types": "^24.8.0",
-        "@types/yargs": "^12.0.9",
+        "@jest/test-result": "^24.9.0",
+        "@jest/types": "^24.9.0",
+        "@types/yargs": "^13.0.0",
         "ansi-escapes": "^3.0.0",
         "chalk": "^2.0.1",
-        "jest-util": "^24.8.0",
+        "jest-util": "^24.9.0",
         "string-length": "^2.0.0"
       },
       "dependencies": {
@@ -7895,11 +8010,11 @@
       }
     },
     "jest-worker": {
-      "version": "24.6.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
-      "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
       "requires": {
-        "merge-stream": "^1.0.1",
+        "merge-stream": "^2.0.0",
         "supports-color": "^6.1.0"
       },
       "dependencies": {
@@ -8112,9 +8227,9 @@
       "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
     },
     "leven": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
     },
     "levn": {
       "version": "0.3.0",
@@ -8229,17 +8344,20 @@
     "lodash.escape": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg="
+      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
+      "dev": true
     },
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI="
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "dev": true
     },
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+      "dev": true
     },
     "lodash.memoize": {
       "version": "4.1.2",
@@ -8251,11 +8369,6 @@
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
-    "lodash.tail": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
-      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ="
-    },
     "lodash.template": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
@@ -8324,9 +8437,9 @@
           "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
         },
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -8432,12 +8545,9 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
     },
     "merge-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "merge2": {
       "version": "1.2.4",
@@ -8626,7 +8736,8 @@
     "moo": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
-      "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw=="
+      "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==",
+      "dev": true
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -8705,6 +8816,7 @@
       "version": "2.18.0",
       "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.18.0.tgz",
       "integrity": "sha512-/zQOMCeJcioI0xJtd5RpBiWw2WP7wLe6vq8/3Yu0rEwgus/G/+pViX80oA87JdVgjRt2895mZSv2VfZmy4W1uw==",
+      "dev": true,
       "requires": {
         "commander": "^2.19.0",
         "moo": "^0.4.3",
@@ -8716,7 +8828,8 @@
         "semver": {
           "version": "5.7.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
         }
       }
     },
@@ -8730,6 +8843,11 @@
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
       "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
     },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -8792,10 +8910,23 @@
         "vm-browserify": "^1.0.1"
       },
       "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "util": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+          "requires": {
+            "inherits": "2.0.3"
+          }
         }
       }
     },
@@ -8805,9 +8936,9 @@
       "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA="
     },
     "node-notifier": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.1.tgz",
-      "integrity": "sha512-p52B+onAEHKW1OF9MGO/S7k/ahGEHfhP5/tvwYzog/5XLYOd8ZuD6vdNZdUuWMONRnKPneXV43v3s6Snx1wsCQ==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
       "requires": {
         "growly": "^1.3.0",
         "is-wsl": "^1.1.0",
@@ -8817,24 +8948,24 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
     "node-releases": {
-      "version": "1.1.27",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz",
-      "integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==",
+      "version": "1.1.28",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz",
+      "integrity": "sha512-AQw4emh6iSXnCpDiFe0phYcThiccmkNWMZnFZ+lDJjAP8J0m2fVd59duvUUyuTirQOhIAajTFkzG6FHCLBO59g==",
       "requires": {
         "semver": "^5.3.0"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -8850,9 +8981,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         }
       }
     },
@@ -8943,18 +9074,25 @@
     "object-inspect": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
+      "dev": true
     },
     "object-is": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY="
+      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+      "dev": true
     },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
+    "object-path": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk="
+    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -9096,11 +9234,11 @@
       }
     },
     "optimize-css-assets-webpack-plugin": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.1.tgz",
-      "integrity": "sha512-Rqm6sSjWtx9FchdP0uzTQDc7GXDKnwVEGoSxjezPkzMewx7gEWE9IMUYKmigTRC4U3RaNSwYVnUDLuIdtTpm0A==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz",
+      "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==",
       "requires": {
-        "cssnano": "^4.1.0",
+        "cssnano": "^4.1.10",
         "last-call-webpack-plugin": "^3.0.0"
       }
     },
@@ -9169,9 +9307,9 @@
       "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
     },
     "p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
       "requires": {
         "p-try": "^2.0.0"
       }
@@ -9430,11 +9568,11 @@
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
     },
     "pnp-webpack-plugin": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.2.1.tgz",
-      "integrity": "sha512-W6GctK7K2qQiVR+gYSv/Gyt6jwwIH4vwdviFqx+Y2jAtVf5eZyYIDf5Ac2NCDMBiX5yWscBLZElPTsyA1UtVVA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz",
+      "integrity": "sha512-jd9olUr9D7do+RN8Wspzhpxhgp1n6Vd0NtQ4SFkmIACZoEL1nkyAdW9Ygrinjec0vgDcWjscFQQ1gDW8rsfKTg==",
       "requires": {
-        "ts-pnp": "^1.0.0"
+        "ts-pnp": "^1.1.2"
       }
     },
     "popper.js": {
@@ -9443,9 +9581,9 @@
       "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA=="
     },
     "portfinder": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.21.tgz",
-      "integrity": "sha512-ESabpDCzmBS3ekHbmpAIiESq3udRsCBGiBZLsC+HgBKv2ezb0R4oG+7RnYEVZ/ZCfhel5Tx3UzdNWA0Lox2QCA==",
+      "version": "1.0.23",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz",
+      "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==",
       "requires": {
         "async": "^1.5.2",
         "debug": "^2.2.0",
@@ -10123,26 +10261,26 @@
       }
     },
     "postcss-preset-env": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.6.0.tgz",
-      "integrity": "sha512-I3zAiycfqXpPIFD6HXhLfWXIewAWO8emOKz+QSsxaUZb9Dp8HbF5kUf+4Wy/AxR33o+LRoO8blEWCHth0ZsCLA==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
+      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
       "requires": {
-        "autoprefixer": "^9.4.9",
-        "browserslist": "^4.4.2",
-        "caniuse-lite": "^1.0.30000939",
+        "autoprefixer": "^9.6.1",
+        "browserslist": "^4.6.4",
+        "caniuse-lite": "^1.0.30000981",
         "css-blank-pseudo": "^0.1.4",
         "css-has-pseudo": "^0.10.0",
         "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.3.0",
-        "postcss": "^7.0.14",
+        "cssdb": "^4.4.0",
+        "postcss": "^7.0.17",
         "postcss-attribute-case-insensitive": "^4.0.1",
         "postcss-color-functional-notation": "^2.0.1",
         "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.2",
+        "postcss-color-hex-alpha": "^5.0.3",
         "postcss-color-mod-function": "^3.0.3",
         "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.7",
-        "postcss-custom-properties": "^8.0.9",
+        "postcss-custom-media": "^7.0.8",
+        "postcss-custom-properties": "^8.0.11",
         "postcss-custom-selectors": "^5.1.2",
         "postcss-dir-pseudo-class": "^5.0.0",
         "postcss-double-position-gradients": "^1.0.0",
@@ -10314,11 +10452,11 @@
       }
     },
     "pretty-format": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.8.0.tgz",
-      "integrity": "sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==",
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+      "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
       "requires": {
-        "@jest/types": "^24.8.0",
+        "@jest/types": "^24.9.0",
         "ansi-regex": "^4.0.0",
         "ansi-styles": "^3.2.0",
         "react-is": "^16.8.4"
@@ -10380,6 +10518,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
+      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object.assign": "^4.1.0",
@@ -10508,12 +10647,14 @@
     "railroad-diagrams": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234="
+      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
+      "dev": true
     },
     "randexp": {
       "version": "0.4.6",
       "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "dev": true,
       "requires": {
         "discontinuous-range": "1.0.0",
         "ret": "~0.1.10"
@@ -10560,14 +10701,13 @@
       }
     },
     "react": {
-      "version": "16.8.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.8.0.tgz",
-      "integrity": "sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ==",
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz",
+      "integrity": "sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.13.0"
+        "prop-types": "^15.6.2"
       }
     },
     "react-app-polyfill": {
@@ -10599,14 +10739,14 @@
       }
     },
     "react-bootstrap": {
-      "version": "1.0.0-beta.9",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.9.tgz",
-      "integrity": "sha512-M0BYLuuUdMITJ16+DDDb1p4vWV87csEBi/uOxZYODuDZh7hvbrJVahfvPXcqeqq4eEpNL+PKSlqb9fNaY0HZyA==",
+      "version": "1.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.11.tgz",
+      "integrity": "sha512-D8rAORkNRMf0ECvB8LHCTibeo1JeWptKs4CA5/tn1x5fTu5W4DUD7fQxLm9QdbzOM0qg2FjcfTKeM9gCqhTcoA==",
       "requires": {
         "@babel/runtime": "^7.4.2",
         "@react-bootstrap/react-popper": "1.2.1",
         "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.0",
+        "@restart/hooks": "^0.3.11",
         "classnames": "^2.2.6",
         "dom-helpers": "^3.4.0",
         "invariant": "^2.2.4",
@@ -10616,7 +10756,7 @@
         "prop-types-extra": "^1.1.0",
         "react-overlays": "^1.2.0",
         "react-transition-group": "^4.0.0",
-        "uncontrollable": "^6.1.0",
+        "uncontrollable": "^7.0.0",
         "warning": "^4.0.3"
       }
     },
@@ -10626,9 +10766,9 @@
       "integrity": "sha512-tY4j0imkYC3n5ZlYSgFkaw7fmlCp3IoQQ6DxpqeNHzcD0hf+6V+/HeJxviLUZ1Rv1Yn3N3xyO2EhkkZwHn0m1A=="
     },
     "react-dev-utils": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.0.2.tgz",
-      "integrity": "sha512-AHVfRepMzZJyJHCNFAsrAG4El1H5v+27c1XkeDoX6pSmdhT/ZDdAN3Mf7DKYcrbIFlubzVYof6NZDnPBjd0CNA==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.0.3.tgz",
+      "integrity": "sha512-OyInhcwsvycQ3Zr2pQN+HV4gtRXrky5mJXIy4HnqrWa+mI624xfYfqGuC9dYbxp4Qq3YZzP8GSGQjv0AgNU15w==",
       "requires": {
         "@babel/code-frame": "7.5.5",
         "address": "1.1.0",
@@ -10649,7 +10789,7 @@
         "loader-utils": "1.2.3",
         "open": "^6.3.0",
         "pkg-up": "2.0.0",
-        "react-error-overlay": "^6.0.0",
+        "react-error-overlay": "^6.0.1",
         "recursive-readdir": "2.2.2",
         "shell-quote": "1.6.1",
         "sockjs-client": "1.3.0",
@@ -10753,39 +10893,24 @@
               }
             }
           }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-            }
-          }
         }
       }
     },
     "react-dom": {
-      "version": "16.8.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.0.tgz",
-      "integrity": "sha512-dBzoAGYZpW9Yggp+CzBPC7q1HmWSeRc93DWrwbskmG1eHJWznZB/p0l/Sm+69leIGUS91AXPB/qB3WcPnKx8Sw==",
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz",
+      "integrity": "sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
-        "scheduler": "^0.13.0"
+        "scheduler": "^0.15.0"
       }
     },
     "react-error-overlay": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.0.tgz",
-      "integrity": "sha512-oHf3b1J2Pxu03apiHvP21qBCkj6fG6A3c3ahya3fX0VXEZUTzIRLwZI9eZ/6cuOO+kvnzdVdGBxZlo+Tjh+hfQ=="
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.1.tgz",
+      "integrity": "sha512-V9yoTr6MeZXPPd4nV/05eCBvGH9cGzc52FN8fs0O0TVQ3HYYf1n7EgZVtHbldRq5xU9zEzoXIITjYNIfxDDdUw=="
     },
     "react-input-autosize": {
       "version": "2.2.1",
@@ -10818,15 +10943,26 @@
         "react-popper": "^1.3.2",
         "uncontrollable": "^6.0.0",
         "warning": "^4.0.2"
+      },
+      "dependencies": {
+        "uncontrollable": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-6.2.3.tgz",
+          "integrity": "sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==",
+          "requires": {
+            "@babel/runtime": "^7.4.5",
+            "invariant": "^2.2.4"
+          }
+        }
       }
     },
     "react-popper": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.3.tgz",
-      "integrity": "sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.4.tgz",
+      "integrity": "sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==",
       "requires": {
         "@babel/runtime": "^7.1.2",
-        "create-react-context": "<=0.2.2",
+        "create-react-context": "^0.3.0",
         "popper.js": "^1.14.4",
         "prop-types": "^15.6.1",
         "typed-styles": "^0.0.7",
@@ -10834,12 +10970,12 @@
       },
       "dependencies": {
         "create-react-context": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz",
-          "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==",
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
+          "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
           "requires": {
-            "fbjs": "^0.8.0",
-            "gud": "^1.0.0"
+            "gud": "^1.0.0",
+            "warning": "^4.0.3"
           }
         },
         "typed-styles": {
@@ -10881,63 +11017,74 @@
       }
     },
     "react-scripts": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.0.1.tgz",
-      "integrity": "sha512-LKEjBhVpEB+c312NeJhzF+NATxF7JkHNr5GhtwMeRS1cMeLElMeIu8Ye7WGHtDP7iz7ra4ryy48Zpo6G/cwWUw==",
-      "requires": {
-        "@babel/core": "7.4.3",
-        "@svgr/webpack": "4.1.0",
-        "@typescript-eslint/eslint-plugin": "1.6.0",
-        "@typescript-eslint/parser": "1.6.0",
-        "babel-eslint": "10.0.1",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.1.1.tgz",
+      "integrity": "sha512-dbjTG9vJC61OI62hIswQYg5xHvwlxDTH6QXz6ICEuA5AqkFQWk1LKl76sk8fVL2WsyumbBc4FErALwKcEV2vNA==",
+      "requires": {
+        "@babel/core": "7.5.5",
+        "@svgr/webpack": "4.3.2",
+        "@typescript-eslint/eslint-plugin": "1.13.0",
+        "@typescript-eslint/parser": "1.13.0",
+        "babel-eslint": "10.0.2",
         "babel-jest": "^24.8.0",
-        "babel-loader": "8.0.5",
-        "babel-plugin-named-asset-import": "^0.3.2",
-        "babel-preset-react-app": "^9.0.0",
+        "babel-loader": "8.0.6",
+        "babel-plugin-named-asset-import": "^0.3.3",
+        "babel-preset-react-app": "^9.0.1",
         "camelcase": "^5.2.0",
         "case-sensitive-paths-webpack-plugin": "2.2.0",
         "css-loader": "2.1.1",
         "dotenv": "6.2.0",
         "dotenv-expand": "4.2.0",
-        "eslint": "^5.16.0",
-        "eslint-config-react-app": "^4.0.1",
-        "eslint-loader": "2.1.2",
-        "eslint-plugin-flowtype": "2.50.1",
-        "eslint-plugin-import": "2.16.0",
-        "eslint-plugin-jsx-a11y": "6.2.1",
-        "eslint-plugin-react": "7.12.4",
-        "eslint-plugin-react-hooks": "^1.5.0",
+        "eslint": "^6.1.0",
+        "eslint-config-react-app": "^5.0.1",
+        "eslint-loader": "2.2.1",
+        "eslint-plugin-flowtype": "3.13.0",
+        "eslint-plugin-import": "2.18.2",
+        "eslint-plugin-jsx-a11y": "6.2.3",
+        "eslint-plugin-react": "7.14.3",
+        "eslint-plugin-react-hooks": "^1.6.1",
         "file-loader": "3.0.1",
         "fs-extra": "7.0.1",
-        "fsevents": "2.0.6",
+        "fsevents": "2.0.7",
         "html-webpack-plugin": "4.0.0-beta.5",
         "identity-obj-proxy": "3.0.0",
         "is-wsl": "^1.1.0",
-        "jest": "24.7.1",
+        "jest": "24.8.0",
         "jest-environment-jsdom-fourteen": "0.1.0",
-        "jest-resolve": "24.7.1",
-        "jest-watch-typeahead": "0.3.0",
+        "jest-resolve": "24.8.0",
+        "jest-watch-typeahead": "0.3.1",
         "mini-css-extract-plugin": "0.5.0",
-        "optimize-css-assets-webpack-plugin": "5.0.1",
-        "pnp-webpack-plugin": "1.2.1",
+        "optimize-css-assets-webpack-plugin": "5.0.3",
+        "pnp-webpack-plugin": "1.5.0",
         "postcss-flexbugs-fixes": "4.1.0",
         "postcss-loader": "3.0.0",
         "postcss-normalize": "7.0.1",
-        "postcss-preset-env": "6.6.0",
+        "postcss-preset-env": "6.7.0",
         "postcss-safe-parser": "4.0.1",
-        "react-app-polyfill": "^1.0.1",
-        "react-dev-utils": "^9.0.1",
-        "resolve": "1.10.0",
-        "sass-loader": "7.1.0",
-        "semver": "6.0.0",
-        "style-loader": "0.23.1",
-        "terser-webpack-plugin": "1.2.3",
+        "react-app-polyfill": "^1.0.2",
+        "react-dev-utils": "^9.0.3",
+        "resolve": "1.12.0",
+        "resolve-url-loader": "3.1.0",
+        "sass-loader": "7.2.0",
+        "semver": "6.3.0",
+        "style-loader": "1.0.0",
+        "terser-webpack-plugin": "1.4.1",
         "ts-pnp": "1.1.2",
-        "url-loader": "1.1.2",
-        "webpack": "4.29.6",
+        "url-loader": "2.1.0",
+        "webpack": "4.39.1",
         "webpack-dev-server": "3.2.1",
         "webpack-manifest-plugin": "2.0.4",
-        "workbox-webpack-plugin": "4.2.0"
+        "workbox-webpack-plugin": "4.3.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "react-select": {
@@ -10974,6 +11121,7 @@
       "version": "16.9.0",
       "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.9.0.tgz",
       "integrity": "sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==",
+      "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
@@ -10985,6 +11133,7 @@
           "version": "0.15.0",
           "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
           "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
+          "dev": true,
           "requires": {
             "loose-envify": "^1.1.0",
             "object-assign": "^4.1.1"
@@ -11072,7 +11221,8 @@
     "reflect.ownkeys": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
-      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA="
+      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
+      "dev": true
     },
     "regenerate": {
       "version": "1.4.0",
@@ -11109,6 +11259,11 @@
         "safe-regex": "^1.1.0"
       }
     },
+    "regex-parser": {
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA=="
+    },
     "regexp-tree": {
       "version": "0.1.11",
       "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz",
@@ -11290,11 +11445,6 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
-    "requireindex": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww=="
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -11331,6 +11481,53 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
+    "resolve-url-loader": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz",
+      "integrity": "sha512-2QcrA+2QgVqsMJ1Hn5NnJXIGCX1clQ1F6QJTqOeiaDw9ACo1G2k+8/shq3mtqne03HOFyskAClqfxKyFBriXZg==",
+      "requires": {
+        "adjust-sourcemap-loader": "2.0.0",
+        "camelcase": "5.0.0",
+        "compose-function": "3.0.3",
+        "convert-source-map": "1.6.0",
+        "es6-iterator": "2.0.3",
+        "loader-utils": "1.2.3",
+        "postcss": "7.0.14",
+        "rework": "1.0.1",
+        "rework-visit": "1.0.0",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
+        },
+        "postcss": {
+          "version": "7.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -11345,6 +11542,27 @@
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
+    "rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "requires": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
+        }
+      }
+    },
+    "rework-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
+      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
+    },
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -11376,6 +11594,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
       "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
+      "dev": true,
       "requires": {
         "lodash.flattendeep": "^4.4.0",
         "nearley": "^2.7.10"
@@ -11445,35 +11664,25 @@
       }
     },
     "sass-loader": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
-      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz",
+      "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==",
       "requires": {
-        "clone-deep": "^2.0.1",
+        "clone-deep": "^4.0.1",
         "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
         "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
+        "pify": "^4.0.1",
         "semver": "^5.5.0"
       },
       "dependencies": {
         "clone-deep": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-          "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+          "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
           "requires": {
-            "for-own": "^1.0.0",
             "is-plain-object": "^2.0.4",
-            "kind-of": "^6.0.0",
-            "shallow-clone": "^1.0.0"
-          }
-        },
-        "for-own": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-          "requires": {
-            "for-in": "^1.0.1"
+            "kind-of": "^6.0.2",
+            "shallow-clone": "^3.0.0"
           }
         },
         "kind-of": {
@@ -11481,26 +11690,22 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         },
         "shallow-clone": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
-          "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+          "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
           "requires": {
-            "is-extendable": "^0.1.1",
-            "kind-of": "^5.0.0",
-            "mixin-object": "^2.0.1"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-            }
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -11519,9 +11724,9 @@
       }
     },
     "scheduler": {
-      "version": "0.13.6",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
-      "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
+      "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
       "requires": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1"
@@ -11551,9 +11756,9 @@
       }
     },
     "semver": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
-      "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "send": {
       "version": "0.17.1",
@@ -11603,9 +11808,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
-      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz",
+      "integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg=="
     },
     "serve-index": {
       "version": "1.9.1",
@@ -12188,6 +12393,21 @@
       "requires": {
         "astral-regex": "^1.0.0",
         "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "string-width": {
@@ -12198,22 +12418,13 @@
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
         "strip-ansi": "^5.2.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
       }
     },
     "string.prototype.trim": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz",
       "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==",
+      "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.13.0",
@@ -12239,18 +12450,11 @@
       }
     },
     "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "requires": {
-        "ansi-regex": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        }
+        "ansi-regex": "^4.1.0"
       }
     },
     "strip-bom": {
@@ -12273,17 +12477,28 @@
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
     },
     "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
+      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
     },
     "style-loader": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
-      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
+      "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==",
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.0.1"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
+          "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
       }
     },
     "styled-components": {
@@ -12377,9 +12592,9 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "table": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.5.tgz",
-      "integrity": "sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==",
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
       "requires": {
         "ajv": "^6.10.2",
         "lodash": "^4.17.14",
@@ -12406,14 +12621,6 @@
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^5.1.0"
           }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -12423,13 +12630,13 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "terser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz",
+      "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==",
       "requires": {
-        "commander": "^2.19.0",
+        "commander": "^2.20.0",
         "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
+        "source-map-support": "~0.5.12"
       },
       "dependencies": {
         "source-map": {
@@ -12440,18 +12647,19 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
-      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+      "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
       "requires": {
-        "cacache": "^11.0.2",
-        "find-cache-dir": "^2.0.0",
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
         "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
+        "serialize-javascript": "^1.7.0",
         "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
         "source-map": {
@@ -12638,6 +12846,11 @@
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
+    "type": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz",
+      "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -12697,9 +12910,9 @@
       }
     },
     "uncontrollable": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-6.2.3.tgz",
-      "integrity": "sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.0.0.tgz",
+      "integrity": "sha512-HFhKHDACiAsTYoV3el/LP4PqcLzqyWrNRHE6nMdr0h8f7qbvTPXIN2S4q+tdfc64PHEXaSFBs/fKVB2+UwSYOA==",
       "requires": {
         "@babel/runtime": "^7.4.5",
         "invariant": "^2.2.4"
@@ -12862,13 +13075,24 @@
       }
     },
     "url-loader": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz",
-      "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.1.0.tgz",
+      "integrity": "sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==",
       "requires": {
-        "loader-utils": "^1.1.0",
-        "mime": "^2.0.3",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "^1.2.3",
+        "mime": "^2.4.4",
+        "schema-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
+          "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
       }
     },
     "url-parse": {
@@ -12886,17 +13110,17 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "2.0.1"
       },
       "dependencies": {
         "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
         }
       }
     },
@@ -12925,9 +13149,14 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+    },
+    "v8-compile-cache": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
+      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -13026,34 +13255,40 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "webpack": {
-      "version": "4.29.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
-      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+      "version": "4.39.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz",
+      "integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==",
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
         "@webassemblyjs/helper-module-context": "1.8.5",
         "@webassemblyjs/wasm-edit": "1.8.5",
         "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.0.5",
-        "acorn-dynamic-import": "^4.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
+        "eslint-scope": "^4.0.3",
         "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.1",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+        }
       }
     },
     "webpack-dev-middleware": {
@@ -13114,6 +13349,31 @@
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
         },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
         "decamelize": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
@@ -13122,6 +13382,11 @@
             "xregexp": "4.0.0"
           }
         },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -13133,9 +13398,9 @@
           "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
         },
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         },
         "string-width": {
           "version": "2.1.1",
@@ -13177,6 +13442,35 @@
             "has-flag": "^3.0.0"
           }
         },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
         "yargs": {
           "version": "12.0.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
@@ -13446,13 +13740,13 @@
       "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w=="
     },
     "workbox-webpack-plugin": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.2.0.tgz",
-      "integrity": "sha512-YZsiA+y/ns/GdWRaBsfYv8dln1ebWtGnJcTOg1ppO0pO1tScAHX0yGtHIjndxz3L/UUhE8b0NQE9KeLNwJwA5A==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz",
+      "integrity": "sha512-gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ==",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "json-stable-stringify": "^1.0.1",
-        "workbox-build": "^4.2.0"
+        "workbox-build": "^4.3.1"
       }
     },
     "workbox-window": {
@@ -13480,43 +13774,33 @@
       }
     },
     "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
         },
         "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
         },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         }
       }
@@ -13583,49 +13867,48 @@
       "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
     },
     "yargs": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+      "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
       "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.2.0",
+        "cliui": "^5.0.0",
         "find-up": "^3.0.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.0.0",
+        "get-caller-file": "^2.0.1",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
+        "require-main-filename": "^2.0.0",
         "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
+        "string-width": "^3.0.0",
         "which-module": "^2.0.0",
-        "y18n": "^3.2.1 || ^4.0.0",
-        "yargs-parser": "^11.1.1"
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.1"
       },
       "dependencies": {
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
         },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-        },
         "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
+            "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "strip-ansi": "^5.1.0"
           }
         }
       }
     },
     "yargs-parser": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-      "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
       "requires": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
diff --git a/ui-react/package.json b/ui-react/package.json
index 9770d44c6..25176058c 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -9,7 +9,7 @@
     "registry": "https://nexus3.onap.org/repository/npm.snapshot/"
   },
   "main": "index.js",
-  "proxy": "http://localhost:8080",
+  "proxy": "https://localhost:8080",
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
@@ -26,10 +26,10 @@
   ],
   "dependencies": {
     "@json-editor/json-editor": "1.4.0-beta.0",
-    "react": "16.8.0",
-    "react-dom": "16.8.0",
-    "react-scripts": "3.0.1",
-    "react-bootstrap": "1.0.0-beta.9",
+    "react": "16.9.0",
+    "react-dom": "16.9.0",
+    "react-scripts": "3.1.1",
+    "react-bootstrap": "1.0.0-beta.11",
     "bootstrap-css-only": "4.3.1",
     "styled-components": "4.3.2",
     "react-router-dom": "5.0.1",
diff --git a/ui-react/src/__test__/LoopCache.test.js b/ui-react/src/__test__/LoopCache.test.js
index 101f864aa..1efea6495 100644
--- a/ui-react/src/__test__/LoopCache.test.js
+++ b/ui-react/src/__test__/LoopCache.test.js
@@ -85,24 +85,19 @@ describe('Verify LoopCache functions', () => {
           "shared": false,
           "jsonRepresentation": {"schema": {}}
       };
-      expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJson);
-      expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
+      expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJson);
+      expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
     });
 
     it('getMicroServicePropertiesForName', () => {
       const msProp = {"domain": "measurementsForVfScaling"};
-      expect(loopCache.getMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msProp);
-      expect(loopCache.getMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
-    });
-
-    it('getMicroServiceJsonRepresentationForType', () => {
-      const msJsonRepresentation = {"schema": {}};
-      expect(loopCache.getMicroServiceJsonRepresentationForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
+      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msProp);
+      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
     });
 
     it('getMicroServiceJsonRepresentationForName', () => {
       const msJsonRepresentation = {"schema": {}};
-      expect(loopCache.getMicroServiceJsonRepresentationForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
+      expect(loopCache.getMicroServiceJsonRepresentationForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
     });
 
     it('getResourceDetailsVfProperty', () => {
@@ -204,14 +199,8 @@ describe('Verify LoopCache functions', () => {
     });
 
     it('updateMicroServiceProperties', () => {
-      const newMsPolicy = {
-          "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-          "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-          "properties": {"domain": "measurementsForVfScalingNew"},
-          "shared": true,
-          "jsonRepresentation": {"schema": {}}
-      };;
-      loopCache.updateMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", newMsPolicy);
-      expect(loopCache.getMicroServicesJsonForType("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newMsPolicy);
+      const newMsPolicyProperties = {"domain": "measurementsForVfScalingNew"};
+      loopCache.updateMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", newMsPolicyProperties);
+      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newMsPolicyProperties);
     });
  });
diff --git a/ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap
new file mode 100644
index 000000000..cb8b8fd30
--- /dev/null
+++ b/ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify OpenLoopModal Test the render method 1`] = `ShallowWrapper {}`;
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index d83e3ce9d..dd8c5b520 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -28,9 +28,9 @@ export default class LoopCache {
 		this.loopJsonCache=loopJson;
 	}
 
-	updateMicroServiceProperties(type, newMsProperties) {
+	updateMicroServiceProperties(name, newMsProperties) {
 			for (var policy in this.loopJsonCache["microServicePolicies"]) {
-				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === type) {
+				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === name) {
 					this.loopJsonCache["microServicePolicies"][policy]["properties"] = newMsProperties;
 				}
 			}
-- 
cgit 1.2.3-korg


From d0d65631dfda6b43339e5c3dd1f1c336040d6672 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 26 Aug 2019 05:47:01 -0700
Subject: Fix the CSS

Remove colors settings in global css and add the theme property to the
menubar correctly (not via global prop anymore)

Issue-ID: CLAMP-477
Change-Id: Ie0ba1ea350e393d452108b1dadb10e7dbe1dab23
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/package-lock.json                         |  6 +-
 ui-react/package.json                              |  2 +-
 ui-react/src/LoopUI.js                             | 30 +++++--
 .../OperationalPolicy/OperationalPolicy.css        | 73 -----------------
 .../OperationalPolicy/OperationalPolicyModal.js    |  2 -
 ui-react/src/components/menu/MenuBar.js            | 48 +++++++----
 ui-react/src/theme/globalStyle.js                  | 92 ++++++++++------------
 7 files changed, 101 insertions(+), 152 deletions(-)
 delete mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css

(limited to 'ui-react/src')

diff --git a/ui-react/package-lock.json b/ui-react/package-lock.json
index 886130424..4f64bb353 100644
--- a/ui-react/package-lock.json
+++ b/ui-react/package-lock.json
@@ -10739,9 +10739,9 @@
       }
     },
     "react-bootstrap": {
-      "version": "1.0.0-beta.11",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.11.tgz",
-      "integrity": "sha512-D8rAORkNRMf0ECvB8LHCTibeo1JeWptKs4CA5/tn1x5fTu5W4DUD7fQxLm9QdbzOM0qg2FjcfTKeM9gCqhTcoA==",
+      "version": "1.0.0-beta.12",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.12.tgz",
+      "integrity": "sha512-qBEAthAzqM+OTS2h5ZCfV5/yZUadQcMlaep4iPyPqsu92JzdcznhSDjw6b+asiepsyQgiS33t8OPeLLRiIDh9Q==",
       "requires": {
         "@babel/runtime": "^7.4.2",
         "@react-bootstrap/react-popper": "1.2.1",
diff --git a/ui-react/package.json b/ui-react/package.json
index 25176058c..358152b5b 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -29,7 +29,7 @@
     "react": "16.9.0",
     "react-dom": "16.9.0",
     "react-scripts": "3.1.1",
-    "react-bootstrap": "1.0.0-beta.11",
+    "react-bootstrap": "1.0.0-beta.12",
     "bootstrap-css-only": "4.3.1",
     "styled-components": "4.3.2",
     "react-router-dom": "5.0.1",
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index b64cfbaa3..9389ad656 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -45,12 +45,29 @@ import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoop from './components/dialogs/DeployLoop';
 
+import { Link } from 'react-router-dom';
+
+const StyledMainDiv = styled.div`
+	background-color: ${props => props.theme.backgroundColor};
+`
+
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
 	padding-left: 30px;
-	font-size: 30px;
+	font-size: 36px;
+	font-weight: bold;
+`
 
+const StyledRouterLink = styled(Link)`
+	color: ${props => props.theme.menuFontColor};
+	background-color: ${props => props.theme.backgroundColor};
 `
+
+const StyledLoginInfo = styled.a`
+	color: ${props => props.theme.menuFontColor};
+	background-color: ${props => props.theme.backgroundColor};
+`
+
 const LoopViewDivStyled = styled.div`
 	height: 100%;
 	overflow: hidden;
@@ -113,7 +130,9 @@ export default class LoopUI extends React.Component {
 	renderUserLoggedNavBar() {
 		return (
 			<Navbar.Text>
-				Signed in as: <a href="/login">{this.state.userName}</a>
+			<StyledLoginInfo>Signed in as: </StyledLoginInfo>
+				<StyledRouterLink to="/userInfo">{this.state.userName}</StyledRouterLink>
+				<StyledRouterLink to="/logout/"> (logout)</StyledRouterLink>
 			</Navbar.Text>
 		);
 	}
@@ -129,8 +148,9 @@ export default class LoopUI extends React.Component {
 
 	renderNavBar() {
 		return (
-			<Navbar expand="lg">
+			<Navbar >
 				{this.renderLogoNavBar()}
+				<Navbar.Toggle aria-controls="responsive-navbar-nav" />
 				{this.renderMenuNavBar()}
 				{this.renderUserLoggedNavBar()}
 			</Navbar>
@@ -188,7 +208,7 @@ export default class LoopUI extends React.Component {
 	
  render() {
 		return (
-				<div id="main_div">
+				<StyledMainDiv id="main_div">
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
@@ -206,7 +226,7 @@ export default class LoopUI extends React.Component {
 					<GlobalClampStyle />
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
-				</div>
+				</StyledMainDiv>
 		);
 	}
 }
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css
deleted file mode 100644
index 94a91c234..000000000
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicy.css
+++ /dev/null
@@ -1,73 +0,0 @@
-.disabled {
-	background-color: #dddd;
-}
-
-label {
-	text-align: right;
-	vertical-align: middle;
-}
-
-.leftPolicyPanel {
-	padding: 0 10px 0 0;
-}
-
-.idError {
-	color: red;
-	padding: 50px 0px;
-	text-align: center;
-	display: none;
-}
-
-.policyPanel {
-	background-color: #f5f5f5;
-	padding: 15px 5px 0 5px;
-}
-
-.form-group.clearfix {
-	display: -webkit-flex;
-	display: flex;
-	align-items: center;
-}
-
-label {
-	margin-bottom: 0px;
-}
-
-.withnote {
-	margin-bottom: 0px;
-}
-
-.note {
-	font-size:10px;
-	margin-left: 250px;
-	font-weight: normal;
-}
-
-#policyTable {
-	cursor: pointer;
-	width: 100%;
-}
-
-#policyTable tr {
-	border-bottom: 1px solid #ddd;
-	border-collapse: collapse;
-	text-align: left;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-#policyTable td {
-	padding: 8px 10px;
-}
-
-#policyTable tr.highlight {
-	background-color: #f5f5f5;
-	font-weight: bold;
-	font-size: 13px;
-}
-
-#policyTableHolder {
-	height: 200px;
-	width: 100%;
-	overflow: auto;
-}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 6db38fd23..7f349a10f 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -78,7 +78,6 @@ export default class OperationalPolicyModal extends React.Component {
 
 	setDefaultJsonEditorOptions() {
 		JSONEditor.defaults.options.theme = 'bootstrap4';
-		// JSONEditor.defaults.options.iconlib = 'bootstrap2';
 
 		JSONEditor.defaults.options.object_layout = 'grid';
 		JSONEditor.defaults.options.disable_properties = true;
@@ -89,7 +88,6 @@ export default class OperationalPolicyModal extends React.Component {
 		JSONEditor.defaults.options.array_controls_top=true;
 		JSONEditor.defaults.options.show_errors = 'always';
 		JSONEditor.defaults.options.keep_oneof_values=false;
-		JSONEditor.defaults.options.ajax=true;
 		JSONEditor.defaults.options.collapsed=true;
 		//JSONEditor.defaults.options.template = 'default';
 	}
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 121787ffd..b68e2376a 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -27,10 +27,10 @@ import NavDropdown from 'react-bootstrap/NavDropdown';
 import LoopUI from '../../LoopUI';
 import 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
-import { Link } from 'react-router-dom'
+import { Link } from 'react-router-dom';
 
 const StyledLink = styled(Link)`
-	color: ${props => props.theme.menuColor};
+	color: ${props => props.theme.menuFontColor};
 	background-color: ${props => props.theme.menuBackgroundColor};
 	font-weight: normal;
 	display: block;
@@ -41,21 +41,34 @@ const StyledLink = styled(Link)`
 	white-space: nowrap;
 	border: 0;
 	:hover {
-			text-decoration: none;
-			background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-			color:  ${props => props.theme.loopViewerHeaderFontColor};
+		text-decoration: none;
+		background-color: ${props => props.theme.menuHighlightedBackgroundColor};
+		color:  ${props => props.theme.menuHighlightedFontColor};
 	}
 `;
 const StyledNavLink = styled(Nav.Link)`
-	color: ${props => props.theme.menuColor};
+	color: ${props => props.theme.menuFontColor};
 	background-color: ${props => props.theme.menuBackgroundColor};
-  font-weight: normal;
+	font-weight: normal;
 	padding: .25rem 1.5rem;
 	:hover {
-			background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
-			color:  ${props => props.theme.loopViewerHeaderFontColor}
+		background-color: ${props => props.theme.menuHighlightedBackgroundColor};
+		color:  ${props => props.theme.menuHighlightedFontColor};
+	}
+`;
+
+const StyledNavDropdown = styled(NavDropdown)`
+	color: ${props => props.theme.menuFontColor};
+	& .dropdown-toggle {
+	color: ${props => props.theme.menuFontColor};
+	background-color: ${props => props.theme.backgroundColor};
+	font-weight: normal;
+		:hover {
+				font-weight: bold;
+		}
 	}
 `;
+
 export default class MenuBar extends React.Component {
 	state = {
 		loopName: this.props.loopName,
@@ -72,28 +85,29 @@ export default class MenuBar extends React.Component {
 
 	render () {
 		return (
+
 				<Navbar.Collapse>
-					<NavDropdown title="Closed Loop">
+					<StyledNavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties CL</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close Model</NavDropdown.Item>
-					</NavDropdown>
-					<NavDropdown title="Manage">
+					</StyledNavDropdown>
+					<StyledNavDropdown title="Manage">
 							<NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Submit</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Stop</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>Restart</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy</NavDropdown.Item>
-					</NavDropdown>
-					<NavDropdown title="View">
+					</StyledNavDropdown>
+					<StyledNavDropdown title="View">
 							<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
-					</NavDropdown>
-					<NavDropdown title="Help">
+					</StyledNavDropdown>
+					<StyledNavDropdown title="Help">
 							<StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>
 							<StyledNavLink href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavLink>
 							<NavDropdown.Item as={StyledLink} to="/userInfo">User Info</NavDropdown.Item>
-					</NavDropdown>
+					</StyledNavDropdown>
 				</Navbar.Collapse>
 		);
 	}
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index 0f6fb91c6..a0c338cd4 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -24,60 +24,50 @@
 import { createGlobalStyle } from 'styled-components';
 
 export const GlobalClampStyle = createGlobalStyle`
-  body {
-    padding: 0;
-    margin: 0;
-    font-family: ${props => props.theme.fontFamily};
-    font-size: ${props => props.theme.fontSize};
-    font-weight: normal;
-    color: ${props => props.theme.fontNormal};
-    background-color: ${props => props.theme.backgroundColor};
-  }
+	body {
+		padding: 0;
+		margin: 0;
+		font-family: ${props => props.theme.fontFamily};
+		font-size: ${props => props.theme.fontSize};
+		font-weight: normal;
+	}
 
- span {
-	font-family: ${props => props.theme.fontFamily};
-    font-size: ${props => props.theme.fontSize};
-    font-weight: bold;
-    color: ${props => props.theme.fontNormal};
-    background-color: ${props => props.theme.backgroundColor};
-  }
-  
-  a {
-	font-family: ${props => props.theme.fontFamily};
-    font-size: ${props => props.theme.fontSize};
-    font-weight: bold;
-    color: ${props => props.theme.fontNormal};
-    background-color: ${props => props.theme.backgroundColor};
+	span {
+		font-family: ${props => props.theme.fontFamily};
+		font-size: ${props => props.theme.fontSize};
+		font-weight: bold;
+	}
 
-  }
-  
-  div {
-  	font-family: ${props => props.theme.fontFamily};
-    font-size: ${props => props.theme.fontSize};
-  	border-radius: 4px;
-  	color: ${props => props.theme.fontNormal};
-	background-color: ${props => (props.theme.backgroundColor)};
-	margin-top: 1px;
-  }
+	a {
+		font-family: ${props => props.theme.fontFamily};
+		font-size: ${props => props.theme.fontSize};
+		font-weight: bold;
+	}
 
-  svg {
-	overflow: hidden;
-	width: 100%;
-	height: 100%;
-  }
-  
-  button {
-  	background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
-  	border: 1px;
-  	color: white;
-  	padding: 15px 32px;
-  	text-align: center;
-  	text-decoration: none;
-  	display: inline-block;
-  	font-size: ${props => props.theme.fontSize};
-  	font-family: ${props => props.theme.fontFamily};
+	div {
+		font-family: ${props => props.theme.fontFamily};
+		font-size: ${props => props.theme.fontSize};
+		border-radius: 4px;
+		margin-top: 1px;
+	}
 
-  }
+	svg {
+		overflow: hidden;
+		width: 100%;
+		height: 100%;
+	}
+
+	label {
+		font-family: ${props => props.theme.fontFamily};
+		font-size: ${props => props.theme.fontSize};
+		font-weight: bold;
+	}
+
+	button {
+		font-family: ${props => props.theme.fontFamily};
+		font-size: ${props => props.theme.fontSize};
+		font-weight: bold;
+	}
 `
 
 export const DefaultClampTheme = {
@@ -90,7 +80,7 @@ export const DefaultClampTheme = {
 
 	backgroundColor: '#eeeeee',
 	fontFamily: 'Arial, Sans-serif',
-	fontSize: '15px',
+	fontSize: '16px',
 
 	loopViewerBackgroundColor: 'white',
 	loopViewerFontColor: 'yellow',
-- 
cgit 1.2.3-korg


From 687b8de49114454bb8f2bfcedeb4a447af4178b3 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 26 Aug 2019 14:29:11 -0700
Subject: Fix the userInfo

Fix user Info window, now clicking on the user name make it appears +
attempt to add a logout

Issue-ID: CLAMP-393
Change-Id: I82686a848f7ccae95c1eab22f1923a8821ba76b1
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../clds/config/DefaultUserConfiguration.java      | 13 +++++------
 src/main/resources/application-noaaf.properties    | 19 ++++++++++++++--
 ui-react/package.json                              |  4 ++--
 ui-react/src/LoopUI.js                             | 16 +++++++++++---
 ui-react/src/api/UserService.js                    | 25 ++++++++++++++++++++++
 ui-react/src/components/dialogs/UserInfo.js        | 17 ++++-----------
 ui-react/src/index.js                              |  6 +++---
 7 files changed, 71 insertions(+), 29 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
index a8ff12067..9d4e7d0c7 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
@@ -75,8 +75,10 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) {
         try {
             http.csrf().disable().httpBasic().and().authorizeRequests().antMatchers("/restservices/clds/v1/user/**")
-            .authenticated().anyRequest().permitAll().and().logout().and().sessionManagement().maximumSessions(1)
-            .and().invalidSessionUrl("/designer/timeout.html");
+                    .authenticated().anyRequest().permitAll().and().logout()
+                    .logoutUrl("/restservices/clds/v1/user/logout").logoutSuccessUrl("/index.html")
+                    .invalidateHttpSession(true).deleteCookies("JSESSIONID").and().sessionManagement()
+                    .maximumSessions(1);
 
         } catch (Exception e) {
             logger.error(SETUP_WEB_USERS_EXCEPTION_MSG, e);
@@ -105,7 +107,7 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter {
             }
             for (CldsUser user : usersList) {
                 auth.inMemoryAuthentication().withUser(user.getUser()).password(user.getPassword())
-                .authorities(user.getPermissionsString()).and().passwordEncoder(passwordEncoder);
+                        .authorities(user.getPermissionsString()).and().passwordEncoder(passwordEncoder);
             }
         } catch (Exception e) {
             logger.error(SETUP_WEB_USERS_EXCEPTION_MSG, e);
@@ -118,8 +120,7 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter {
      * CldsUser.
      *
      * @return The array of CldsUser
-     * @throws IOException
-     *         In case of the file is not found
+     * @throws IOException In case of the file is not found
      */
     private CldsUser[] loadUsers() throws IOException {
         logger.info("Load from clds-users.properties");
@@ -134,7 +135,7 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter {
             return new BCryptPasswordEncoder(cldsBcryptEncoderStrength);
         } else {
             throw new CldsConfigException(
-                "Invalid clamp.config.security.encoder value. 'bcrypt' is the only option at this time.");
+                    "Invalid clamp.config.security.encoder value. 'bcrypt' is the only option at this time.");
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index 52f79bef4..cec02579a 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP CLAMP
 # ================================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
 #                             reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +51,21 @@ info.build.version=@project.version@
 ### server.ssl.key-store=file:/tmp/mykey.jks
 ### server.ssl.key-store-password=mypass
 ### server.ssl.key-password=mypass
-server.port=8080
+server.port=8443
+## Config part for Server certificates
+# Can be a classpath parameter instead of file:/
+server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
+server.ssl.key-store-password=China in the Spring
+server.ssl.key-password=China in the Spring
+server.ssl.key-store-type=PKCS12
+server.ssl.key-alias=clamp@clamp.onap.org
+
+## Config part for Client certificates
+server.ssl.client-auth=want
+server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks
+server.ssl.trust-store-password=changeit
+
+#server.http-to-https-redirection.port=8080
 
 server.servlet.context-path=/
 #Modified engine-rest applicationpath
@@ -141,6 +155,7 @@ clamp.config.policy.api.password=zb!XztG34
 clamp.config.policy.pap.url=http4://policy.api.simpledemo.onap.org:6969
 clamp.config.policy.pap.userName=healthcheck
 clamp.config.policy.pap.password=zb!XztG34
+
 clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
 clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
 clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123
diff --git a/ui-react/package.json b/ui-react/package.json
index 358152b5b..65608bed4 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "onap-clamp-ui",
-  "version": "4.1.0-SNAPSHOT",
+  "version": "4.1.1-SNAPSHOT",
   "description": "ONAP Clamp Loop Designer UI",
   "author": "ONAP Clamp Team",
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
     "registry": "https://nexus3.onap.org/repository/npm.snapshot/"
   },
   "main": "index.js",
-  "proxy": "https://localhost:8080",
+  "proxy": "https://localhost:8443",
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 9389ad656..fb595ded0 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -106,6 +106,7 @@ export default class LoopUI extends React.Component {
 	constructor() {
 		super();
 		this.getUser = this.getUser.bind(this);
+		this.logout = this.logout.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
 		this.closeLoop = this.closeLoop.bind(this);
@@ -120,6 +121,14 @@ export default class LoopUI extends React.Component {
 			this.setState({ userName: user })
 		});
 	}
+	
+	logout() {
+		UserService.logout().then(user => {
+			this.setState({ userName: user });
+			window.location.reload();
+		});
+		
+	}
 
 	renderMenuNavBar() {
 		return (
@@ -205,8 +214,8 @@ export default class LoopUI extends React.Component {
 		this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
 		this.props.history.push('/');
 	}
-	
- render() {
+
+	render() {
 		return (
 				<StyledMainDiv id="main_div">
 				<Route path="/operationalPolicyModal"
@@ -223,7 +232,8 @@ export default class LoopUI extends React.Component {
 				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-					<GlobalClampStyle />
+				<Route path="/logout" render={this.logout} />
+				<GlobalClampStyle />
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
 				</StyledMainDiv>
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index be21e692a..37ec73d1a 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -47,6 +47,31 @@ export default class UserService {
 			return UserService.notLoggedUserName;
 		});
 	}
+	
+	static logout() {
+		return fetch('/restservices/clds/v1/user/logout', {
+			method: 'POST',
+			credentials: 'same-origin',
+		})
+		.then(function (response) {
+			console.debug("logout response received, status code:", response.status);
+			if (response.ok) {
+				return response.text();
+			} else {
+				console.error("logout response is nok");
+				return UserService.notLoggedUserName;
+			}
+		})
+		.then(function (data) {
+			console.info ("User disconnected:",data)
+			return data;
+		})
+		.catch(function(error) {
+			console.warn("logout error received, user set to: ",UserService.notLoggedUserName);
+			console.error("logout error:",error);
+			return UserService.notLoggedUserName;
+		});
+	}
 
 	static getUserInfo() {
 		return fetch('/restservices/clds/v1/clds/cldsInfo', {
diff --git a/ui-react/src/components/dialogs/UserInfo.js b/ui-react/src/components/dialogs/UserInfo.js
index b8d68b849..7d81b38b3 100644
--- a/ui-react/src/components/dialogs/UserInfo.js
+++ b/ui-react/src/components/dialogs/UserInfo.js
@@ -39,7 +39,6 @@ export default class UserInfo extends React.Component {
 		super(props, context);
 
 		this.handleClose = this.handleClose.bind(this);
-		this.initialValues = this.initialValues.bind(this);
 		this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this);
 		this.renderReadModelPermission = this.renderReadModelPermission.bind(this);
 		this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this);
@@ -49,23 +48,15 @@ export default class UserInfo extends React.Component {
 		this.renderUserName = this.renderUserName.bind(this);
 		this.state = {
 			show: true,
-			userInfo: {permissionReadTemplate: true,
-						permissionReadCl: true,
-						permissionReadTosca: true,
-						permissionUpdateCl: true,
-						permissionUpdateTemplate: true,
-						permissionUpdateTosca: true,
-						userName: 'admin',
-						cldsVersion: '1.0.0'
-						}
+			userInfo: {}
 		};
-
 	}
-	initialValues() {
+	componentWillMount() {
 		UserService.getUserInfo().then(userInfo => {
 			this.setState({ userInfo: userInfo })
 		});
 	}
+
 	handleClose() {
 			this.props.history.push('/');
 	}
@@ -127,7 +118,7 @@ export default class UserInfo extends React.Component {
 	}
 	render() {
 		return (
-			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose} onEntered={this.initialValues}>
+			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>User Info</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/index.js b/ui-react/src/index.js
index cbbdc65ef..dd83096ea 100644
--- a/ui-react/src/index.js
+++ b/ui-react/src/index.js
@@ -23,13 +23,13 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import OnapClamp from './OnapClamp';
-import { Route, BrowserRouter } from 'react-router-dom'
+import { Route, MemoryRouter } from 'react-router-dom'
 
 
 const routing = (
-	<BrowserRouter forceRefresh={false}>
+	<MemoryRouter forceRefresh={false}>
 		<Route path="/" component={OnapClamp}/>
-	</BrowserRouter>
+	</MemoryRouter>
 );
 
 export var mainClamp = ReactDOM.render(
-- 
cgit 1.2.3-korg


From 101193d07d757ce299c34fc61ea37b416138bf85 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 5 Sep 2019 18:25:59 +0200
Subject: Draft of React test

Reworking the react test with Jest & Enzyme + coverage

Issue-ID: CLAMP-425
Change-Id: If287e357f4afaf712587e21ef5e0cb26f8a46d4c
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 docs/swagger/swagger.json                          |   405 +-
 docs/swagger/swagger.pdf                           | 13218 ++++++++++--------
 extra/bin-for-dev/start-backend.sh                 |    27 +
 extra/bin-for-dev/start-frontend.sh                |    27 +
 pom.xml                                            |  2440 ++--
 src/main/docker/frontend/Dockerfile                |     4 +-
 src/main/resources/META-INF/resources/swagger.html |   265 +-
 ui-react/package-lock.json                         | 13918 -------------------
 ui-react/package.json                              |   126 +-
 ui-react/src/__test__/LoopCache.test.js            |   206 -
 .../src/__test__/LoopCache_mokeLoopJsonCache.json  |   117 -
 ui-react/src/__test__/OpenLoopModal.test.js        |    35 -
 .../__snapshots__/OpenLoopModal.test.js.snap       |     3 -
 ui-react/src/api/LoopCache.test.js                 |   205 +
 ui-react/src/api/LoopCache_mokeLoopJsonCache.json  |   117 +
 .../dialogs/OpenLoop/OpenLoopModal.test.js         |    45 +
 .../__snapshots__/OpenLoopModal.test.js.snap       |    92 +
 ui-react/src/setupTests.js                         |    28 +-
 18 files changed, 9414 insertions(+), 21864 deletions(-)
 create mode 100755 extra/bin-for-dev/start-backend.sh
 create mode 100755 extra/bin-for-dev/start-frontend.sh
 delete mode 100644 ui-react/package-lock.json
 delete mode 100644 ui-react/src/__test__/LoopCache.test.js
 delete mode 100644 ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json
 delete mode 100644 ui-react/src/__test__/OpenLoopModal.test.js
 delete mode 100644 ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap
 create mode 100644 ui-react/src/api/LoopCache.test.js
 create mode 100644 ui-react/src/api/LoopCache_mokeLoopJsonCache.json
 create mode 100644 ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
 create mode 100644 ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 079daa253..d35a59c51 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,16 +1,16 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "4.0.3-SNAPSHOT",
+    "version" : "4.1.1-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:46235",
+  "host" : "localhost:43819",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route3",
+        "operationId" : "route167",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -26,13 +26,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route3"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route167"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route13",
+        "operationId" : "route177",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -42,13 +42,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route13"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route177"
       }
     },
-    "/v2/loop/deployLoop/{loopName}" : {
+    "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route8",
+        "operationId" : "route172",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -64,13 +64,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route8"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route172"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route2",
+        "operationId" : "route166",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -83,13 +83,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route2"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route166"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route14",
+        "operationId" : "route178",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -105,13 +105,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route14"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route178"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route11",
+        "operationId" : "route175",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -127,13 +127,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route11"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route175"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route10",
+        "operationId" : "route174",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -149,13 +149,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route10"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route174"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route12",
+        "operationId" : "route176",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -171,13 +171,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route12"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route176"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route4",
+        "operationId" : "route168",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -193,13 +193,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route4"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route168"
       }
     },
-    "/v2/loop/undeployLoop/{loopName}" : {
+    "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route9",
+        "operationId" : "route173",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -215,13 +215,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route9"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route173"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route5",
+        "operationId" : "route169",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -245,13 +245,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route5"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route169"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route7",
+        "operationId" : "route171",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -275,13 +275,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route7"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route171"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route6",
+        "operationId" : "route170",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -305,13 +305,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route6"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route170"
       }
     },
     "/v1/clds/action/{action}/{modelName}?test={test}" : {
       "put" : {
-        "operationId" : "route23",
+        "operationId" : "route187",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -335,13 +335,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route23"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route187"
       }
     },
     "/v1/clds/cldsDetails" : {
       "get" : {
-        "operationId" : "route15",
+        "operationId" : "route179",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -351,13 +351,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route15"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route179"
       }
     },
     "/v1/clds/cldsInfo" : {
       "get" : {
-        "operationId" : "route16",
+        "operationId" : "route180",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -367,13 +367,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route16"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route180"
       }
     },
     "/v1/clds/dcae/event?test={test}" : {
       "post" : {
-        "operationId" : "route24",
+        "operationId" : "route188",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -387,13 +387,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route24"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route188"
       }
     },
     "/v1/clds/deploy/{modelName}" : {
       "put" : {
-        "operationId" : "route26",
+        "operationId" : "route190",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -412,13 +412,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route190"
       }
     },
     "/v1/clds/model-names" : {
       "get" : {
-        "operationId" : "route22",
+        "operationId" : "route186",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -428,13 +428,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route186"
       }
     },
     "/v1/clds/model/{modelName}" : {
       "get" : {
-        "operationId" : "route20",
+        "operationId" : "route184",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "modelName",
@@ -450,11 +450,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route184"
       },
       "put" : {
-        "operationId" : "route21",
+        "operationId" : "route185",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -478,13 +478,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route21"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route185"
       }
     },
     "/v1/clds/model/bpmn/{modelName}" : {
       "get" : {
-        "operationId" : "route18",
+        "operationId" : "route182",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "modelName",
@@ -495,13 +495,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route18"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route182"
       }
     },
     "/v1/clds/model/image/{modelName}" : {
       "get" : {
-        "operationId" : "route19",
+        "operationId" : "route183",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "modelName",
@@ -512,24 +512,24 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route19"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route183"
       }
     },
     "/v1/clds/properties" : {
       "get" : {
-        "operationId" : "route25",
+        "operationId" : "route189",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route189"
       }
     },
     "/v1/clds/undeploy/{modelName}" : {
       "put" : {
-        "operationId" : "route27",
+        "operationId" : "route191",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -548,13 +548,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route27"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route191"
       }
     },
     "/v1/cldsTempate/template-names" : {
       "get" : {
-        "operationId" : "route32",
+        "operationId" : "route196",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -564,13 +564,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route32"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route196"
       }
     },
     "/v1/cldsTempate/template/{templateName}" : {
       "get" : {
-        "operationId" : "route30",
+        "operationId" : "route194",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -586,11 +586,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route194"
       },
       "put" : {
-        "operationId" : "route31",
+        "operationId" : "route195",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -614,13 +614,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route31"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route195"
       }
     },
     "/v1/cldsTempate/template/bpmn/{templateName}" : {
       "get" : {
-        "operationId" : "route28",
+        "operationId" : "route192",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -631,13 +631,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route28"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route192"
       }
     },
     "/v1/cldsTempate/template/image/{templateName}" : {
       "get" : {
-        "operationId" : "route29",
+        "operationId" : "route193",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -648,13 +648,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route193"
       }
     },
     "/v1/dictionary" : {
       "get" : {
-        "operationId" : "route40",
+        "operationId" : "route204",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -664,13 +664,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route40"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route204"
       }
     },
     "/v1/dictionary/{dictionaryName}" : {
       "put" : {
-        "operationId" : "route39",
+        "operationId" : "route203",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -694,8 +694,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route39"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route203"
       }
     },
     "/v1/dictionary/{dictionaryName}/items" : {
@@ -715,7 +715,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-5",
         "x-routeId" : null
       },
       "put" : {
@@ -742,24 +742,24 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-5",
         "x-routeId" : null
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route17",
+        "operationId" : "route181",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route17"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route181"
       }
     },
     "/v1/tosca/models" : {
       "get" : {
-        "operationId" : "route36",
+        "operationId" : "route200",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -769,8 +769,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route36"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route200"
       }
     },
     "/v1/tosca/models/{toscaModelName}" : {
@@ -790,11 +790,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-5",
         "x-routeId" : null
       },
       "put" : {
-        "operationId" : "route33",
+        "operationId" : "route197",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -813,13 +813,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route33"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route197"
       }
     },
     "/v1/tosca/models/policyType/{policyType}" : {
       "get" : {
-        "operationId" : "route34",
+        "operationId" : "route198",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "policyType",
@@ -835,19 +835,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route34"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route198"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route41",
+        "operationId" : "route205",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route41"
+        "x-camelContextId" : "camel-5",
+        "x-routeId" : "route205"
       }
     }
   },
@@ -883,6 +883,12 @@
           "type" : "string",
           "enum" : [ "DESIGN", "SUBMITTED", "DEPLOYED", "RUNNING", "STOPPED", "IN_ERROR", "WAITING" ]
         },
+        "components" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ExternalComponent"
+          }
+        },
         "operationalPolicies" : {
           "type" : "array",
           "uniqueItems" : true,
@@ -913,12 +919,12 @@
     "JsonArray" : {
       "type" : "object",
       "properties" : {
-        "asString" : {
-          "type" : "string"
-        },
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asString" : {
+          "type" : "string"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -955,29 +961,29 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
-        "jsonNull" : {
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "jsonPrimitive" : {
+          "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
         }
       },
       "x-className" : {
@@ -996,6 +1002,9 @@
           "type" : "string",
           "enum" : [ "INFO", "WARNING", "ERROR" ]
         },
+        "logComponent" : {
+          "type" : "string"
+        },
         "message" : {
           "type" : "string"
         },
@@ -1014,6 +1023,9 @@
     "JsonPrimitive" : {
       "type" : "object",
       "properties" : {
+        "asBoolean" : {
+          "type" : "boolean"
+        },
         "boolean" : {
           "type" : "boolean"
         },
@@ -1023,9 +1035,6 @@
         "asString" : {
           "type" : "string"
         },
-        "asBoolean" : {
-          "type" : "boolean"
-        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -1065,29 +1074,29 @@
         "string" : {
           "type" : "boolean"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
-        "jsonNull" : {
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "jsonPrimitive" : {
+          "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
         }
       }
     },
@@ -1128,36 +1137,21 @@
     "JsonObject" : {
       "type" : "object",
       "properties" : {
-        "jsonPrimitive" : {
-          "type" : "boolean"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "jsonObject" : {
+        "asBoolean" : {
           "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
+        "asString" : {
+          "type" : "string"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
-        "asBoolean" : {
-          "type" : "boolean"
-        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -1193,6 +1187,21 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         }
       },
       "x-className" : {
@@ -1200,6 +1209,17 @@
         "format" : "com.google.gson.JsonObject"
       }
     },
+    "ExternalComponent" : {
+      "type" : "object",
+      "properties" : {
+        "state" : {
+          "$ref" : "#/definitions/ExternalComponentState"
+        },
+        "componentName" : {
+          "type" : "string"
+        }
+      }
+    },
     "OperationalPolicy" : {
       "type" : "object",
       "properties" : {
@@ -1217,39 +1237,39 @@
         }
       }
     },
-    "JsonNull" : {
+    "ExternalComponentState" : {
       "type" : "object",
       "properties" : {
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "stateName" : {
+          "type" : "string"
         },
-        "jsonNull" : {
-          "type" : "boolean"
+        "description" : {
+          "type" : "string"
         },
-        "jsonObject" : {
+        "level" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "JsonNull" : {
+      "type" : "object",
+      "properties" : {
+        "asBoolean" : {
           "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
+        "asString" : {
+          "type" : "string"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
-        "asBoolean" : {
-          "type" : "boolean"
-        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -1285,6 +1305,21 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         }
       }
     },
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index a2cf79b85..422012341 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,16 +4,16 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20190820073408-07'00')
-/ModDate (D:20190820073408-07'00')
+/CreationDate (D:20190906143053+02'00')
+/ModDate (D:20190906143053+02'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 22 0 R
-/Outlines 738 0 R
-/PageLabels 927 0 R
+/Outlines 749 0 R
+/PageLabels 940 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 793.0]
 /ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
 endobj
 3 0 obj
 << /Type /Pages
-/Count 39
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 29 0 R 44 0 R 60 0 R 73 0 R 87 0 R 100 0 R 114 0 R 125 0 R 141 0 R 156 0 R 170 0 R 184 0 R 197 0 R 211 0 R 226 0 R 238 0 R 252 0 R 266 0 R 279 0 R 285 0 R 289 0 R 294 0 R 299 0 R 302 0 R 306 0 R 313 0 R 318 0 R 326 0 R 333 0 R 341 0 R 348 0 R 357 0 R]
+/Count 40
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 29 0 R 44 0 R 60 0 R 73 0 R 87 0 R 100 0 R 114 0 R 125 0 R 141 0 R 156 0 R 170 0 R 184 0 R 197 0 R 210 0 R 225 0 R 237 0 R 252 0 R 266 0 R 279 0 R 285 0 R 289 0 R 294 0 R 299 0 R 302 0 R 306 0 R 313 0 R 320 0 R 328 0 R 335 0 R 340 0 R 348 0 R 357 0 R 369 0 R]
 >>
 endobj
 4 0 obj
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 929 0 R
+/FontDescriptor 942 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 931 0 R
-/ToUnicode 930 0 R
+/Widths 944 0 R
+/ToUnicode 943 0 R
 >>
 endobj
 9 0 obj
@@ -1559,7 +1559,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R]
+/Annots [372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R]
 >>
 endobj
 11 0 obj
@@ -3102,7 +3102,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R]
+/Annots [444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R]
 >>
 endobj
 13 0 obj
@@ -4645,11 +4645,11 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R]
+/Annots [520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R]
 >>
 endobj
 15 0 obj
-<< /Length 32031
+<< /Length 32060
 >>
 stream
 q
@@ -4781,7 +4781,7 @@ ET
 BT
 60.24000000000001 689.3459999999999 Td
 /F1.0 10.5 Tf
-[<322e32392e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <794c6f6f702f7b6c6f6f704e616d657d>] TJ
+[<322e32392e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4790,9 +4790,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-278.09175 689.3459999999999 Td
+251.36924999999997 689.3459999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5861,7 +5861,7 @@ ET
 BT
 60.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-[<322e33362e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <794c6f6f702f7b6c6f6f704e616d657d>] TJ
+[<322e33362e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -5870,9 +5870,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-288.78074999999995 190.38599999999954 Td
+267.40274999999997 190.38599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6188,11 +6188,11 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R 646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R]
+/Annots [596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R 603 0 R 604 0 R 605 0 R 606 0 R 607 0 R 608 0 R 609 0 R 610 0 R 611 0 R 612 0 R 613 0 R 614 0 R 615 0 R 616 0 R 617 0 R 618 0 R 619 0 R 620 0 R 621 0 R 622 0 R 623 0 R 624 0 R 625 0 R 626 0 R 627 0 R 628 0 R 629 0 R 630 0 R 631 0 R 632 0 R 633 0 R 634 0 R 635 0 R 636 0 R 637 0 R 638 0 R 639 0 R 640 0 R 641 0 R 642 0 R 643 0 R 644 0 R 645 0 R 646 0 R 647 0 R 648 0 R 649 0 R 650 0 R 651 0 R 652 0 R 653 0 R 654 0 R 655 0 R 656 0 R 657 0 R 658 0 R 659 0 R 660 0 R 661 0 R 662 0 R 663 0 R 664 0 R 665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R]
 >>
 endobj
 17 0 obj
-<< /Length 30718
+<< /Length 32382
 >>
 stream
 q
@@ -7244,7 +7244,7 @@ ET
 BT
 60.24000000000001 264.30599999999953 Td
 /F1.0 10.5 Tf
-[<332e31312e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<332e31312e2045787465726e616c436f6d706f6e656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7253,9 +7253,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-139.13475 264.30599999999953 Td
+187.23524999999995 264.30599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7284,7 +7284,7 @@ ET
 BT
 60.24000000000001 245.8259999999995 Td
 /F1.0 10.5 Tf
-<332e31322e204a736f6e4e756c6c> Tj
+<332e31322e2045787465726e616c436f6d706f6e656e745374617465> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7293,9 +7293,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 245.8259999999995 Td
+213.95774999999998 245.8259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7313,7 +7313,7 @@ ET
 BT
 552.021 245.8259999999995 Td
 /F1.0 10.5 Tf
-<3237> Tj
+<3236> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7324,7 +7324,7 @@ ET
 BT
 60.24000000000001 227.34599999999952 Td
 /F1.0 10.5 Tf
-<332e31332e204a736f6e4f626a656374> Tj
+[<332e31332e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -7333,9 +7333,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-144.47924999999998 227.34599999999952 Td
+139.13475 227.34599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7353,7 +7353,7 @@ ET
 BT
 552.021 227.34599999999952 Td
 /F1.0 10.5 Tf
-<3238> Tj
+<3236> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7364,7 +7364,7 @@ ET
 BT
 60.24000000000001 208.86599999999953 Td
 /F1.0 10.5 Tf
-<332e31342e204a736f6e5072696d6974697665> Tj
+<332e31342e204a736f6e4e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7373,9 +7373,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 208.86599999999953 Td
+133.79024999999996 208.86599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7393,7 +7393,7 @@ ET
 BT
 552.021 208.86599999999953 Td
 /F1.0 10.5 Tf
-<3330> Tj
+<3238> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7404,7 +7404,7 @@ ET
 BT
 60.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-<332e31352e204c6f6f70> Tj
+<332e31352e204a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7413,9 +7413,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-112.41224999999997 190.38599999999954 Td
+144.47924999999998 190.38599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7433,7 +7433,7 @@ ET
 BT
 552.021 190.38599999999954 Td
 /F1.0 10.5 Tf
-<3331> Tj
+<3239> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7444,7 +7444,7 @@ ET
 BT
 60.24000000000001 171.90599999999955 Td
 /F1.0 10.5 Tf
-<332e31362e204c6f6f704c6f67> Tj
+<332e31362e204a736f6e5072696d6974697665> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7453,9 +7453,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 171.90599999999955 Td
+155.16824999999994 171.90599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7473,7 +7473,7 @@ ET
 BT
 552.021 171.90599999999955 Td
 /F1.0 10.5 Tf
-<3332> Tj
+<3330> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7484,7 +7484,7 @@ ET
 BT
 60.24000000000001 153.42599999999956 Td
 /F1.0 10.5 Tf
-<332e31372e204d6963726f53657276696365506f6c696379> Tj
+<332e31372e204c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7493,9 +7493,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-187.23524999999995 153.42599999999956 Td
+112.41224999999997 153.42599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7513,7 +7513,7 @@ ET
 BT
 552.021 153.42599999999956 Td
 /F1.0 10.5 Tf
-<3332> Tj
+<3331> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7524,7 +7524,7 @@ ET
 BT
 60.24000000000001 134.94599999999957 Td
 /F1.0 10.5 Tf
-<332e31382e204e756d626572> Tj
+<332e31382e204c6f6f704c6f67> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7533,9 +7533,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-128.44574999999998 134.94599999999957 Td
+133.79024999999996 134.94599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7553,7 +7553,7 @@ ET
 BT
 552.021 134.94599999999957 Td
 /F1.0 10.5 Tf
-<3333> Tj
+<3332> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7564,7 +7564,7 @@ ET
 BT
 60.24000000000001 116.46599999999958 Td
 /F1.0 10.5 Tf
-[<332e31392e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+<332e31392e204d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7573,9 +7573,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-176.54625 116.46599999999958 Td
+187.23524999999995 116.46599999999958 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7604,7 +7604,7 @@ ET
 BT
 60.24000000000001 97.98599999999959 Td
 /F1.0 10.5 Tf
-[<332e32302e2056> 60.05859375 <616c75654974656d>] TJ
+<332e32302e204e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7613,9 +7613,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-139.13475 97.98599999999959 Td
+128.44574999999998 97.98599999999959 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7636,6 +7636,86 @@ BT
 <3333> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24000000000001 79.5059999999996 Td
+/F1.0 10.5 Tf
+[<332e32312e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+176.54625 79.5059999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 79.5059999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.021 79.5059999999996 Td
+/F1.0 10.5 Tf
+<3333> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24000000000001 61.02599999999961 Td
+/F1.0 10.5 Tf
+[<332e32322e2056> 60.05859375 <616c75654974656d>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+139.13475 61.02599999999961 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 61.02599999999961 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.021 61.02599999999961 Td
+/F1.0 10.5 Tf
+<3334> Tj
+ET
+
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 Q
@@ -7651,7 +7731,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [665 0 R 666 0 R 667 0 R 668 0 R 669 0 R 670 0 R 671 0 R 672 0 R 673 0 R 674 0 R 675 0 R 676 0 R 677 0 R 678 0 R 679 0 R 680 0 R 681 0 R 682 0 R 683 0 R 684 0 R 685 0 R 686 0 R 687 0 R 688 0 R 689 0 R 690 0 R 691 0 R 692 0 R 693 0 R 694 0 R 695 0 R 696 0 R 697 0 R 698 0 R 699 0 R 700 0 R 701 0 R 702 0 R 703 0 R 704 0 R 705 0 R 706 0 R 707 0 R 708 0 R 709 0 R 710 0 R 711 0 R 712 0 R 713 0 R 714 0 R 715 0 R 716 0 R 717 0 R 718 0 R 719 0 R 720 0 R 721 0 R 722 0 R 723 0 R 724 0 R 725 0 R 726 0 R 727 0 R 728 0 R 729 0 R 730 0 R 731 0 R 732 0 R 733 0 R 734 0 R 735 0 R 736 0 R]
+/Annots [672 0 R 673 0 R 674 0 R 675 0 R 676 0 R 677 0 R 678 0 R 679 0 R 680 0 R 681 0 R 682 0 R 683 0 R 684 0 R 685 0 R 686 0 R 687 0 R 688 0 R 689 0 R 690 0 R 691 0 R 692 0 R 693 0 R 694 0 R 695 0 R 696 0 R 697 0 R 698 0 R 699 0 R 700 0 R 701 0 R 702 0 R 703 0 R 704 0 R 705 0 R 706 0 R 707 0 R 708 0 R 709 0 R 710 0 R 711 0 R 712 0 R 713 0 R 714 0 R 715 0 R 716 0 R 717 0 R 718 0 R 719 0 R 720 0 R 721 0 R 722 0 R 723 0 R 724 0 R 725 0 R 726 0 R 727 0 R 728 0 R 729 0 R 730 0 R 731 0 R 732 0 R 733 0 R 734 0 R 735 0 R 736 0 R 737 0 R 738 0 R 739 0 R 740 0 R 741 0 R 742 0 R 743 0 R 744 0 R 745 0 R 746 0 R 747 0 R]
 >>
 endobj
 19 0 obj
@@ -7700,7 +7780,7 @@ ET
 BT
 85.136384765625 660.036 Td
 /F1.0 10.5 Tf
-[<203a20342e302e332d534e415053484f> 20.01953125 <54>] TJ
+[<203a20342e312e312d534e415053484f> 20.01953125 <54>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -7733,7 +7813,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3436323335> Tj
+<203a206c6f63616c686f73743a3433383139> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7834,7 +7914,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 >>
@@ -7848,18 +7928,18 @@ endobj
 >>
 endobj
 23 0 obj
-<< /Kids [56 0 R 296 0 R 360 0 R 180 0 R 248 0 R 104 0 R 154 0 R 217 0 R 57 0 R 137 0 R 200 0 R 260 0 R 78 0 R 128 0 R 202 0 R]
+<< /Kids [56 0 R 296 0 R 359 0 R 180 0 R 248 0 R 104 0 R 154 0 R 216 0 R 57 0 R 137 0 R 200 0 R 260 0 R 78 0 R 246 0 R 128 0 R 371 0 R]
 >>
 endobj
 24 0 obj
 << /Type /Font
 /BaseFont /AAAAAB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 933 0 R
+/FontDescriptor 946 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 935 0 R
-/ToUnicode 934 0 R
+/Widths 948 0 R
+/ToUnicode 947 0 R
 >>
 endobj
 25 0 obj
@@ -7869,11 +7949,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAC+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 937 0 R
+/FontDescriptor 950 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 939 0 R
-/ToUnicode 938 0 R
+/Widths 952 0 R
+/ToUnicode 951 0 R
 >>
 endobj
 27 0 obj
@@ -9041,7 +9121,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [33 0 R 40 0 R 41 0 R]
@@ -9074,11 +9154,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 941 0 R
+/FontDescriptor 954 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 943 0 R
-/ToUnicode 942 0 R
+/Widths 956 0 R
+/ToUnicode 955 0 R
 >>
 endobj
 37 0 obj
@@ -10244,7 +10324,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [47 0 R 51 0 R]
@@ -11586,7 +11666,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [61 0 R 67 0 R]
@@ -12762,7 +12842,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [83 0 R]
@@ -12781,8 +12861,8 @@ endobj
 [73 0 R /XYZ 0 556.9200000000003 null]
 endobj
 78 0 obj
-<< /Limits [(_responses_8) (_route23)]
-/Names [(_responses_8) 77 0 R (_responses_9) 82 0 R (_route10) 223 0 R (_route11) 218 0 R (_route12) 230 0 R (_route13) 195 0 R (_route14) 212 0 R (_route15) 38 0 R (_route16) 45 0 R (_route17) 164 0 R (_route18) 69 0 R (_route19) 75 0 R (_route2) 207 0 R (_route20) 80 0 R (_route21) 85 0 R (_route22) 65 0 R (_route23) 31 0 R]
+<< /Limits [(_responses_8) (_route176)]
+/Names [(_responses_8) 77 0 R (_responses_9) 82 0 R (_route166) 206 0 R (_route167) 273 0 R (_route168) 234 0 R (_route169) 245 0 R (_route170) 264 0 R (_route171) 256 0 R (_route172) 201 0 R (_route173) 240 0 R (_route174) 222 0 R (_route175) 217 0 R (_route176) 229 0 R]
 >>
 endobj
 79 0 obj
@@ -14064,7 +14144,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [89 0 R 91 0 R]
@@ -15248,7 +15328,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [101 0 R 108 0 R]
@@ -16548,7 +16628,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [123 0 R]
@@ -17712,7 +17792,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [130 0 R 132 0 R 138 0 R]
@@ -17725,8 +17805,8 @@ endobj
 [125 0 R /XYZ 0 702.1200000000001 null]
 endobj
 128 0 obj
-<< /Limits [(_route24) (_route33)]
-/Names [(_route24) 49 0 R (_route25) 94 0 R (_route26) 55 0 R (_route27) 97 0 R (_route28) 110 0 R (_route29) 116 0 R (_route3) 273 0 R (_route30) 120 0 R (_route31) 127 0 R (_route32) 106 0 R (_route33) 186 0 R]
+<< /Limits [(_route188) (_route197)]
+/Names [(_route188) 49 0 R (_route189) 94 0 R (_route190) 55 0 R (_route191) 97 0 R (_route192) 110 0 R (_route193) 116 0 R (_route194) 120 0 R (_route195) 127 0 R (_route196) 106 0 R (_route197) 186 0 R]
 >>
 endobj
 129 0 obj
@@ -19125,7 +19205,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [144 0 R 146 0 R 152 0 R]
@@ -20205,7 +20285,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [159 0 R 161 0 R]
@@ -21678,7 +21758,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [171 0 R 176 0 R 182 0 R]
@@ -22688,7 +22768,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [188 0 R]
@@ -22733,7 +22813,7 @@ endobj
 [184 0 R /XYZ 0 128.7600000000003 null]
 endobj
 196 0 obj
-<< /Length 17711
+<< /Length 17703
 >>
 stream
 q
@@ -23169,7 +23249,7 @@ ET
 BT
 48.24 539.0160000000005 Td
 /F2.0 18 Tf
-[<322e32392e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <794c6f6f702f7b6c6f6f704e616d657d>] TJ
+[<322e32392e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -24063,10 +24143,10 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [205 0 R]
+/Annots [204 0 R]
 >>
 endobj
 198 0 obj
@@ -24077,24 +24157,19 @@ endobj
 endobj
 200 0 obj
 << /Limits [(_responses_23) (_responses_31)]
-/Names [(_responses_23) 168 0 R (_responses_24) 175 0 R (_responses_25) 181 0 R (_responses_26) 189 0 R (_responses_27) 193 0 R (_responses_28) 199 0 R (_responses_29) 204 0 R (_responses_3) 46 0 R (_responses_30) 208 0 R (_responses_31) 214 0 R]
+/Names [(_responses_23) 168 0 R (_responses_24) 175 0 R (_responses_25) 181 0 R (_responses_26) 189 0 R (_responses_27) 193 0 R (_responses_28) 199 0 R (_responses_29) 203 0 R (_responses_3) 46 0 R (_responses_30) 207 0 R (_responses_31) 213 0 R]
 >>
 endobj
 201 0 obj
 [197 0 R /XYZ 0 562.4400000000004 null]
 endobj
 202 0 obj
-<< /Limits [(_route34) (_version_information)]
-/Names [(_route34) 173 0 R (_route36) 167 0 R (_route39) 142 0 R (_route4) 235 0 R (_route40) 135 0 R (_route41) 192 0 R (_route5) 246 0 R (_route6) 264 0 R (_route7) 256 0 R (_route8) 201 0 R (_route9) 241 0 R (_uri_scheme) 27 0 R (_v1_dictionary_dictionaryname_items_get) 149 0 R (_v1_dictionary_dictionaryname_items_put) 157 0 R (_v1_tosca_models_toscamodelname_get) 178 0 R (_valueitem) 364 0 R (_version_information) 25 0 R]
->>
-endobj
-203 0 obj
 [197 0 R /XYZ 0 522.3600000000005 null]
 endobj
-204 0 obj
+203 0 obj
 [197 0 R /XYZ 0 417.2400000000005 null]
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -24102,19 +24177,19 @@ endobj
 /Type /Annot
 >>
 endobj
-206 0 obj
+205 0 obj
 [197 0 R /XYZ 0 312.12000000000046 null]
 endobj
-207 0 obj
+206 0 obj
 [197 0 R /XYZ 0 255.84000000000043 null]
 endobj
-208 0 obj
+207 0 obj
 [197 0 R /XYZ 0 215.76000000000042 null]
 endobj
-209 0 obj
+208 0 obj
 [197 0 R /XYZ 0 110.64000000000038 null]
 endobj
-210 0 obj
+209 0 obj
 << /Length 16115
 >>
 stream
@@ -25297,33 +25372,33 @@ Q
 
 endstream
 endobj
-211 0 obj
+210 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 210 0 R
+/Contents 209 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [215 0 R 221 0 R]
+/Annots [214 0 R 220 0 R]
 >>
 endobj
+211 0 obj
+[210 0 R /XYZ 0 792.0 null]
+endobj
 212 0 obj
-[211 0 R /XYZ 0 792.0 null]
+[210 0 R /XYZ 0 718.32 null]
 endobj
 213 0 obj
-[211 0 R /XYZ 0 718.32 null]
+[210 0 R /XYZ 0 613.2000000000003 null]
 endobj
 214 0 obj
-[211 0 R /XYZ 0 613.2000000000003 null]
-endobj
-215 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -25331,24 +25406,24 @@ endobj
 /Type /Annot
 >>
 endobj
-216 0 obj
-[211 0 R /XYZ 0 508.0800000000004 null]
+215 0 obj
+[210 0 R /XYZ 0 508.0800000000004 null]
 endobj
-217 0 obj
+216 0 obj
 << /Limits [(_produces_22) (_produces_4)]
-/Names [(_produces_22) 166 0 R (_produces_23) 172 0 R (_produces_24) 177 0 R (_produces_25) 185 0 R (_produces_26) 191 0 R (_produces_27) 194 0 R (_produces_28) 206 0 R (_produces_29) 209 0 R (_produces_3) 48 0 R (_produces_30) 216 0 R (_produces_31) 222 0 R (_produces_32) 229 0 R (_produces_33) 234 0 R (_produces_34) 240 0 R (_produces_35) 245 0 R (_produces_36) 255 0 R (_produces_37) 263 0 R (_produces_38) 272 0 R (_produces_39) 277 0 R (_produces_4) 54 0 R]
+/Names [(_produces_22) 166 0 R (_produces_23) 172 0 R (_produces_24) 177 0 R (_produces_25) 185 0 R (_produces_26) 191 0 R (_produces_27) 194 0 R (_produces_28) 205 0 R (_produces_29) 208 0 R (_produces_3) 48 0 R (_produces_30) 215 0 R (_produces_31) 221 0 R (_produces_32) 228 0 R (_produces_33) 233 0 R (_produces_34) 239 0 R (_produces_35) 244 0 R (_produces_36) 255 0 R (_produces_37) 263 0 R (_produces_38) 272 0 R (_produces_39) 277 0 R (_produces_4) 54 0 R]
 >>
 endobj
+217 0 obj
+[210 0 R /XYZ 0 451.80000000000035 null]
+endobj
 218 0 obj
-[211 0 R /XYZ 0 451.80000000000035 null]
+[210 0 R /XYZ 0 411.7200000000003 null]
 endobj
 219 0 obj
-[211 0 R /XYZ 0 411.7200000000003 null]
+[210 0 R /XYZ 0 306.6000000000003 null]
 endobj
 220 0 obj
-[211 0 R /XYZ 0 306.6000000000003 null]
-endobj
-221 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -25356,16 +25431,16 @@ endobj
 /Type /Annot
 >>
 endobj
+221 0 obj
+[210 0 R /XYZ 0 201.48000000000027 null]
+endobj
 222 0 obj
-[211 0 R /XYZ 0 201.48000000000027 null]
+[210 0 R /XYZ 0 145.20000000000024 null]
 endobj
 223 0 obj
-[211 0 R /XYZ 0 145.20000000000024 null]
+[210 0 R /XYZ 0 105.12000000000023 null]
 endobj
 224 0 obj
-[211 0 R /XYZ 0 105.12000000000023 null]
-endobj
-225 0 obj
 << /Length 18924
 >>
 stream
@@ -26772,27 +26847,27 @@ Q
 
 endstream
 endobj
-226 0 obj
+225 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 225 0 R
+/Contents 224 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [228 0 R 233 0 R]
+/Annots [227 0 R 232 0 R]
 >>
 endobj
-227 0 obj
-[226 0 R /XYZ 0 683.1600000000001 null]
+226 0 obj
+[225 0 R /XYZ 0 683.1600000000001 null]
 endobj
-228 0 obj
+227 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -26800,19 +26875,19 @@ endobj
 /Type /Annot
 >>
 endobj
+228 0 obj
+[225 0 R /XYZ 0 578.0400000000002 null]
+endobj
 229 0 obj
-[226 0 R /XYZ 0 578.0400000000002 null]
+[225 0 R /XYZ 0 521.7600000000003 null]
 endobj
 230 0 obj
-[226 0 R /XYZ 0 521.7600000000003 null]
+[225 0 R /XYZ 0 481.68000000000035 null]
 endobj
 231 0 obj
-[226 0 R /XYZ 0 481.68000000000035 null]
+[225 0 R /XYZ 0 376.56000000000034 null]
 endobj
 232 0 obj
-[226 0 R /XYZ 0 376.56000000000034 null]
-endobj
-233 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -26820,17 +26895,17 @@ endobj
 /Type /Annot
 >>
 endobj
+233 0 obj
+[225 0 R /XYZ 0 271.4400000000003 null]
+endobj
 234 0 obj
-[226 0 R /XYZ 0 271.4400000000003 null]
+[225 0 R /XYZ 0 215.16000000000028 null]
 endobj
 235 0 obj
-[226 0 R /XYZ 0 215.16000000000028 null]
+[225 0 R /XYZ 0 175.08000000000027 null]
 endobj
 236 0 obj
-[226 0 R /XYZ 0 175.08000000000027 null]
-endobj
-237 0 obj
-<< /Length 17700
+<< /Length 17692
 >>
 stream
 q
@@ -27131,7 +27206,7 @@ ET
 BT
 48.24000000000001 573.5760000000004 Td
 /F2.0 18 Tf
-[<322e33362e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <794c6f6f702f7b6c6f6f704e616d657d>] TJ
+[<322e33362e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -28130,39 +28205,39 @@ Q
 
 endstream
 endobj
-238 0 obj
+237 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 237 0 R
+/Contents 236 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F1.0 8 0 R
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [244 0 R 249 0 R]
+/Annots [243 0 R 249 0 R]
 >>
 endobj
+238 0 obj
+[237 0 R /XYZ 0 792.0 null]
+endobj
 239 0 obj
-[238 0 R /XYZ 0 792.0 null]
+[237 0 R /XYZ 0 653.2800000000002 null]
 endobj
 240 0 obj
-[238 0 R /XYZ 0 653.2800000000002 null]
+[237 0 R /XYZ 0 597.0000000000003 null]
 endobj
 241 0 obj
-[238 0 R /XYZ 0 597.0000000000003 null]
+[237 0 R /XYZ 0 556.9200000000004 null]
 endobj
 242 0 obj
-[238 0 R /XYZ 0 556.9200000000004 null]
+[237 0 R /XYZ 0 451.8000000000006 null]
 endobj
 243 0 obj
-[238 0 R /XYZ 0 451.8000000000006 null]
-endobj
-244 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -28170,18 +28245,23 @@ endobj
 /Type /Annot
 >>
 endobj
+244 0 obj
+[237 0 R /XYZ 0 346.6800000000005 null]
+endobj
 245 0 obj
-[238 0 R /XYZ 0 346.6800000000005 null]
+[237 0 R /XYZ 0 290.4000000000005 null]
 endobj
 246 0 obj
-[238 0 R /XYZ 0 290.4000000000005 null]
+<< /Limits [(_route177) (_route187)]
+/Names [(_route177) 195 0 R (_route178) 211 0 R (_route179) 38 0 R (_route180) 45 0 R (_route181) 164 0 R (_route182) 69 0 R (_route183) 75 0 R (_route184) 80 0 R (_route185) 85 0 R (_route186) 65 0 R (_route187) 31 0 R]
+>>
 endobj
 247 0 obj
-[238 0 R /XYZ 0 250.32000000000048 null]
+[237 0 R /XYZ 0 250.32000000000048 null]
 endobj
 248 0 obj
 << /Limits [(_parameters_2) (_parameters_4)]
-/Names [(_parameters_2) 50 0 R (_parameters_20) 203 0 R (_parameters_21) 213 0 R (_parameters_22) 219 0 R (_parameters_23) 224 0 R (_parameters_24) 231 0 R (_parameters_25) 236 0 R (_parameters_26) 242 0 R (_parameters_27) 247 0 R (_parameters_28) 257 0 R (_parameters_29) 267 0 R (_parameters_3) 58 0 R (_parameters_30) 274 0 R (_parameters_4) 70 0 R]
+/Names [(_parameters_2) 50 0 R (_parameters_20) 202 0 R (_parameters_21) 212 0 R (_parameters_22) 218 0 R (_parameters_23) 223 0 R (_parameters_24) 230 0 R (_parameters_25) 235 0 R (_parameters_26) 241 0 R (_parameters_27) 247 0 R (_parameters_28) 257 0 R (_parameters_29) 267 0 R (_parameters_3) 58 0 R (_parameters_30) 274 0 R (_parameters_4) 70 0 R]
 >>
 endobj
 249 0 obj
@@ -28193,7 +28273,7 @@ endobj
 >>
 endobj
 250 0 obj
-[238 0 R /XYZ 0 107.64000000000044 null]
+[237 0 R /XYZ 0 107.64000000000044 null]
 endobj
 251 0 obj
 << /Length 15536
@@ -29332,7 +29412,7 @@ endobj
 /F4.0 36 0 R
 /F3.0 26 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [253 0 R 258 0 R 261 0 R]
@@ -29371,7 +29451,7 @@ endobj
 endobj
 260 0 obj
 << /Limits [(_responses_32) (_responses_7)]
-/Names [(_responses_32) 220 0 R (_responses_33) 227 0 R (_responses_34) 232 0 R (_responses_35) 239 0 R (_responses_36) 243 0 R (_responses_37) 250 0 R (_responses_38) 259 0 R (_responses_39) 269 0 R (_responses_4) 52 0 R (_responses_40) 275 0 R (_responses_5) 62 0 R (_responses_6) 66 0 R (_responses_7) 71 0 R]
+/Names [(_responses_32) 219 0 R (_responses_33) 226 0 R (_responses_34) 231 0 R (_responses_35) 238 0 R (_responses_36) 242 0 R (_responses_37) 250 0 R (_responses_38) 259 0 R (_responses_39) 269 0 R (_responses_4) 52 0 R (_responses_40) 275 0 R (_responses_5) 62 0 R (_responses_6) 66 0 R (_responses_7) 71 0 R]
 >>
 endobj
 261 0 obj
@@ -30726,7 +30806,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 36 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [268 0 R 270 0 R 276 0 R]
@@ -32202,7 +32282,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [282 0 R]
@@ -33782,7 +33862,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 >>
@@ -35471,7 +35551,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 /Annots [291 0 R 292 0 R]
@@ -37053,7 +37133,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 >>
@@ -38717,7 +38797,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 >>
@@ -40282,7 +40362,7 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
 >>
@@ -40294,7 +40374,7 @@ endobj
 [302 0 R /XYZ 0 194.63999999999993 null]
 endobj
 305 0 obj
-<< /Length 21772
+<< /Length 19137
 >>
 stream
 q
@@ -40856,7 +40936,7 @@ ET
 BT
 48.24 509.49600000000015 Td
 /F2.0 18 Tf
-[<332e31312e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<332e31312e2045787465726e616c436f6d706f6e656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -40885,78 +40965,6 @@ f
 269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 492.840 m
@@ -41058,7 +41066,7 @@ S
 BT
 51.24 453.31300000000005 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
+<636f6d706f6e656e744e616d65> Tj
 ET
 
 
@@ -41105,7 +41113,7 @@ S
 BT
 272.17692192000004 446.17300000000006 Td
 /F1.0 10.5 Tf
-<6e756d626572> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -41140,7 +41148,7 @@ S
 BT
 51.24 415.7530000000001 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+<7374617465> Tj
 ET
 
 
@@ -41183,36 +41191,87 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 408.6130000000001 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<45787465726e616c436f6d706f6e656e745374617465> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 359.01600000000013 Td
+/F2.0 18 Tf
+<332e31322e2045787465726e616c436f6d706f6e656e745374617465> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.080 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.080 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 243.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 243.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.400 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 342.360 m
+269.177 342.360 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 319.080 m
+269.177 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 342.610 m
+48.240 318.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 342.610 m
+269.177 318.330 l
 S
 [ ] 0 d
 1 w
@@ -41220,46 +41279,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000004 Td
+51.24 326.61300000000006 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
-ET
-
-
-BT
-51.24 363.913 Td
-ET
-
-
-BT
-51.24 363.913 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 342.360 m
+563.760 342.360 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 319.080 m
+563.760 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 342.610 m
+269.177 318.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 342.610 m
+563.760 318.330 l
 S
 [ ] 0 d
 1 w
@@ -41267,34 +41314,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05300000000005 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+272.17692192000004 326.61300000000006 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 319.080 m
+269.177 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 281.520 m
+269.177 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 319.330 m
+48.240 281.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 319.330 m
+269.177 281.270 l
 S
 [ ] 0 d
 1 w
@@ -41302,19 +41349,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000001 Td
+51.24 302.833 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
+<6465736372697074696f6e> Tj
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 288.553 Td
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 288.553 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41322,26 +41369,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 319.080 m
+563.760 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 281.520 m
+563.760 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 319.330 m
+269.177 281.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 319.330 m
+563.760 281.270 l
 S
 [ ] 0 d
 1 w
@@ -41349,34 +41396,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.4930000000001 Td
+272.17692192000004 295.69300000000004 Td
 /F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 281.520 m
+269.177 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 243.960 m
+269.177 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 281.770 m
+48.240 243.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 281.770 m
+269.177 243.710 l
 S
 [ ] 0 d
 1 w
@@ -41384,19 +41431,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.07300000000004 Td
+51.24 265.2730000000001 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
+<6c6576656c> Tj
 ET
 
 
 BT
-51.24 288.793 Td
+51.24 250.99300000000008 Td
 ET
 
 
 BT
-51.24 288.793 Td
+51.24 250.99300000000008 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41404,26 +41451,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 281.520 m
+563.760 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 243.960 m
+563.760 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 281.770 m
+269.177 243.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 281.770 m
+563.760 243.710 l
 S
 [ ] 0 d
 1 w
@@ -41431,34 +41478,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.93300000000005 Td
+272.17692192000004 258.1330000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 243.960 m
+269.177 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 206.400 m
+269.177 206.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 244.210 m
+48.240 206.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 244.210 m
+269.177 206.150 l
 S
 [ ] 0 d
 1 w
@@ -41466,19 +41513,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000001 Td
+51.24 227.71300000000008 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
+<73746174654e616d65> Tj
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 213.43300000000008 Td
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 213.43300000000008 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41486,26 +41533,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 243.960 m
+563.760 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 206.400 m
+563.760 206.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 244.210 m
+269.177 206.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 244.210 m
+563.760 206.150 l
 S
 [ ] 0 d
 1 w
@@ -41513,34 +41560,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.3730000000001 Td
+272.17692192000004 220.57300000000006 Td
 /F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 170.97600000000006 Td
+/F2.0 18 Tf
+[<332e31332e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.040 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.040 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 55.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 55.920 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 154.320 m
+269.177 154.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 131.040 m
+269.177 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 154.570 m
+48.240 130.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 154.570 m
+269.177 130.290 l
 S
 [ ] 0 d
 1 w
@@ -41548,163 +41630,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.9530000000001 Td
+51.24 138.57300000000006 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
-ET
-
-
-BT
-51.24 213.6730000000001 Td
-ET
-
-
-BT
-51.24 213.6730000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 220.81300000000007 Td
-/F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 190.39300000000006 Td
-/F2.0 10.5 Tf
-<6173496e74> Tj
-ET
-
-
-BT
-51.24 176.11300000000006 Td
-ET
-
-
-BT
-51.24 176.11300000000006 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 183.25300000000004 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+269.177 154.320 m
+563.760 154.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+269.177 131.040 m
+563.760 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+269.177 154.570 m
+269.177 130.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+563.760 154.570 m
+563.760 130.290 l
 S
 [ ] 0 d
 1 w
@@ -41712,89 +41665,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000006 Td
+272.17692192000004 138.57300000000006 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 138.55300000000005 Td
-ET
-
-
-BT
-51.24 138.55300000000005 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 145.69300000000004 Td
-/F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<536368656d61> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 131.040 m
+269.177 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 93.480 m
+269.177 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 131.290 m
+48.240 93.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 131.290 m
+269.177 93.230 l
 S
 [ ] 0 d
 1 w
@@ -41802,19 +41700,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000004 Td
+51.24 114.79300000000005 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 100.99300000000004 Td
+51.24 100.51300000000005 Td
 ET
 
 
 BT
-51.24 100.99300000000004 Td
+51.24 100.51300000000005 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41822,69 +41720,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 131.040 m
+563.760 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 93.480 m
+563.760 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 131.290 m
+269.177 93.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 131.290 m
+563.760 93.230 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.13300000000004 Td
+272.17692192000004 107.65300000000005 Td
 /F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+<6e756d626572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 93.480 m
+269.177 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 55.920 m
+269.177 55.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 93.730 m
+48.240 55.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 93.730 m
+269.177 55.670 l
 S
 [ ] 0 d
 1 w
@@ -41892,19 +41782,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000004 Td
+51.24 77.23300000000005 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 63.433000000000035 Td
+51.24 62.953000000000046 Td
 ET
 
 
 BT
-51.24 63.433000000000035 Td
+51.24 62.953000000000046 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41912,46 +41802,38 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 93.480 m
+563.760 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 55.920 m
+563.760 55.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 93.730 m
+269.177 55.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 93.730 m
+563.760 55.670 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.57300000000004 Td
+272.17692192000004 70.09300000000005 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<696e7465676572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -41987,10 +41869,10 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [307 0 R 309 0 R 310 0 R 311 0 R]
+/Annots [307 0 R 309 0 R]
 >>
 endobj
 307 0 obj
@@ -42006,30 +41888,20 @@ endobj
 endobj
 309 0 obj
 << /Border [0 0 0]
-/Dest (_jsonarray)
+/Dest (_externalcomponentstate)
 /Subtype /Link
-/Rect [272.17692192000004 142.62700000000007 322.17751176375003 156.90700000000004]
+/Rect [272.17692192000004 405.5470000000001 397.34742192000004 419.8270000000001]
 /Type /Annot
 >>
 endobj
 310 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 105.06700000000004 314.65992192000004 119.34700000000004]
-/Type /Annot
->>
+[306 0 R /XYZ 0 382.4400000000001 null]
 endobj
 311 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 67.50700000000003 325.32792192000005 81.78700000000003]
-/Type /Annot
->>
+[306 0 R /XYZ 0 194.40000000000006 null]
 endobj
 312 0 obj
-<< /Length 21161
+<< /Length 22907
 >>
 stream
 q
@@ -42114,6 +41986,78 @@ f
 269.177 394.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 94.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 94.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -42216,7 +42160,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
@@ -42259,21 +42203,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42306,17 +42242,17 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42351,9 +42287,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
 0.000 0.000 0.000 scn
@@ -42388,7 +42324,7 @@ S
 BT
 51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
@@ -42431,21 +42367,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42478,7 +42406,7 @@ S
 BT
 51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
+<6173446f75626c65> Tj
 ET
 
 
@@ -42525,7 +42453,7 @@ S
 BT
 272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -42560,7 +42488,7 @@ S
 BT
 51.24 566.233 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
+<6173466c6f6174> Tj
 ET
 
 
@@ -42607,7 +42535,7 @@ S
 BT
 272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<6e756d6265722028666c6f617429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -42642,17 +42570,17 @@ S
 BT
 51.24 528.673 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 514.3929999999999 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 514.3929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42687,9 +42615,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -42722,19 +42650,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.1130000000001 Td
+51.24 491.11299999999994 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 476.8330000000001 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 476.8330000000001 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42767,13 +42695,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.9730000000001 Td
+272.17692192000004 483.97299999999996 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42804,19 +42740,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55300000000017 Td
+51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 439.27300000000014 Td
+51.24 439.2729999999999 Td
 ET
 
 
 BT
-51.24 439.27300000000014 Td
+51.24 439.2729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42849,13 +42785,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.4130000000002 Td
+272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42886,19 +42830,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.9930000000002 Td
+51.24 415.99299999999994 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
+<61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 401.7130000000002 Td
+51.24 401.71299999999997 Td
 ET
 
 
 BT
-51.24 401.7130000000002 Td
+51.24 401.71299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42931,111 +42875,134 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.85300000000024 Td
+272.17692192000004 408.85299999999995 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.930 m
+48.240 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24 359.25600000000026 Td
-/F2.0 18 Tf
-<332e31322e204a736f6e4e756c6c> Tj
+51.24 378.43299999999994 Td
+/F2.0 10.5 Tf
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 364.1529999999999 Td
+ET
+
+
+BT
+51.24 364.1529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.320 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.320 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
-f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
-f
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.930 m
+563.760 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 371.29299999999995 Td
+/F1.0 10.5 Tf
+<4a736f6e5072696d6974697665> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.600 m
-269.177 342.600 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.850 m
-48.240 318.570 l
+48.240 357.370 m
+48.240 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.850 m
-269.177 318.570 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 1 w
@@ -43043,34 +43010,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 326.8530000000002 Td
+51.24 340.87299999999993 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<61734c6f6e67> Tj
+ET
+
+
+BT
+51.24 326.59299999999996 Td
+ET
+
+
+BT
+51.24 326.59299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.600 m
-563.760 342.600 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.850 m
-269.177 318.570 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 342.850 m
-563.760 318.570 l
+563.760 357.370 m
+563.760 319.310 l
 S
 [ ] 0 d
 1 w
@@ -43078,34 +43057,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 326.8530000000002 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 333.73299999999995 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 319.810 m
+48.240 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 1 w
@@ -43113,19 +43092,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.07300000000015 Td
+51.24 303.31299999999993 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 288.7930000000001 Td
+51.24 289.0329999999999 Td
 ET
 
 
 BT
-51.24 288.7930000000001 Td
+51.24 289.0329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43133,61 +43112,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 319.810 m
+563.760 281.750 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 295.93300000000016 Td
+272.17692192000004 296.17299999999994 Td
 /F1.0 10.5 Tf
-<6e756d626572> Tj
+<4e756d626572> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 282.250 m
+48.240 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 1 w
@@ -43195,19 +43182,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000002 Td
+51.24 265.7529999999999 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 251.2330000000002 Td
+51.24 251.47299999999987 Td
 ET
 
 
 BT
-51.24 251.2330000000002 Td
+51.24 251.47299999999987 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43215,26 +43202,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 282.250 m
+563.760 244.190 l
 S
 [ ] 0 d
 1 w
@@ -43242,34 +43229,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.3730000000002 Td
+272.17692192000004 258.6129999999999 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 244.690 m
+48.240 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 1 w
@@ -43277,19 +43264,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.9530000000002 Td
+51.24 228.19299999999996 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 213.6730000000002 Td
+51.24 213.91299999999995 Td
 ET
 
 
 BT
-51.24 213.6730000000002 Td
+51.24 213.91299999999995 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43297,26 +43284,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 244.690 m
+563.760 206.630 l
 S
 [ ] 0 d
 1 w
@@ -43324,34 +43311,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.8130000000002 Td
+272.17692192000004 221.05299999999994 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 169.320 m
+269.177 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 207.130 m
+48.240 169.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 207.130 m
+269.177 169.070 l
 S
 [ ] 0 d
 1 w
@@ -43359,19 +43346,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.3930000000002 Td
+51.24 190.633 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 176.1130000000002 Td
+51.24 176.353 Td
 ET
 
 
 BT
-51.24 176.1130000000002 Td
+51.24 176.353 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43379,26 +43366,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 169.320 m
+563.760 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 207.130 m
+269.177 169.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 207.130 m
+563.760 169.070 l
 S
 [ ] 0 d
 1 w
@@ -43406,34 +43393,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000018 Td
+272.17692192000004 183.493 Td
 /F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 169.320 m
+269.177 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 131.760 m
+269.177 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 169.570 m
+48.240 131.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 169.570 m
+269.177 131.510 l
 S
 [ ] 0 d
 1 w
@@ -43441,19 +43428,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.8330000000002 Td
+51.24 153.07300000000006 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
+<6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 138.5530000000002 Td
+51.24 138.79300000000006 Td
 ET
 
 
 BT
-51.24 138.5530000000002 Td
+51.24 138.79300000000006 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43461,26 +43448,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 169.320 m
+563.760 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 131.760 m
+563.760 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 169.570 m
+269.177 131.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 169.570 m
+563.760 131.510 l
 S
 [ ] 0 d
 1 w
@@ -43488,34 +43475,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.69300000000018 Td
+272.17692192000004 145.93300000000005 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 131.760 m
+269.177 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 94.200 m
+269.177 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 132.010 m
+48.240 93.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 132.010 m
+269.177 93.950 l
 S
 [ ] 0 d
 1 w
@@ -43523,19 +43510,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000018 Td
+51.24 115.5130000000001 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
+<6a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 100.99300000000018 Td
+51.24 101.2330000000001 Td
 ET
 
 
 BT
-51.24 100.99300000000018 Td
+51.24 101.2330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43543,26 +43530,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 131.760 m
+563.760 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 94.200 m
+563.760 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 132.010 m
+269.177 93.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 132.010 m
+563.760 93.950 l
 S
 [ ] 0 d
 1 w
@@ -43570,34 +43557,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13300000000018 Td
+272.17692192000004 108.3730000000001 Td
 /F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 94.200 m
+269.177 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 56.640 m
+269.177 56.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 94.450 m
+48.240 56.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 94.450 m
+269.177 56.390 l
 S
 [ ] 0 d
 1 w
@@ -43605,19 +43592,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000018 Td
+51.24 77.95300000000016 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
+<6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 63.43300000000018 Td
+51.24 63.67300000000016 Td
 ET
 
 
 BT
-51.24 63.43300000000018 Td
+51.24 63.67300000000016 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43625,26 +43612,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 94.200 m
+563.760 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 56.640 m
+563.760 56.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 94.450 m
+269.177 56.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 94.450 m
+563.760 56.390 l
 S
 [ ] 0 d
 1 w
@@ -43652,9 +43639,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.57300000000018 Td
+272.17692192000004 70.81300000000016 Td
 /F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -43692,172 +43679,236 @@ endobj
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [314 0 R 315 0 R]
+/Annots [314 0 R 315 0 R 316 0 R 317 0 R 318 0 R]
 >>
 endobj
 314 0 obj
 << /Border [0 0 0]
-/Dest (_jsonprimitive)
+/Dest (_jsonarray)
 /Subtype /Link
-/Rect [272.17692192000004 706.267 340.1224219200001 720.547]
+/Rect [272.17692192000004 480.9069999999999 322.17751176375003 495.18699999999995]
 /Type /Annot
 >>
 endobj
 315 0 obj
 << /Border [0 0 0]
-/Dest (_number)
+/Dest (_jsonnull)
 /Subtype /Link
-/Rect [272.17692192000004 631.147 313.75692192 645.427]
+/Rect [272.17692192000004 443.3469999999999 314.65992192000004 457.62699999999995]
 /Type /Annot
 >>
 endobj
 316 0 obj
-[313 0 R /XYZ 0 382.68000000000023 null]
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 405.7869999999999 325.32792192000005 420.06699999999995]
+/Type /Annot
+>>
 endobj
 317 0 obj
-<< /Length 21652
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 368.2269999999999 340.1224219200001 382.50699999999995]
+/Type /Annot
+>>
+endobj
+318 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 293.1069999999999 313.75692192 307.38699999999994]
+/Type /Annot
+>>
+endobj
+319 0 obj
+<< /Length 21618
 >>
 stream
 q
 /DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
+/F2.0 18 Tf
+<332e31342e204a736f6e4e756c6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
+48.240 695.040 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
+269.177 695.040 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
+48.240 657.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
+269.177 657.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
+48.240 619.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
+269.177 619.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
+48.240 582.360 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
+269.177 582.360 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
+48.240 544.800 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
+269.177 544.800 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
+48.240 507.240 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
+269.177 507.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
+48.240 469.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
+269.177 469.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
+48.240 432.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
+269.177 432.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
+48.240 394.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
+269.177 394.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
+48.240 357.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
+269.177 357.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
+48.240 319.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
+269.177 319.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
+48.240 281.880 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
+269.177 281.880 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
+48.240 244.320 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
+269.177 244.320 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 244.440 220.937 37.560 re
+48.240 206.760 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.440 294.583 37.560 re
+269.177 206.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 94.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 94.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 718.320 m
+269.177 718.320 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 695.040 m
+269.177 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 718.570 m
+48.240 694.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 718.570 m
+269.177 694.290 l
 S
 [ ] 0 d
 1 w
@@ -43865,7 +43916,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 702.573 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -43873,26 +43924,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 718.320 m
+563.760 718.320 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 695.040 m
+563.760 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 718.570 m
+269.177 694.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 718.570 m
+563.760 694.290 l
 S
 [ ] 0 d
 1 w
@@ -43900,7 +43951,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+272.17692192000004 702.573 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -43908,26 +43959,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 695.040 m
+269.177 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 657.480 m
+269.177 657.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 695.290 m
+48.240 657.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 695.290 m
+269.177 657.230 l
 S
 [ ] 0 d
 1 w
@@ -43935,19 +43986,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 678.7930000000001 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 664.513 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 664.513 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43955,26 +44006,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 695.040 m
+563.760 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 657.480 m
+563.760 657.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 695.290 m
+269.177 657.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 695.290 m
+563.760 657.230 l
 S
 [ ] 0 d
 1 w
@@ -43982,34 +44033,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 671.653 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<6e756d626572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 657.480 m
+269.177 657.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 619.920 m
+269.177 619.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 657.730 m
+48.240 619.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 657.730 m
+269.177 619.670 l
 S
 [ ] 0 d
 1 w
@@ -44017,19 +44068,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 641.233 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 626.953 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 626.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44037,69 +44088,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 657.480 m
+563.760 657.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 619.920 m
+563.760 619.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 657.730 m
+269.177 619.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 657.730 m
+563.760 619.670 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 634.093 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<696e7465676572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 619.920 m
+269.177 619.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 582.360 m
+269.177 582.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 620.170 m
+48.240 582.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 620.170 m
+269.177 582.110 l
 S
 [ ] 0 d
 1 w
@@ -44107,19 +44150,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 603.673 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 589.393 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 589.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44127,69 +44170,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 619.920 m
+563.760 619.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 582.360 m
+563.760 582.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 620.170 m
+269.177 582.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 620.170 m
+563.760 582.110 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 596.533 Td
 /F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 582.360 m
+269.177 582.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 544.800 m
+269.177 544.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 582.610 m
+48.240 544.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 582.610 m
+269.177 544.550 l
 S
 [ ] 0 d
 1 w
@@ -44197,19 +44232,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 566.113 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 551.833 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 551.833 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44217,69 +44252,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 582.360 m
+563.760 582.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 544.800 m
+563.760 544.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 582.610 m
+269.177 544.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 582.610 m
+563.760 544.550 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 558.973 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 544.800 m
+269.177 544.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 507.240 m
+269.177 507.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 545.050 m
+48.240 506.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 545.050 m
+269.177 506.990 l
 S
 [ ] 0 d
 1 w
@@ -44287,19 +44314,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 528.5530000000001 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 514.273 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 514.273 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44307,69 +44334,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 544.800 m
+563.760 544.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 507.240 m
+563.760 507.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 545.050 m
+269.177 506.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 545.050 m
+563.760 506.990 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 521.413 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 507.240 m
+269.177 507.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 469.680 m
+269.177 469.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 507.490 m
+48.240 469.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 507.490 m
+269.177 469.430 l
 S
 [ ] 0 d
 1 w
@@ -44377,19 +44396,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 490.993 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+<6173446f75626c65> Tj
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 476.71299999999997 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 476.71299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44397,26 +44416,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 507.240 m
+563.760 507.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 469.680 m
+563.760 469.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 507.490 m
+269.177 469.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 507.490 m
+563.760 469.430 l
 S
 [ ] 0 d
 1 w
@@ -44424,34 +44443,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 483.853 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 469.680 m
+269.177 469.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 432.120 m
+269.177 432.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 469.930 m
+48.240 431.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 469.930 m
+269.177 431.870 l
 S
 [ ] 0 d
 1 w
@@ -44459,19 +44478,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+51.24 453.43300000000005 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 439.153 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 439.153 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44479,69 +44498,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 469.680 m
+563.760 469.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 432.120 m
+563.760 432.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 469.930 m
+269.177 431.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 469.930 m
+563.760 431.870 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 446.29300000000006 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<6e756d6265722028666c6f617429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 432.120 m
+269.177 432.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
-S
+48.240 394.560 m
+269.177 394.560 l
+S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 432.370 m
+48.240 394.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 432.370 m
+269.177 394.310 l
 S
 [ ] 0 d
 1 w
@@ -44549,19 +44560,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55299999999994 Td
+51.24 415.873 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 401.59299999999996 Td
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 401.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44569,26 +44580,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 432.120 m
+563.760 432.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 394.560 m
+563.760 394.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 432.370 m
+269.177 394.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 432.370 m
+563.760 394.310 l
 S
 [ ] 0 d
 1 w
@@ -44596,7 +44607,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.41299999999995 Td
+272.17692192000004 408.733 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -44604,26 +44615,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 394.560 m
+269.177 394.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 357.000 m
+269.177 357.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 394.810 m
+48.240 356.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 394.810 m
+269.177 356.750 l
 S
 [ ] 0 d
 1 w
@@ -44631,19 +44642,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 378.313 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 364.033 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 364.033 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44651,61 +44662,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 394.560 m
+563.760 394.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 357.000 m
+563.760 357.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 394.810 m
+269.177 356.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 394.810 m
+563.760 356.750 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.853 Td
+272.17692192000004 371.173 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 357.000 m
+269.177 357.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 319.440 m
+269.177 319.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 357.250 m
+48.240 319.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 357.250 m
+269.177 319.190 l
 S
 [ ] 0 d
 1 w
@@ -44713,19 +44732,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.43300000000005 Td
+51.24 340.753 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 326.47299999999996 Td
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 326.47299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44733,61 +44752,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 357.000 m
+563.760 357.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 319.440 m
+563.760 319.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 357.250 m
+269.177 319.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 357.250 m
+563.760 319.190 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 371.29300000000006 Td
+272.17692192000004 333.613 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 319.440 m
+269.177 319.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 281.880 m
+269.177 281.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+48.240 319.690 m
+48.240 281.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 319.690 m
+269.177 281.630 l
 S
 [ ] 0 d
 1 w
@@ -44795,19 +44822,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.8730000000001 Td
+51.24 303.193 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 326.5930000000001 Td
+51.24 288.913 Td
 ET
 
 
 BT
-51.24 326.5930000000001 Td
+51.24 288.913 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44815,61 +44842,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 319.440 m
+563.760 319.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 281.880 m
+563.760 281.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 319.690 m
+269.177 281.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 319.690 m
+563.760 281.630 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.7330000000001 Td
+272.17692192000004 296.053 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 281.880 m
+269.177 281.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 244.320 m
+269.177 244.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 282.130 m
+48.240 244.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 282.130 m
+269.177 244.070 l
 S
 [ ] 0 d
 1 w
@@ -44877,19 +44912,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.31300000000016 Td
+51.24 265.633 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<61734a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 289.03300000000013 Td
+51.24 251.35299999999998 Td
 ET
 
 
 BT
-51.24 289.03300000000013 Td
+51.24 251.35299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44897,61 +44932,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 281.880 m
+563.760 281.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 244.320 m
+563.760 244.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 282.130 m
+269.177 244.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+563.760 282.130 m
+563.760 244.070 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 296.1730000000002 Td
+272.17692192000004 258.493 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 244.320 m
+269.177 244.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+48.240 206.760 m
+269.177 206.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.250 m
-48.240 244.190 l
+48.240 244.570 m
+48.240 206.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+269.177 244.570 m
+269.177 206.510 l
 S
 [ ] 0 d
 1 w
@@ -44959,19 +45002,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.7530000000002 Td
+51.24 228.073 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
+<61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 251.4730000000002 Td
+51.24 213.793 Td
 ET
 
 
 BT
-51.24 251.4730000000002 Td
+51.24 213.793 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44979,26 +45022,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 244.320 m
+563.760 244.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+269.177 206.760 m
+563.760 206.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+269.177 244.570 m
+269.177 206.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.250 m
-563.760 244.190 l
+563.760 244.570 m
+563.760 206.510 l
 S
 [ ] 0 d
 1 w
@@ -45006,77 +45049,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.6130000000002 Td
+272.17692192000004 220.933 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 209.01600000000022 Td
-/F2.0 18 Tf
-<332e31332e204a736f6e4f626a656374> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.080 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.080 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 192.360 m
-269.177 192.360 l
+48.240 206.760 m
+269.177 206.760 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 169.200 m
+269.177 169.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 192.610 m
-48.240 168.330 l
+48.240 207.010 m
+48.240 168.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 192.610 m
-269.177 168.330 l
+269.177 207.010 m
+269.177 168.950 l
 S
 [ ] 0 d
 1 w
@@ -45084,69 +45084,89 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 176.61300000000023 Td
+51.24 190.513 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<61734e756d626572> Tj
+ET
+
+
+BT
+51.24 176.233 Td
+ET
+
+
+BT
+51.24 176.233 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 192.360 m
-563.760 192.360 l
+269.177 206.760 m
+563.760 206.760 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 169.200 m
+563.760 169.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 192.610 m
-269.177 168.330 l
+269.177 207.010 m
+269.177 168.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 192.610 m
-563.760 168.330 l
+563.760 207.010 m
+563.760 168.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 176.61300000000023 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 183.373 Td
+/F1.0 10.5 Tf
+<4e756d626572> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 169.200 m
+269.177 169.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 131.640 m
+269.177 131.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 169.450 m
+48.240 131.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 169.450 m
+269.177 131.390 l
 S
 [ ] 0 d
 1 w
@@ -45154,19 +45174,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000023 Td
+51.24 152.95299999999995 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 138.55300000000022 Td
+51.24 138.67299999999994 Td
 ET
 
 
 BT
-51.24 138.55300000000022 Td
+51.24 138.67299999999994 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45174,26 +45194,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 169.200 m
+563.760 169.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 131.640 m
+563.760 131.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 169.450 m
+269.177 131.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 169.450 m
+563.760 131.390 l
 S
 [ ] 0 d
 1 w
@@ -45201,34 +45221,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6930000000002 Td
+272.17692192000004 145.81299999999993 Td
 /F1.0 10.5 Tf
-<6e756d626572> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 131.640 m
+269.177 131.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 94.080 m
+269.177 94.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 131.890 m
+48.240 93.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 131.890 m
+269.177 93.830 l
 S
 [ ] 0 d
 1 w
@@ -45236,19 +45256,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000021 Td
+51.24 115.39299999999999 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 100.99300000000021 Td
+51.24 101.11299999999999 Td
 ET
 
 
 BT
-51.24 100.99300000000021 Td
+51.24 101.11299999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45256,26 +45276,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 131.640 m
+563.760 131.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 94.080 m
+563.760 94.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 131.890 m
+269.177 93.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 131.890 m
+563.760 93.830 l
 S
 [ ] 0 d
 1 w
@@ -45283,34 +45303,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13300000000021 Td
+272.17692192000004 108.25299999999999 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 94.080 m
+269.177 94.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 56.520 m
+269.177 56.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 94.330 m
+48.240 56.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 94.330 m
+269.177 56.270 l
 S
 [ ] 0 d
 1 w
@@ -45318,19 +45338,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.7130000000002 Td
+51.24 77.83300000000004 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 63.433000000000206 Td
+51.24 63.55300000000004 Td
 ET
 
 
 BT
-51.24 63.433000000000206 Td
+51.24 63.55300000000004 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45338,26 +45358,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 94.080 m
+563.760 94.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 56.520 m
+563.760 56.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 94.330 m
+269.177 56.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 94.330 m
+563.760 56.270 l
 S
 [ ] 0 d
 1 w
@@ -45365,7 +45385,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.5730000000002 Td
+272.17692192000004 70.69300000000004 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -45395,67 +45415,67 @@ Q
 
 endstream
 endobj
-318 0 obj
+320 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 317 0 R
+/Contents 319 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [319 0 R 320 0 R 321 0 R 322 0 R 323 0 R]
+/Annots [322 0 R 323 0 R 324 0 R 325 0 R 326 0 R]
 >>
 endobj
-319 0 obj
+321 0 obj
+[320 0 R /XYZ 0 792.0 null]
+endobj
+322 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
-/Rect [272.17692192000004 668.7070000000001 322.17751176375003 682.9870000000001]
+/Rect [272.17692192000004 368.10699999999997 322.17751176375003 382.387]
 /Type /Annot
 >>
 endobj
-320 0 obj
+323 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
-/Rect [272.17692192000004 631.147 314.65992192000004 645.427]
+/Rect [272.17692192000004 330.54699999999997 314.65992192000004 344.827]
 /Type /Annot
 >>
 endobj
-321 0 obj
+324 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 593.587 325.32792192000005 607.867]
+/Rect [272.17692192000004 292.98699999999997 325.32792192000005 307.267]
 /Type /Annot
 >>
 endobj
-322 0 obj
+325 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [272.17692192000004 556.027 340.1224219200001 570.307]
+/Rect [272.17692192000004 255.427 340.1224219200001 269.707]
 /Type /Annot
 >>
 endobj
-323 0 obj
+326 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
-/Rect [272.17692192000004 480.907 313.75692192 495.187]
+/Rect [272.17692192000004 180.30700000000002 313.75692192 194.587]
 /Type /Annot
 >>
 endobj
-324 0 obj
-[318 0 R /XYZ 0 232.44000000000023 null]
-endobj
-325 0 obj
-<< /Length 21564
+327 0 obj
+<< /Length 21697
 >>
 stream
 q
@@ -45492,118 +45512,6 @@ f
 269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 131.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 94.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 94.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -45706,7 +45614,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
+<6a736f6e4e756c6c> Tj
 ET
 
 
@@ -45753,7 +45661,7 @@ S
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -45788,7 +45696,7 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
+<6a736f6e4f626a656374> Tj
 ET
 
 
@@ -45835,7 +45743,7 @@ S
 BT
 272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -45870,17 +45778,17 @@ S
 BT
 51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
+<6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 627.0730000000001 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 627.0730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45915,34 +45823,157 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 634.2130000000001 Td
 /F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 584.6160000000002 Td
+/F2.0 18 Tf
+<332e31352e204a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.680 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.680 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 507.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 507.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 469.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 469.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 432.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 432.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 394.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 394.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 567.960 m
+269.177 567.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 568.210 m
+48.240 543.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 568.210 m
+269.177 543.930 l
 S
 [ ] 0 d
 1 w
@@ -45950,46 +45981,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7930000000001 Td
+51.24 552.2130000000002 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
-ET
-
-
-BT
-51.24 589.513 Td
-ET
-
-
-BT
-51.24 589.513 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 567.960 m
+563.760 567.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 568.210 m
+269.177 543.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 568.210 m
+563.760 543.930 l
 S
 [ ] 0 d
 1 w
@@ -45997,34 +46016,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.653 Td
-/F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+272.17692192000004 552.2130000000002 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -46032,19 +46051,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 514.1530000000002 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 514.1530000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46052,26 +46071,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -46079,34 +46098,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 521.2930000000002 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<6e756d626572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -46114,19 +46133,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 490.8730000000002 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 476.5930000000002 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 476.5930000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46134,69 +46153,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 483.73300000000023 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<696e7465676572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -46204,19 +46215,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+51.24 453.3130000000003 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 439.03300000000024 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 439.03300000000024 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46224,69 +46235,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 446.1730000000003 Td
 /F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -46294,19 +46297,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.553 Td
+51.24 415.7530000000002 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 401.4730000000002 Td
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 401.4730000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46314,69 +46317,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.413 Td
+272.17692192000004 408.6130000000002 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -46384,19 +46379,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 378.19300000000027 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 363.91300000000024 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 363.91300000000024 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46404,69 +46399,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.853 Td
+272.17692192000004 371.0530000000003 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -46474,19 +46461,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.433 Td
+51.24 340.6330000000002 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+<6173446f75626c65> Tj
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 326.3530000000002 Td
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 326.3530000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46494,26 +46481,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -46521,34 +46508,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.293 Td
+272.17692192000004 333.4930000000002 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -46556,19 +46543,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.873 Td
+51.24 303.07300000000026 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+51.24 288.79300000000023 Td
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+51.24 288.79300000000023 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46576,69 +46563,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.733 Td
+272.17692192000004 295.9330000000003 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<6e756d6265722028666c6f617429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -46646,19 +46625,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.31299999999993 Td
+51.24 265.5130000000002 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 289.0329999999999 Td
+51.24 251.2330000000002 Td
 ET
 
 
 BT
-51.24 289.0329999999999 Td
+51.24 251.2330000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46666,26 +46645,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -46693,7 +46672,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.17299999999994 Td
+272.17692192000004 258.3730000000002 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -46701,26 +46680,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.250 m
-48.240 244.190 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -46728,19 +46707,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.753 Td
+51.24 227.95300000000023 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 251.47299999999998 Td
+51.24 213.67300000000023 Td
 ET
 
 
 BT
-51.24 251.47299999999998 Td
+51.24 213.67300000000023 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46748,61 +46727,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.250 m
-563.760 244.190 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.613 Td
+272.17692192000004 220.81300000000022 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.690 m
-48.240 206.630 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -46810,19 +46797,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 228.19300000000007 Td
+51.24 190.39300000000023 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 213.91300000000007 Td
+51.24 176.11300000000023 Td
 ET
 
 
 BT
-51.24 213.91300000000007 Td
+51.24 176.11300000000023 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46830,61 +46817,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.690 m
-563.760 206.630 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 221.05300000000005 Td
+272.17692192000004 183.2530000000002 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 207.130 m
-48.240 169.070 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -46892,19 +46887,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.63300000000012 Td
+51.24 152.83300000000023 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 176.35300000000012 Td
+51.24 138.55300000000022 Td
 ET
 
 
 BT
-51.24 176.35300000000012 Td
+51.24 138.55300000000022 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46912,61 +46907,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 207.130 m
-563.760 169.070 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 183.4930000000001 Td
+272.17692192000004 145.6930000000002 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.760 m
-269.177 131.760 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.570 m
-48.240 131.510 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.570 m
-269.177 131.510 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -46974,19 +46977,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 153.07300000000018 Td
+51.24 115.27300000000021 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<61734a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 138.79300000000018 Td
+51.24 100.99300000000021 Td
 ET
 
 
 BT
-51.24 138.79300000000018 Td
+51.24 100.99300000000021 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46994,61 +46997,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.760 m
-563.760 131.760 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.570 m
-269.177 131.510 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.570 m
-563.760 131.510 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 145.93300000000016 Td
+272.17692192000004 108.13300000000021 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.760 m
-269.177 131.760 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.200 m
-269.177 94.200 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 132.010 m
-48.240 93.950 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 132.010 m
-269.177 93.950 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -47056,19 +47067,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.51300000000022 Td
+51.24 77.7130000000002 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
+<61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 101.23300000000022 Td
+51.24 63.433000000000206 Td
 ET
 
 
 BT
-51.24 101.23300000000022 Td
+51.24 63.433000000000206 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47076,26 +47087,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.760 m
-563.760 131.760 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.200 m
-563.760 94.200 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 132.010 m
-269.177 93.950 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 132.010 m
-563.760 93.950 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
@@ -47103,9 +47114,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.37300000000022 Td
+272.17692192000004 70.5730000000002 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -47133,281 +47144,185 @@ Q
 
 endstream
 endobj
-326 0 obj
+328 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 325 0 R
+/Contents 327 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [327 0 R 328 0 R 329 0 R 330 0 R 331 0 R]
+/Annots [330 0 R 331 0 R 332 0 R 333 0 R]
 >>
 endobj
-327 0 obj
+329 0 obj
+[328 0 R /XYZ 0 608.0400000000002 null]
+endobj
+330 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
-/Rect [272.17692192000004 518.4670000000001 322.17751176375003 532.7470000000001]
+/Rect [272.17692192000004 217.74700000000024 322.17751176375003 232.0270000000002]
 /Type /Annot
 >>
 endobj
-328 0 obj
+331 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
-/Rect [272.17692192000004 480.907 314.65992192000004 495.187]
+/Rect [272.17692192000004 180.18700000000024 314.65992192000004 194.4670000000002]
 /Type /Annot
 >>
 endobj
-329 0 obj
+332 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 443.347 325.32792192000005 457.627]
+/Rect [272.17692192000004 142.62700000000024 325.32792192000005 156.9070000000002]
 /Type /Annot
 >>
 endobj
-330 0 obj
+333 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [272.17692192000004 405.787 340.1224219200001 420.067]
-/Type /Annot
->>
-endobj
-331 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 330.667 313.75692192 344.947]
+/Rect [272.17692192000004 105.0670000000002 340.1224219200001 119.34700000000021]
 /Type /Annot
 >>
 endobj
-332 0 obj
-<< /Length 21592
+334 0 obj
+<< /Length 21285
 >>
 stream
 q
 /DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 734.976 Td
-/F2.0 18 Tf
-<332e31342e204a736f6e5072696d6974697665> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.040 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.040 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 657.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 657.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 619.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 619.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 582.360 220.937 37.560 re
+48.240 732.720 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 582.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 544.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 544.800 294.583 37.560 re
+269.177 732.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 507.240 220.937 37.560 re
+48.240 695.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 507.240 294.583 37.560 re
+269.177 695.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 469.680 220.937 37.560 re
+48.240 657.600 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 469.680 294.583 37.560 re
+269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 432.120 220.937 37.560 re
+48.240 620.040 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 432.120 294.583 37.560 re
+269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 394.560 220.937 37.560 re
+48.240 582.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 394.560 294.583 37.560 re
+269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 357.000 220.937 37.560 re
+48.240 544.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 357.000 294.583 37.560 re
+269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 319.440 220.937 37.560 re
+48.240 507.360 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 319.440 294.583 37.560 re
+269.177 507.360 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 281.880 220.937 37.560 re
+48.240 469.800 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 281.880 294.583 37.560 re
+269.177 469.800 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 94.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 94.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 718.320 m
-269.177 718.320 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 695.040 m
-269.177 695.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 718.570 m
-48.240 694.290 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 718.570 m
-269.177 694.290 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 702.573 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.320 m
-563.760 718.320 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 695.040 m
-563.760 695.040 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.570 m
-269.177 694.290 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 718.570 m
-563.760 694.290 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -47415,7 +47330,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 702.573 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -47423,26 +47338,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.040 m
-269.177 695.040 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.480 m
-269.177 657.480 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.290 m
-48.240 657.230 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.290 m
-269.177 657.230 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -47450,19 +47365,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.7930000000001 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 664.513 Td
+51.24 702.1929999999999 Td
 ET
 
 
 BT
-51.24 664.513 Td
+51.24 702.1929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47470,61 +47385,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.040 m
-563.760 695.040 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.480 m
-563.760 657.480 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.290 m
-269.177 657.230 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.290 m
-563.760 657.230 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.653 Td
+272.17692192000004 709.3329999999999 Td
 /F1.0 10.5 Tf
-<6e756d626572> Tj
+<4e756d626572> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.480 m
-269.177 657.480 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.920 m
-269.177 619.920 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.730 m
-48.240 619.670 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.730 m
-269.177 619.670 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -47532,19 +47455,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.233 Td
+51.24 678.9129999999998 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 626.953 Td
+51.24 664.6329999999998 Td
 ET
 
 
 BT
-51.24 626.953 Td
+51.24 664.6329999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47552,26 +47475,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.480 m
-563.760 657.480 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.920 m
-563.760 619.920 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.730 m
-269.177 619.670 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.730 m
-563.760 619.670 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -47579,34 +47502,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.093 Td
+272.17692192000004 671.7729999999998 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.920 m
-269.177 619.920 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.360 m
-269.177 582.360 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.170 m
-48.240 582.110 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.170 m
-269.177 582.110 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -47614,19 +47537,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.673 Td
+51.24 641.3529999999998 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 589.393 Td
+51.24 627.0729999999999 Td
 ET
 
 
 BT
-51.24 589.393 Td
+51.24 627.0729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47634,26 +47557,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.920 m
-563.760 619.920 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.360 m
-563.760 582.360 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.170 m
-269.177 582.110 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.170 m
-563.760 582.110 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -47661,34 +47584,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.533 Td
+272.17692192000004 634.2129999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.360 m
-269.177 582.360 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.800 m
-269.177 544.800 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.610 m
-48.240 544.550 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.610 m
-269.177 544.550 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -47696,19 +47619,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.113 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 551.833 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 551.833 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47716,26 +47639,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.360 m
-563.760 582.360 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.800 m
-563.760 544.800 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.610 m
-269.177 544.550 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.610 m
-563.760 544.550 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -47743,34 +47666,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 558.973 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.800 m
-269.177 544.800 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.240 m
-269.177 507.240 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.050 m
-48.240 506.990 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.050 m
-269.177 506.990 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -47778,19 +47701,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.5530000000001 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
+<6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 514.273 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 514.273 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47798,26 +47721,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.800 m
-563.760 544.800 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.240 m
-563.760 507.240 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.050 m
-269.177 506.990 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.050 m
-563.760 506.990 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -47825,34 +47748,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.413 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.240 m
-269.177 507.240 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.680 m
-269.177 469.680 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.490 m
-48.240 469.430 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.490 m
-269.177 469.430 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -47860,19 +47783,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.993 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
+<6a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 476.71299999999997 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 476.71299999999997 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47880,26 +47803,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.240 m
-563.760 507.240 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.680 m
-563.760 469.680 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.490 m
-269.177 469.430 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.490 m
-563.760 469.430 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -47907,34 +47830,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.853 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.680 m
-269.177 469.680 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.120 m
-269.177 432.120 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.930 m
-48.240 431.870 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.930 m
-269.177 431.870 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -47942,19 +47865,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.43300000000005 Td
+51.24 491.1130000000001 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
+<6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 439.153 Td
+51.24 476.8330000000001 Td
 ET
 
 
 BT
-51.24 439.153 Td
+51.24 476.8330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -47962,26 +47885,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.680 m
-563.760 469.680 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.120 m
-563.760 432.120 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.930 m
-269.177 431.870 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.930 m
-563.760 431.870 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -47989,34 +47912,125 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.29300000000006 Td
+272.17692192000004 483.9730000000001 Td
 /F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 434.37600000000015 Td
+/F2.0 18 Tf
+<332e31362e204a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.440 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.440 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.120 m
-269.177 432.120 l
+48.240 417.720 m
+269.177 417.720 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 394.560 m
-269.177 394.560 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.370 m
-48.240 394.310 l
+48.240 417.970 m
+48.240 393.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.370 m
-269.177 394.310 l
+269.177 417.970 m
+269.177 393.690 l
 S
 [ ] 0 d
 1 w
@@ -48024,46 +48038,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.873 Td
+51.24 401.97300000000007 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
-ET
-
-
-BT
-51.24 401.59299999999996 Td
-ET
-
-
-BT
-51.24 401.59299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.120 m
-563.760 432.120 l
+269.177 417.720 m
+563.760 417.720 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 394.560 m
-563.760 394.560 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.370 m
-269.177 394.310 l
+269.177 417.970 m
+269.177 393.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.370 m
-563.760 394.310 l
+563.760 417.970 m
+563.760 393.690 l
 S
 [ ] 0 d
 1 w
@@ -48071,34 +48073,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.733 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+272.17692192000004 401.97300000000007 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.560 m
-269.177 394.560 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.000 m
-269.177 357.000 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.810 m
-48.240 356.750 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.810 m
-269.177 356.750 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -48106,19 +48108,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.313 Td
+51.24 378.19300000000004 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 364.033 Td
+51.24 363.913 Td
 ET
 
 
 BT
-51.24 364.033 Td
+51.24 363.913 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48126,69 +48128,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.560 m
-563.760 394.560 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.000 m
-563.760 357.000 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.810 m
-269.177 356.750 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.810 m
-563.760 356.750 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 371.173 Td
+272.17692192000004 371.05300000000005 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6e756d626572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.000 m
-269.177 357.000 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.440 m
-269.177 319.440 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.250 m
-48.240 319.190 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.250 m
-269.177 319.190 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -48196,19 +48190,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.753 Td
+51.24 340.6330000000001 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 326.47299999999996 Td
+51.24 326.35300000000007 Td
 ET
 
 
 BT
-51.24 326.47299999999996 Td
+51.24 326.35300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48216,69 +48210,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.000 m
-563.760 357.000 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.440 m
-563.760 319.440 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.250 m
-269.177 319.190 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.250 m
-563.760 319.190 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.613 Td
+272.17692192000004 333.4930000000001 Td
 /F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+<696e7465676572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.440 m
-269.177 319.440 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.880 m
-269.177 281.880 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.690 m
-48.240 281.630 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.690 m
-269.177 281.630 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -48286,19 +48272,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.193 Td
+51.24 303.07300000000004 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 288.913 Td
+51.24 288.793 Td
 ET
 
 
 BT
-51.24 288.913 Td
+51.24 288.793 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48306,69 +48292,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.440 m
-563.760 319.440 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.880 m
-563.760 281.880 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.690 m
-269.177 281.630 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.690 m
-563.760 281.630 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 296.053 Td
+272.17692192000004 295.93300000000005 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.880 m
-269.177 281.880 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.320 m
-269.177 244.320 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.130 m
-48.240 244.070 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.130 m
-269.177 244.070 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -48376,19 +48354,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.633 Td
+51.24 265.5130000000001 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 251.35299999999998 Td
+51.24 251.2330000000001 Td
 ET
 
 
 BT
-51.24 251.35299999999998 Td
+51.24 251.2330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48396,69 +48374,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.880 m
-563.760 281.880 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.320 m
-563.760 244.320 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.130 m
-269.177 244.070 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.130 m
-563.760 244.070 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.493 Td
+272.17692192000004 258.3730000000001 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.320 m
-269.177 244.320 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.760 m
-269.177 206.760 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.570 m
-48.240 206.510 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.570 m
-269.177 206.510 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -48466,19 +48436,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 228.073 Td
+51.24 227.9530000000001 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 213.793 Td
+51.24 213.6730000000001 Td
 ET
 
 
 BT
-51.24 213.793 Td
+51.24 213.6730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48486,26 +48456,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.320 m
-563.760 244.320 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.760 m
-563.760 206.760 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.570 m
-269.177 206.510 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.570 m
-563.760 206.510 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -48513,34 +48483,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.933 Td
+272.17692192000004 220.81300000000007 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.760 m
-269.177 206.760 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.200 m
-269.177 169.200 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 207.010 m
-48.240 168.950 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.010 m
-269.177 168.950 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -48548,19 +48518,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.513 Td
+51.24 190.3930000000001 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
+<6173446f75626c65> Tj
 ET
 
 
 BT
-51.24 176.233 Td
+51.24 176.11300000000008 Td
 ET
 
 
 BT
-51.24 176.233 Td
+51.24 176.11300000000008 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48568,69 +48538,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.760 m
-563.760 206.760 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.200 m
-563.760 169.200 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.010 m
-269.177 168.950 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 207.010 m
-563.760 168.950 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 183.373 Td
+272.17692192000004 183.25300000000007 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.200 m
-269.177 169.200 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.640 m
-269.177 131.640 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.450 m
-48.240 131.390 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.450 m
-269.177 131.390 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -48638,19 +48600,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.95299999999995 Td
+51.24 152.83300000000008 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 138.67299999999994 Td
+51.24 138.55300000000008 Td
 ET
 
 
 BT
-51.24 138.67299999999994 Td
+51.24 138.55300000000008 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48658,26 +48620,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.200 m
-563.760 169.200 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.640 m
-563.760 131.640 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.450 m
-269.177 131.390 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.450 m
-563.760 131.390 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -48685,34 +48647,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.81299999999993 Td
+272.17692192000004 145.69300000000007 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<6e756d6265722028666c6f617429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.640 m
-269.177 131.640 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.080 m
-269.177 94.080 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.890 m
-48.240 93.830 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.890 m
-269.177 93.830 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -48720,19 +48682,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.39299999999999 Td
+51.24 115.27300000000004 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 101.11299999999999 Td
+51.24 100.99300000000004 Td
 ET
 
 
 BT
-51.24 101.11299999999999 Td
+51.24 100.99300000000004 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48740,26 +48702,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.640 m
-563.760 131.640 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.080 m
-563.760 94.080 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.890 m
-269.177 93.830 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.890 m
-563.760 93.830 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -48767,34 +48729,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.25299999999999 Td
+272.17692192000004 108.13300000000004 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.080 m
-269.177 94.080 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.520 m
-269.177 56.520 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.330 m
-48.240 56.270 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.330 m
-269.177 56.270 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -48802,19 +48764,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.83300000000004 Td
+51.24 77.71300000000004 Td
 /F2.0 10.5 Tf
-<626f6f6c65616e> Tj
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 63.55300000000004 Td
+51.24 63.433000000000035 Td
 ET
 
 
 BT
-51.24 63.55300000000004 Td
+51.24 63.433000000000035 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -48822,38 +48784,46 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.080 m
-563.760 94.080 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.520 m
-563.760 56.520 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.330 m
-269.177 56.270 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.330 m
-563.760 56.270 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.69300000000004 Td
+272.17692192000004 70.57300000000004 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -48879,67 +48849,43 @@ Q
 
 endstream
 endobj
-333 0 obj
+335 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 332 0 R
+/Contents 334 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [335 0 R 336 0 R 337 0 R 338 0 R 339 0 R]
->>
-endobj
-334 0 obj
-[333 0 R /XYZ 0 792.0 null]
-endobj
-335 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 368.10699999999997 322.17751176375003 382.387]
-/Type /Annot
+/Annots [336 0 R 338 0 R]
 >>
 endobj
 336 0 obj
 << /Border [0 0 0]
-/Dest (_jsonnull)
+/Dest (_number)
 /Subtype /Link
-/Rect [272.17692192000004 330.54699999999997 314.65992192000004 344.827]
+/Rect [272.17692192000004 706.2669999999999 313.75692192 720.5469999999999]
 /Type /Annot
 >>
 endobj
 337 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 292.98699999999997 325.32792192000005 307.267]
-/Type /Annot
->>
+[335 0 R /XYZ 0 457.8000000000001 null]
 endobj
 338 0 obj
 << /Border [0 0 0]
-/Dest (_jsonprimitive)
+/Dest (_jsonarray)
 /Subtype /Link
-/Rect [272.17692192000004 255.427 340.1224219200001 269.707]
+/Rect [272.17692192000004 67.50700000000003 322.17751176375003 81.78700000000003]
 /Type /Annot
 >>
 endobj
 339 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 180.30700000000002 313.75692192 194.587]
-/Type /Annot
->>
-endobj
-340 0 obj
-<< /Length 22326
+<< /Length 21887
 >>
 stream
 q
@@ -49000,32 +48946,96 @@ f
 269.177 507.360 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-1 w
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
@@ -49100,19 +49110,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 716.4730000000002 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 702.1930000000001 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 702.1930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49145,13 +49155,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 709.3330000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -49184,7 +49202,7 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<61734a736f6e4f626a656374> Tj
 ET
 
 
@@ -49227,13 +49245,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -49266,7 +49292,7 @@ S
 BT
 51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<61734a736f6e5072696d6974697665> Tj
 ET
 
 
@@ -49309,13 +49335,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 634.2130000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -49348,7 +49382,7 @@ S
 BT
 51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
+<61734c6f6e67> Tj
 ET
 
 
@@ -49395,7 +49429,7 @@ S
 BT
 272.17692192000004 596.6530000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -49430,17 +49464,17 @@ S
 BT
 51.24 566.2330000000002 Td
 /F2.0 10.5 Tf
-<6e756d626572> Tj
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 551.9530000000002 Td
+51.24 551.9530000000001 Td
 ET
 
 
 BT
-51.24 551.9530000000002 Td
+51.24 551.9530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49473,13 +49507,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 559.0930000000002 Td
+272.17692192000004 559.0930000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4e756d626572> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -49510,19 +49552,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.6730000000002 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<737472696e67> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 514.3930000000003 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 514.3930000000003 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49557,133 +49599,198 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5330000000002 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.610 m
+48.240 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24 471.9360000000003 Td
-/F2.0 18 Tf
-<332e31352e204c6f6f70> Tj
+51.24 491.1130000000001 Td
+/F2.0 10.5 Tf
+<6173537472696e67> Tj
+ET
+
+
+BT
+51.24 476.8330000000001 Td
+ET
+
+
+BT
+51.24 476.8330000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 432.000 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 432.000 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 281.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
-f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
-f
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.9730000000001 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
-f
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.55300000000017 Td
+/F2.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+
+BT
+51.24 439.27300000000014 Td
+ET
+
+
+BT
+51.24 439.27300000000014 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 56.400 294.583 37.560 re
-f
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.4130000000002 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 455.280 m
-269.177 455.280 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 455.530 m
-48.240 431.250 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 455.530 m
-269.177 431.250 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -49691,34 +49798,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 439.53300000000024 Td
+51.24 415.9930000000002 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 401.7130000000002 Td
+ET
+
+
+BT
+51.24 401.7130000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 455.280 m
-563.760 455.280 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 455.530 m
-269.177 431.250 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 455.530 m
-563.760 431.250 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
@@ -49726,34 +49845,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 439.53300000000024 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 408.85300000000024 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 394.930 m
+48.240 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 1 w
@@ -49761,19 +49880,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000002 Td
+51.24 378.4330000000003 Td
 /F2.0 10.5 Tf
-<626c75657072696e74> Tj
+<6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 401.4730000000002 Td
+51.24 364.15300000000025 Td
 ET
 
 
 BT
-51.24 401.4730000000002 Td
+51.24 364.15300000000025 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49781,26 +49900,901 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 394.930 m
+563.760 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.2930000000003 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.370 m
+48.240 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.87300000000033 Td
+/F2.0 10.5 Tf
+<6a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 326.5930000000003 Td
+ET
+
+
+BT
+51.24 326.5930000000003 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.370 m
+563.760 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.73300000000035 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.000 m
+269.177 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.810 m
+48.240 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.3130000000004 Td
+/F2.0 10.5 Tf
+<6a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 289.03300000000036 Td
+ET
+
+
+BT
+51.24 289.03300000000036 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.000 m
+563.760 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.810 m
+563.760 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 296.1730000000004 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.000 m
+269.177 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.440 m
+269.177 244.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.250 m
+48.240 244.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.250 m
+269.177 244.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 265.75300000000044 Td
+/F2.0 10.5 Tf
+<6e756d626572> Tj
+ET
+
+
+BT
+51.24 251.47300000000044 Td
+ET
+
+
+BT
+51.24 251.47300000000044 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.000 m
+563.760 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.440 m
+563.760 244.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.250 m
+269.177 244.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.250 m
+563.760 244.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 258.61300000000045 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.440 m
+269.177 244.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.880 m
+269.177 206.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.690 m
+48.240 206.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.690 m
+269.177 206.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 228.19300000000052 Td
+/F2.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+
+BT
+51.24 213.91300000000052 Td
+ET
+
+
+BT
+51.24 213.91300000000052 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.440 m
+563.760 244.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.880 m
+563.760 206.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.690 m
+269.177 206.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 244.690 m
+563.760 206.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 221.0530000000005 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 171.45600000000047 Td
+/F2.0 18 Tf
+<332e31372e204c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 154.800 m
+269.177 154.800 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 155.050 m
+48.240 130.770 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 155.050 m
+269.177 130.770 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 139.0530000000005 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 154.800 m
+563.760 154.800 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 155.050 m
+269.177 130.770 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 155.050 m
+563.760 130.770 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 139.0530000000005 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.2730000000005 Td
+/F2.0 10.5 Tf
+<626c75657072696e74> Tj
+ET
+
+
+BT
+51.24 100.99300000000049 Td
+ET
+
+
+BT
+51.24 100.99300000000049 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.1330000000005 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71300000000049 Td
+/F2.0 10.5 Tf
+<636f6d706f6e656e7473> Tj
+ET
+
+
+BT
+51.24 63.43300000000049 Td
+ET
+
+
+BT
+51.24 63.43300000000049 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57300000000049 Td
+/F1.0 10.5 Tf
+<3c20737472696e672c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+315.25842192000005 70.57300000000049 Td
+/F1.0 10.5 Tf
+<45787465726e616c436f6d706f6e656e74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+415.81692192 70.57300000000049 Td
+/F1.0 10.5 Tf
+<203e206d6170> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3331> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+340 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 339 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 24 0 R
+/F3.0 26 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 748 0 R
+>>
+>>
+/Annots [341 0 R 342 0 R 343 0 R 344 0 R 346 0 R]
+>>
+endobj
+341 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 706.2670000000002 314.65992192000004 720.5470000000001]
+/Type /Annot
+>>
+endobj
+342 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 668.7070000000001 325.32792192000005 682.9870000000001]
+/Type /Annot
+>>
+endobj
+343 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 631.1470000000002 340.1224219200001 645.4270000000001]
+/Type /Annot
+>>
+endobj
+344 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 556.0270000000002 313.75692192 570.3070000000001]
+/Type /Annot
+>>
+endobj
+345 0 obj
+[340 0 R /XYZ 0 194.8800000000005 null]
+endobj
+346 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponent)
+/Subtype /Link
+/Rect [315.25842192000005 67.50700000000049 415.81692192 81.78700000000049]
+/Type /Annot
+>>
+endobj
+347 0 obj
+<< /Length 22947
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -49808,34 +50802,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.6130000000002 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -49843,19 +50837,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000027 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 <64636165426c75657072696e744964> Tj
 ET
 
 
 BT
-51.24 363.91300000000024 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 363.91300000000024 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49863,26 +50857,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -49890,7 +50884,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.0530000000003 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -49898,26 +50892,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -49925,19 +50919,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000002 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 [<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
 ET
 
 
 BT
-51.24 326.3530000000002 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 326.3530000000002 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -49945,26 +50939,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -49972,7 +50966,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.4930000000002 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -49980,26 +50974,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -50007,19 +51001,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.07300000000026 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
 [<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
 ET
 
 
 BT
-51.24 288.79300000000023 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 288.79300000000023 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50027,26 +51021,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -50054,7 +51048,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.9330000000003 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -50062,26 +51056,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -50089,19 +51083,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000002 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
 <676c6f62616c50726f706572746965734a736f6e> Tj
 ET
 
 
 BT
-51.24 251.2330000000002 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 251.2330000000002 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50109,26 +51103,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -50142,7 +51136,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.3730000000002 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -50152,26 +51146,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -50179,19 +51173,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000026 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
 <6c617374436f6d70757465645374617465> Tj
 ET
 
 
 BT
-51.24 213.67300000000026 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 213.67300000000026 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50199,26 +51193,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -50226,14 +51220,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 227.95300000000026 Td
+272.17692192000004 566.233 Td
 /F1.0 10.5 Tf
 [<656e756d202844455349474e2c205355424d49545445442c204445504c4f> 29.78515625 <5945442c2052> 9.765625 <554e4e494e472c>] TJ
 ET
 
 
 BT
-272.17692192000004 213.67300000000026 Td
+272.17692192000004 551.953 Td
 /F1.0 10.5 Tf
 [<53> 20.01953125 <54> 20.01953125 <4f505045442c20494e5f455252> 20.01953125 <4f522c2057> 60.05859375 <414954494e4729>] TJ
 ET
@@ -50241,26 +51235,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -50268,19 +51262,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000026 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
 <6c6f6f704c6f6773> Tj
 ET
 
 
 BT
-51.24 176.11300000000026 Td
+51.24 514.3929999999999 Td
 ET
 
 
 BT
-51.24 176.11300000000026 Td
+51.24 514.3929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50288,26 +51282,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -50319,7 +51313,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000024 Td
+272.17692192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -50328,7 +51322,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 183.25300000000024 Td
+280.76592192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
 <4c6f6f704c6f67> Tj
 ET
@@ -50337,7 +51331,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-324.10992192000003 183.25300000000024 Td
+324.10992192000003 521.5329999999999 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -50345,26 +51339,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -50372,19 +51366,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000023 Td
+51.24 491.11299999999994 Td
 /F2.0 10.5 Tf
 <6d6963726f53657276696365506f6c6963696573> Tj
 ET
 
 
 BT
-51.24 138.55300000000022 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 138.55300000000022 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50392,26 +51386,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -50423,7 +51417,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6930000000002 Td
+272.17692192000004 483.97299999999996 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -50432,7 +51426,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 145.6930000000002 Td
+280.76592192000004 483.97299999999996 Td
 /F1.0 10.5 Tf
 <4d6963726f53657276696365506f6c696379> Tj
 ET
@@ -50441,7 +51435,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-376.69392192000004 145.6930000000002 Td
+376.69392192000004 483.97299999999996 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -50449,26 +51443,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -50476,19 +51470,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000021 Td
+51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
 <6d6f64656c50726f706572746965734a736f6e> Tj
 ET
 
 
 BT
-51.24 100.99300000000021 Td
+51.24 439.2729999999999 Td
 ET
 
 
 BT
-51.24 100.99300000000021 Td
+51.24 439.2729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50496,26 +51490,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -50529,7 +51523,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.13300000000021 Td
+272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -50539,26 +51533,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -50566,19 +51560,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.7130000000002 Td
+51.24 415.99299999999994 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 63.433000000000206 Td
+51.24 401.71299999999997 Td
 ET
 
 
 BT
-51.24 63.433000000000206 Td
+51.24 401.71299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50586,202 +51580,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 70.5730000000002 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3331> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-341 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 340 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 24 0 R
-/F3.0 26 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 737 0 R
->>
->>
-/Annots [343 0 R 344 0 R 345 0 R 346 0 R]
->>
-endobj
-342 0 obj
-[341 0 R /XYZ 0 495.3600000000003 null]
-endobj
-343 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 255.30700000000022 325.32792192000005 269.5870000000002]
-/Type /Annot
->>
-endobj
-344 0 obj
-<< /Border [0 0 0]
-/Dest (_looplog)
-/Subtype /Link
-/Rect [280.76592192000004 180.18700000000027 324.10992192000003 194.46700000000027]
-/Type /Annot
->>
-endobj
-345 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [280.76592192000004 142.62700000000024 376.69392192000004 156.9070000000002]
-/Type /Annot
->>
-endobj
-346 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 105.0670000000002 325.32792192000005 119.34700000000021]
-/Type /Annot
->>
-endobj
-347 0 obj
-<< /Length 21106
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
@@ -50789,34 +51607,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 408.85299999999995 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 394.930 m
+48.240 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 1 w
@@ -50824,19 +51642,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 378.43299999999994 Td
 /F2.0 10.5 Tf
 [<6f706572> 20.01953125 <6174696f6e616c506f6c6963696573>] TJ
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 364.1529999999999 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 364.1529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50844,26 +51662,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 394.930 m
+563.760 356.870 l
 S
 [ ] 0 d
 1 w
@@ -50875,7 +51693,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 371.29299999999995 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -50884,7 +51702,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 709.333 Td
+280.76592192000004 371.29299999999995 Td
 /F1.0 10.5 Tf
 [<4f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
@@ -50893,7 +51711,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-370.37271684187505 709.333 Td
+370.37271684187505 371.29299999999995 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -50901,26 +51719,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 357.370 m
+48.240 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 1 w
@@ -50928,19 +51746,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 340.87299999999993 Td
 /F2.0 10.5 Tf
 <737667526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 326.59299999999996 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 326.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -50948,26 +51766,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 357.370 m
+563.760 319.310 l
 S
 [ ] 0 d
 1 w
@@ -50975,7 +51793,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 333.73299999999995 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -50985,83 +51803,83 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 622.1760000000002 Td
+48.24 284.13599999999997 Td
 /F2.0 18 Tf
-<332e31362e204c6f6f704c6f67> Tj
+<332e31382e204c6f6f704c6f67> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 582.240 220.937 23.280 re
+48.240 244.200 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 582.240 294.583 23.280 re
+269.177 244.200 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 544.680 220.937 37.560 re
+48.240 206.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 544.680 294.583 37.560 re
+269.177 206.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 507.120 220.937 37.560 re
+48.240 169.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 507.120 294.583 37.560 re
+269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.560 220.937 37.560 re
+48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.560 294.583 37.560 re
+269.177 131.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 432.000 220.937 37.560 re
+48.240 93.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 432.000 294.583 37.560 re
+269.177 93.960 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.440 220.937 37.560 re
+48.240 56.400 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.440 294.583 37.560 re
+269.177 56.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 605.520 m
-269.177 605.520 l
+48.240 267.480 m
+269.177 267.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 605.770 m
-48.240 581.490 l
+48.240 267.730 m
+48.240 243.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.770 m
-269.177 581.490 l
+269.177 267.730 m
+269.177 243.450 l
 S
 [ ] 0 d
 1 w
@@ -51069,7 +51887,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 589.7730000000001 Td
+51.24 251.7329999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -51077,26 +51895,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.520 m
-563.760 605.520 l
+269.177 267.480 m
+563.760 267.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.770 m
-269.177 581.490 l
+269.177 267.730 m
+269.177 243.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 605.770 m
-563.760 581.490 l
+563.760 267.730 m
+563.760 243.450 l
 S
 [ ] 0 d
 1 w
@@ -51104,7 +51922,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 589.7730000000001 Td
+272.17692192000004 251.7329999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -51112,26 +51930,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.490 m
-48.240 544.430 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -51139,19 +51957,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.9930000000002 Td
+51.24 227.95299999999992 Td
 /F2.0 10.5 Tf
 <6964> Tj
 ET
 
 
 BT
-51.24 551.7130000000002 Td
+51.24 213.67299999999992 Td
 ET
 
 
 BT
-51.24 551.7130000000002 Td
+51.24 213.67299999999992 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51159,26 +51977,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.490 m
-563.760 544.430 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -51186,7 +52004,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 558.8530000000002 Td
+272.17692192000004 220.8129999999999 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -51194,26 +52012,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.930 m
-48.240 506.870 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -51221,19 +52039,101 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.4330000000002 Td
+51.24 190.39299999999992 Td
+/F2.0 10.5 Tf
+<6c6f67436f6d706f6e656e74> Tj
+ET
+
+
+BT
+51.24 176.11299999999991 Td
+ET
+
+
+BT
+51.24 176.11299999999991 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.2529999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.8329999999999 Td
 /F2.0 10.5 Tf
 <6c6f67496e7374616e74> Tj
 ET
 
 
 BT
-51.24 514.1530000000001 Td
+51.24 138.5529999999999 Td
 ET
 
 
 BT
-51.24 514.1530000000001 Td
+51.24 138.5529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51241,26 +52141,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 544.930 m
-563.760 506.870 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -51268,7 +52168,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.2930000000001 Td
+272.17692192000004 145.6929999999999 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -51276,26 +52176,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -51303,19 +52203,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000002 Td
+51.24 115.2729999999999 Td
 /F2.0 10.5 Tf
 <6c6f6754797065> Tj
 ET
 
 
 BT
-51.24 476.5930000000002 Td
+51.24 100.9929999999999 Td
 ET
 
 
 BT
-51.24 476.5930000000002 Td
+51.24 100.9929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51323,26 +52223,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -51350,7 +52250,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.73300000000023 Td
+272.17692192000004 108.1329999999999 Td
 /F1.0 10.5 Tf
 [<656e756d2028494e464f2c2057> 60.05859375 <41524e494e472c20455252> 20.01953125 <4f5229>] TJ
 ET
@@ -51358,26 +52258,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -51385,89 +52285,273 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000016 Td
+51.24 77.7129999999999 Td
 /F2.0 10.5 Tf
 <6c6f6f70> Tj
 ET
 
 
 BT
-51.24 439.03300000000013 Td
+51.24 63.43299999999989 Td
+ET
+
+
+BT
+51.24 63.43299999999989 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 70.5729999999999 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3332> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+348 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 347 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 24 0 R
+/F3.0 26 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 748 0 R
+>>
+>>
+/Annots [349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 355 0 R]
+>>
+endobj
+349 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 593.587 325.32792192000005 607.867]
+/Type /Annot
+>>
+endobj
+350 0 obj
+<< /Border [0 0 0]
+/Dest (_looplog)
+/Subtype /Link
+/Rect [280.76592192000004 518.467 324.10992192000003 532.747]
+/Type /Annot
+>>
+endobj
+351 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [280.76592192000004 480.9069999999999 376.69392192000004 495.18699999999995]
+/Type /Annot
+>>
+endobj
+352 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 443.3469999999999 325.32792192000005 457.62699999999995]
+/Type /Annot
+>>
+endobj
+353 0 obj
+<< /Border [0 0 0]
+/Dest (_operationalpolicy)
+/Subtype /Link
+/Rect [280.76592192000004 368.2269999999999 370.37271684187505 382.50699999999995]
+/Type /Annot
+>>
+endobj
+354 0 obj
+[348 0 R /XYZ 0 307.55999999999995 null]
+endobj
+355 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 67.50699999999989 297.27192192000007 81.78699999999989]
+/Type /Annot
+>>
+endobj
+356 0 obj
+<< /Length 19273
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 439.03300000000013 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.1730000000002 Td
-/F1.0 10.5 Tf
-<4c6f6f70> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -51475,19 +52559,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000002 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 <6d657373616765> Tj
 ET
 
 
 BT
-51.24 401.4730000000002 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 401.4730000000002 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51495,26 +52579,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -51522,7 +52606,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.6130000000002 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -51532,99 +52616,99 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 359.01600000000025 Td
+48.24 659.7360000000001 Td
 /F2.0 18 Tf
-<332e31372e204d6963726f53657276696365506f6c696379> Tj
+<332e31392e204d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.080 220.937 23.280 re
+48.240 619.800 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.080 294.583 23.280 re
+269.177 619.800 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 281.520 220.937 37.560 re
+48.240 582.240 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 281.520 294.583 37.560 re
+269.177 582.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 243.960 220.937 37.560 re
+48.240 544.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 243.960 294.583 37.560 re
+269.177 544.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.400 220.937 37.560 re
+48.240 507.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.400 294.583 37.560 re
+269.177 507.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 168.840 220.937 37.560 re
+48.240 469.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 168.840 294.583 37.560 re
+269.177 469.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.280 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.280 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 93.720 220.937 37.560 re
+48.240 394.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 93.720 294.583 37.560 re
+269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.160 220.937 37.560 re
+48.240 356.880 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.160 294.583 37.560 re
+269.177 356.880 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.360 m
-269.177 342.360 l
+48.240 643.080 m
+269.177 643.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+48.240 619.800 m
+269.177 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.610 m
-48.240 318.330 l
+48.240 643.330 m
+48.240 619.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.610 m
-269.177 318.330 l
+269.177 643.330 m
+269.177 619.050 l
 S
 [ ] 0 d
 1 w
@@ -51632,7 +52716,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 326.61300000000017 Td
+51.24 627.3330000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -51640,26 +52724,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.360 m
-563.760 342.360 l
+269.177 643.080 m
+563.760 643.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+269.177 619.800 m
+563.760 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.610 m
-269.177 318.330 l
+269.177 643.330 m
+269.177 619.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 342.610 m
-563.760 318.330 l
+563.760 643.330 m
+563.760 619.050 l
 S
 [ ] 0 d
 1 w
@@ -51667,7 +52751,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 326.61300000000017 Td
+272.17692192000004 627.3330000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -51675,26 +52759,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+48.240 619.800 m
+269.177 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.520 m
-269.177 281.520 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.330 m
-48.240 281.270 l
+48.240 620.050 m
+48.240 581.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.330 m
-269.177 281.270 l
+269.177 620.050 m
+269.177 581.990 l
 S
 [ ] 0 d
 1 w
@@ -51702,19 +52786,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 302.83300000000014 Td
+51.24 603.5530000000001 Td
 /F2.0 10.5 Tf
 <6a736f6e526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 288.5530000000001 Td
+51.24 589.2730000000001 Td
 ET
 
 
 BT
-51.24 288.5530000000001 Td
+51.24 589.2730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51722,26 +52806,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+269.177 619.800 m
+563.760 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.520 m
-563.760 281.520 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.330 m
-269.177 281.270 l
+269.177 620.050 m
+269.177 581.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.330 m
-563.760 281.270 l
+563.760 620.050 m
+563.760 581.990 l
 S
 [ ] 0 d
 1 w
@@ -51755,7 +52839,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 295.69300000000015 Td
+272.17692192000004 596.4130000000001 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -51765,26 +52849,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.520 m
-269.177 281.520 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.960 m
-269.177 243.960 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.770 m
-48.240 243.710 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.770 m
-269.177 243.710 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -51792,19 +52876,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.2730000000002 Td
+51.24 565.9930000000002 Td
 /F2.0 10.5 Tf
 <6d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 250.9930000000002 Td
+51.24 551.7130000000001 Td
 ET
 
 
 BT
-51.24 250.9930000000002 Td
+51.24 551.7130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51812,26 +52896,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.520 m
-563.760 281.520 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.960 m
-563.760 243.960 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.770 m
-269.177 243.710 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 281.770 m
-563.760 243.710 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -51839,7 +52923,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.1330000000002 Td
+272.17692192000004 558.8530000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -51847,26 +52931,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.960 m
-269.177 243.960 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.400 m
-269.177 206.400 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.210 m
-48.240 206.150 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.210 m
-269.177 206.150 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -51874,19 +52958,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.7130000000002 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 213.4330000000002 Td
+51.24 514.1530000000001 Td
 ET
 
 
 BT
-51.24 213.4330000000002 Td
+51.24 514.1530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51894,26 +52978,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.960 m
-563.760 243.960 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.400 m
-563.760 206.400 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.210 m
-269.177 206.150 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.210 m
-563.760 206.150 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -51921,7 +53005,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.57300000000018 Td
+272.17692192000004 521.2930000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -51929,26 +53013,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.400 m
-269.177 206.400 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.840 m
-269.177 168.840 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.650 m
-48.240 168.590 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.650 m
-269.177 168.590 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -51956,19 +53040,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.1530000000002 Td
+51.24 490.8730000000001 Td
 /F2.0 10.5 Tf
 [<706f6c69637954> 29.78515625 <6f736361>] TJ
 ET
 
 
 BT
-51.24 175.8730000000002 Td
+51.24 476.5930000000001 Td
 ET
 
 
 BT
-51.24 175.8730000000002 Td
+51.24 476.5930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -51976,26 +53060,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.400 m
-563.760 206.400 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.840 m
-563.760 168.840 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.650 m
-269.177 168.590 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.650 m
-563.760 168.590 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -52003,7 +53087,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.01300000000018 Td
+272.17692192000004 483.7330000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -52011,26 +53095,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.840 m
-269.177 168.840 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.280 m
-269.177 131.280 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.090 m
-48.240 131.030 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.090 m
-269.177 131.030 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -52038,19 +53122,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.5930000000002 Td
+51.24 453.31300000000016 Td
 /F2.0 10.5 Tf
 <70726f70657274696573> Tj
 ET
 
 
 BT
-51.24 138.3130000000002 Td
+51.24 439.03300000000013 Td
 ET
 
 
 BT
-51.24 138.3130000000002 Td
+51.24 439.03300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52058,26 +53142,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.840 m
-563.760 168.840 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.280 m
-563.760 131.280 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.090 m
-269.177 131.030 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.090 m
-563.760 131.030 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -52091,7 +53175,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 145.45300000000017 Td
+272.17692192000004 446.1730000000002 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -52101,26 +53185,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.280 m
-269.177 131.280 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.720 m
-269.177 93.720 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.530 m
-48.240 93.470 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.530 m
-269.177 93.470 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -52128,19 +53212,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.03300000000017 Td
+51.24 415.7530000000001 Td
 /F2.0 10.5 Tf
 <736861726564> Tj
 ET
 
 
 BT
-51.24 100.75300000000017 Td
+51.24 401.47300000000007 Td
 ET
 
 
 BT
-51.24 100.75300000000017 Td
+51.24 401.47300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52148,26 +53232,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.280 m
-563.760 131.280 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.720 m
-563.760 93.720 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.530 m
-269.177 93.470 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.530 m
-563.760 93.470 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -52175,7 +53259,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 107.89300000000017 Td
+272.17692192000004 408.6130000000001 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -52183,26 +53267,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.720 m
-269.177 93.720 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.160 m
-269.177 56.160 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.970 m
-48.240 55.910 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.970 m
-269.177 55.910 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -52210,19 +53294,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.47300000000017 Td
+51.24 378.19300000000015 Td
 /F2.0 10.5 Tf
 [<7573656442> 20.01953125 <794c6f6f7073>] TJ
 ET
 
 
 BT
-51.24 63.19300000000017 Td
+51.24 363.9130000000001 Td
 ET
 
 
 BT
-51.24 63.19300000000017 Td
+51.24 363.9130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52230,26 +53314,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.720 m
-563.760 93.720 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.160 m
-563.760 56.160 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.970 m
-269.177 55.910 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 93.970 m
-563.760 55.910 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -52261,7 +53345,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.33300000000017 Td
+272.17692192000004 371.05300000000017 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -52270,7 +53354,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 70.33300000000017 Td
+280.76592192000004 371.05300000000017 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -52279,112 +53363,19 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-305.86092192000007 70.33300000000017 Td
+305.86092192000007 371.05300000000017 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3332> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-348 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 347 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 24 0 R
-/F3.0 26 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 737 0 R
->>
->>
-/Annots [349 0 R 351 0 R 353 0 R 354 0 R 355 0 R]
->>
-endobj
-349 0 obj
-<< /Border [0 0 0]
-/Dest (_operationalpolicy)
-/Subtype /Link
-/Rect [280.76592192000004 706.267 370.37271684187505 720.547]
-/Type /Annot
->>
-endobj
-350 0 obj
-[348 0 R /XYZ 0 645.6000000000001 null]
-endobj
-351 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [272.17692192000004 443.10700000000014 297.27192192000007 457.38700000000017]
-/Type /Annot
->>
-endobj
-352 0 obj
-[348 0 R /XYZ 0 382.4400000000002 null]
-endobj
-353 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 292.6270000000001 325.32792192000005 306.90700000000015]
-/Type /Annot
->>
-endobj
-354 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 142.3870000000002 325.32792192000005 156.6670000000002]
-/Type /Annot
->>
-endobj
-355 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [280.76592192000004 67.26700000000017 305.86092192000007 81.54700000000017]
-/Type /Annot
->>
-endobj
-356 0 obj
-<< /Length 9408
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 734.976 Td
+48.24 321.4560000000002 Td
 /F2.0 18 Tf
-<332e31382e204e756d626572> Tj
+<332e32302e204e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -52393,7 +53384,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 706.356 Td
+48.24 292.8360000000001 Td
 /F3.0 10.5 Tf
 <54797065> Tj
 ET
@@ -52404,7 +53395,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-71.4345 706.356 Td
+71.4345 292.8360000000001 Td
 /F1.0 10.5 Tf
 <203a206f626a656374> Tj
 ET
@@ -52415,75 +53406,75 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 667.1160000000001 Td
+48.24 253.59600000000012 Td
 /F2.0 18 Tf
-[<332e31392e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+[<332e32312e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 627.180 220.937 23.280 re
+48.240 213.660 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 627.180 294.583 23.280 re
+269.177 213.660 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 589.620 220.937 37.560 re
+48.240 176.100 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 589.620 294.583 37.560 re
+269.177 176.100 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 552.060 220.937 37.560 re
+48.240 138.540 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 552.060 294.583 37.560 re
+269.177 138.540 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 514.500 220.937 37.560 re
+48.240 100.980 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 514.500 294.583 37.560 re
+269.177 100.980 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 476.940 220.937 37.560 re
+48.240 63.420 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 476.940 294.583 37.560 re
+269.177 63.420 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 650.460 m
-269.177 650.460 l
+48.240 236.940 m
+269.177 236.940 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 627.180 m
-269.177 627.180 l
+48.240 213.660 m
+269.177 213.660 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 650.710 m
-48.240 626.430 l
+48.240 237.190 m
+48.240 212.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 650.710 m
-269.177 626.430 l
+269.177 237.190 m
+269.177 212.910 l
 S
 [ ] 0 d
 1 w
@@ -52491,7 +53482,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 634.7130000000001 Td
+51.24 221.19300000000013 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -52499,26 +53490,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 650.460 m
-563.760 650.460 l
+269.177 236.940 m
+563.760 236.940 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 627.180 m
-563.760 627.180 l
+269.177 213.660 m
+563.760 213.660 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 650.710 m
-269.177 626.430 l
+269.177 237.190 m
+269.177 212.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 650.710 m
-563.760 626.430 l
+563.760 237.190 m
+563.760 212.910 l
 S
 [ ] 0 d
 1 w
@@ -52526,7 +53517,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.7130000000001 Td
+272.17692192000004 221.19300000000013 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -52534,26 +53525,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 627.180 m
-269.177 627.180 l
+48.240 213.660 m
+269.177 213.660 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 589.620 m
-269.177 589.620 l
+48.240 176.100 m
+269.177 176.100 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 627.430 m
-48.240 589.370 l
+48.240 213.910 m
+48.240 175.850 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 627.430 m
-269.177 589.370 l
+269.177 213.910 m
+269.177 175.850 l
 S
 [ ] 0 d
 1 w
@@ -52561,19 +53552,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 610.9330000000002 Td
+51.24 197.41300000000012 Td
 /F2.0 10.5 Tf
 [<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
 ET
 
 
 BT
-51.24 596.6530000000001 Td
+51.24 183.13300000000012 Td
 ET
 
 
 BT
-51.24 596.6530000000001 Td
+51.24 183.13300000000012 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52581,26 +53572,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 627.180 m
-563.760 627.180 l
+269.177 213.660 m
+563.760 213.660 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 589.620 m
-563.760 589.620 l
+269.177 176.100 m
+563.760 176.100 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 627.430 m
-269.177 589.370 l
+269.177 213.910 m
+269.177 175.850 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 627.430 m
-563.760 589.370 l
+563.760 213.910 m
+563.760 175.850 l
 S
 [ ] 0 d
 1 w
@@ -52614,7 +53605,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 603.7930000000001 Td
+272.17692192000004 190.2730000000001 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -52624,26 +53615,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 589.620 m
-269.177 589.620 l
+48.240 176.100 m
+269.177 176.100 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 552.060 m
-269.177 552.060 l
+48.240 138.540 m
+269.177 138.540 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 589.870 m
-48.240 551.810 l
+48.240 176.350 m
+48.240 138.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 589.870 m
-269.177 551.810 l
+269.177 176.350 m
+269.177 138.290 l
 S
 [ ] 0 d
 1 w
@@ -52651,19 +53642,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 573.373 Td
+51.24 159.85300000000012 Td
 /F2.0 10.5 Tf
 <6a736f6e526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 559.0930000000001 Td
+51.24 145.57300000000012 Td
 ET
 
 
 BT
-51.24 559.0930000000001 Td
+51.24 145.57300000000012 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52671,26 +53662,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 589.620 m
-563.760 589.620 l
+269.177 176.100 m
+563.760 176.100 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 552.060 m
-563.760 552.060 l
+269.177 138.540 m
+563.760 138.540 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 589.870 m
-269.177 551.810 l
+269.177 176.350 m
+269.177 138.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 589.870 m
-563.760 551.810 l
+563.760 176.350 m
+563.760 138.290 l
 S
 [ ] 0 d
 1 w
@@ -52704,7 +53695,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 566.2330000000001 Td
+272.17692192000004 152.7130000000001 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -52714,26 +53705,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 552.060 m
-269.177 552.060 l
+48.240 138.540 m
+269.177 138.540 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.500 m
-269.177 514.500 l
+48.240 100.980 m
+269.177 100.980 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 552.310 m
-48.240 514.250 l
+48.240 138.790 m
+48.240 100.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 552.310 m
-269.177 514.250 l
+269.177 138.790 m
+269.177 100.730 l
 S
 [ ] 0 d
 1 w
@@ -52741,19 +53732,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 535.8130000000001 Td
+51.24 122.29300000000012 Td
 /F2.0 10.5 Tf
 <6c6f6f70> Tj
 ET
 
 
 BT
-51.24 521.5330000000001 Td
+51.24 108.01300000000012 Td
 ET
 
 
 BT
-51.24 521.5330000000001 Td
+51.24 108.01300000000012 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52761,26 +53752,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 552.060 m
-563.760 552.060 l
+269.177 138.540 m
+563.760 138.540 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.500 m
-563.760 514.500 l
+269.177 100.980 m
+563.760 100.980 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 552.310 m
-269.177 514.250 l
+269.177 138.790 m
+269.177 100.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 552.310 m
-563.760 514.250 l
+563.760 138.790 m
+563.760 100.730 l
 S
 [ ] 0 d
 1 w
@@ -52794,7 +53785,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 528.6730000000001 Td
+272.17692192000004 115.15300000000012 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -52804,26 +53795,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.500 m
-269.177 514.500 l
+48.240 100.980 m
+269.177 100.980 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 476.940 m
-269.177 476.940 l
+48.240 63.420 m
+269.177 63.420 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.750 m
-48.240 476.690 l
+48.240 101.230 m
+48.240 63.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.750 m
-269.177 476.690 l
+269.177 101.230 m
+269.177 63.170 l
 S
 [ ] 0 d
 1 w
@@ -52831,19 +53822,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 498.2530000000001 Td
+51.24 84.7330000000001 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 483.97300000000007 Td
+51.24 70.4530000000001 Td
 ET
 
 
 BT
-51.24 483.97300000000007 Td
+51.24 70.4530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -52851,26 +53842,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.500 m
-563.760 514.500 l
+269.177 100.980 m
+563.760 100.980 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 476.940 m
-563.760 476.940 l
+269.177 63.420 m
+563.760 63.420 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.750 m
-269.177 476.690 l
+269.177 101.230 m
+269.177 63.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 514.750 m
-563.760 476.690 l
+563.760 101.230 m
+563.760 63.170 l
 S
 [ ] 0 d
 1 w
@@ -52878,61 +53869,170 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 491.1130000000001 Td
+272.17692192000004 77.5930000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3333> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+357 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 356 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 24 0 R
+/F3.0 26 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 748 0 R
+>>
+>>
+/Annots [360 0 R 361 0 R 362 0 R 365 0 R 366 0 R 367 0 R]
+>>
+endobj
+358 0 obj
+[357 0 R /XYZ 0 683.1600000000001 null]
+endobj
+359 0 obj
+<< /Limits [(_externalcomponent) (_parameters)]
+/Names [(_externalcomponent) 308 0 R (_externalcomponentstate) 310 0 R (_jsonarray) 311 0 R (_jsonnull) 321 0 R (_jsonobject) 329 0 R (_jsonprimitive) 337 0 R (_loop) 345 0 R (_looplog) 354 0 R (_microservicepolicy) 358 0 R (_number) 363 0 R (_operationalpolicy) 364 0 R (_overview) 21 0 R (_parameters) 32 0 R]
+>>
+endobj
+360 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 593.3470000000002 325.32792192000005 607.6270000000002]
+/Type /Annot
+>>
+endobj
+361 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 443.10700000000014 325.32792192000005 457.38700000000017]
+/Type /Annot
+>>
+endobj
+362 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [280.76592192000004 367.98700000000014 305.86092192000007 382.26700000000017]
+/Type /Annot
+>>
+endobj
+363 0 obj
+[357 0 R /XYZ 0 344.88000000000017 null]
+endobj
+364 0 obj
+[357 0 R /XYZ 0 277.0200000000001 null]
+endobj
+365 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 187.20700000000014 325.32792192000005 201.48700000000014]
+/Type /Annot
+>>
+endobj
+366 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 149.64700000000013 325.32792192000005 163.92700000000013]
+/Type /Annot
+>>
+endobj
+367 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 112.08700000000012 297.27192192000007 126.36700000000012]
+/Type /Annot
+>>
+endobj
+368 0 obj
+<< /Length 2540
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 441.51600000000013 Td
+48.24 734.976 Td
 /F2.0 18 Tf
-[<332e32302e2056> 60.05859375 <616c75654974656d>] TJ
+[<332e32322e2056> 60.05859375 <616c75654974656d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 401.580 220.937 23.280 re
+48.240 695.040 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 401.580 294.583 23.280 re
+269.177 695.040 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 364.020 220.937 37.560 re
+48.240 657.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 364.020 294.583 37.560 re
+269.177 657.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 424.860 m
-269.177 424.860 l
+48.240 718.320 m
+269.177 718.320 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 401.580 m
-269.177 401.580 l
+48.240 695.040 m
+269.177 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 425.110 m
-48.240 400.830 l
+48.240 718.570 m
+48.240 694.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 425.110 m
-269.177 400.830 l
+269.177 718.570 m
+269.177 694.290 l
 S
 [ ] 0 d
 1 w
@@ -52940,7 +54040,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 409.11300000000006 Td
+51.24 702.573 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -52948,26 +54048,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 424.860 m
-563.760 424.860 l
+269.177 718.320 m
+563.760 718.320 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 401.580 m
-563.760 401.580 l
+269.177 695.040 m
+563.760 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 425.110 m
-269.177 400.830 l
+269.177 718.570 m
+269.177 694.290 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 425.110 m
-563.760 400.830 l
+563.760 718.570 m
+563.760 694.290 l
 S
 [ ] 0 d
 1 w
@@ -52975,7 +54075,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 409.11300000000006 Td
+272.17692192000004 702.573 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -52983,26 +54083,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.580 m
-269.177 401.580 l
+48.240 695.040 m
+269.177 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 364.020 m
-269.177 364.020 l
+48.240 657.480 m
+269.177 657.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.830 m
-48.240 363.770 l
+48.240 695.290 m
+48.240 657.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.830 m
-269.177 363.770 l
+269.177 695.290 m
+269.177 657.230 l
 S
 [ ] 0 d
 1 w
@@ -53010,19 +54110,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 385.333 Td
+51.24 678.7930000000001 Td
 /F2.0 10.5 Tf
 <76616c7565> Tj
 ET
 
 
 BT
-51.24 371.053 Td
+51.24 664.513 Td
 ET
 
 
 BT
-51.24 371.053 Td
+51.24 664.513 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -53030,26 +54130,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.580 m
-563.760 401.580 l
+269.177 695.040 m
+563.760 695.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.020 m
-563.760 364.020 l
+269.177 657.480 m
+563.760 657.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.830 m
-269.177 363.770 l
+269.177 695.290 m
+269.177 657.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 401.830 m
-563.760 363.770 l
+563.760 695.290 m
+563.760 657.230 l
 S
 [ ] 0 d
 1 w
@@ -53057,7 +54157,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 378.19300000000004 Td
+272.17692192000004 671.653 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -53075,9 +54175,9 @@ q
 0.200 0.200 0.200 SCN
 
 BT
-552.698 14.388 Td
+49.24 14.388 Td
 /F1.0 9 Tf
-<3333> Tj
+<3334> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -53087,61 +54187,30 @@ Q
 
 endstream
 endobj
-357 0 obj
+369 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 356 0 R
+/Contents 368 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 24 0 R
 /F3.0 26 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 737 0 R
+/XObject << /Stamp1 748 0 R
 >>
 >>
-/Annots [361 0 R 362 0 R 363 0 R]
 >>
 endobj
-358 0 obj
-[357 0 R /XYZ 0 792.0 null]
-endobj
-359 0 obj
-[357 0 R /XYZ 0 690.5400000000001 null]
-endobj
-360 0 obj
-<< /Limits [(_jsonarray) (_parameters)]
-/Names [(_jsonarray) 308 0 R (_jsonnull) 316 0 R (_jsonobject) 324 0 R (_jsonprimitive) 334 0 R (_loop) 342 0 R (_looplog) 350 0 R (_microservicepolicy) 352 0 R (_number) 358 0 R (_operationalpolicy) 359 0 R (_overview) 21 0 R (_parameters) 32 0 R]
->>
-endobj
-361 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 600.7270000000002 325.32792192000005 615.0070000000002]
-/Type /Annot
->>
-endobj
-362 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 563.1670000000001 325.32792192000005 577.4470000000001]
-/Type /Annot
->>
+370 0 obj
+[369 0 R /XYZ 0 792.0 null]
 endobj
-363 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [272.17692192000004 525.6070000000002 297.27192192000007 539.8870000000002]
-/Type /Annot
+371 0 obj
+<< /Limits [(_route198) (_version_information)]
+/Names [(_route198) 173 0 R (_route200) 167 0 R (_route203) 142 0 R (_route204) 135 0 R (_route205) 192 0 R (_uri_scheme) 27 0 R (_v1_dictionary_dictionaryname_items_get) 149 0 R (_v1_dictionary_dictionaryname_items_put) 157 0 R (_v1_tosca_models_toscamodelname_get) 178 0 R (_valueitem) 370 0 R (_version_information) 25 0 R]
 >>
 endobj
-364 0 obj
-[357 0 R /XYZ 0 464.9400000000001 null]
-endobj
-365 0 obj
+372 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -53149,7 +54218,7 @@ endobj
 /Type /Annot
 >>
 endobj
-366 0 obj
+373 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -53157,7 +54226,7 @@ endobj
 /Type /Annot
 >>
 endobj
-367 0 obj
+374 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -53165,7 +54234,7 @@ endobj
 /Type /Annot
 >>
 endobj
-368 0 obj
+375 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -53173,7 +54242,7 @@ endobj
 /Type /Annot
 >>
 endobj
-369 0 obj
+376 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -53181,7 +54250,7 @@ endobj
 /Type /Annot
 >>
 endobj
-370 0 obj
+377 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -53189,7 +54258,7 @@ endobj
 /Type /Annot
 >>
 endobj
-371 0 obj
+378 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -53197,7 +54266,7 @@ endobj
 /Type /Annot
 >>
 endobj
-372 0 obj
+379 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -53205,23 +54274,23 @@ endobj
 /Type /Annot
 >>
 endobj
-373 0 obj
+380 0 obj
 << /Border [0 0 0]
-/Dest (_route23)
+/Dest (_route187)
 /Subtype /Link
 /Rect [60.24000000000001 621.7799999999997 345.798 636.0599999999998]
 /Type /Annot
 >>
 endobj
-374 0 obj
+381 0 obj
 << /Border [0 0 0]
-/Dest (_route23)
+/Dest (_route187)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
 >>
 endobj
-375 0 obj
+382 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -53229,7 +54298,7 @@ endobj
 /Type /Annot
 >>
 endobj
-376 0 obj
+383 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -53237,7 +54306,7 @@ endobj
 /Type /Annot
 >>
 endobj
-377 0 obj
+384 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -53245,7 +54314,7 @@ endobj
 /Type /Annot
 >>
 endobj
-378 0 obj
+385 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -53253,7 +54322,7 @@ endobj
 /Type /Annot
 >>
 endobj
-379 0 obj
+386 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -53261,7 +54330,7 @@ endobj
 /Type /Annot
 >>
 endobj
-380 0 obj
+387 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -53269,7 +54338,7 @@ endobj
 /Type /Annot
 >>
 endobj
-381 0 obj
+388 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -53277,7 +54346,7 @@ endobj
 /Type /Annot
 >>
 endobj
-382 0 obj
+389 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -53285,23 +54354,23 @@ endobj
 /Type /Annot
 >>
 endobj
-383 0 obj
+390 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_route179)
 /Subtype /Link
 /Rect [60.24000000000001 529.3799999999998 197.51700000000002 543.6599999999997]
 /Type /Annot
 >>
 endobj
-384 0 obj
+391 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_route179)
 /Subtype /Link
 /Rect [557.8905 529.3799999999998 563.76 543.6599999999997]
 /Type /Annot
 >>
 endobj
-385 0 obj
+392 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -53309,7 +54378,7 @@ endobj
 /Type /Annot
 >>
 endobj
-386 0 obj
+393 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -53317,7 +54386,7 @@ endobj
 /Type /Annot
 >>
 endobj
-387 0 obj
+394 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -53325,7 +54394,7 @@ endobj
 /Type /Annot
 >>
 endobj
-388 0 obj
+395 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -53333,23 +54402,23 @@ endobj
 /Type /Annot
 >>
 endobj
-389 0 obj
+396 0 obj
 << /Border [0 0 0]
-/Dest (_route16)
+/Dest (_route180)
 /Subtype /Link
 /Rect [60.24000000000001 473.9399999999997 183.88800000000003 488.2199999999997]
 /Type /Annot
 >>
 endobj
-390 0 obj
+397 0 obj
 << /Border [0 0 0]
-/Dest (_route16)
+/Dest (_route180)
 /Subtype /Link
 /Rect [557.8905 473.9399999999997 563.76 488.2199999999997]
 /Type /Annot
 >>
 endobj
-391 0 obj
+398 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -53357,7 +54426,7 @@ endobj
 /Type /Annot
 >>
 endobj
-392 0 obj
+399 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -53365,7 +54434,7 @@ endobj
 /Type /Annot
 >>
 endobj
-393 0 obj
+400 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -53373,7 +54442,7 @@ endobj
 /Type /Annot
 >>
 endobj
-394 0 obj
+401 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -53381,23 +54450,23 @@ endobj
 /Type /Annot
 >>
 endobj
-395 0 obj
+402 0 obj
 << /Border [0 0 0]
-/Dest (_route24)
+/Dest (_route188)
 /Subtype /Link
 /Rect [60.24000000000001 418.49999999999966 258.857794921875 432.77999999999963]
 /Type /Annot
 >>
 endobj
-396 0 obj
+403 0 obj
 << /Border [0 0 0]
-/Dest (_route24)
+/Dest (_route188)
 /Subtype /Link
 /Rect [557.8905 418.49999999999966 563.76 432.77999999999963]
 /Type /Annot
 >>
 endobj
-397 0 obj
+404 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -53405,7 +54474,7 @@ endobj
 /Type /Annot
 >>
 endobj
-398 0 obj
+405 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -53413,7 +54482,7 @@ endobj
 /Type /Annot
 >>
 endobj
-399 0 obj
+406 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -53421,7 +54490,7 @@ endobj
 /Type /Annot
 >>
 endobj
-400 0 obj
+407 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -53429,7 +54498,7 @@ endobj
 /Type /Annot
 >>
 endobj
-401 0 obj
+408 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -53437,7 +54506,7 @@ endobj
 /Type /Annot
 >>
 endobj
-402 0 obj
+409 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -53445,7 +54514,7 @@ endobj
 /Type /Annot
 >>
 endobj
-403 0 obj
+410 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -53453,7 +54522,7 @@ endobj
 /Type /Annot
 >>
 endobj
-404 0 obj
+411 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -53461,23 +54530,23 @@ endobj
 /Type /Annot
 >>
 endobj
-405 0 obj
+412 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route190)
 /Subtype /Link
 /Rect [60.24000000000001 326.09999999999957 249.81729492187503 340.37999999999954]
 /Type /Annot
 >>
 endobj
-406 0 obj
+413 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route190)
 /Subtype /Link
 /Rect [557.8905 326.09999999999957 563.76 340.37999999999954]
 /Type /Annot
 >>
 endobj
-407 0 obj
+414 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -53485,7 +54554,7 @@ endobj
 /Type /Annot
 >>
 endobj
-408 0 obj
+415 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -53493,7 +54562,7 @@ endobj
 /Type /Annot
 >>
 endobj
-409 0 obj
+416 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -53501,7 +54570,7 @@ endobj
 /Type /Annot
 >>
 endobj
-410 0 obj
+417 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -53509,7 +54578,7 @@ endobj
 /Type /Annot
 >>
 endobj
-411 0 obj
+418 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -53517,7 +54586,7 @@ endobj
 /Type /Annot
 >>
 endobj
-412 0 obj
+419 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -53525,7 +54594,7 @@ endobj
 /Type /Annot
 >>
 endobj
-413 0 obj
+420 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -53533,7 +54602,7 @@ endobj
 /Type /Annot
 >>
 endobj
-414 0 obj
+421 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -53541,23 +54610,23 @@ endobj
 /Type /Annot
 >>
 endobj
-415 0 obj
+422 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_route186)
 /Subtype /Link
 /Rect [60.24000000000001 233.69999999999948 211.20900000000003 247.97999999999948]
 /Type /Annot
 >>
 endobj
-416 0 obj
+423 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_route186)
 /Subtype /Link
 /Rect [557.8905 233.69999999999948 563.76 247.97999999999948]
 /Type /Annot
 >>
 endobj
-417 0 obj
+424 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -53565,7 +54634,7 @@ endobj
 /Type /Annot
 >>
 endobj
-418 0 obj
+425 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -53573,7 +54642,7 @@ endobj
 /Type /Annot
 >>
 endobj
-419 0 obj
+426 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -53581,7 +54650,7 @@ endobj
 /Type /Annot
 >>
 endobj
-420 0 obj
+427 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -53589,23 +54658,23 @@ endobj
 /Type /Annot
 >>
 endobj
-421 0 obj
+428 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_route182)
 /Subtype /Link
 /Rect [60.24000000000001 178.2599999999995 280.33050000000003 192.5399999999995]
 /Type /Annot
 >>
 endobj
-422 0 obj
+429 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_route182)
 /Subtype /Link
 /Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
 /Type /Annot
 >>
 endobj
-423 0 obj
+430 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -53613,7 +54682,7 @@ endobj
 /Type /Annot
 >>
 endobj
-424 0 obj
+431 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -53621,7 +54690,7 @@ endobj
 /Type /Annot
 >>
 endobj
-425 0 obj
+432 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -53629,7 +54698,7 @@ endobj
 /Type /Annot
 >>
 endobj
-426 0 obj
+433 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -53637,7 +54706,7 @@ endobj
 /Type /Annot
 >>
 endobj
-427 0 obj
+434 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -53645,7 +54714,7 @@ endobj
 /Type /Annot
 >>
 endobj
-428 0 obj
+435 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -53653,23 +54722,23 @@ endobj
 /Type /Annot
 >>
 endobj
-429 0 obj
+436 0 obj
 << /Border [0 0 0]
-/Dest (_route19)
+/Dest (_route183)
 /Subtype /Link
 /Rect [60.24000000000001 104.33999999999955 281.202 118.61999999999955]
 /Type /Annot
 >>
 endobj
-430 0 obj
+437 0 obj
 << /Border [0 0 0]
-/Dest (_route19)
+/Dest (_route183)
 /Subtype /Link
 /Rect [557.8905 104.33999999999955 563.76 118.61999999999955]
 /Type /Annot
 >>
 endobj
-431 0 obj
+438 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -53677,7 +54746,7 @@ endobj
 /Type /Annot
 >>
 endobj
-432 0 obj
+439 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -53685,7 +54754,7 @@ endobj
 /Type /Annot
 >>
 endobj
-433 0 obj
+440 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -53693,7 +54762,7 @@ endobj
 /Type /Annot
 >>
 endobj
-434 0 obj
+441 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -53701,7 +54770,7 @@ endobj
 /Type /Annot
 >>
 endobj
-435 0 obj
+442 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -53709,7 +54778,7 @@ endobj
 /Type /Annot
 >>
 endobj
-436 0 obj
+443 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -53717,23 +54786,23 @@ endobj
 /Type /Annot
 >>
 endobj
-437 0 obj
+444 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_route184)
 /Subtype /Link
 /Rect [60.24 741.7199999999999 247.74900000000002 756.0]
 /Type /Annot
 >>
 endobj
-438 0 obj
+445 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_route184)
 /Subtype /Link
 /Rect [557.8905 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
-439 0 obj
+446 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -53741,7 +54810,7 @@ endobj
 /Type /Annot
 >>
 endobj
-440 0 obj
+447 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -53749,7 +54818,7 @@ endobj
 /Type /Annot
 >>
 endobj
-441 0 obj
+448 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -53757,7 +54826,7 @@ endobj
 /Type /Annot
 >>
 endobj
-442 0 obj
+449 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -53765,7 +54834,7 @@ endobj
 /Type /Annot
 >>
 endobj
-443 0 obj
+450 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -53773,7 +54842,7 @@ endobj
 /Type /Annot
 >>
 endobj
-444 0 obj
+451 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -53781,23 +54850,23 @@ endobj
 /Type /Annot
 >>
 endobj
-445 0 obj
+452 0 obj
 << /Border [0 0 0]
-/Dest (_route21)
+/Dest (_route185)
 /Subtype /Link
 /Rect [60.24000000000001 667.7999999999998 253.45050000000003 682.0799999999999]
 /Type /Annot
 >>
 endobj
-446 0 obj
+453 0 obj
 << /Border [0 0 0]
-/Dest (_route21)
+/Dest (_route185)
 /Subtype /Link
 /Rect [557.8905 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
-447 0 obj
+454 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -53805,7 +54874,7 @@ endobj
 /Type /Annot
 >>
 endobj
-448 0 obj
+455 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -53813,7 +54882,7 @@ endobj
 /Type /Annot
 >>
 endobj
-449 0 obj
+456 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -53821,7 +54890,7 @@ endobj
 /Type /Annot
 >>
 endobj
-450 0 obj
+457 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -53829,7 +54898,7 @@ endobj
 /Type /Annot
 >>
 endobj
-451 0 obj
+458 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -53837,7 +54906,7 @@ endobj
 /Type /Annot
 >>
 endobj
-452 0 obj
+459 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -53845,7 +54914,7 @@ endobj
 /Type /Annot
 >>
 endobj
-453 0 obj
+460 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -53853,7 +54922,7 @@ endobj
 /Type /Annot
 >>
 endobj
-454 0 obj
+461 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -53861,23 +54930,23 @@ endobj
 /Type /Annot
 >>
 endobj
-455 0 obj
+462 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route189)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 201.44400000000002 589.6799999999998]
 /Type /Annot
 >>
 endobj
-456 0 obj
+463 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route189)
 /Subtype /Link
 /Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-457 0 obj
+464 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -53885,7 +54954,7 @@ endobj
 /Type /Annot
 >>
 endobj
-458 0 obj
+465 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -53893,7 +54962,7 @@ endobj
 /Type /Annot
 >>
 endobj
-459 0 obj
+466 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -53901,7 +54970,7 @@ endobj
 /Type /Annot
 >>
 endobj
-460 0 obj
+467 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -53909,23 +54978,23 @@ endobj
 /Type /Annot
 >>
 endobj
-461 0 obj
+468 0 obj
 << /Border [0 0 0]
-/Dest (_route27)
+/Dest (_route191)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 269.116294921875 534.2399999999998]
 /Type /Annot
 >>
 endobj
-462 0 obj
+469 0 obj
 << /Border [0 0 0]
-/Dest (_route27)
+/Dest (_route191)
 /Subtype /Link
 /Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-463 0 obj
+470 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -53933,7 +55002,7 @@ endobj
 /Type /Annot
 >>
 endobj
-464 0 obj
+471 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -53941,7 +55010,7 @@ endobj
 /Type /Annot
 >>
 endobj
-465 0 obj
+472 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -53949,7 +55018,7 @@ endobj
 /Type /Annot
 >>
 endobj
-466 0 obj
+473 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -53957,7 +55026,7 @@ endobj
 /Type /Annot
 >>
 endobj
-467 0 obj
+474 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -53965,7 +55034,7 @@ endobj
 /Type /Annot
 >>
 endobj
-468 0 obj
+475 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -53973,7 +55042,7 @@ endobj
 /Type /Annot
 >>
 endobj
-469 0 obj
+476 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -53981,7 +55050,7 @@ endobj
 /Type /Annot
 >>
 endobj
-470 0 obj
+477 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -53989,23 +55058,23 @@ endobj
 /Type /Annot
 >>
 endobj
-471 0 obj
+478 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route196)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 273.22425585937503 441.8399999999997]
 /Type /Annot
 >>
 endobj
-472 0 obj
+479 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route196)
 /Subtype /Link
 /Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-473 0 obj
+480 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -54013,7 +55082,7 @@ endobj
 /Type /Annot
 >>
 endobj
-474 0 obj
+481 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -54021,7 +55090,7 @@ endobj
 /Type /Annot
 >>
 endobj
-475 0 obj
+482 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -54029,7 +55098,7 @@ endobj
 /Type /Annot
 >>
 endobj
-476 0 obj
+483 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -54037,23 +55106,23 @@ endobj
 /Type /Annot
 >>
 endobj
-477 0 obj
+484 0 obj
 << /Border [0 0 0]
-/Dest (_route28)
+/Dest (_route192)
 /Subtype /Link
 /Rect [60.24000000000001 372.11999999999966 355.19775585937504 386.39999999999964]
 /Type /Annot
 >>
 endobj
-478 0 obj
+485 0 obj
 << /Border [0 0 0]
-/Dest (_route28)
+/Dest (_route192)
 /Subtype /Link
 /Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-479 0 obj
+486 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -54061,7 +55130,7 @@ endobj
 /Type /Annot
 >>
 endobj
-480 0 obj
+487 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -54069,7 +55138,7 @@ endobj
 /Type /Annot
 >>
 endobj
-481 0 obj
+488 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -54077,7 +55146,7 @@ endobj
 /Type /Annot
 >>
 endobj
-482 0 obj
+489 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -54085,7 +55154,7 @@ endobj
 /Type /Annot
 >>
 endobj
-483 0 obj
+490 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -54093,7 +55162,7 @@ endobj
 /Type /Annot
 >>
 endobj
-484 0 obj
+491 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -54101,23 +55170,23 @@ endobj
 /Type /Annot
 >>
 endobj
-485 0 obj
+492 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_route193)
 /Subtype /Link
 /Rect [60.24000000000001 298.1999999999996 356.069255859375 312.47999999999956]
 /Type /Annot
 >>
 endobj
-486 0 obj
+493 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_route193)
 /Subtype /Link
 /Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
-487 0 obj
+494 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -54125,7 +55194,7 @@ endobj
 /Type /Annot
 >>
 endobj
-488 0 obj
+495 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -54133,7 +55202,7 @@ endobj
 /Type /Annot
 >>
 endobj
-489 0 obj
+496 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -54141,7 +55210,7 @@ endobj
 /Type /Annot
 >>
 endobj
-490 0 obj
+497 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -54149,7 +55218,7 @@ endobj
 /Type /Annot
 >>
 endobj
-491 0 obj
+498 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -54157,7 +55226,7 @@ endobj
 /Type /Annot
 >>
 endobj
-492 0 obj
+499 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -54165,23 +55234,23 @@ endobj
 /Type /Annot
 >>
 endobj
-493 0 obj
+500 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route194)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 322.61625585937503 238.55999999999952]
 /Type /Annot
 >>
 endobj
-494 0 obj
+501 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route194)
 /Subtype /Link
 /Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-495 0 obj
+502 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -54189,7 +55258,7 @@ endobj
 /Type /Annot
 >>
 endobj
-496 0 obj
+503 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -54197,7 +55266,7 @@ endobj
 /Type /Annot
 >>
 endobj
-497 0 obj
+504 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -54205,7 +55274,7 @@ endobj
 /Type /Annot
 >>
 endobj
-498 0 obj
+505 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -54213,7 +55282,7 @@ endobj
 /Type /Annot
 >>
 endobj
-499 0 obj
+506 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -54221,7 +55290,7 @@ endobj
 /Type /Annot
 >>
 endobj
-500 0 obj
+507 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -54229,23 +55298,23 @@ endobj
 /Type /Annot
 >>
 endobj
-501 0 obj
+508 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route195)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 322.448255859375 164.63999999999956]
 /Type /Annot
 >>
 endobj
-502 0 obj
+509 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route195)
 /Subtype /Link
 /Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-503 0 obj
+510 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -54253,7 +55322,7 @@ endobj
 /Type /Annot
 >>
 endobj
-504 0 obj
+511 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -54261,7 +55330,7 @@ endobj
 /Type /Annot
 >>
 endobj
-505 0 obj
+512 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -54269,7 +55338,7 @@ endobj
 /Type /Annot
 >>
 endobj
-506 0 obj
+513 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -54277,7 +55346,7 @@ endobj
 /Type /Annot
 >>
 endobj
-507 0 obj
+514 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -54285,7 +55354,7 @@ endobj
 /Type /Annot
 >>
 endobj
-508 0 obj
+515 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -54293,7 +55362,7 @@ endobj
 /Type /Annot
 >>
 endobj
-509 0 obj
+516 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -54301,7 +55370,7 @@ endobj
 /Type /Annot
 >>
 endobj
-510 0 obj
+517 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -54309,23 +55378,23 @@ endobj
 /Type /Annot
 >>
 endobj
-511 0 obj
+518 0 obj
 << /Border [0 0 0]
-/Dest (_route40)
+/Dest (_route204)
 /Subtype /Link
 /Rect [60.24000000000001 57.95999999999961 178.58550000000002 72.23999999999961]
 /Type /Annot
 >>
 endobj
-512 0 obj
+519 0 obj
 << /Border [0 0 0]
-/Dest (_route40)
+/Dest (_route204)
 /Subtype /Link
 /Rect [557.8905 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
-513 0 obj
+520 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -54333,7 +55402,7 @@ endobj
 /Type /Annot
 >>
 endobj
-514 0 obj
+521 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -54341,7 +55410,7 @@ endobj
 /Type /Annot
 >>
 endobj
-515 0 obj
+522 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -54349,7 +55418,7 @@ endobj
 /Type /Annot
 >>
 endobj
-516 0 obj
+523 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -54357,23 +55426,23 @@ endobj
 /Type /Annot
 >>
 endobj
-517 0 obj
+524 0 obj
 << /Border [0 0 0]
-/Dest (_route39)
+/Dest (_route203)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 271.46850000000006 719.04]
 /Type /Annot
 >>
 endobj
-518 0 obj
+525 0 obj
 << /Border [0 0 0]
-/Dest (_route39)
+/Dest (_route203)
 /Subtype /Link
 /Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-519 0 obj
+526 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -54381,7 +55450,7 @@ endobj
 /Type /Annot
 >>
 endobj
-520 0 obj
+527 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -54389,7 +55458,7 @@ endobj
 /Type /Annot
 >>
 endobj
-521 0 obj
+528 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -54397,7 +55466,7 @@ endobj
 /Type /Annot
 >>
 endobj
-522 0 obj
+529 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -54405,7 +55474,7 @@ endobj
 /Type /Annot
 >>
 endobj
-523 0 obj
+530 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_7)
 /Subtype /Link
@@ -54413,7 +55482,7 @@ endobj
 /Type /Annot
 >>
 endobj
-524 0 obj
+531 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_7)
 /Subtype /Link
@@ -54421,7 +55490,7 @@ endobj
 /Type /Annot
 >>
 endobj
-525 0 obj
+532 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -54429,7 +55498,7 @@ endobj
 /Type /Annot
 >>
 endobj
-526 0 obj
+533 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -54437,7 +55506,7 @@ endobj
 /Type /Annot
 >>
 endobj
-527 0 obj
+534 0 obj
 << /Border [0 0 0]
 /Dest (_v1_dictionary_dictionaryname_items_get)
 /Subtype /Link
@@ -54445,7 +55514,7 @@ endobj
 /Type /Annot
 >>
 endobj
-528 0 obj
+535 0 obj
 << /Border [0 0 0]
 /Dest (_v1_dictionary_dictionaryname_items_get)
 /Subtype /Link
@@ -54453,7 +55522,7 @@ endobj
 /Type /Annot
 >>
 endobj
-529 0 obj
+536 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -54461,7 +55530,7 @@ endobj
 /Type /Annot
 >>
 endobj
-530 0 obj
+537 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -54469,7 +55538,7 @@ endobj
 /Type /Annot
 >>
 endobj
-531 0 obj
+538 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -54477,7 +55546,7 @@ endobj
 /Type /Annot
 >>
 endobj
-532 0 obj
+539 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -54485,7 +55554,7 @@ endobj
 /Type /Annot
 >>
 endobj
-533 0 obj
+540 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -54493,7 +55562,7 @@ endobj
 /Type /Annot
 >>
 endobj
-534 0 obj
+541 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -54501,7 +55570,7 @@ endobj
 /Type /Annot
 >>
 endobj
-535 0 obj
+542 0 obj
 << /Border [0 0 0]
 /Dest (_v1_dictionary_dictionaryname_items_put)
 /Subtype /Link
@@ -54509,7 +55578,7 @@ endobj
 /Type /Annot
 >>
 endobj
-536 0 obj
+543 0 obj
 << /Border [0 0 0]
 /Dest (_v1_dictionary_dictionaryname_items_put)
 /Subtype /Link
@@ -54517,7 +55586,7 @@ endobj
 /Type /Annot
 >>
 endobj
-537 0 obj
+544 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -54525,7 +55594,7 @@ endobj
 /Type /Annot
 >>
 endobj
-538 0 obj
+545 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -54533,7 +55602,7 @@ endobj
 /Type /Annot
 >>
 endobj
-539 0 obj
+546 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -54541,7 +55610,7 @@ endobj
 /Type /Annot
 >>
 endobj
-540 0 obj
+547 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -54549,7 +55618,7 @@ endobj
 /Type /Annot
 >>
 endobj
-541 0 obj
+548 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_8)
 /Subtype /Link
@@ -54557,7 +55626,7 @@ endobj
 /Type /Annot
 >>
 endobj
-542 0 obj
+549 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_8)
 /Subtype /Link
@@ -54565,7 +55634,7 @@ endobj
 /Type /Annot
 >>
 endobj
-543 0 obj
+550 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -54573,7 +55642,7 @@ endobj
 /Type /Annot
 >>
 endobj
-544 0 obj
+551 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -54581,23 +55650,23 @@ endobj
 /Type /Annot
 >>
 endobj
-545 0 obj
+552 0 obj
 << /Border [0 0 0]
-/Dest (_route17)
+/Dest (_route181)
 /Subtype /Link
 /Rect [60.24000000000001 446.03999999999974 187.51050000000004 460.3199999999997]
 /Type /Annot
 >>
 endobj
-546 0 obj
+553 0 obj
 << /Border [0 0 0]
-/Dest (_route17)
+/Dest (_route181)
 /Subtype /Link
 /Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-547 0 obj
+554 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -54605,7 +55674,7 @@ endobj
 /Type /Annot
 >>
 endobj
-548 0 obj
+555 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -54613,7 +55682,7 @@ endobj
 /Type /Annot
 >>
 endobj
-549 0 obj
+556 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -54621,7 +55690,7 @@ endobj
 /Type /Annot
 >>
 endobj
-550 0 obj
+557 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -54629,23 +55698,23 @@ endobj
 /Type /Annot
 >>
 endobj
-551 0 obj
+558 0 obj
 << /Border [0 0 0]
-/Dest (_route36)
+/Dest (_route200)
 /Subtype /Link
 /Rect [60.24000000000001 390.5999999999997 191.58450000000002 404.87999999999965]
 /Type /Annot
 >>
 endobj
-552 0 obj
+559 0 obj
 << /Border [0 0 0]
-/Dest (_route36)
+/Dest (_route200)
 /Subtype /Link
 /Rect [552.021 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
-553 0 obj
+560 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -54653,7 +55722,7 @@ endobj
 /Type /Annot
 >>
 endobj
-554 0 obj
+561 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -54661,7 +55730,7 @@ endobj
 /Type /Annot
 >>
 endobj
-555 0 obj
+562 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -54669,7 +55738,7 @@ endobj
 /Type /Annot
 >>
 endobj
-556 0 obj
+563 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -54677,23 +55746,23 @@ endobj
 /Type /Annot
 >>
 endobj
-557 0 obj
+564 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_route198)
 /Subtype /Link
 /Rect [60.24000000000001 335.1599999999996 315.7995 349.4399999999996]
 /Type /Annot
 >>
 endobj
-558 0 obj
+565 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_route198)
 /Subtype /Link
 /Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
-559 0 obj
+566 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -54701,7 +55770,7 @@ endobj
 /Type /Annot
 >>
 endobj
-560 0 obj
+567 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -54709,7 +55778,7 @@ endobj
 /Type /Annot
 >>
 endobj
-561 0 obj
+568 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -54717,7 +55786,7 @@ endobj
 /Type /Annot
 >>
 endobj
-562 0 obj
+569 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -54725,7 +55794,7 @@ endobj
 /Type /Annot
 >>
 endobj
-563 0 obj
+570 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -54733,7 +55802,7 @@ endobj
 /Type /Annot
 >>
 endobj
-564 0 obj
+571 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -54741,7 +55810,7 @@ endobj
 /Type /Annot
 >>
 endobj
-565 0 obj
+572 0 obj
 << /Border [0 0 0]
 /Dest (_v1_tosca_models_toscamodelname_get)
 /Subtype /Link
@@ -54749,7 +55818,7 @@ endobj
 /Type /Annot
 >>
 endobj
-566 0 obj
+573 0 obj
 << /Border [0 0 0]
 /Dest (_v1_tosca_models_toscamodelname_get)
 /Subtype /Link
@@ -54757,7 +55826,7 @@ endobj
 /Type /Annot
 >>
 endobj
-567 0 obj
+574 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -54765,7 +55834,7 @@ endobj
 /Type /Annot
 >>
 endobj
-568 0 obj
+575 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -54773,7 +55842,7 @@ endobj
 /Type /Annot
 >>
 endobj
-569 0 obj
+576 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -54781,7 +55850,7 @@ endobj
 /Type /Annot
 >>
 endobj
-570 0 obj
+577 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -54789,7 +55858,7 @@ endobj
 /Type /Annot
 >>
 endobj
-571 0 obj
+578 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -54797,7 +55866,7 @@ endobj
 /Type /Annot
 >>
 endobj
-572 0 obj
+579 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -54805,23 +55874,23 @@ endobj
 /Type /Annot
 >>
 endobj
-573 0 obj
+580 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route197)
 /Subtype /Link
 /Rect [60.24000000000001 187.31999999999954 289.6335 201.59999999999954]
 /Type /Annot
 >>
 endobj
-574 0 obj
+581 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route197)
 /Subtype /Link
 /Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
-575 0 obj
+582 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -54829,7 +55898,7 @@ endobj
 /Type /Annot
 >>
 endobj
-576 0 obj
+583 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -54837,7 +55906,7 @@ endobj
 /Type /Annot
 >>
 endobj
-577 0 obj
+584 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -54845,7 +55914,7 @@ endobj
 /Type /Annot
 >>
 endobj
-578 0 obj
+585 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -54853,7 +55922,7 @@ endobj
 /Type /Annot
 >>
 endobj
-579 0 obj
+586 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_9)
 /Subtype /Link
@@ -54861,7 +55930,7 @@ endobj
 /Type /Annot
 >>
 endobj
-580 0 obj
+587 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_9)
 /Subtype /Link
@@ -54869,7 +55938,7 @@ endobj
 /Type /Annot
 >>
 endobj
-581 0 obj
+588 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -54877,7 +55946,7 @@ endobj
 /Type /Annot
 >>
 endobj
-582 0 obj
+589 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -54885,23 +55954,23 @@ endobj
 /Type /Annot
 >>
 endobj
-583 0 obj
+590 0 obj
 << /Border [0 0 0]
-/Dest (_route41)
+/Dest (_route205)
 /Subtype /Link
 /Rect [60.24000000000001 94.91999999999959 189.747 109.19999999999959]
 /Type /Annot
 >>
 endobj
-584 0 obj
+591 0 obj
 << /Border [0 0 0]
-/Dest (_route41)
+/Dest (_route205)
 /Subtype /Link
 /Rect [552.021 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
-585 0 obj
+592 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -54909,7 +55978,7 @@ endobj
 /Type /Annot
 >>
 endobj
-586 0 obj
+593 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -54917,7 +55986,7 @@ endobj
 /Type /Annot
 >>
 endobj
-587 0 obj
+594 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -54925,7 +55994,7 @@ endobj
 /Type /Annot
 >>
 endobj
-588 0 obj
+595 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -54933,23 +56002,23 @@ endobj
 /Type /Annot
 >>
 endobj
-589 0 obj
+596 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_route177)
 /Subtype /Link
 /Rect [60.24 741.7199999999999 245.15550000000002 756.0]
 /Type /Annot
 >>
 endobj
-590 0 obj
+597 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_route177)
 /Subtype /Link
 /Rect [552.021 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
-591 0 obj
+598 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -54957,7 +56026,7 @@ endobj
 /Type /Annot
 >>
 endobj
-592 0 obj
+599 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -54965,7 +56034,7 @@ endobj
 /Type /Annot
 >>
 endobj
-593 0 obj
+600 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -54973,7 +56042,7 @@ endobj
 /Type /Annot
 >>
 endobj
-594 0 obj
+601 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -54981,23 +56050,23 @@ endobj
 /Type /Annot
 >>
 endobj
-595 0 obj
+602 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route172)
 /Subtype /Link
-/Rect [60.24000000000001 686.2799999999999 273.52629492187504 700.56]
+/Rect [60.24000000000001 686.2799999999999 248.431294921875 700.56]
 /Type /Annot
 >>
 endobj
-596 0 obj
+603 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route172)
 /Subtype /Link
 /Rect [552.021 686.2799999999999 563.76 700.56]
 /Type /Annot
 >>
 endobj
-597 0 obj
+604 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -55005,7 +56074,7 @@ endobj
 /Type /Annot
 >>
 endobj
-598 0 obj
+605 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -55013,7 +56082,7 @@ endobj
 /Type /Annot
 >>
 endobj
-599 0 obj
+606 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -55021,7 +56090,7 @@ endobj
 /Type /Annot
 >>
 endobj
-600 0 obj
+607 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -55029,7 +56098,7 @@ endobj
 /Type /Annot
 >>
 endobj
-601 0 obj
+608 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -55037,7 +56106,7 @@ endobj
 /Type /Annot
 >>
 endobj
-602 0 obj
+609 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -55045,23 +56114,23 @@ endobj
 /Type /Annot
 >>
 endobj
-603 0 obj
+610 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route166)
 /Subtype /Link
 /Rect [60.24000000000001 612.3599999999998 214.8735 626.6399999999999]
 /Type /Annot
 >>
 endobj
-604 0 obj
+611 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route166)
 /Subtype /Link
 /Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
-605 0 obj
+612 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -55069,7 +56138,7 @@ endobj
 /Type /Annot
 >>
 endobj
-606 0 obj
+613 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -55077,7 +56146,7 @@ endobj
 /Type /Annot
 >>
 endobj
-607 0 obj
+614 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -55085,7 +56154,7 @@ endobj
 /Type /Annot
 >>
 endobj
-608 0 obj
+615 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -55093,23 +56162,23 @@ endobj
 /Type /Annot
 >>
 endobj
-609 0 obj
+616 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route178)
 /Subtype /Link
 /Rect [60.24000000000001 556.9199999999998 259.467 571.1999999999998]
 /Type /Annot
 >>
 endobj
-610 0 obj
+617 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route178)
 /Subtype /Link
 /Rect [552.021 556.9199999999998 563.76 571.1999999999998]
 /Type /Annot
 >>
 endobj
-611 0 obj
+618 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -55117,7 +56186,7 @@ endobj
 /Type /Annot
 >>
 endobj
-612 0 obj
+619 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -55125,7 +56194,7 @@ endobj
 /Type /Annot
 >>
 endobj
-613 0 obj
+620 0 obj
 << /Border [0 0 0]
 /Dest (_responses_31)
 /Subtype /Link
@@ -55133,7 +56202,7 @@ endobj
 /Type /Annot
 >>
 endobj
-614 0 obj
+621 0 obj
 << /Border [0 0 0]
 /Dest (_responses_31)
 /Subtype /Link
@@ -55141,7 +56210,7 @@ endobj
 /Type /Annot
 >>
 endobj
-615 0 obj
+622 0 obj
 << /Border [0 0 0]
 /Dest (_produces_30)
 /Subtype /Link
@@ -55149,7 +56218,7 @@ endobj
 /Type /Annot
 >>
 endobj
-616 0 obj
+623 0 obj
 << /Border [0 0 0]
 /Dest (_produces_30)
 /Subtype /Link
@@ -55157,23 +56226,23 @@ endobj
 /Type /Annot
 >>
 endobj
-617 0 obj
+624 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_route175)
 /Subtype /Link
 /Rect [60.24000000000001 482.9999999999998 248.45250000000001 497.27999999999975]
 /Type /Annot
 >>
 endobj
-618 0 obj
+625 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_route175)
 /Subtype /Link
 /Rect [552.021 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
-619 0 obj
+626 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -55181,7 +56250,7 @@ endobj
 /Type /Annot
 >>
 endobj
-620 0 obj
+627 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -55189,7 +56258,7 @@ endobj
 /Type /Annot
 >>
 endobj
-621 0 obj
+628 0 obj
 << /Border [0 0 0]
 /Dest (_responses_32)
 /Subtype /Link
@@ -55197,7 +56266,7 @@ endobj
 /Type /Annot
 >>
 endobj
-622 0 obj
+629 0 obj
 << /Border [0 0 0]
 /Dest (_responses_32)
 /Subtype /Link
@@ -55205,7 +56274,7 @@ endobj
 /Type /Annot
 >>
 endobj
-623 0 obj
+630 0 obj
 << /Border [0 0 0]
 /Dest (_produces_31)
 /Subtype /Link
@@ -55213,7 +56282,7 @@ endobj
 /Type /Annot
 >>
 endobj
-624 0 obj
+631 0 obj
 << /Border [0 0 0]
 /Dest (_produces_31)
 /Subtype /Link
@@ -55221,23 +56290,23 @@ endobj
 /Type /Annot
 >>
 endobj
-625 0 obj
+632 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_route174)
 /Subtype /Link
 /Rect [60.24000000000001 409.0799999999997 235.842 423.3599999999997]
 /Type /Annot
 >>
 endobj
-626 0 obj
+633 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_route174)
 /Subtype /Link
 /Rect [552.021 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
-627 0 obj
+634 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_23)
 /Subtype /Link
@@ -55245,7 +56314,7 @@ endobj
 /Type /Annot
 >>
 endobj
-628 0 obj
+635 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_23)
 /Subtype /Link
@@ -55253,7 +56322,7 @@ endobj
 /Type /Annot
 >>
 endobj
-629 0 obj
+636 0 obj
 << /Border [0 0 0]
 /Dest (_responses_33)
 /Subtype /Link
@@ -55261,7 +56330,7 @@ endobj
 /Type /Annot
 >>
 endobj
-630 0 obj
+637 0 obj
 << /Border [0 0 0]
 /Dest (_responses_33)
 /Subtype /Link
@@ -55269,7 +56338,7 @@ endobj
 /Type /Annot
 >>
 endobj
-631 0 obj
+638 0 obj
 << /Border [0 0 0]
 /Dest (_produces_32)
 /Subtype /Link
@@ -55277,7 +56346,7 @@ endobj
 /Type /Annot
 >>
 endobj
-632 0 obj
+639 0 obj
 << /Border [0 0 0]
 /Dest (_produces_32)
 /Subtype /Link
@@ -55285,23 +56354,23 @@ endobj
 /Type /Annot
 >>
 endobj
-633 0 obj
+640 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_route176)
 /Subtype /Link
 /Rect [60.24000000000001 335.1599999999996 249.70200000000003 349.4399999999996]
 /Type /Annot
 >>
 endobj
-634 0 obj
+641 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_route176)
 /Subtype /Link
 /Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
-635 0 obj
+642 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_24)
 /Subtype /Link
@@ -55309,7 +56378,7 @@ endobj
 /Type /Annot
 >>
 endobj
-636 0 obj
+643 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_24)
 /Subtype /Link
@@ -55317,7 +56386,7 @@ endobj
 /Type /Annot
 >>
 endobj
-637 0 obj
+644 0 obj
 << /Border [0 0 0]
 /Dest (_responses_34)
 /Subtype /Link
@@ -55325,7 +56394,7 @@ endobj
 /Type /Annot
 >>
 endobj
-638 0 obj
+645 0 obj
 << /Border [0 0 0]
 /Dest (_responses_34)
 /Subtype /Link
@@ -55333,7 +56402,7 @@ endobj
 /Type /Annot
 >>
 endobj
-639 0 obj
+646 0 obj
 << /Border [0 0 0]
 /Dest (_produces_33)
 /Subtype /Link
@@ -55341,7 +56410,7 @@ endobj
 /Type /Annot
 >>
 endobj
-640 0 obj
+647 0 obj
 << /Border [0 0 0]
 /Dest (_produces_33)
 /Subtype /Link
@@ -55349,23 +56418,23 @@ endobj
 /Type /Annot
 >>
 endobj
-641 0 obj
+648 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_route168)
 /Subtype /Link
 /Rect [60.24000000000001 261.23999999999955 307.641 275.5199999999995]
 /Type /Annot
 >>
 endobj
-642 0 obj
+649 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_route168)
 /Subtype /Link
 /Rect [552.021 261.23999999999955 563.76 275.5199999999995]
 /Type /Annot
 >>
 endobj
-643 0 obj
+650 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_25)
 /Subtype /Link
@@ -55373,7 +56442,7 @@ endobj
 /Type /Annot
 >>
 endobj
-644 0 obj
+651 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_25)
 /Subtype /Link
@@ -55381,7 +56450,7 @@ endobj
 /Type /Annot
 >>
 endobj
-645 0 obj
+652 0 obj
 << /Border [0 0 0]
 /Dest (_responses_35)
 /Subtype /Link
@@ -55389,7 +56458,7 @@ endobj
 /Type /Annot
 >>
 endobj
-646 0 obj
+653 0 obj
 << /Border [0 0 0]
 /Dest (_responses_35)
 /Subtype /Link
@@ -55397,7 +56466,7 @@ endobj
 /Type /Annot
 >>
 endobj
-647 0 obj
+654 0 obj
 << /Border [0 0 0]
 /Dest (_produces_34)
 /Subtype /Link
@@ -55405,7 +56474,7 @@ endobj
 /Type /Annot
 >>
 endobj
-648 0 obj
+655 0 obj
 << /Border [0 0 0]
 /Dest (_produces_34)
 /Subtype /Link
@@ -55413,23 +56482,23 @@ endobj
 /Type /Annot
 >>
 endobj
-649 0 obj
+656 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_route173)
 /Subtype /Link
-/Rect [60.24000000000001 187.31999999999954 286.95579492187505 201.59999999999954]
+/Rect [60.24000000000001 187.31999999999954 261.860794921875 201.59999999999954]
 /Type /Annot
 >>
 endobj
-650 0 obj
+657 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_route173)
 /Subtype /Link
 /Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
-651 0 obj
+658 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_26)
 /Subtype /Link
@@ -55437,7 +56506,7 @@ endobj
 /Type /Annot
 >>
 endobj
-652 0 obj
+659 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_26)
 /Subtype /Link
@@ -55445,7 +56514,7 @@ endobj
 /Type /Annot
 >>
 endobj
-653 0 obj
+660 0 obj
 << /Border [0 0 0]
 /Dest (_responses_36)
 /Subtype /Link
@@ -55453,7 +56522,7 @@ endobj
 /Type /Annot
 >>
 endobj
-654 0 obj
+661 0 obj
 << /Border [0 0 0]
 /Dest (_responses_36)
 /Subtype /Link
@@ -55461,7 +56530,7 @@ endobj
 /Type /Annot
 >>
 endobj
-655 0 obj
+662 0 obj
 << /Border [0 0 0]
 /Dest (_produces_35)
 /Subtype /Link
@@ -55469,7 +56538,7 @@ endobj
 /Type /Annot
 >>
 endobj
-656 0 obj
+663 0 obj
 << /Border [0 0 0]
 /Dest (_produces_35)
 /Subtype /Link
@@ -55477,23 +56546,23 @@ endobj
 /Type /Annot
 >>
 endobj
-657 0 obj
+664 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_route169)
 /Subtype /Link
 /Rect [60.24000000000001 113.39999999999958 339.560794921875 127.67999999999958]
 /Type /Annot
 >>
 endobj
-658 0 obj
+665 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_route169)
 /Subtype /Link
 /Rect [552.021 113.39999999999958 563.76 127.67999999999958]
 /Type /Annot
 >>
 endobj
-659 0 obj
+666 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_27)
 /Subtype /Link
@@ -55501,7 +56570,7 @@ endobj
 /Type /Annot
 >>
 endobj
-660 0 obj
+667 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_27)
 /Subtype /Link
@@ -55509,7 +56578,7 @@ endobj
 /Type /Annot
 >>
 endobj
-661 0 obj
+668 0 obj
 << /Border [0 0 0]
 /Dest (_responses_37)
 /Subtype /Link
@@ -55517,7 +56586,7 @@ endobj
 /Type /Annot
 >>
 endobj
-662 0 obj
+669 0 obj
 << /Border [0 0 0]
 /Dest (_responses_37)
 /Subtype /Link
@@ -55525,7 +56594,7 @@ endobj
 /Type /Annot
 >>
 endobj
-663 0 obj
+670 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_10)
 /Subtype /Link
@@ -55533,7 +56602,7 @@ endobj
 /Type /Annot
 >>
 endobj
-664 0 obj
+671 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_10)
 /Subtype /Link
@@ -55541,7 +56610,7 @@ endobj
 /Type /Annot
 >>
 endobj
-665 0 obj
+672 0 obj
 << /Border [0 0 0]
 /Dest (_produces_36)
 /Subtype /Link
@@ -55549,7 +56618,7 @@ endobj
 /Type /Annot
 >>
 endobj
-666 0 obj
+673 0 obj
 << /Border [0 0 0]
 /Dest (_produces_36)
 /Subtype /Link
@@ -55557,23 +56626,23 @@ endobj
 /Type /Annot
 >>
 endobj
-667 0 obj
+674 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_route171)
 /Subtype /Link
 /Rect [60.24000000000001 723.2399999999999 350.38629492187505 737.52]
 /Type /Annot
 >>
 endobj
-668 0 obj
+675 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_route171)
 /Subtype /Link
 /Rect [552.021 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
-669 0 obj
+676 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_28)
 /Subtype /Link
@@ -55581,7 +56650,7 @@ endobj
 /Type /Annot
 >>
 endobj
-670 0 obj
+677 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_28)
 /Subtype /Link
@@ -55589,7 +56658,7 @@ endobj
 /Type /Annot
 >>
 endobj
-671 0 obj
+678 0 obj
 << /Border [0 0 0]
 /Dest (_responses_38)
 /Subtype /Link
@@ -55597,7 +56666,7 @@ endobj
 /Type /Annot
 >>
 endobj
-672 0 obj
+679 0 obj
 << /Border [0 0 0]
 /Dest (_responses_38)
 /Subtype /Link
@@ -55605,7 +56674,7 @@ endobj
 /Type /Annot
 >>
 endobj
-673 0 obj
+680 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_11)
 /Subtype /Link
@@ -55613,7 +56682,7 @@ endobj
 /Type /Annot
 >>
 endobj
-674 0 obj
+681 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_11)
 /Subtype /Link
@@ -55621,7 +56690,7 @@ endobj
 /Type /Annot
 >>
 endobj
-675 0 obj
+682 0 obj
 << /Border [0 0 0]
 /Dest (_produces_37)
 /Subtype /Link
@@ -55629,7 +56698,7 @@ endobj
 /Type /Annot
 >>
 endobj
-676 0 obj
+683 0 obj
 << /Border [0 0 0]
 /Dest (_produces_37)
 /Subtype /Link
@@ -55637,23 +56706,23 @@ endobj
 /Type /Annot
 >>
 endobj
-677 0 obj
+684 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_route170)
 /Subtype /Link
 /Rect [60.24000000000001 630.8399999999998 352.81158984375 645.1199999999999]
 /Type /Annot
 >>
 endobj
-678 0 obj
+685 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_route170)
 /Subtype /Link
 /Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
-679 0 obj
+686 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_29)
 /Subtype /Link
@@ -55661,7 +56730,7 @@ endobj
 /Type /Annot
 >>
 endobj
-680 0 obj
+687 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_29)
 /Subtype /Link
@@ -55669,7 +56738,7 @@ endobj
 /Type /Annot
 >>
 endobj
-681 0 obj
+688 0 obj
 << /Border [0 0 0]
 /Dest (_responses_39)
 /Subtype /Link
@@ -55677,7 +56746,7 @@ endobj
 /Type /Annot
 >>
 endobj
-682 0 obj
+689 0 obj
 << /Border [0 0 0]
 /Dest (_responses_39)
 /Subtype /Link
@@ -55685,7 +56754,7 @@ endobj
 /Type /Annot
 >>
 endobj
-683 0 obj
+690 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_12)
 /Subtype /Link
@@ -55693,7 +56762,7 @@ endobj
 /Type /Annot
 >>
 endobj
-684 0 obj
+691 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_12)
 /Subtype /Link
@@ -55701,7 +56770,7 @@ endobj
 /Type /Annot
 >>
 endobj
-685 0 obj
+692 0 obj
 << /Border [0 0 0]
 /Dest (_produces_38)
 /Subtype /Link
@@ -55709,7 +56778,7 @@ endobj
 /Type /Annot
 >>
 endobj
-686 0 obj
+693 0 obj
 << /Border [0 0 0]
 /Dest (_produces_38)
 /Subtype /Link
@@ -55717,23 +56786,23 @@ endobj
 /Type /Annot
 >>
 endobj
-687 0 obj
+694 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_route167)
 /Subtype /Link
 /Rect [60.24000000000001 538.4399999999998 212.0595 552.7199999999998]
 /Type /Annot
 >>
 endobj
-688 0 obj
+695 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_route167)
 /Subtype /Link
 /Rect [552.021 538.4399999999998 563.76 552.7199999999998]
 /Type /Annot
 >>
 endobj
-689 0 obj
+696 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_30)
 /Subtype /Link
@@ -55741,7 +56810,7 @@ endobj
 /Type /Annot
 >>
 endobj
-690 0 obj
+697 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_30)
 /Subtype /Link
@@ -55749,7 +56818,7 @@ endobj
 /Type /Annot
 >>
 endobj
-691 0 obj
+698 0 obj
 << /Border [0 0 0]
 /Dest (_responses_40)
 /Subtype /Link
@@ -55757,7 +56826,7 @@ endobj
 /Type /Annot
 >>
 endobj
-692 0 obj
+699 0 obj
 << /Border [0 0 0]
 /Dest (_responses_40)
 /Subtype /Link
@@ -55765,7 +56834,7 @@ endobj
 /Type /Annot
 >>
 endobj
-693 0 obj
+700 0 obj
 << /Border [0 0 0]
 /Dest (_produces_39)
 /Subtype /Link
@@ -55773,7 +56842,7 @@ endobj
 /Type /Annot
 >>
 endobj
-694 0 obj
+701 0 obj
 << /Border [0 0 0]
 /Dest (_produces_39)
 /Subtype /Link
@@ -55781,7 +56850,7 @@ endobj
 /Type /Annot
 >>
 endobj
-695 0 obj
+702 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -55789,7 +56858,7 @@ endobj
 /Type /Annot
 >>
 endobj
-696 0 obj
+703 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -55797,7 +56866,7 @@ endobj
 /Type /Annot
 >>
 endobj
-697 0 obj
+704 0 obj
 << /Border [0 0 0]
 /Dest (_cldsdictionary)
 /Subtype /Link
@@ -55805,7 +56874,7 @@ endobj
 /Type /Annot
 >>
 endobj
-698 0 obj
+705 0 obj
 << /Border [0 0 0]
 /Dest (_cldsdictionary)
 /Subtype /Link
@@ -55813,7 +56882,7 @@ endobj
 /Type /Annot
 >>
 endobj
-699 0 obj
+706 0 obj
 << /Border [0 0 0]
 /Dest (_cldsdictionaryitem)
 /Subtype /Link
@@ -55821,7 +56890,7 @@ endobj
 /Type /Annot
 >>
 endobj
-700 0 obj
+707 0 obj
 << /Border [0 0 0]
 /Dest (_cldsdictionaryitem)
 /Subtype /Link
@@ -55829,7 +56898,7 @@ endobj
 /Type /Annot
 >>
 endobj
-701 0 obj
+708 0 obj
 << /Border [0 0 0]
 /Dest (_cldsevent)
 /Subtype /Link
@@ -55837,7 +56906,7 @@ endobj
 /Type /Annot
 >>
 endobj
-702 0 obj
+709 0 obj
 << /Border [0 0 0]
 /Dest (_cldsevent)
 /Subtype /Link
@@ -55845,7 +56914,7 @@ endobj
 /Type /Annot
 >>
 endobj
-703 0 obj
+710 0 obj
 << /Border [0 0 0]
 /Dest (_cldsinfo)
 /Subtype /Link
@@ -55853,7 +56922,7 @@ endobj
 /Type /Annot
 >>
 endobj
-704 0 obj
+711 0 obj
 << /Border [0 0 0]
 /Dest (_cldsinfo)
 /Subtype /Link
@@ -55861,7 +56930,7 @@ endobj
 /Type /Annot
 >>
 endobj
-705 0 obj
+712 0 obj
 << /Border [0 0 0]
 /Dest (_cldsmodel)
 /Subtype /Link
@@ -55869,7 +56938,7 @@ endobj
 /Type /Annot
 >>
 endobj
-706 0 obj
+713 0 obj
 << /Border [0 0 0]
 /Dest (_cldsmodel)
 /Subtype /Link
@@ -55877,7 +56946,7 @@ endobj
 /Type /Annot
 >>
 endobj
-707 0 obj
+714 0 obj
 << /Border [0 0 0]
 /Dest (_cldsmodelinstance)
 /Subtype /Link
@@ -55885,7 +56954,7 @@ endobj
 /Type /Annot
 >>
 endobj
-708 0 obj
+715 0 obj
 << /Border [0 0 0]
 /Dest (_cldsmodelinstance)
 /Subtype /Link
@@ -55893,7 +56962,7 @@ endobj
 /Type /Annot
 >>
 endobj
-709 0 obj
+716 0 obj
 << /Border [0 0 0]
 /Dest (_cldsmonitoringdetails)
 /Subtype /Link
@@ -55901,7 +56970,7 @@ endobj
 /Type /Annot
 >>
 endobj
-710 0 obj
+717 0 obj
 << /Border [0 0 0]
 /Dest (_cldsmonitoringdetails)
 /Subtype /Link
@@ -55909,7 +56978,7 @@ endobj
 /Type /Annot
 >>
 endobj
-711 0 obj
+718 0 obj
 << /Border [0 0 0]
 /Dest (_cldstemplate)
 /Subtype /Link
@@ -55917,7 +56986,7 @@ endobj
 /Type /Annot
 >>
 endobj
-712 0 obj
+719 0 obj
 << /Border [0 0 0]
 /Dest (_cldstemplate)
 /Subtype /Link
@@ -55925,7 +56994,7 @@ endobj
 /Type /Annot
 >>
 endobj
-713 0 obj
+720 0 obj
 << /Border [0 0 0]
 /Dest (_cldstoscamodel)
 /Subtype /Link
@@ -55933,7 +57002,7 @@ endobj
 /Type /Annot
 >>
 endobj
-714 0 obj
+721 0 obj
 << /Border [0 0 0]
 /Dest (_cldstoscamodel)
 /Subtype /Link
@@ -55941,7 +57010,7 @@ endobj
 /Type /Annot
 >>
 endobj
-715 0 obj
+722 0 obj
 << /Border [0 0 0]
 /Dest (_dcaeevent)
 /Subtype /Link
@@ -55949,7 +57018,7 @@ endobj
 /Type /Annot
 >>
 endobj
-716 0 obj
+723 0 obj
 << /Border [0 0 0]
 /Dest (_dcaeevent)
 /Subtype /Link
@@ -55957,167 +57026,199 @@ endobj
 /Type /Annot
 >>
 endobj
-717 0 obj
+724 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponent)
+/Subtype /Link
+/Rect [60.24000000000001 261.23999999999955 186.37650000000002 275.5199999999995]
+/Type /Annot
+>>
+endobj
+725 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponent)
+/Subtype /Link
+/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
+/Type /Annot
+>>
+endobj
+726 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponentstate)
+/Subtype /Link
+/Rect [60.24000000000001 242.7599999999995 210.98850000000002 257.0399999999995]
+/Type /Annot
+>>
+endobj
+727 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponentstate)
+/Subtype /Link
+/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
+/Type /Annot
+>>
+endobj
+728 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
-/Rect [60.24000000000001 261.23999999999955 135.81858984375003 275.5199999999995]
+/Rect [60.24000000000001 224.27999999999952 135.81858984375003 238.55999999999952]
 /Type /Annot
 >>
 endobj
-718 0 obj
+729 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
-/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
+/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-719 0 obj
+730 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
-/Rect [60.24000000000001 242.7599999999995 128.30100000000002 257.0399999999995]
+/Rect [60.24000000000001 205.79999999999953 128.30100000000002 220.07999999999953]
 /Type /Annot
 >>
 endobj
-720 0 obj
+731 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
-/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
+/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
 /Type /Annot
 >>
 endobj
-721 0 obj
+732 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [60.24000000000001 224.27999999999952 138.969 238.55999999999952]
+/Rect [60.24000000000001 187.31999999999954 138.969 201.59999999999954]
 /Type /Annot
 >>
 endobj
-722 0 obj
+733 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
+/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
-723 0 obj
+734 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [60.24000000000001 205.79999999999953 153.76350000000002 220.07999999999953]
+/Rect [60.24000000000001 168.83999999999955 153.76350000000002 183.11999999999955]
 /Type /Annot
 >>
 endobj
-724 0 obj
+735 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
+/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
 /Type /Annot
 >>
 endobj
-725 0 obj
+736 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [60.24000000000001 187.31999999999954 110.91300000000001 201.59999999999954]
+/Rect [60.24000000000001 150.35999999999956 110.91300000000001 164.63999999999956]
 /Type /Annot
 >>
 endobj
-726 0 obj
+737 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
+/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-727 0 obj
+738 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
-/Rect [60.24000000000001 168.83999999999955 129.16200000000003 183.11999999999955]
+/Rect [60.24000000000001 131.87999999999957 129.16200000000003 146.15999999999957]
 /Type /Annot
 >>
 endobj
-728 0 obj
+739 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
-/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
+/Rect [552.021 131.87999999999957 563.76 146.15999999999957]
 /Type /Annot
 >>
 endobj
-729 0 obj
+740 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
-/Rect [60.24000000000001 150.35999999999956 181.74600000000004 164.63999999999956]
+/Rect [60.24000000000001 113.39999999999958 181.74600000000004 127.67999999999958]
 /Type /Annot
 >>
 endobj
-730 0 obj
+741 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
-/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
+/Rect [552.021 113.39999999999958 563.76 127.67999999999958]
 /Type /Annot
 >>
 endobj
-731 0 obj
+742 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
-/Rect [60.24000000000001 131.87999999999957 127.39800000000001 146.15999999999957]
+/Rect [60.24000000000001 94.91999999999959 127.39800000000001 109.19999999999959]
 /Type /Annot
 >>
 endobj
-732 0 obj
+743 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
-/Rect [552.021 131.87999999999957 563.76 146.15999999999957]
+/Rect [552.021 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
-733 0 obj
+744 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
-/Rect [60.24000000000001 113.39999999999958 175.42479492187502 127.67999999999958]
+/Rect [60.24000000000001 76.4399999999996 175.42479492187502 90.7199999999996]
 /Type /Annot
 >>
 endobj
-734 0 obj
+745 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
-/Rect [552.021 113.39999999999958 563.76 127.67999999999958]
+/Rect [552.021 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
-735 0 obj
+746 0 obj
 << /Border [0 0 0]
 /Dest (_valueitem)
 /Subtype /Link
-/Rect [60.24000000000001 94.91999999999959 136.773884765625 109.19999999999959]
+/Rect [60.24000000000001 57.95999999999961 136.773884765625 72.23999999999961]
 /Type /Annot
 >>
 endobj
-736 0 obj
+747 0 obj
 << /Border [0 0 0]
 /Dest (_valueitem)
 /Subtype /Link
-/Rect [552.021 94.91999999999959 563.76 109.19999999999959]
+/Rect [552.021 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
-737 0 obj
+748 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 612.0 792.0]
@@ -56145,1704 +57246,1722 @@ Q
 
 endstream
 endobj
-738 0 obj
+749 0 obj
 << /Type /Outlines
-/Count 188
-/First 739 0 R
-/Last 906 0 R
+/Count 190
+/First 750 0 R
+/Last 917 0 R
 >>
 endobj
-739 0 obj
+750 0 obj
 << /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
-/Parent 738 0 R
+/Parent 749 0 R
 /Count 0
-/Next 740 0 R
+/Next 751 0 R
 /Dest [7 0 R /XYZ 0 792.0 null]
 >>
 endobj
-740 0 obj
+751 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 738 0 R
+/Parent 749 0 R
 /Count 0
-/Next 741 0 R
-/Prev 739 0 R
+/Next 752 0 R
+/Prev 750 0 R
 /Dest [10 0 R /XYZ 0 792.0 null]
 >>
 endobj
-741 0 obj
+752 0 obj
 << /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
-/Parent 738 0 R
+/Parent 749 0 R
 /Count 2
-/First 742 0 R
-/Last 743 0 R
-/Next 744 0 R
-/Prev 740 0 R
+/First 753 0 R
+/Last 754 0 R
+/Next 755 0 R
+/Prev 751 0 R
 /Dest [20 0 R /XYZ 0 792.0 null]
 >>
 endobj
-742 0 obj
+753 0 obj
 << /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
-/Parent 741 0 R
+/Parent 752 0 R
 /Count 0
-/Next 743 0 R
+/Next 754 0 R
 /Dest [20 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-743 0 obj
+754 0 obj
 << /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
-/Parent 741 0 R
+/Parent 752 0 R
 /Count 0
-/Prev 742 0 R
+/Prev 753 0 R
 /Dest [20 0 R /XYZ 0 644.22 null]
 >>
 endobj
-744 0 obj
+755 0 obj
 << /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
-/Parent 738 0 R
+/Parent 749 0 R
 /Count 161
-/First 745 0 R
-/Last 902 0 R
-/Next 906 0 R
-/Prev 741 0 R
+/First 756 0 R
+/Last 913 0 R
+/Next 917 0 R
+/Prev 752 0 R
 /Dest [29 0 R /XYZ 0 792.0 null]
 >>
 endobj
-745 0 obj
+756 0 obj
 << /Title <feff0032002e0031002e00200050005500540020002f00760031002f0063006c00640073002f0061006300740069006f006e002f007b0061006300740069006f006e007d002f007b006d006f00640065006c004e0061006d0065007d003f0074006500730074003d007b0074006500730074007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 746 0 R
-/Last 749 0 R
-/Next 750 0 R
+/First 757 0 R
+/Last 760 0 R
+/Next 761 0 R
 /Dest [29 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-746 0 obj
+757 0 obj
 << /Title <feff0032002e0031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 745 0 R
+/Parent 756 0 R
 /Count 0
-/Next 747 0 R
+/Next 758 0 R
 /Dest [29 0 R /XYZ 0 643.92 null]
 >>
 endobj
-747 0 obj
+758 0 obj
 << /Title <feff0032002e0031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 745 0 R
+/Parent 756 0 R
 /Count 0
-/Next 748 0 R
-/Prev 746 0 R
+/Next 759 0 R
+/Prev 757 0 R
 /Dest [29 0 R /XYZ 0 463.6800000000001 null]
 >>
 endobj
-748 0 obj
+759 0 obj
 << /Title <feff0032002e0031002e0033002e00200043006f006e00730075006d00650073>
-/Parent 745 0 R
+/Parent 756 0 R
 /Count 0
-/Next 749 0 R
-/Prev 747 0 R
+/Next 760 0 R
+/Prev 758 0 R
 /Dest [29 0 R /XYZ 0 372.84000000000015 null]
 >>
 endobj
-749 0 obj
+760 0 obj
 << /Title <feff0032002e0031002e0034002e002000500072006f00640075006300650073>
-/Parent 745 0 R
+/Parent 756 0 R
 /Count 0
-/Prev 748 0 R
+/Prev 759 0 R
 /Dest [29 0 R /XYZ 0 316.5600000000001 null]
 >>
 endobj
-750 0 obj
+761 0 obj
 << /Title <feff0032002e0032002e00200047004500540020002f00760031002f0063006c00640073002f0063006c0064007300440065007400610069006c0073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 751 0 R
-/Last 752 0 R
-/Next 753 0 R
-/Prev 745 0 R
+/First 762 0 R
+/Last 763 0 R
+/Next 764 0 R
+/Prev 756 0 R
 /Dest [29 0 R /XYZ 0 260.2800000000001 null]
 >>
 endobj
-751 0 obj
+762 0 obj
 << /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 750 0 R
+/Parent 761 0 R
 /Count 0
-/Next 752 0 R
+/Next 763 0 R
 /Dest [29 0 R /XYZ 0 220.2000000000001 null]
 >>
 endobj
-752 0 obj
+763 0 obj
 << /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
-/Parent 750 0 R
+/Parent 761 0 R
 /Count 0
-/Prev 751 0 R
+/Prev 762 0 R
 /Dest [29 0 R /XYZ 0 100.80000000000007 null]
 >>
 endobj
-753 0 obj
+764 0 obj
 << /Title <feff0032002e0033002e00200047004500540020002f00760031002f0063006c00640073002f0063006c006400730049006e0066006f>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 754 0 R
-/Last 755 0 R
-/Next 756 0 R
-/Prev 750 0 R
+/First 765 0 R
+/Last 766 0 R
+/Next 767 0 R
+/Prev 761 0 R
 /Dest [44 0 R /XYZ 0 792.0 null]
 >>
 endobj
-754 0 obj
+765 0 obj
 << /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 753 0 R
+/Parent 764 0 R
 /Count 0
-/Next 755 0 R
+/Next 766 0 R
 /Dest [44 0 R /XYZ 0 718.32 null]
 >>
 endobj
-755 0 obj
+766 0 obj
 << /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
-/Parent 753 0 R
+/Parent 764 0 R
 /Count 0
-/Prev 754 0 R
+/Prev 765 0 R
 /Dest [44 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-756 0 obj
+767 0 obj
 << /Title <feff0032002e0034002e00200050004f005300540020002f00760031002f0063006c00640073002f0064006300610065002f006500760065006e0074003f0074006500730074003d007b0074006500730074007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 757 0 R
-/Last 760 0 R
-/Next 761 0 R
-/Prev 753 0 R
+/First 768 0 R
+/Last 771 0 R
+/Next 772 0 R
+/Prev 764 0 R
 /Dest [44 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-757 0 obj
+768 0 obj
 << /Title <feff0032002e0034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 756 0 R
+/Parent 767 0 R
 /Count 0
-/Next 758 0 R
+/Next 769 0 R
 /Dest [44 0 R /XYZ 0 516.8400000000005 null]
 >>
 endobj
-758 0 obj
+769 0 obj
 << /Title <feff0032002e0034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 756 0 R
+/Parent 767 0 R
 /Count 0
-/Next 759 0 R
-/Prev 757 0 R
+/Next 770 0 R
+/Prev 768 0 R
 /Dest [44 0 R /XYZ 0 411.72000000000054 null]
 >>
 endobj
-759 0 obj
+770 0 obj
 << /Title <feff0032002e0034002e0033002e00200043006f006e00730075006d00650073>
-/Parent 756 0 R
+/Parent 767 0 R
 /Count 0
-/Next 760 0 R
-/Prev 758 0 R
+/Next 771 0 R
+/Prev 769 0 R
 /Dest [44 0 R /XYZ 0 320.88000000000056 null]
 >>
 endobj
-760 0 obj
+771 0 obj
 << /Title <feff0032002e0034002e0034002e002000500072006f00640075006300650073>
-/Parent 756 0 R
+/Parent 767 0 R
 /Count 0
-/Prev 759 0 R
+/Prev 770 0 R
 /Dest [44 0 R /XYZ 0 264.60000000000053 null]
 >>
 endobj
-761 0 obj
+772 0 obj
 << /Title <feff0032002e0035002e00200050005500540020002f00760031002f0063006c00640073002f006400650070006c006f0079002f007b006d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 762 0 R
-/Last 765 0 R
-/Next 766 0 R
-/Prev 756 0 R
+/First 773 0 R
+/Last 776 0 R
+/Next 777 0 R
+/Prev 767 0 R
 /Dest [44 0 R /XYZ 0 208.32000000000053 null]
 >>
 endobj
-762 0 obj
+773 0 obj
 << /Title <feff0032002e0035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 761 0 R
+/Parent 772 0 R
 /Count 0
-/Next 763 0 R
+/Next 774 0 R
 /Dest [44 0 R /XYZ 0 168.24000000000052 null]
 >>
 endobj
-763 0 obj
+774 0 obj
 << /Title <feff0032002e0035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 761 0 R
+/Parent 772 0 R
 /Count 0
-/Next 764 0 R
-/Prev 762 0 R
+/Next 775 0 R
+/Prev 773 0 R
 /Dest [60 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-764 0 obj
+775 0 obj
 << /Title <feff0032002e0035002e0033002e00200043006f006e00730075006d00650073>
-/Parent 761 0 R
+/Parent 772 0 R
 /Count 0
-/Next 765 0 R
-/Prev 763 0 R
+/Next 776 0 R
+/Prev 774 0 R
 /Dest [60 0 R /XYZ 0 592.3200000000003 null]
 >>
 endobj
-765 0 obj
+776 0 obj
 << /Title <feff0032002e0035002e0034002e002000500072006f00640075006300650073>
-/Parent 761 0 R
+/Parent 772 0 R
 /Count 0
-/Prev 764 0 R
+/Prev 775 0 R
 /Dest [60 0 R /XYZ 0 536.0400000000004 null]
 >>
 endobj
-766 0 obj
+777 0 obj
 << /Title <feff0032002e0036002e00200047004500540020002f00760031002f0063006c00640073002f006d006f00640065006c002d006e0061006d00650073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 767 0 R
-/Last 768 0 R
-/Next 769 0 R
-/Prev 761 0 R
+/First 778 0 R
+/Last 779 0 R
+/Next 780 0 R
+/Prev 772 0 R
 /Dest [60 0 R /XYZ 0 479.76000000000056 null]
 >>
 endobj
-767 0 obj
+778 0 obj
 << /Title <feff0032002e0036002e0031002e00200052006500730070006f006e007300650073>
-/Parent 766 0 R
+/Parent 777 0 R
 /Count 0
-/Next 768 0 R
+/Next 779 0 R
 /Dest [60 0 R /XYZ 0 439.6800000000005 null]
 >>
 endobj
-768 0 obj
+779 0 obj
 << /Title <feff0032002e0036002e0032002e002000500072006f00640075006300650073>
-/Parent 766 0 R
+/Parent 777 0 R
 /Count 0
-/Prev 767 0 R
+/Prev 778 0 R
 /Dest [60 0 R /XYZ 0 334.5600000000005 null]
 >>
 endobj
-769 0 obj
+780 0 obj
 << /Title <feff0032002e0037002e00200047004500540020002f00760031002f0063006c00640073002f006d006f00640065006c002f00620070006d006e002f007b006d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 770 0 R
-/Last 772 0 R
-/Next 773 0 R
-/Prev 766 0 R
+/First 781 0 R
+/Last 783 0 R
+/Next 784 0 R
+/Prev 777 0 R
 /Dest [60 0 R /XYZ 0 278.2800000000005 null]
 >>
 endobj
-770 0 obj
+781 0 obj
 << /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 769 0 R
+/Parent 780 0 R
 /Count 0
-/Next 771 0 R
+/Next 782 0 R
 /Dest [60 0 R /XYZ 0 238.2000000000005 null]
 >>
 endobj
-771 0 obj
+782 0 obj
 << /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 769 0 R
+/Parent 780 0 R
 /Count 0
-/Next 772 0 R
-/Prev 770 0 R
+/Next 783 0 R
+/Prev 781 0 R
 /Dest [60 0 R /XYZ 0 133.08000000000047 null]
 >>
 endobj
-772 0 obj
+783 0 obj
 << /Title <feff0032002e0037002e0033002e002000500072006f00640075006300650073>
-/Parent 769 0 R
+/Parent 780 0 R
 /Count 0
-/Prev 771 0 R
+/Prev 782 0 R
 /Dest [73 0 R /XYZ 0 792.0 null]
 >>
 endobj
-773 0 obj
+784 0 obj
 << /Title <feff0032002e0038002e00200047004500540020002f00760031002f0063006c00640073002f006d006f00640065006c002f0069006d006100670065002f007b006d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 774 0 R
-/Last 776 0 R
-/Next 777 0 R
-/Prev 769 0 R
+/First 785 0 R
+/Last 787 0 R
+/Next 788 0 R
+/Prev 780 0 R
 /Dest [73 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-774 0 obj
+785 0 obj
 << /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 773 0 R
+/Parent 784 0 R
 /Count 0
-/Next 775 0 R
+/Next 786 0 R
 /Dest [73 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-775 0 obj
+786 0 obj
 << /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 773 0 R
+/Parent 784 0 R
 /Count 0
-/Next 776 0 R
-/Prev 774 0 R
+/Next 787 0 R
+/Prev 785 0 R
 /Dest [73 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-776 0 obj
+787 0 obj
 << /Title <feff0032002e0038002e0033002e002000500072006f00640075006300650073>
-/Parent 773 0 R
+/Parent 784 0 R
 /Count 0
-/Prev 775 0 R
+/Prev 786 0 R
 /Dest [73 0 R /XYZ 0 466.0800000000005 null]
 >>
 endobj
-777 0 obj
+788 0 obj
 << /Title <feff0032002e0039002e00200047004500540020002f00760031002f0063006c00640073002f006d006f00640065006c002f007b006d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 778 0 R
-/Last 780 0 R
-/Next 781 0 R
-/Prev 773 0 R
+/First 789 0 R
+/Last 791 0 R
+/Next 792 0 R
+/Prev 784 0 R
 /Dest [73 0 R /XYZ 0 409.80000000000047 null]
 >>
 endobj
-778 0 obj
+789 0 obj
 << /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 777 0 R
+/Parent 788 0 R
 /Count 0
-/Next 779 0 R
+/Next 790 0 R
 /Dest [73 0 R /XYZ 0 369.7200000000004 null]
 >>
 endobj
-779 0 obj
+790 0 obj
 << /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 777 0 R
+/Parent 788 0 R
 /Count 0
-/Next 780 0 R
-/Prev 778 0 R
+/Next 791 0 R
+/Prev 789 0 R
 /Dest [73 0 R /XYZ 0 264.6000000000004 null]
 >>
 endobj
-780 0 obj
+791 0 obj
 << /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
-/Parent 777 0 R
+/Parent 788 0 R
 /Count 0
-/Prev 779 0 R
+/Prev 790 0 R
 /Dest [73 0 R /XYZ 0 159.48000000000042 null]
 >>
 endobj
-781 0 obj
+792 0 obj
 << /Title <feff0032002e00310030002e00200050005500540020002f00760031002f0063006c00640073002f006d006f00640065006c002f007b006d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 782 0 R
-/Last 785 0 R
-/Next 786 0 R
-/Prev 777 0 R
+/First 793 0 R
+/Last 796 0 R
+/Next 797 0 R
+/Prev 788 0 R
 /Dest [73 0 R /XYZ 0 103.20000000000039 null]
 >>
 endobj
-782 0 obj
+793 0 obj
 << /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 781 0 R
+/Parent 792 0 R
 /Count 0
-/Next 783 0 R
+/Next 794 0 R
 /Dest [87 0 R /XYZ 0 792.0 null]
 >>
 endobj
-783 0 obj
+794 0 obj
 << /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 781 0 R
+/Parent 792 0 R
 /Count 0
-/Next 784 0 R
-/Prev 782 0 R
+/Next 795 0 R
+/Prev 793 0 R
 /Dest [87 0 R /XYZ 0 615.72 null]
 >>
 endobj
-784 0 obj
+795 0 obj
 << /Title <feff0032002e00310030002e0033002e00200043006f006e00730075006d00650073>
-/Parent 781 0 R
+/Parent 792 0 R
 /Count 0
-/Next 785 0 R
-/Prev 783 0 R
+/Next 796 0 R
+/Prev 794 0 R
 /Dest [87 0 R /XYZ 0 510.60000000000014 null]
 >>
 endobj
-785 0 obj
+796 0 obj
 << /Title <feff0032002e00310030002e0034002e002000500072006f00640075006300650073>
-/Parent 781 0 R
+/Parent 792 0 R
 /Count 0
-/Prev 784 0 R
+/Prev 795 0 R
 /Dest [87 0 R /XYZ 0 454.3200000000001 null]
 >>
 endobj
-786 0 obj
+797 0 obj
 << /Title <feff0032002e00310031002e00200047004500540020002f00760031002f0063006c00640073002f00700072006f0070006500720074006900650073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 787 0 R
-/Last 788 0 R
-/Next 789 0 R
-/Prev 781 0 R
+/First 798 0 R
+/Last 799 0 R
+/Next 800 0 R
+/Prev 792 0 R
 /Dest [87 0 R /XYZ 0 398.0400000000001 null]
 >>
 endobj
-787 0 obj
+798 0 obj
 << /Title <feff0032002e00310031002e0031002e00200052006500730070006f006e007300650073>
-/Parent 786 0 R
+/Parent 797 0 R
 /Count 0
-/Next 788 0 R
+/Next 799 0 R
 /Dest [87 0 R /XYZ 0 357.96000000000004 null]
 >>
 endobj
-788 0 obj
+799 0 obj
 << /Title <feff0032002e00310031002e0032002e002000500072006f00640075006300650073>
-/Parent 786 0 R
+/Parent 797 0 R
 /Count 0
-/Prev 787 0 R
+/Prev 798 0 R
 /Dest [87 0 R /XYZ 0 267.12 null]
 >>
 endobj
-789 0 obj
+800 0 obj
 << /Title <feff0032002e00310032002e00200050005500540020002f00760031002f0063006c00640073002f0075006e006400650070006c006f0079002f007b006d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 790 0 R
-/Last 793 0 R
-/Next 794 0 R
-/Prev 786 0 R
+/First 801 0 R
+/Last 804 0 R
+/Next 805 0 R
+/Prev 797 0 R
 /Dest [87 0 R /XYZ 0 210.84 null]
 >>
 endobj
-790 0 obj
+801 0 obj
 << /Title <feff0032002e00310032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 789 0 R
+/Parent 800 0 R
 /Count 0
-/Next 791 0 R
+/Next 802 0 R
 /Dest [87 0 R /XYZ 0 170.76 null]
 >>
 endobj
-791 0 obj
+802 0 obj
 << /Title <feff0032002e00310032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 789 0 R
+/Parent 800 0 R
 /Count 0
-/Next 792 0 R
-/Prev 790 0 R
+/Next 803 0 R
+/Prev 801 0 R
 /Dest [100 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-792 0 obj
+803 0 obj
 << /Title <feff0032002e00310032002e0033002e00200043006f006e00730075006d00650073>
-/Parent 789 0 R
+/Parent 800 0 R
 /Count 0
-/Next 793 0 R
-/Prev 791 0 R
+/Next 804 0 R
+/Prev 802 0 R
 /Dest [100 0 R /XYZ 0 592.3200000000003 null]
 >>
 endobj
-793 0 obj
+804 0 obj
 << /Title <feff0032002e00310032002e0034002e002000500072006f00640075006300650073>
-/Parent 789 0 R
+/Parent 800 0 R
 /Count 0
-/Prev 792 0 R
+/Prev 803 0 R
 /Dest [100 0 R /XYZ 0 536.0400000000004 null]
 >>
 endobj
-794 0 obj
+805 0 obj
 << /Title <feff0032002e00310033002e00200047004500540020002f00760031002f0063006c0064007300540065006d0070006100740065002f00740065006d0070006c006100740065002d006e0061006d00650073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 795 0 R
-/Last 796 0 R
-/Next 797 0 R
-/Prev 789 0 R
+/First 806 0 R
+/Last 807 0 R
+/Next 808 0 R
+/Prev 800 0 R
 /Dest [100 0 R /XYZ 0 479.76000000000056 null]
 >>
 endobj
-795 0 obj
+806 0 obj
 << /Title <feff0032002e00310033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 794 0 R
+/Parent 805 0 R
 /Count 0
-/Next 796 0 R
+/Next 807 0 R
 /Dest [100 0 R /XYZ 0 439.6800000000005 null]
 >>
 endobj
-796 0 obj
+807 0 obj
 << /Title <feff0032002e00310033002e0032002e002000500072006f00640075006300650073>
-/Parent 794 0 R
+/Parent 805 0 R
 /Count 0
-/Prev 795 0 R
+/Prev 806 0 R
 /Dest [100 0 R /XYZ 0 334.5600000000005 null]
 >>
 endobj
-797 0 obj
+808 0 obj
 << /Title <feff0032002e00310034002e00200047004500540020002f00760031002f0063006c0064007300540065006d0070006100740065002f00740065006d0070006c006100740065002f00620070006d006e002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 798 0 R
-/Last 800 0 R
-/Next 801 0 R
-/Prev 794 0 R
+/First 809 0 R
+/Last 811 0 R
+/Next 812 0 R
+/Prev 805 0 R
 /Dest [100 0 R /XYZ 0 278.2800000000005 null]
 >>
 endobj
-798 0 obj
+809 0 obj
 << /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 797 0 R
+/Parent 808 0 R
 /Count 0
-/Next 799 0 R
+/Next 810 0 R
 /Dest [100 0 R /XYZ 0 210.1200000000005 null]
 >>
 endobj
-799 0 obj
+810 0 obj
 << /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 797 0 R
+/Parent 808 0 R
 /Count 0
-/Next 800 0 R
-/Prev 798 0 R
+/Next 811 0 R
+/Prev 809 0 R
 /Dest [100 0 R /XYZ 0 105.00000000000045 null]
 >>
 endobj
-800 0 obj
+811 0 obj
 << /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
-/Parent 797 0 R
+/Parent 808 0 R
 /Count 0
-/Prev 799 0 R
+/Prev 810 0 R
 /Dest [114 0 R /XYZ 0 697.44 null]
 >>
 endobj
-801 0 obj
+812 0 obj
 << /Title <feff0032002e00310035002e00200047004500540020002f00760031002f0063006c0064007300540065006d0070006100740065002f00740065006d0070006c006100740065002f0069006d006100670065002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 802 0 R
-/Last 804 0 R
-/Next 805 0 R
-/Prev 797 0 R
+/First 813 0 R
+/Last 815 0 R
+/Next 816 0 R
+/Prev 808 0 R
 /Dest [114 0 R /XYZ 0 641.1600000000002 null]
 >>
 endobj
-802 0 obj
+813 0 obj
 << /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 801 0 R
+/Parent 812 0 R
 /Count 0
-/Next 803 0 R
+/Next 814 0 R
 /Dest [114 0 R /XYZ 0 573.0000000000003 null]
 >>
 endobj
-803 0 obj
+814 0 obj
 << /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 801 0 R
+/Parent 812 0 R
 /Count 0
-/Next 804 0 R
-/Prev 802 0 R
+/Next 815 0 R
+/Prev 813 0 R
 /Dest [114 0 R /XYZ 0 467.8800000000005 null]
 >>
 endobj
-804 0 obj
+815 0 obj
 << /Title <feff0032002e00310035002e0033002e002000500072006f00640075006300650073>
-/Parent 801 0 R
+/Parent 812 0 R
 /Count 0
-/Prev 803 0 R
+/Prev 814 0 R
 /Dest [114 0 R /XYZ 0 377.04000000000053 null]
 >>
 endobj
-805 0 obj
+816 0 obj
 << /Title <feff0032002e00310036002e00200047004500540020002f00760031002f0063006c0064007300540065006d0070006100740065002f00740065006d0070006c006100740065002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 806 0 R
-/Last 808 0 R
-/Next 809 0 R
-/Prev 801 0 R
+/First 817 0 R
+/Last 819 0 R
+/Next 820 0 R
+/Prev 812 0 R
 /Dest [114 0 R /XYZ 0 320.7600000000005 null]
 >>
 endobj
-806 0 obj
+817 0 obj
 << /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 805 0 R
+/Parent 816 0 R
 /Count 0
-/Next 807 0 R
+/Next 818 0 R
 /Dest [114 0 R /XYZ 0 280.68000000000046 null]
 >>
 endobj
-807 0 obj
+818 0 obj
 << /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 805 0 R
+/Parent 816 0 R
 /Count 0
-/Next 808 0 R
-/Prev 806 0 R
+/Next 819 0 R
+/Prev 817 0 R
 /Dest [114 0 R /XYZ 0 175.56000000000046 null]
 >>
 endobj
-808 0 obj
+819 0 obj
 << /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
-/Parent 805 0 R
+/Parent 816 0 R
 /Count 0
-/Prev 807 0 R
+/Prev 818 0 R
 /Dest [125 0 R /XYZ 0 792.0 null]
 >>
 endobj
-809 0 obj
+820 0 obj
 << /Title <feff0032002e00310037002e00200050005500540020002f00760031002f0063006c0064007300540065006d0070006100740065002f00740065006d0070006c006100740065002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 810 0 R
-/Last 813 0 R
-/Next 814 0 R
-/Prev 805 0 R
+/First 821 0 R
+/Last 824 0 R
+/Next 825 0 R
+/Prev 816 0 R
 /Dest [125 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-810 0 obj
+821 0 obj
 << /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 809 0 R
+/Parent 820 0 R
 /Count 0
-/Next 811 0 R
+/Next 822 0 R
 /Dest [125 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-811 0 obj
+822 0 obj
 << /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 809 0 R
+/Parent 820 0 R
 /Count 0
-/Next 812 0 R
-/Prev 810 0 R
+/Next 823 0 R
+/Prev 821 0 R
 /Dest [125 0 R /XYZ 0 519.3600000000004 null]
 >>
 endobj
-812 0 obj
+823 0 obj
 << /Title <feff0032002e00310037002e0033002e00200043006f006e00730075006d00650073>
-/Parent 809 0 R
+/Parent 820 0 R
 /Count 0
-/Next 813 0 R
-/Prev 811 0 R
+/Next 824 0 R
+/Prev 822 0 R
 /Dest [125 0 R /XYZ 0 414.24000000000035 null]
 >>
 endobj
-813 0 obj
+824 0 obj
 << /Title <feff0032002e00310037002e0034002e002000500072006f00640075006300650073>
-/Parent 809 0 R
+/Parent 820 0 R
 /Count 0
-/Prev 812 0 R
+/Prev 823 0 R
 /Dest [125 0 R /XYZ 0 357.9600000000003 null]
 >>
 endobj
-814 0 obj
+825 0 obj
 << /Title <feff0032002e00310038002e00200047004500540020002f00760031002f00640069006300740069006f006e006100720079>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 815 0 R
-/Last 816 0 R
-/Next 817 0 R
-/Prev 809 0 R
+/First 826 0 R
+/Last 827 0 R
+/Next 828 0 R
+/Prev 820 0 R
 /Dest [125 0 R /XYZ 0 301.6800000000003 null]
 >>
 endobj
-815 0 obj
+826 0 obj
 << /Title <feff0032002e00310038002e0031002e00200052006500730070006f006e007300650073>
-/Parent 814 0 R
+/Parent 825 0 R
 /Count 0
-/Next 816 0 R
+/Next 827 0 R
 /Dest [125 0 R /XYZ 0 261.60000000000025 null]
 >>
 endobj
-816 0 obj
+827 0 obj
 << /Title <feff0032002e00310038002e0032002e002000500072006f00640075006300650073>
-/Parent 814 0 R
+/Parent 825 0 R
 /Count 0
-/Prev 815 0 R
+/Prev 826 0 R
 /Dest [125 0 R /XYZ 0 156.48000000000025 null]
 >>
 endobj
-817 0 obj
+828 0 obj
 << /Title <feff0032002e00310039002e00200050005500540020002f00760031002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 818 0 R
-/Last 821 0 R
-/Next 822 0 R
-/Prev 814 0 R
+/First 829 0 R
+/Last 832 0 R
+/Next 833 0 R
+/Prev 825 0 R
 /Dest [141 0 R /XYZ 0 792.0 null]
 >>
 endobj
-818 0 obj
+829 0 obj
 << /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 817 0 R
+/Parent 828 0 R
 /Count 0
-/Next 819 0 R
+/Next 830 0 R
 /Dest [141 0 R /XYZ 0 718.32 null]
 >>
 endobj
-819 0 obj
+830 0 obj
 << /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 817 0 R
+/Parent 828 0 R
 /Count 0
-/Next 820 0 R
-/Prev 818 0 R
+/Next 831 0 R
+/Prev 829 0 R
 /Dest [141 0 R /XYZ 0 575.6400000000001 null]
 >>
 endobj
-820 0 obj
+831 0 obj
 << /Title <feff0032002e00310039002e0033002e00200043006f006e00730075006d00650073>
-/Parent 817 0 R
+/Parent 828 0 R
 /Count 0
-/Next 821 0 R
-/Prev 819 0 R
+/Next 832 0 R
+/Prev 830 0 R
 /Dest [141 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-821 0 obj
+832 0 obj
 << /Title <feff0032002e00310039002e0034002e002000500072006f00640075006300650073>
-/Parent 817 0 R
+/Parent 828 0 R
 /Count 0
-/Prev 820 0 R
+/Prev 831 0 R
 /Dest [141 0 R /XYZ 0 414.2400000000002 null]
 >>
 endobj
-822 0 obj
+833 0 obj
 << /Title <feff0032002e00320030002e00200047004500540020002f00760031002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d002f006900740065006d0073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 823 0 R
-/Last 825 0 R
-/Next 826 0 R
-/Prev 817 0 R
+/First 834 0 R
+/Last 836 0 R
+/Next 837 0 R
+/Prev 828 0 R
 /Dest [141 0 R /XYZ 0 357.96000000000015 null]
 >>
 endobj
-823 0 obj
+834 0 obj
 << /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 822 0 R
+/Parent 833 0 R
 /Count 0
-/Next 824 0 R
+/Next 835 0 R
 /Dest [141 0 R /XYZ 0 317.8800000000001 null]
 >>
 endobj
-824 0 obj
+835 0 obj
 << /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 822 0 R
+/Parent 833 0 R
 /Count 0
-/Next 825 0 R
-/Prev 823 0 R
+/Next 836 0 R
+/Prev 834 0 R
 /Dest [141 0 R /XYZ 0 212.76000000000005 null]
 >>
 endobj
-825 0 obj
+836 0 obj
 << /Title <feff0032002e00320030002e0033002e002000500072006f00640075006300650073>
-/Parent 822 0 R
+/Parent 833 0 R
 /Count 0
-/Prev 824 0 R
+/Prev 835 0 R
 /Dest [141 0 R /XYZ 0 107.64000000000001 null]
 >>
 endobj
-826 0 obj
+837 0 obj
 << /Title <feff0032002e00320031002e00200050005500540020002f00760031002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d002f006900740065006d0073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 827 0 R
-/Last 830 0 R
-/Next 831 0 R
-/Prev 822 0 R
+/First 838 0 R
+/Last 841 0 R
+/Next 842 0 R
+/Prev 833 0 R
 /Dest [156 0 R /XYZ 0 792.0 null]
 >>
 endobj
-827 0 obj
+838 0 obj
 << /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 826 0 R
+/Parent 837 0 R
 /Count 0
-/Next 828 0 R
+/Next 839 0 R
 /Dest [156 0 R /XYZ 0 718.32 null]
 >>
 endobj
-828 0 obj
+839 0 obj
 << /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 826 0 R
+/Parent 837 0 R
 /Count 0
-/Next 829 0 R
-/Prev 827 0 R
+/Next 840 0 R
+/Prev 838 0 R
 /Dest [156 0 R /XYZ 0 575.6400000000001 null]
 >>
 endobj
-829 0 obj
+840 0 obj
 << /Title <feff0032002e00320031002e0033002e00200043006f006e00730075006d00650073>
-/Parent 826 0 R
+/Parent 837 0 R
 /Count 0
-/Next 830 0 R
-/Prev 828 0 R
+/Next 841 0 R
+/Prev 839 0 R
 /Dest [156 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-830 0 obj
+841 0 obj
 << /Title <feff0032002e00320031002e0034002e002000500072006f00640075006300650073>
-/Parent 826 0 R
+/Parent 837 0 R
 /Count 0
-/Prev 829 0 R
+/Prev 840 0 R
 /Dest [156 0 R /XYZ 0 414.2400000000002 null]
 >>
 endobj
-831 0 obj
+842 0 obj
 << /Title <feff0032002e00320032002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 832 0 R
-/Last 833 0 R
-/Next 834 0 R
-/Prev 826 0 R
+/First 843 0 R
+/Last 844 0 R
+/Next 845 0 R
+/Prev 837 0 R
 /Dest [156 0 R /XYZ 0 357.96000000000015 null]
 >>
 endobj
-832 0 obj
+843 0 obj
 << /Title <feff0032002e00320032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 831 0 R
+/Parent 842 0 R
 /Count 0
-/Next 833 0 R
+/Next 844 0 R
 /Dest [156 0 R /XYZ 0 317.8800000000001 null]
 >>
 endobj
-833 0 obj
+844 0 obj
 << /Title <feff0032002e00320032002e0032002e002000500072006f00640075006300650073>
-/Parent 831 0 R
+/Parent 842 0 R
 /Count 0
-/Prev 832 0 R
+/Prev 843 0 R
 /Dest [156 0 R /XYZ 0 227.04000000000005 null]
 >>
 endobj
-834 0 obj
+845 0 obj
 << /Title <feff0032002e00320033002e00200047004500540020002f00760031002f0074006f007300630061002f006d006f00640065006c0073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 835 0 R
-/Last 836 0 R
-/Next 837 0 R
-/Prev 831 0 R
+/First 846 0 R
+/Last 847 0 R
+/Next 848 0 R
+/Prev 842 0 R
 /Dest [156 0 R /XYZ 0 170.76000000000002 null]
 >>
 endobj
-835 0 obj
+846 0 obj
 << /Title <feff0032002e00320033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 834 0 R
+/Parent 845 0 R
 /Count 0
-/Next 836 0 R
+/Next 847 0 R
 /Dest [156 0 R /XYZ 0 130.68 null]
 >>
 endobj
-836 0 obj
+847 0 obj
 << /Title <feff0032002e00320033002e0032002e002000500072006f00640075006300650073>
-/Parent 834 0 R
+/Parent 845 0 R
 /Count 0
-/Prev 835 0 R
+/Prev 846 0 R
 /Dest [170 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-837 0 obj
+848 0 obj
 << /Title <feff0032002e00320034002e00200047004500540020002f00760031002f0074006f007300630061002f006d006f00640065006c0073002f0070006f006c0069006300790054007900700065002f007b0070006f006c0069006300790054007900700065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 838 0 R
-/Last 840 0 R
-/Next 841 0 R
-/Prev 834 0 R
+/First 849 0 R
+/Last 851 0 R
+/Next 852 0 R
+/Prev 845 0 R
 /Dest [170 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-838 0 obj
+849 0 obj
 << /Title <feff0032002e00320034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 837 0 R
+/Parent 848 0 R
 /Count 0
-/Next 839 0 R
+/Next 850 0 R
 /Dest [170 0 R /XYZ 0 586.8000000000003 null]
 >>
 endobj
-839 0 obj
+850 0 obj
 << /Title <feff0032002e00320034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 837 0 R
+/Parent 848 0 R
 /Count 0
-/Next 840 0 R
-/Prev 838 0 R
+/Next 851 0 R
+/Prev 849 0 R
 /Dest [170 0 R /XYZ 0 481.68000000000046 null]
 >>
 endobj
-840 0 obj
+851 0 obj
 << /Title <feff0032002e00320034002e0033002e002000500072006f00640075006300650073>
-/Parent 837 0 R
+/Parent 848 0 R
 /Count 0
-/Prev 839 0 R
+/Prev 850 0 R
 /Dest [170 0 R /XYZ 0 376.5600000000004 null]
 >>
 endobj
-841 0 obj
+852 0 obj
 << /Title <feff0032002e00320035002e00200047004500540020002f00760031002f0074006f007300630061002f006d006f00640065006c0073002f007b0074006f007300630061004d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 842 0 R
-/Last 844 0 R
-/Next 845 0 R
-/Prev 837 0 R
+/First 853 0 R
+/Last 855 0 R
+/Next 856 0 R
+/Prev 848 0 R
 /Dest [170 0 R /XYZ 0 320.28000000000037 null]
 >>
 endobj
-842 0 obj
+853 0 obj
 << /Title <feff0032002e00320035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 841 0 R
+/Parent 852 0 R
 /Count 0
-/Next 843 0 R
+/Next 854 0 R
 /Dest [170 0 R /XYZ 0 280.20000000000033 null]
 >>
 endobj
-843 0 obj
+854 0 obj
 << /Title <feff0032002e00320035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 841 0 R
+/Parent 852 0 R
 /Count 0
-/Next 844 0 R
-/Prev 842 0 R
+/Next 855 0 R
+/Prev 853 0 R
 /Dest [170 0 R /XYZ 0 175.08000000000033 null]
 >>
 endobj
-844 0 obj
+855 0 obj
 << /Title <feff0032002e00320035002e0033002e002000500072006f00640075006300650073>
-/Parent 841 0 R
+/Parent 852 0 R
 /Count 0
-/Prev 843 0 R
+/Prev 854 0 R
 /Dest [184 0 R /XYZ 0 792.0 null]
 >>
 endobj
-845 0 obj
+856 0 obj
 << /Title <feff0032002e00320036002e00200050005500540020002f00760031002f0074006f007300630061002f006d006f00640065006c0073002f007b0074006f007300630061004d006f00640065006c004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 846 0 R
-/Last 849 0 R
-/Next 850 0 R
-/Prev 841 0 R
+/First 857 0 R
+/Last 860 0 R
+/Next 861 0 R
+/Prev 852 0 R
 /Dest [184 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-846 0 obj
+857 0 obj
 << /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 845 0 R
+/Parent 856 0 R
 /Count 0
-/Next 847 0 R
+/Next 858 0 R
 /Dest [184 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-847 0 obj
+858 0 obj
 << /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 845 0 R
+/Parent 856 0 R
 /Count 0
-/Next 848 0 R
-/Prev 846 0 R
+/Next 859 0 R
+/Prev 857 0 R
 /Dest [184 0 R /XYZ 0 519.3600000000004 null]
 >>
 endobj
-848 0 obj
+859 0 obj
 << /Title <feff0032002e00320036002e0033002e00200043006f006e00730075006d00650073>
-/Parent 845 0 R
+/Parent 856 0 R
 /Count 0
-/Next 849 0 R
-/Prev 847 0 R
+/Next 860 0 R
+/Prev 858 0 R
 /Dest [184 0 R /XYZ 0 428.52000000000044 null]
 >>
 endobj
-849 0 obj
+860 0 obj
 << /Title <feff0032002e00320036002e0034002e002000500072006f00640075006300650073>
-/Parent 845 0 R
+/Parent 856 0 R
 /Count 0
-/Prev 848 0 R
+/Prev 859 0 R
 /Dest [184 0 R /XYZ 0 372.2400000000004 null]
 >>
 endobj
-850 0 obj
+861 0 obj
 << /Title <feff0032002e00320037002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 851 0 R
-/Last 852 0 R
-/Next 853 0 R
-/Prev 845 0 R
+/First 862 0 R
+/Last 863 0 R
+/Next 864 0 R
+/Prev 856 0 R
 /Dest [184 0 R /XYZ 0 315.9600000000004 null]
 >>
 endobj
-851 0 obj
+862 0 obj
 << /Title <feff0032002e00320037002e0031002e00200052006500730070006f006e007300650073>
-/Parent 850 0 R
+/Parent 861 0 R
 /Count 0
-/Next 852 0 R
+/Next 863 0 R
 /Dest [184 0 R /XYZ 0 275.88000000000034 null]
 >>
 endobj
-852 0 obj
+863 0 obj
 << /Title <feff0032002e00320037002e0032002e002000500072006f00640075006300650073>
-/Parent 850 0 R
+/Parent 861 0 R
 /Count 0
-/Prev 851 0 R
+/Prev 862 0 R
 /Dest [184 0 R /XYZ 0 185.04000000000033 null]
 >>
 endobj
-853 0 obj
+864 0 obj
 << /Title <feff0032002e00320038002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 854 0 R
-/Last 855 0 R
-/Next 856 0 R
-/Prev 850 0 R
+/First 865 0 R
+/Last 866 0 R
+/Next 867 0 R
+/Prev 861 0 R
 /Dest [184 0 R /XYZ 0 128.7600000000003 null]
 >>
 endobj
-854 0 obj
+865 0 obj
 << /Title <feff0032002e00320038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 853 0 R
+/Parent 864 0 R
 /Count 0
-/Next 855 0 R
+/Next 866 0 R
 /Dest [197 0 R /XYZ 0 792.0 null]
 >>
 endobj
-855 0 obj
+866 0 obj
 << /Title <feff0032002e00320038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 853 0 R
+/Parent 864 0 R
 /Count 0
-/Prev 854 0 R
+/Prev 865 0 R
 /Dest [197 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-856 0 obj
-<< /Title <feff0032002e00320039002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079004c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+867 0 obj
+<< /Title <feff0032002e00320039002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 755 0 R
 /Count 3
-/First 857 0 R
-/Last 859 0 R
-/Next 860 0 R
-/Prev 853 0 R
+/First 868 0 R
+/Last 870 0 R
+/Next 871 0 R
+/Prev 864 0 R
 /Dest [197 0 R /XYZ 0 562.4400000000004 null]
 >>
 endobj
-857 0 obj
+868 0 obj
 << /Title <feff0032002e00320039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 856 0 R
+/Parent 867 0 R
 /Count 0
-/Next 858 0 R
+/Next 869 0 R
 /Dest [197 0 R /XYZ 0 522.3600000000005 null]
 >>
 endobj
-858 0 obj
+869 0 obj
 << /Title <feff0032002e00320039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 856 0 R
+/Parent 867 0 R
 /Count 0
-/Next 859 0 R
-/Prev 857 0 R
+/Next 870 0 R
+/Prev 868 0 R
 /Dest [197 0 R /XYZ 0 417.2400000000005 null]
 >>
 endobj
-859 0 obj
+870 0 obj
 << /Title <feff0032002e00320039002e0033002e002000500072006f00640075006300650073>
-/Parent 856 0 R
+/Parent 867 0 R
 /Count 0
-/Prev 858 0 R
+/Prev 869 0 R
 /Dest [197 0 R /XYZ 0 312.12000000000046 null]
 >>
 endobj
-860 0 obj
+871 0 obj
 << /Title <feff0032002e00330030002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 2
-/First 861 0 R
-/Last 862 0 R
-/Next 863 0 R
-/Prev 856 0 R
+/First 872 0 R
+/Last 873 0 R
+/Next 874 0 R
+/Prev 867 0 R
 /Dest [197 0 R /XYZ 0 255.84000000000043 null]
 >>
 endobj
-861 0 obj
+872 0 obj
 << /Title <feff0032002e00330030002e0031002e00200052006500730070006f006e007300650073>
-/Parent 860 0 R
+/Parent 871 0 R
 /Count 0
-/Next 862 0 R
+/Next 873 0 R
 /Dest [197 0 R /XYZ 0 215.76000000000042 null]
 >>
 endobj
-862 0 obj
+873 0 obj
 << /Title <feff0032002e00330030002e0032002e002000500072006f00640075006300650073>
-/Parent 860 0 R
+/Parent 871 0 R
 /Count 0
-/Prev 861 0 R
+/Prev 872 0 R
 /Dest [197 0 R /XYZ 0 110.64000000000038 null]
 >>
 endobj
-863 0 obj
+874 0 obj
 << /Title <feff0032002e00330031002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 864 0 R
-/Last 866 0 R
-/Next 867 0 R
-/Prev 860 0 R
-/Dest [211 0 R /XYZ 0 792.0 null]
+/First 875 0 R
+/Last 877 0 R
+/Next 878 0 R
+/Prev 871 0 R
+/Dest [210 0 R /XYZ 0 792.0 null]
 >>
 endobj
-864 0 obj
+875 0 obj
 << /Title <feff0032002e00330031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 863 0 R
+/Parent 874 0 R
 /Count 0
-/Next 865 0 R
-/Dest [211 0 R /XYZ 0 718.32 null]
+/Next 876 0 R
+/Dest [210 0 R /XYZ 0 718.32 null]
 >>
 endobj
-865 0 obj
+876 0 obj
 << /Title <feff0032002e00330031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 863 0 R
+/Parent 874 0 R
 /Count 0
-/Next 866 0 R
-/Prev 864 0 R
-/Dest [211 0 R /XYZ 0 613.2000000000003 null]
+/Next 877 0 R
+/Prev 875 0 R
+/Dest [210 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-866 0 obj
+877 0 obj
 << /Title <feff0032002e00330031002e0033002e002000500072006f00640075006300650073>
-/Parent 863 0 R
+/Parent 874 0 R
 /Count 0
-/Prev 865 0 R
-/Dest [211 0 R /XYZ 0 508.0800000000004 null]
+/Prev 876 0 R
+/Dest [210 0 R /XYZ 0 508.0800000000004 null]
 >>
 endobj
-867 0 obj
+878 0 obj
 << /Title <feff0032002e00330032002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 868 0 R
-/Last 870 0 R
-/Next 871 0 R
-/Prev 863 0 R
-/Dest [211 0 R /XYZ 0 451.80000000000035 null]
+/First 879 0 R
+/Last 881 0 R
+/Next 882 0 R
+/Prev 874 0 R
+/Dest [210 0 R /XYZ 0 451.80000000000035 null]
 >>
 endobj
-868 0 obj
+879 0 obj
 << /Title <feff0032002e00330032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 867 0 R
+/Parent 878 0 R
 /Count 0
-/Next 869 0 R
-/Dest [211 0 R /XYZ 0 411.7200000000003 null]
+/Next 880 0 R
+/Dest [210 0 R /XYZ 0 411.7200000000003 null]
 >>
 endobj
-869 0 obj
+880 0 obj
 << /Title <feff0032002e00330032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 867 0 R
+/Parent 878 0 R
 /Count 0
-/Next 870 0 R
-/Prev 868 0 R
-/Dest [211 0 R /XYZ 0 306.6000000000003 null]
+/Next 881 0 R
+/Prev 879 0 R
+/Dest [210 0 R /XYZ 0 306.6000000000003 null]
 >>
 endobj
-870 0 obj
+881 0 obj
 << /Title <feff0032002e00330032002e0033002e002000500072006f00640075006300650073>
-/Parent 867 0 R
+/Parent 878 0 R
 /Count 0
-/Prev 869 0 R
-/Dest [211 0 R /XYZ 0 201.48000000000027 null]
+/Prev 880 0 R
+/Dest [210 0 R /XYZ 0 201.48000000000027 null]
 >>
 endobj
-871 0 obj
+882 0 obj
 << /Title <feff0032002e00330033002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 872 0 R
-/Last 874 0 R
-/Next 875 0 R
-/Prev 867 0 R
-/Dest [211 0 R /XYZ 0 145.20000000000024 null]
+/First 883 0 R
+/Last 885 0 R
+/Next 886 0 R
+/Prev 878 0 R
+/Dest [210 0 R /XYZ 0 145.20000000000024 null]
 >>
 endobj
-872 0 obj
+883 0 obj
 << /Title <feff0032002e00330033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 871 0 R
+/Parent 882 0 R
 /Count 0
-/Next 873 0 R
-/Dest [211 0 R /XYZ 0 105.12000000000023 null]
+/Next 884 0 R
+/Dest [210 0 R /XYZ 0 105.12000000000023 null]
 >>
 endobj
-873 0 obj
+884 0 obj
 << /Title <feff0032002e00330033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 871 0 R
+/Parent 882 0 R
 /Count 0
-/Next 874 0 R
-/Prev 872 0 R
-/Dest [226 0 R /XYZ 0 683.1600000000001 null]
+/Next 885 0 R
+/Prev 883 0 R
+/Dest [225 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-874 0 obj
+885 0 obj
 << /Title <feff0032002e00330033002e0033002e002000500072006f00640075006300650073>
-/Parent 871 0 R
+/Parent 882 0 R
 /Count 0
-/Prev 873 0 R
-/Dest [226 0 R /XYZ 0 578.0400000000002 null]
+/Prev 884 0 R
+/Dest [225 0 R /XYZ 0 578.0400000000002 null]
 >>
 endobj
-875 0 obj
+886 0 obj
 << /Title <feff0032002e00330034002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 876 0 R
-/Last 878 0 R
-/Next 879 0 R
-/Prev 871 0 R
-/Dest [226 0 R /XYZ 0 521.7600000000003 null]
+/First 887 0 R
+/Last 889 0 R
+/Next 890 0 R
+/Prev 882 0 R
+/Dest [225 0 R /XYZ 0 521.7600000000003 null]
 >>
 endobj
-876 0 obj
+887 0 obj
 << /Title <feff0032002e00330034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 875 0 R
+/Parent 886 0 R
 /Count 0
-/Next 877 0 R
-/Dest [226 0 R /XYZ 0 481.68000000000035 null]
+/Next 888 0 R
+/Dest [225 0 R /XYZ 0 481.68000000000035 null]
 >>
 endobj
-877 0 obj
+888 0 obj
 << /Title <feff0032002e00330034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 875 0 R
+/Parent 886 0 R
 /Count 0
-/Next 878 0 R
-/Prev 876 0 R
-/Dest [226 0 R /XYZ 0 376.56000000000034 null]
+/Next 889 0 R
+/Prev 887 0 R
+/Dest [225 0 R /XYZ 0 376.56000000000034 null]
 >>
 endobj
-878 0 obj
+889 0 obj
 << /Title <feff0032002e00330034002e0033002e002000500072006f00640075006300650073>
-/Parent 875 0 R
+/Parent 886 0 R
 /Count 0
-/Prev 877 0 R
-/Dest [226 0 R /XYZ 0 271.4400000000003 null]
+/Prev 888 0 R
+/Dest [225 0 R /XYZ 0 271.4400000000003 null]
 >>
 endobj
-879 0 obj
+890 0 obj
 << /Title <feff0032002e00330035002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 880 0 R
-/Last 882 0 R
-/Next 883 0 R
-/Prev 875 0 R
-/Dest [226 0 R /XYZ 0 215.16000000000028 null]
+/First 891 0 R
+/Last 893 0 R
+/Next 894 0 R
+/Prev 886 0 R
+/Dest [225 0 R /XYZ 0 215.16000000000028 null]
 >>
 endobj
-880 0 obj
+891 0 obj
 << /Title <feff0032002e00330035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 879 0 R
+/Parent 890 0 R
 /Count 0
-/Next 881 0 R
-/Dest [226 0 R /XYZ 0 175.08000000000027 null]
+/Next 892 0 R
+/Dest [225 0 R /XYZ 0 175.08000000000027 null]
 >>
 endobj
-881 0 obj
+892 0 obj
 << /Title <feff0032002e00330035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 879 0 R
+/Parent 890 0 R
 /Count 0
-/Next 882 0 R
-/Prev 880 0 R
-/Dest [238 0 R /XYZ 0 792.0 null]
+/Next 893 0 R
+/Prev 891 0 R
+/Dest [237 0 R /XYZ 0 792.0 null]
 >>
 endobj
-882 0 obj
+893 0 obj
 << /Title <feff0032002e00330035002e0033002e002000500072006f00640075006300650073>
-/Parent 879 0 R
+/Parent 890 0 R
 /Count 0
-/Prev 881 0 R
-/Dest [238 0 R /XYZ 0 653.2800000000002 null]
+/Prev 892 0 R
+/Dest [237 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-883 0 obj
-<< /Title <feff0032002e00330036002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079004c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+894 0 obj
+<< /Title <feff0032002e00330036002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 755 0 R
 /Count 3
-/First 884 0 R
-/Last 886 0 R
-/Next 887 0 R
-/Prev 879 0 R
-/Dest [238 0 R /XYZ 0 597.0000000000003 null]
+/First 895 0 R
+/Last 897 0 R
+/Next 898 0 R
+/Prev 890 0 R
+/Dest [237 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-884 0 obj
+895 0 obj
 << /Title <feff0032002e00330036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 883 0 R
+/Parent 894 0 R
 /Count 0
-/Next 885 0 R
-/Dest [238 0 R /XYZ 0 556.9200000000004 null]
+/Next 896 0 R
+/Dest [237 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-885 0 obj
+896 0 obj
 << /Title <feff0032002e00330036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 883 0 R
+/Parent 894 0 R
 /Count 0
-/Next 886 0 R
-/Prev 884 0 R
-/Dest [238 0 R /XYZ 0 451.8000000000006 null]
+/Next 897 0 R
+/Prev 895 0 R
+/Dest [237 0 R /XYZ 0 451.8000000000006 null]
 >>
 endobj
-886 0 obj
+897 0 obj
 << /Title <feff0032002e00330036002e0033002e002000500072006f00640075006300650073>
-/Parent 883 0 R
+/Parent 894 0 R
 /Count 0
-/Prev 885 0 R
-/Dest [238 0 R /XYZ 0 346.6800000000005 null]
+/Prev 896 0 R
+/Dest [237 0 R /XYZ 0 346.6800000000005 null]
 >>
 endobj
-887 0 obj
+898 0 obj
 << /Title <feff0032002e00330037002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 888 0 R
-/Last 891 0 R
-/Next 892 0 R
-/Prev 883 0 R
-/Dest [238 0 R /XYZ 0 290.4000000000005 null]
+/First 899 0 R
+/Last 902 0 R
+/Next 903 0 R
+/Prev 894 0 R
+/Dest [237 0 R /XYZ 0 290.4000000000005 null]
 >>
 endobj
-888 0 obj
+899 0 obj
 << /Title <feff0032002e00330037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 887 0 R
+/Parent 898 0 R
 /Count 0
-/Next 889 0 R
-/Dest [238 0 R /XYZ 0 250.32000000000048 null]
+/Next 900 0 R
+/Dest [237 0 R /XYZ 0 250.32000000000048 null]
 >>
 endobj
-889 0 obj
+900 0 obj
 << /Title <feff0032002e00330037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 887 0 R
+/Parent 898 0 R
 /Count 0
-/Next 890 0 R
-/Prev 888 0 R
-/Dest [238 0 R /XYZ 0 107.64000000000044 null]
+/Next 901 0 R
+/Prev 899 0 R
+/Dest [237 0 R /XYZ 0 107.64000000000044 null]
 >>
 endobj
-890 0 obj
+901 0 obj
 << /Title <feff0032002e00330037002e0033002e00200043006f006e00730075006d00650073>
-/Parent 887 0 R
+/Parent 898 0 R
 /Count 0
-/Next 891 0 R
-/Prev 889 0 R
+/Next 902 0 R
+/Prev 900 0 R
 /Dest [252 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-891 0 obj
+902 0 obj
 << /Title <feff0032002e00330037002e0034002e002000500072006f00640075006300650073>
-/Parent 887 0 R
+/Parent 898 0 R
 /Count 0
-/Prev 890 0 R
+/Prev 901 0 R
 /Dest [252 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-892 0 obj
+903 0 obj
 << /Title <feff0032002e00330038002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 893 0 R
-/Last 896 0 R
-/Next 897 0 R
-/Prev 887 0 R
+/First 904 0 R
+/Last 907 0 R
+/Next 908 0 R
+/Prev 898 0 R
 /Dest [252 0 R /XYZ 0 570.6000000000004 null]
 >>
 endobj
-893 0 obj
+904 0 obj
 << /Title <feff0032002e00330038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 892 0 R
+/Parent 903 0 R
 /Count 0
-/Next 894 0 R
+/Next 905 0 R
 /Dest [252 0 R /XYZ 0 502.4400000000004 null]
 >>
 endobj
-894 0 obj
+905 0 obj
 << /Title <feff0032002e00330038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 892 0 R
+/Parent 903 0 R
 /Count 0
-/Next 895 0 R
-/Prev 893 0 R
+/Next 906 0 R
+/Prev 904 0 R
 /Dest [252 0 R /XYZ 0 359.7600000000004 null]
 >>
 endobj
-895 0 obj
+906 0 obj
 << /Title <feff0032002e00330038002e0033002e00200043006f006e00730075006d00650073>
-/Parent 892 0 R
+/Parent 903 0 R
 /Count 0
-/Next 896 0 R
-/Prev 894 0 R
+/Next 907 0 R
+/Prev 905 0 R
 /Dest [252 0 R /XYZ 0 254.64000000000033 null]
 >>
 endobj
-896 0 obj
+907 0 obj
 << /Title <feff0032002e00330038002e0034002e002000500072006f00640075006300650073>
-/Parent 892 0 R
+/Parent 903 0 R
 /Count 0
-/Prev 895 0 R
+/Prev 906 0 R
 /Dest [252 0 R /XYZ 0 198.3600000000003 null]
 >>
 endobj
-897 0 obj
+908 0 obj
 << /Title <feff0032002e00330039002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 4
-/First 898 0 R
-/Last 901 0 R
-/Next 902 0 R
-/Prev 892 0 R
+/First 909 0 R
+/Last 912 0 R
+/Next 913 0 R
+/Prev 903 0 R
 /Dest [252 0 R /XYZ 0 142.08000000000027 null]
 >>
 endobj
-898 0 obj
+909 0 obj
 << /Title <feff0032002e00330039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 897 0 R
+/Parent 908 0 R
 /Count 0
-/Next 899 0 R
+/Next 910 0 R
 /Dest [266 0 R /XYZ 0 792.0 null]
 >>
 endobj
-899 0 obj
+910 0 obj
 << /Title <feff0032002e00330039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 897 0 R
+/Parent 908 0 R
 /Count 0
-/Next 900 0 R
-/Prev 898 0 R
+/Next 911 0 R
+/Prev 909 0 R
 /Dest [266 0 R /XYZ 0 615.72 null]
 >>
 endobj
-900 0 obj
+911 0 obj
 << /Title <feff0032002e00330039002e0033002e00200043006f006e00730075006d00650073>
-/Parent 897 0 R
+/Parent 908 0 R
 /Count 0
-/Next 901 0 R
-/Prev 899 0 R
+/Next 912 0 R
+/Prev 910 0 R
 /Dest [266 0 R /XYZ 0 510.60000000000014 null]
 >>
 endobj
-901 0 obj
+912 0 obj
 << /Title <feff0032002e00330039002e0034002e002000500072006f00640075006300650073>
-/Parent 897 0 R
+/Parent 908 0 R
 /Count 0
-/Prev 900 0 R
+/Prev 911 0 R
 /Dest [266 0 R /XYZ 0 454.3200000000001 null]
 >>
 endobj
-902 0 obj
+913 0 obj
 << /Title <feff0032002e00340030002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 744 0 R
+/Parent 755 0 R
 /Count 3
-/First 903 0 R
-/Last 905 0 R
-/Prev 897 0 R
+/First 914 0 R
+/Last 916 0 R
+/Prev 908 0 R
 /Dest [266 0 R /XYZ 0 398.0400000000001 null]
 >>
 endobj
-903 0 obj
+914 0 obj
 << /Title <feff0032002e00340030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 902 0 R
+/Parent 913 0 R
 /Count 0
-/Next 904 0 R
+/Next 915 0 R
 /Dest [266 0 R /XYZ 0 357.96000000000004 null]
 >>
 endobj
-904 0 obj
+915 0 obj
 << /Title <feff0032002e00340030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 902 0 R
+/Parent 913 0 R
 /Count 0
-/Next 905 0 R
-/Prev 903 0 R
+/Next 916 0 R
+/Prev 914 0 R
 /Dest [266 0 R /XYZ 0 252.83999999999997 null]
 >>
 endobj
-905 0 obj
+916 0 obj
 << /Title <feff0032002e00340030002e0033002e002000500072006f00640075006300650073>
-/Parent 902 0 R
+/Parent 913 0 R
 /Count 0
-/Prev 904 0 R
+/Prev 915 0 R
 /Dest [266 0 R /XYZ 0 147.71999999999994 null]
 >>
 endobj
-906 0 obj
+917 0 obj
 << /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
-/Parent 738 0 R
-/Count 20
-/First 907 0 R
-/Last 926 0 R
-/Prev 744 0 R
+/Parent 749 0 R
+/Count 22
+/First 918 0 R
+/Last 939 0 R
+/Prev 755 0 R
 /Dest [279 0 R /XYZ 0 792.0 null]
 >>
 endobj
-907 0 obj
+918 0 obj
 << /Title <feff0033002e0031002e00200043006c0064007300440069006300740069006f006e006100720079>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 908 0 R
+/Next 919 0 R
 /Dest [279 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-908 0 obj
+919 0 obj
 << /Title <feff0033002e0032002e00200043006c0064007300440069006300740069006f006e006100720079004900740065006d>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 909 0 R
-/Prev 907 0 R
+/Next 920 0 R
+/Prev 918 0 R
 /Dest [279 0 R /XYZ 0 411.35999999999996 null]
 >>
 endobj
-909 0 obj
+920 0 obj
 << /Title <feff0033002e0033002e00200043006c00640073004500760065006e0074>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 910 0 R
-/Prev 908 0 R
+/Next 921 0 R
+/Prev 919 0 R
 /Dest [285 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
-910 0 obj
+921 0 obj
 << /Title <feff0033002e0034002e00200043006c006400730049006e0066006f>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 911 0 R
-/Prev 909 0 R
+/Next 922 0 R
+/Prev 920 0 R
 /Dest [285 0 R /XYZ 0 382.4400000000002 null]
 >>
 endobj
-911 0 obj
+922 0 obj
 << /Title <feff0033002e0035002e00200043006c00640073004d006f00640065006c>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 912 0 R
-/Prev 910 0 R
+/Next 923 0 R
+/Prev 921 0 R
 /Dest [289 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-912 0 obj
+923 0 obj
 << /Title <feff0033002e0036002e00200043006c00640073004d006f00640065006c0049006e007300740061006e00630065>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 913 0 R
-/Prev 911 0 R
+/Next 924 0 R
+/Prev 922 0 R
 /Dest [294 0 R /XYZ 0 495.3600000000003 null]
 >>
 endobj
-913 0 obj
+924 0 obj
 << /Title <feff0033002e0037002e00200043006c00640073004d006f006e00690074006f00720069006e006700440065007400610069006c0073>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 914 0 R
-/Prev 912 0 R
+/Next 925 0 R
+/Prev 923 0 R
 /Dest [294 0 R /XYZ 0 307.3200000000002 null]
 >>
 endobj
-914 0 obj
+925 0 obj
 << /Title <feff0033002e0038002e00200043006c0064007300540065006d0070006c006100740065>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 915 0 R
-/Prev 913 0 R
+/Next 926 0 R
+/Prev 924 0 R
 /Dest [299 0 R /XYZ 0 570.48 null]
 >>
 endobj
-915 0 obj
+926 0 obj
 << /Title <feff0033002e0039002e00200043006c006400730054006f007300630061004d006f00640065006c>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 916 0 R
-/Prev 914 0 R
+/Next 927 0 R
+/Prev 925 0 R
 /Dest [302 0 R /XYZ 0 645.5999999999999 null]
 >>
 endobj
-916 0 obj
+927 0 obj
 << /Title <feff0033002e00310030002e00200044006300610065004500760065006e0074>
-/Parent 906 0 R
+/Parent 917 0 R
 /Count 0
-/Next 917 0 R
-/Prev 915 0 R
+/Next 928 0 R
+/Prev 926 0 R
 /Dest [302 0 R /XYZ 0 194.63999999999993 null]
 >>
 endobj
-917 0 obj
-<< /Title <feff0033002e00310031002e0020004a0073006f006e00410072007200610079>
-/Parent 906 0 R
+928 0 obj
+<< /Title <feff0033002e00310031002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
+/Parent 917 0 R
 /Count 0
-/Next 918 0 R
-/Prev 916 0 R
+/Next 929 0 R
+/Prev 927 0 R
 /Dest [306 0 R /XYZ 0 532.9200000000001 null]
 >>
 endobj
-918 0 obj
-<< /Title <feff0033002e00310032002e0020004a0073006f006e004e0075006c006c>
-/Parent 906 0 R
+929 0 obj
+<< /Title <feff0033002e00310032002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
+/Parent 917 0 R
 /Count 0
-/Next 919 0 R
-/Prev 917 0 R
-/Dest [313 0 R /XYZ 0 382.68000000000023 null]
+/Next 930 0 R
+/Prev 928 0 R
+/Dest [306 0 R /XYZ 0 382.4400000000001 null]
 >>
 endobj
-919 0 obj
-<< /Title <feff0033002e00310033002e0020004a0073006f006e004f0062006a006500630074>
-/Parent 906 0 R
+930 0 obj
+<< /Title <feff0033002e00310033002e0020004a0073006f006e00410072007200610079>
+/Parent 917 0 R
 /Count 0
-/Next 920 0 R
-/Prev 918 0 R
-/Dest [318 0 R /XYZ 0 232.44000000000023 null]
+/Next 931 0 R
+/Prev 929 0 R
+/Dest [306 0 R /XYZ 0 194.40000000000006 null]
 >>
 endobj
-920 0 obj
-<< /Title <feff0033002e00310034002e0020004a0073006f006e005000720069006d00690074006900760065>
-/Parent 906 0 R
+931 0 obj
+<< /Title <feff0033002e00310034002e0020004a0073006f006e004e0075006c006c>
+/Parent 917 0 R
 /Count 0
-/Next 921 0 R
-/Prev 919 0 R
-/Dest [333 0 R /XYZ 0 792.0 null]
+/Next 932 0 R
+/Prev 930 0 R
+/Dest [320 0 R /XYZ 0 792.0 null]
 >>
 endobj
-921 0 obj
-<< /Title <feff0033002e00310035002e0020004c006f006f0070>
-/Parent 906 0 R
+932 0 obj
+<< /Title <feff0033002e00310035002e0020004a0073006f006e004f0062006a006500630074>
+/Parent 917 0 R
 /Count 0
-/Next 922 0 R
-/Prev 920 0 R
-/Dest [341 0 R /XYZ 0 495.3600000000003 null]
+/Next 933 0 R
+/Prev 931 0 R
+/Dest [328 0 R /XYZ 0 608.0400000000002 null]
 >>
 endobj
-922 0 obj
-<< /Title <feff0033002e00310036002e0020004c006f006f0070004c006f0067>
-/Parent 906 0 R
+933 0 obj
+<< /Title <feff0033002e00310036002e0020004a0073006f006e005000720069006d00690074006900760065>
+/Parent 917 0 R
 /Count 0
-/Next 923 0 R
-/Prev 921 0 R
-/Dest [348 0 R /XYZ 0 645.6000000000001 null]
+/Next 934 0 R
+/Prev 932 0 R
+/Dest [335 0 R /XYZ 0 457.8000000000001 null]
 >>
 endobj
-923 0 obj
-<< /Title <feff0033002e00310037002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
-/Parent 906 0 R
+934 0 obj
+<< /Title <feff0033002e00310037002e0020004c006f006f0070>
+/Parent 917 0 R
 /Count 0
-/Next 924 0 R
-/Prev 922 0 R
-/Dest [348 0 R /XYZ 0 382.4400000000002 null]
+/Next 935 0 R
+/Prev 933 0 R
+/Dest [340 0 R /XYZ 0 194.8800000000005 null]
 >>
 endobj
-924 0 obj
-<< /Title <feff0033002e00310038002e0020004e0075006d006200650072>
-/Parent 906 0 R
+935 0 obj
+<< /Title <feff0033002e00310038002e0020004c006f006f0070004c006f0067>
+/Parent 917 0 R
 /Count 0
-/Next 925 0 R
-/Prev 923 0 R
-/Dest [357 0 R /XYZ 0 792.0 null]
+/Next 936 0 R
+/Prev 934 0 R
+/Dest [348 0 R /XYZ 0 307.55999999999995 null]
 >>
 endobj
-925 0 obj
-<< /Title <feff0033002e00310039002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
-/Parent 906 0 R
+936 0 obj
+<< /Title <feff0033002e00310039002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
+/Parent 917 0 R
 /Count 0
-/Next 926 0 R
-/Prev 924 0 R
-/Dest [357 0 R /XYZ 0 690.5400000000001 null]
+/Next 937 0 R
+/Prev 935 0 R
+/Dest [357 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-926 0 obj
-<< /Title <feff0033002e00320030002e002000560061006c00750065004900740065006d>
-/Parent 906 0 R
+937 0 obj
+<< /Title <feff0033002e00320030002e0020004e0075006d006200650072>
+/Parent 917 0 R
 /Count 0
-/Prev 925 0 R
-/Dest [357 0 R /XYZ 0 464.9400000000001 null]
+/Next 938 0 R
+/Prev 936 0 R
+/Dest [357 0 R /XYZ 0 344.88000000000017 null]
 >>
 endobj
-927 0 obj
+938 0 obj
+<< /Title <feff0033002e00320031002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
+/Parent 917 0 R
+/Count 0
+/Next 939 0 R
+/Prev 937 0 R
+/Dest [357 0 R /XYZ 0 277.0200000000001 null]
+>>
+endobj
+939 0 obj
+<< /Title <feff0033002e00320032002e002000560061006c00750065004900740065006d>
+/Parent 917 0 R
+/Count 0
+/Prev 938 0 R
+/Dest [369 0 R /XYZ 0 792.0 null]
+>>
+endobj
+940 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (iii)
@@ -57875,47 +58994,57 @@ endobj
 >> 29 << /P (24)
 >> 30 << /P (25)
 >> 31 << /P (26)
->> 32 << /P (27)
 >> 33 << /P (28)
+>> 34 << /P (29)
 >> 35 << /P (30)
 >> 36 << /P (31)
 >> 37 << /P (32)
 >> 38 << /P (33)
+>> 39 << /P (34)
 >>]
 >>
 endobj
-928 0 obj
-<< /Length1 12112
-/Length 7747
+941 0 obj
+<< /Length1 12332
+/Length 7916
 /Filter [/FlateDecode]
 >>
 stream
-xœ�z	XW–î½U%!‹Z‘Ħ„Ä"$;b1«X�‹³³ÄÆÄ¡‡8Ävâ´³8ŽÇqÇ„q'þÒé´ÇY;/_&qϼ¼¼¿‰;�¤ýÒžN¦;�Œ“I{òòÙP~§JdLº»øŠÒ=U:ç¿çœ{–[B!ÄG&ÄA}cž‰ç^¢€€Î!„£Gg½±ÓB/|~¡ä¢Q_ŸÇàË ¤ežythlzOñx̽0~žIðD}À…ϺWà~ò˜gÏòàQÿÆŠmMƬïß9|ŒW`Ü3ᛚv\z˜¥tÁø�qÏØÀ•mf„RãâÐÀ®?"þàE„Œ0FV81bð"¹è¯8p%H„(7„Ê�DF	£QŒH‹ââ$ÒÄ$™\�”*u²iu)©ié(ƒýšŒ¦Ì,s¶Åš“›—o+°#Ga‘³¸•¢2Tþ×å³GÅßòPåßÈ쎣úq€+BbˆdDœØ@–ìhÎHìŠ)Ú7|äŸæóóçÿéÈð¾¢bqïµË狺sO_ÁÊW_Åòß>�ÛUô‹®1¼Š�W}€W¶�ÐYdD´XDpˆÅAâ¹çÝÀë›íàu·“åõÁ/ŠºrŸþ-}õÕWéO¯œÎí.:™åe§ßÅG0Å!¤	à€-ÙÊ’m5gÉ|$¹a¾k ;V¥UÅÖæ)r3ÜνCMR·¢«@$‹Så6Gœ¾„�£_%*‰9vŒ±(ÅfBŒ¯ž8áŸÿü­oñ~�ƒPN¶ƒ`˜‹AžZe æEj£TbT‹Åj£DjT‹ö¥X�Â’¢³2W+ë"·xDÌxÇ©±yv¸ûûð0D ®[_QIœ÷€·ŽÑ.(Øb¿zAŽæ€ÆÍY @¢€ ’l{ÎÏÞsa&7wæåù=¿Øc[%ºª½…Riါz°(‘¸òSúOGG/â¸çžÃ¢wvî|‡þòùã_?ÛÚúì×Ç�_[jiYºæŸÛA„ÈKœ7‘!³…•#�j•¬QˆÍBnÃâwÕv½TW^d—éóå…Mæ£$»ºß͗盨lS]®ÜžÉ‹ÓX4;o¦›òå|7Ã{xÿæfdföÁJà\I¥;ȵ	‰A�–€ZÉ
mó
ô2þÈP ‡ðÜü•‡±»ÑW*K0o³–·fEkŠLRóÀã}ž£yÔLåŸh§÷KÒrdúÔãøÐŽÇæËm;Ê4YÍãöp¹Ygp¥f¶ßÃÎu7èš<.ð—€FÓ±%X¹ÁX‡È8p¡Ô,Ùjmàûxs–¹çA·ÓY:Óšoi²•·py
ש]ŽÌ¶=Zws­M�Që�Þkøñ}¹M]ìéPÕÝÓåv¥égª
-º‹UÁ03šfëÊöö•©˜dkÝ`i㽞Ҵ�£Iï(³vkXQCœéâ\@ñ¬¿ˆýöQ²“°cЫYhc˜AŽ€ú&»¥z‡JºúD>cÀÕEbömšv$‡
-‘(5E8}†9ËšŒ5æÙfòÒJݾ¦�ð™Æü"»%šŽgõ·ëÖW`ÏóȲ¡?Fi!ºeŒZg ÕJ’uÚõÕ±¦³/
-G¶ed4NVXjm1™ÅÄ9¾›G†Å§*è)�|¦³ïù{*Jæ_™™|¬-¹°XnßÞ¯nXð4ì©×ñ"¢xâ2ýž=V.æÓŽ°Xëè™Ñ¡ss%º‚*U^QFMŽ‚ÕË>°mØ6
åTA:È $Ì‚rP~W
¸I·±Z²µÄ±§Âì•-YÝÇGòm»Î{_˜¯LÊoÛýx‡{¾9µ¾6&£t6Åå´Š	]y¿}|jgˆ¾D_ë’¢óGOöŽžß_Ùò2–ÿOÏkˇr“êRmEY­NÍêY±2]|âã‹žíg§΂ýâ@‡|„”X©ŠÄê¥ãüûÕÿ‡'¥yœ¨!/ž´Ý8ȬQuÃܤ07ÊCµŸóÈÛý”\Ó9'`�€õ¼æÙLàv�ÝÆæÉ’üÞr]ÖΟÞÕóø 5¥Òë¨ÙבYþ£S/ÌØð'%cµiZ÷bŸgR]6„M	9íμö9Jó«3¢±Ïåk-W(k»ÆŠ*îó:,ÝûkK¼
NyrcÏD‰çÉ�9ÃG>H­ì·e·7mKÏ^ž.ªN¥4ÆŽŠt�³Ã’ÓVY¨H²Wµ"ÖnC·¾ WX»Ù¯ŠŽa¢Ïú"ÄÑAË/GFÆ8È8šŠËÎíßž{†k«î´¶?6b+Øufpè…UHóÚçN÷µN•$j㩶šû³šŠŒ"¥ÜcÛ-+hïÀ&œ-ÍÒÅe�ò½ºP]–^9?òþ…ã>»<«H¡Íæ)lz	ш¥ú%uðï)xóš÷Ô¨Y¼Ë�ÎRÍþx½97�—7g‡¿–-È©
‚R Pú+’t•¼N}„¸LnÂâP,^ }«õÄ‹Ä+•ø£Eúýð"ƒm
_&¯“WÁcB˜ØÑNòúÊ#¤oå¢òαÙÙÛùåXB1<¶@¼¸ZOú®.â]xf‘ÖU²sm»õ-yl£
¿CX-Ü:f³þGnš9Áß×>[%—X[lE­Öx�C/Ñï8ÚçYÚSjñ>ºãíÍŠÀ'qNò߬ÝÒjW¥Uî°•YÊÌf‡:kǃmÍNvëVoÜ‘YŒpp– &³Y&„qúØõˆ˜ƒÍXF†°Ð�˜4`�€!•øT](¿¤ÌH‡ëdi*y¾xÿKx‚*C&]}ß8Êk\RX„!1±‰Ñ‡ðÿÆ_|of›ÜîˆdG&õÖÍEZDÌ^arÜçøýΧ]š²Êm&ú »^ë`�¿	˜”È€l�Ü'fV(•H7BêQ*(l¾3¥cj¿®t»µ|ºÉ@¯Ðß­ž’¨í‰Ô`WI
æcjµûW­{jT²ª=ï=Ô±§R®ª™m]¤*ˆê,Ѽðüíó
ßeã9ù•>GêþùM�¢b²±þ®:­WQ²ÓU=à�øk;ˆ-K�½f¿ �ÁjQ†ƒÂ(Ô%$wø©A³ÔäÔ&äu–L?ã5˜†~²«zª­D"ŒµŒ.O>ùÇ¿«o~ö;Î{jGs¦Ò¢™º«�-g¾>±øÙ™Ž$S¡*L+×5§C�ûÓe,º8ÎÚôÆar›<.P)o×0Cˆ‚¡�ÓÕ¼|ãïW�igêÔ÷Ïw¬Zö¾¼×þç?Ÿ'®œ¥ÿë+ÂóýÍÊ•¦Ó:Ž3qñÍxFŒ½–A.¬hÍF‰r›à@~*ÅJü)>”Yf�p#‚›$*»AÊÔBŠÇßɧâÒ�ú,¾FG{Dmô	whbŽž¼Æ¦XúDóüê§ýkr{@.3[†³08›o
R�'“ÍKW°BÙ	û…ÆëKMœúÕûéZ&gE~ÇND2¹?`kÎÃ`kXÍU²–1¦5Ù¼¥Õ­9kâÅ,Q(À¤å%úÿýÌÝù8üç“?Ý•+3—¥$Bl¿÷åélëÞ·Û|é$!â%ekc?m˜w³<yí™æðìÒç$±u‡ÍD5:áòA'P•¯éáô¦Ü4ö?K^�²�×_ÿœr‘f©Ê¡—'¤z»ZJ4oÜaÝÿŽVlTC
§a?Ó½øÔÆ�•h}Nb¨0Ïæ z+Lu¬(ÖW Xp~AŸ±NTÐÀûÖ´ˆå��eKÖÅÅ–k‚§WyÏó½jzFÓúÈ(õ‡�9ÜT?øò˜!Øç•?„ym!lB
Ž‡58Óâ(шà6衲ýÍG”–bå“tåš^BÌ ÃºfË!Vã­­ŠoW':&– Ó}´F¤ËQqi݆ÛãÃgñ¾¸�Í*5§Qå7~ÏI¸ù¯w,‚›cÔ±;tËÆ›«€/ƒ©Å¶†…7i…:²Šü.Eo8ÞM\a>H	‚%R'Wjïð¡›�’‡‚a†x7ëqŽóþßÞûqæš—¾yêÌ·§ëëO_?óÔµ¥æ›ŸèûŸžœ|º/#£ïï&'OèoïýÄ¼Üû}½äv/}�Öâ-µóW#Ó^ˆ
-ékz!7’S]Ðb*ÜÿæÝö¼{ÿÏñý̸ô«±í÷5ë˜dt(xî6ß©þγûkéevÑ't­‹¦²^ÇÁ©
l¶ÔÈ0ˆcj”[EA±5‡&(_ú²{�ܤž9·]MùkXôëþ¼ kZÜ£VzñèZ¾<t£±Ñ-H©ÌÇïÓ,°`—y÷bã\GA´1¥~O}ãT•ü¥úŸo!~2ñÓßÝZ\�sƒƒiœ¿6Ç7úŸÌ®­ •ÅÞÊŸR¸f;v<Ôm(Ù³äéz¨×Üꊳ¶9mÛ‹TŠê½íGz³+î{M”V=Rä¨)º«Ãº°/×]U¢Ñµ�ÝßÜöàŽ,mQ“¾¸Ä´½Ê ´»-öíÕ%ÉšÆ�}Û˜œñíÔ@
¢föFnS"ƒ‹m;ØÄ’Ž‰�‡6®02êzGo×ÅPa�Tö3™E¤u~õÅÆz¢v±Y
{™Œ]GrðãS ËÐË�Ñï"ñùì[åÁqËܹ¯º}KªŸF°4çü"³ïgûHéÆúY¹Ú¾¯.ÙÔ2SNƒ¨—½gv À¶Ç˜Ò˜µÍL“•mCl\ŒÇ9pN³[¤]‚	/]&a*@ÂltØCyWå¨Õ¿óø%¥Füg�,]-ÒmÔuEZ<èÃh†êou°óy—k¹‡8”`ZŒnw¸Ú‘u³�Å�¯0ä"Š×„’·U‡BHÜu£$½ R—xžäq9†ë:™>YI/¿B¿Dÿê—ô"?Ae¼Ù€—Ï}CbF¦J¯sή,z_¯p�é#ö„Ëd’P—Êa¾YHÍÝ\¸ÿ®í¿pÕÿ²�ôùóÍw 7.`vläß
xŒCð‘…x³þ‹—³ŽD/eʉ„0×$ªE!	áO$g	C¥Êäè"a‘­_��Õ¥¤K賿U&Ö»ð
âÇI©’p°ft|DR~,}­pÎkµ;_ªôz·;Rc7¬þ„>è〗¾B^¸åföÖ°Ò¢$/¬‘oÑWf™¸â…Ú6•êFfÅbQ¬“$D@Æ°-Œv}Á®…�z­û´2[‰Ö7´8*´Zg*åßÛªR-íù÷×tî6
-d™�”¾T•�E¥3-¦?~ù\xJ5NíÙ‘âÚé\æRêÂ.☲ Ñ”_aqc5Í{Wÿ3=W%p¿˜^™�¤k˜k>s*„;—³½Dx5€w–+Bzäôw
lT‡l
-B7„böopà B�ALÍæì<9`멵ÅF$Ó¯D1U³˜¢ð,
/.¿¦§`àäÎÚV?R$•:GJwØíB÷èo—HLÅ)§ýÛz.ýø€º3Íd6ÖX’Jýt<ºäYšÈË›xvtį̀5°/tôœº·ˆƒ±LMéo$ˆRï¹»ËÊæþÞS4ï-êêŒÒ•dÛv”&?ò쎇ԑ¢ŒÖ{E…\~béÊý¹	ÙÛ,ù&·S“1zañã_׆§$ªËsý½8È¥ÞeõU¸å6lèGgÖêØŽ×zðnŸ(–
-g”#¤Ÿ�åÅÙüš±Zý
-,ˆ
'I‚bïãY:µ~Ä	êm(é±'Þu•ÕÍ+ÆjV+ÇÖ4—•¡­Ž>ËÞ»Ñé×”/?âÙ‘�ãÇK^=ñMa7DÉîD
Ö¨hjVÊÈ Ž‹0OÎ…áã³[4¾Ÿïu~õqß©qÛª›H­�¨²tºò¢	Éo^}©áþžì›+ÕG/-`9V9æ^žížøÉPf|Š9‘«•È+
-R˜x‰�<ÀME™ ­�t`1wòk,þ†ÄL¼¸z�-¦_=«ûþæúñY‚Þ®‰�gë2lÉ‘XIÊ$w ÚAo×ážL±6[‘˜ž)·U%½ÎYÏ*bÖ,Óie¡Q+E{žÎŠå†¬·š´éþÝÍõ]v½²_Ö í¯¸À:ZéÌ¢ˆñ¯wQÀ—²DHR¹‘±$M¤Ö:mg#O”,�ŠQ¥ìúQƒÆyÿû‡~ýAZE—Yœ¢•g”L=G=šJ{fddJ–M%×Ë"WNÇxëÆnVI-uæNo(ÔîníË*ˈiîïk¡ä±º$ax¼8"<"}¦­f·cóãeÚ¸™�chØUÜöPŸõÔ‘‚Ž¢”ÐPYšUioO‹.lè1·îÍ‹‰�ˆÒ)c…Iº›ñúº\…¦¸Ój´«‘i5dÏ�½2‡§äÁûúëWè©OÀÿóƒíy{�°Þß„kŽï7lÍêG›ã¿ëRëÁ.S|Z>Ķ“ñ·£h»]Æ<°ïZTp$Ú%²¤×Œžãô¿¦&þ±d¨Rcl�«¦ë™jÊ_Ûáß`ŒgªìœÛÊ’˜M{G®µ²�‹ÇýµökËÑŠ´„ø4yLŒ<->!Mͦb°ðÝ+OûëNQ²I.3%Ã5"BE-që´?òc™JûÛ¥Û4µY:>U0úX»22Çm“³ ~-O��Ogd³×hÊus™i£<LwEîe1àš;dûíó"È.ðçÿµ²–oYÖúMƾѪ!«Âr .`¡e¸Œ›Ô>Õ\žþþ, ;­†‘2]ÂÏ4ãw*ë‰côH£Û–º­;'^õ¶A¦[ùSbkšÉ‚ã5¹iÊHI¤ÛÝßé÷'¨æˆÖV?`)Ëš\	fßÿHV_æ|ã²ß¯<èýÜëZ·ð͸@îZ»níŸ[8lÏêGRu~ZëžØ)åËKk[LYµö¡¼²¡ÝTw·ÛðÝ8s#³õ4,éÌ�rebž5Ýr^U*d�
-3s½ÃŸ3›ÇtaÁÚµ§xÝÁÙyRßÀ<sÿÂ<ÿÂt„kåâj)_Q±­=³a¾Ý C觘õW¾#?á@ß
ö6lþü¨l‘L€£ü¯dü©æŽ·ŠúÿþÊ÷âœóÏטÿ«|YÉHmíÎâ$Y1{•:úSú?Êúð($˜ø²#—�N¾0SP0óÂä乩üü©sŒ<)ÄõY�üaÛ\˜lÔ3±Ð%á-—ÀšÆˆó›Š¼½¬á�¿Ã±y)H°W¼QÝ�Ÿl®Sèšµ$m1Ĥ&'ñÞÑç$…ú7Ÿ¨�¬R_
9Œ]K!Q-Ã\ WnÞ´õƒŒõgKÈ.*``âØêϹµéø¢4{GéĘØP™m*Ðèå1<æ^^°)ß34ØÕu
-«NÜR�^ÑåéÑÑo®ûWÔÅTS®×VAZÝÜvj7w�/Ôîk3IuúèØìGNsž,.¯×µm¦F›ã}¨µj¢F[[ÑÒ™
Å)(¹´aº:9çc"iNƒ55Gaí®H•f–¥jsLY
-µ³ÆSR>Z¥•™Ë´¹%ƒ“ñɺ<“>QU\×[T¿§!ðên}E<Ã)göÂ4Pñ‰Å”0‚®Æ,fëŠXB®q("Ò2­ñu•ê“šv•:=ª‡Ó×[ÚxÜnx(GéÚÛFœk”©µÃÛVfVë†{�¿|úsÊÅÖ0›+¾àxu›Å¨Ö"ôë1ª›»²îqëý6ò‰3›¥žB³ùæS6\.çW¦Fz�ã/Y­Ú™ÕejÝëÂË&ÛúþÖþIÀbôÿf`½}#¹³¿dú<5�@‡�Ç;‘˜ ¢B8qIrÁ1~hIi$~9�}Aÿòuúåp¦%¯»Ý&³PGïKnm®–Ä:kë5øa¦Ñ¼‰X9GdÞDøñqx˜nÇ�b‹.WMê¶è8�Éy?\/âpCSä^^XI™_�È2ÔÐr~¿t]Cÿßgèë,4.¾!µ;¸=üؘ(h…q’ˆËTéêO4-M.‰ù±>ì’ØX˜Ð›WΗ®œõcu»¡4ÅÑg5m­5IÙ¶F
1â×'Ä�ÀϼÁ
 p'û&g+ÄAÓ£¸L{MÿsrQyÓÎ;£‡«J e:ÀýŠë°‡„>.�Kc)n˜N²
-:çR.¿—ú)O‹ò8F�¹ÉyEª„¿¦ùcꦆJ‰~¿kMï€ÓKß ¹�'Ù*>àw:äma¶•Mò\1“ËÅPÌ
-Ù·QÄ|¥Ï¥Õ·™ÍmÅšÇ~|ÐÞY»kê®ñÚN;}#­f¬÷6fŠ	7!Êltà�ÃÇÛFGègúbÑ}^úÔðxº]n³íâr,W-[ÔIJq(Ö\`_Øë謻krWm§ã�GÓ:ùN­Ö5^ùÀãø×{ŸˆˆYèÇÝ#£mÇÓO93EBœÙXHŸ,«IóûU?~‘ØOÌï_6WKý©•ýù¹½®´4Won~e*ñQód™LV6Ùܼ«\&+ßø‘Õ Iô#t½€®áDÜ�/ÑH,o‘ò~ò-òò�ä
-UG§®q²9œsœÏ¸VîQî›Ü?…$†Œ†œùŠgâÝÇû84*´#ôdèwü:~ÿ|XTXMØRØgá)áÿ+BÑq2âº@"xHðÛHQäÞÈ7£b£Ê£G} Ì> |'E+¢<&=Šà|ÍÀYÇNÌ!3\ç	fWtuÁyÎ!8wé†sœûàœ…³›¹G¸Ð2\ÖO„Ú8K©m¨ŽúÍp.ÁuÎW³4ÃmCuÄ7p~r놲Õq¥pï4E]†k!<Û�z©? TÎHÎñ"ÄëAÑtë;òÜ­ï¨ýÈ|5ä7€å8+Ñ.â:Ê¡ê�‘#Bâad$¼·þ@½Ÿç�4äa”ÇIEyÔ)öy)ù.*%O¢.âÒÁóFêÄã~Žj
ñÈ1äeNâsÔÏè†ÙCãY=‹¿™®¡ëB¿_ÿ±ÛÚQÅRªÀ¢Qè
ÄÙtŸ€1E]ÃGáâœà˜�¥Ì%ÿyñ·"Â8Å¡‚ú”êEhÏ-ø»)\±m[*B|ú–ïѦ@øéO?ë¸@—)ü�9ny‘wËß®U±ïcÃP8Ô@QHˆ¢Á‡™ßžÅ¢8¨r�jÞD”ÙJ�”H…’¡f×"J
iˆù•ž¢»	²M2#²B�5_>ÔôÅ�ßèU J�ãBÕàᵨmCõ¨
5¢&Ô‚ÜPÿ¶¡vÔ�ºP7êA1™6™œÐ  $Ü»®3#‹SLÖŸŽ	Ð1 "@'Pz>@'�½ “0—·tP^	Ð)ÄÇq
:…DX sP$¶è$Ã¥
:E­cA*<x&•âGtãßè<”†ÿ3@E"bMV(J!Òt>øfS€ÎGÝĽ
z’¿ÐÃP
A¯ÿSFæèᨀlÐ#��|4@�@]äÛ
º¥Q²]€š©ÊßÄìäðàд"Ë”™¥¨ðùGUã}…stTÑÈÜšR4L
LÞ5Ðo@%ȇ&Ð,„©a4ˆ†Ð48EVÀø
-0³þÑ(€QG}ÈŸœ@…kãú·¦ØÑ\€×]ð¿ê|Ó>EÓÀä°\ÄOùà©&ö‰aämœõL²_D3ÀЃ&k}ã¾éÙ	€<æTèA\j�Ã8ËiPû1�Á×�ß8üW€ë*¶’õ—‘¸&§†}ãŠLƒ)[13Ìܘ‚[Œ8(Ã*ɆO3hÈÉéG–!ËzxJáQLOzúÆ<“#
-Ÿ7XóA"‡YEyàœ	PÒ;�I44¬èPúzaÿu}lþzéÀÔðà¸bzÀ3¶Å·KY26g!¯±RÏ´G13>4<>
à0Яè�U¬³íb[
-_šfç8l†X(Ó~‡Ø$‚¡)P/ˆWl
¦+0CÓÓùFcŸ¯À0ȪØÐç3N
ˆÏȺâ4|?¢‰&îc¹€Ç†N
,}îOÀ9°�1Ày÷î݆±À´XÖSÓ3ýþMœw³àr;ê
ÞS@›
éàC5Ã}ãS ±™ñþ�IÅôЀÂ9áéƒKàN†bͳ&ˆ¨ÃÀeøN4Ä豟õIFC¬vœ ÏÏùG·'(›}8‹ñá 9zXßä qÔ�bÊXSURV×T¦gPl=_O�Tpž�A«ÁÒ§€RŽW™¢Y,JVº?¿"Ì·¢{»sGdÁa<6Œ]úäIñÚò.
-ýž×ËFÛÀñÿ
­Ñ5Š
+xœ�z	\×µ÷½3#!	´"‰M‰EH v‹Å€A¬ÆˆE€Y„YbcâP'!±�8uâ8ŽŸãÆÏMüKÓÆu¶6/¿6qû^^¾×|�›&©_ê¯ÉKÓä9ùR¿|ùÙ0þÎŒLÚ¿atÏŒÎùßsÎ=Ë!Œâ#3â ñÞQïø³/T‘@9�Ž™ñùχçàóëicFü½^×pÞE„t¿�gŽ
ŽNí©ÄBH?Ϥö{cÞå>ŠP긟2êÝ3ŽzðŒ/ÀX¹u›)ûÛ7Ý
ãwaÜ=zñTÑOJË�ñkcÞÑþ+[ç-0¾Ž‡v}Q	.!d‚1²Á‰ƒ¡HøÈE÷ÀÁ+
s¢8Ü0^8?"2J#ŒEq"q<’$$JeIÉr…©Ôš-ÒéSÓÒ3P&û52šÌYÙ–«-7/¿À^è@΢bWIiY9ª@•_>{Tý#mù™Ýv`4Mß îáŠ�"9!	šëĹb
‰ÝqÅû†ÿz® `îׇ‡öÇ{¯]¾PÜ•wú
+V½ü2VüáɼÎâÞ½Æð*
^õA^9FBo•±b!ÀaV'‰gã\w¯»ìö»€×�.–×»/wæ=ùúêË/Ó]9�×U|á2ËËA¿‰c’€ïˆpÀÖ#eͱY²å>œÒ0×Ù߯֩ãkó•y™‰×ÞÁm2�²³P$‹’Òv§ÄPÊÎÑ‚¯UÄ,;ÆYUb!ÆWOœÌîÖ×x?ȉC(7ÇI0ÌÅ O£6s"�I&5iÄb�I*3iDûR­J�@iMÕÛ˜«�u‘[<¢æ¼%l™™Áïíþ6<¨óÖT2ç-à­g´Š¶8 ^„c9 qK¶(F�( ¨dûž3w]œÎË›~qnÏ{ìË¢¤¢
wµ¯H&+êwW'W~HÿåÒÈÈ%,yæ,zcçÎ7èÏŸ=þåÓ--Oyüøµ³ÍÍg¯æv!òÎkH��ÅÊÊ
+H�ZÖ(Â!·cñ›‡A¦¯(vÈ
Š¢Êm–#÷H�MŸ‡¯(0S9æº<…#‹'ÑZµ;of˜|ÃÖ,ù'˜›‰™Ø«€?p%UVì$W&$5Zƒj%Ÿ7¶Î5Ћø}c¡NÆóð—žF™<ѲÕVÑ’«-6Ë,ýÇz½'Fò©éªû:ÑFï—¦çʵô©cøàŽcósöåÚì¦1G¤Â¢·÷»Ó²ÚîbçºtM7øKP£ØªÜP,Œ‰Ãä¸P–l³€6ð’c¬)ÛÒý€Çå*›nÉN°n³W´qùש]άÖ=•:OS­]“Yë›ÚkïÿþC…]SâmW×ÝÕér§
§·v•¨Cafn›©+ßÛ[!¤âRlue�w{ËÒã´Îmg¹­£DËú‹âL'ç"J`ýE°�Š�„ƒ^-B‹ÃrÐ7Ù%38Õ²åÇ
+./3¿ i'Ar¨0©J«UFÒ—ðÇøás¬ÉXcžk"ßYª›Ä×#ã~³ÀTPì°ÆÒ	¬þvÝúìy
Y×ôÇ(-L§ŠÓè�¤FE²N»º:VtöYÑðÖÌÌƉJk­=3.«„8Ï÷ðȈ„4%=©WLwô>{WeéÜKÓ�¶¦•(Ûû4
óÞ†=õz^TO@\¦ßrÄ+Ä|Úo932x~¶T_¸E�_œY“«dõ²l¶MGUM�N2	³ œT€ÀÕn’Á-‡GlÖqôÄ©ˆDGUsv×ñáû®3C¾ç檒Zwk÷Ì5¥Õ×Æe–ͤº]61¡¯èsŒMîãÒïЗÅúäØ‚‘“=#öW5¿ˆÿæ}eñP^Ja]š½8»Å¥]>'VeˆO|ð@ñ³¯üè4£Ã°ŸtÈGH…Uêh¬‰S‰1žÇZþ¯±ppxòšÇ‰ôá	û�Ì%QÌMsÓ£|Tñ‰1¯‘\ï§äŠÎ9AËè¬wàÏf·“ì25M”ôTè³wþðŽîc¶Ô*Ÿ³f_{VÅ÷.ŽO>7mÇ–ŽÖ¦ë<½Þ	Mù 6'涹òÛ
+0(+¨ÎŒÅ~·¿¥B©ªí-®¼×ç´ví¯-õ5¸)�Ýã¥ÞÇwæ~7­ªÏžÓ¶mkFÎâTñ`u¥5µWfh]íÖÜÖª"e²cKbí6xë3r‰µ›ƒñªØ8&ú¬.B²ürådœ“̵‚£©¹ìÜ~ûÌSüx{u‡­íÑa{á®3ƒÏ}¯R–ß6{º·e²4I'¤ÙkîËÞVl©^ûènya[;6ãY¶^’3xrÐÿò|uý9zéÂðÛ�ûŠìb¥.‡§´¤D#–
+UÔ�_ÞUøÚO›öÔhX¼‹�ÎQM�x½17Œ7f‡¿—-ÈÉ5‚J P*’yt•¼N½�¸LnÂâp,ž'ýËõÄóÄKUøýú ýЃm_&¯“WÁc˜ØÑNòúÒäéa¢òÎÑ™™õür­á›'ž_®'ýWð.<½@ë«Ø¹¶Þúš<¶Ñ‚ß!¬n³Yÿ#7Ìœàïk›Ù¢�ÚšíÅ-¶­Ó 5ì8Òë=»§Ìê{dÇ/6*ŸÄ¹);ü3k‹C�^µÃ*Te«²šœšì´6=0Ñ¥_¾q[fe0ÂÁ9ñ0…Í2aŒÓǯFÄ\lÁr28„…n¤ëd©Â§êÂù¥å&:R/OW+âð¥Óø?"Õ™rÙòÛ¦Ùp^ãY¥UŸ{ÿ/üÙ{	&aŽÙã‰JqfQ¯ßŒR¦'BÄì¦H>Áow<éÖ–Wm5ÓØõZkü5À¤BFdæ>1³B©´`ºR�JIaËí™(SûõeÛmSÛŒôýÍò)©Æa”ÊŒµ”Ðb>¦–»~Õ²§F-ß²§ý­Û÷T)Ô53-TUù`�5–Y°}®áÒ›l<'¿0äÊÃ=?¾éUVN4ÖßQ§ó)Kwº«û�Ò@m±ål0G¯Ø/$d°Z”ã�0
+u	ÉzbÀ"3»t‰ù¥SOùŒæÁ쪞l-•
+ã­#‹�ÿùŸê›žþ†ó–ÆÙ”¥²jEæ®jSó™/O,||¦=Ù\¤ŽÐ)ô
%P Äÿp‹.�±¶½q˜Ü&�ÖBªõúb"f10r:›oüóòáíLžúöÙöeëÞ÷:þú×Ä•sôÿý—�PEx_¡¿Zº²íô_Žã,\r3�Ñ
c¯E�+Z»V¢¬ÌoB•X…?³Ê�RŽ`Xpó¢Tí0ʘZHJñø;ù”$Ãe¤Ïákt¬�AÔJŸð„'åÈklŠ¥O´2Ï/Ô·"·ä2³e8C³ùÑ x2Ù¼lùV(;á€ÐC™™S¿ü|]Èä¬ÈoØ	ƒH&÷mÍyl
«™£NÑ1Æ´¥X6µº-wE¼˜%
+˜´þ„þ?òtüGþx⇻òä–òÔ$ˆíw¿8•cÛû‹Cv‰GˆxÉ9ºø�DkæÝè�_{ª)2
+»
¹ÉlÝa7ÓGÌÆ N¸|Ð	Tå+zø½�©6ŒÏ’elÅãÔ?çC\¤I¦vdÄ	™Á¡‘MkwX7Á¤•kÕPÐiØÏt>µvg)Ö�›îAAÌÄS€9¤†ÞS+Šõ• \@ÐÇ!¬“‚4ð¾õ-by'C`Ù”µF’¸’�
+mèôªîz¶GCOk[¡>]›ÃMÍ/ŽC}^õ]˜WÂÔàxø£+]B‰†ë ‡Ës
7VYKT�ÓU+z	³€ÛŠ-s…Xƒ7·f8^¯,Nl8L<Agøi­HŸ«æÒú5·Ç¿ÅçðY|i
›'\fI§*nü‰“xó7·-‚›£ÔÑÛtËÆ›«€/“©Å6‡…7h…:¼Œ.E¯9ÞM\a>È‚%R'—joó¡›��Ca�x7	ëq–óö?Þûqf›Î~õÄ™¯O×ן¾~æ‰kg›n~hè{rbâÉÞÌÌÞš˜8ÝoXßû‰ß~3´÷ûò¬ÇsöK´o©y˜¿™oó‚`TÈXѹ–œêBSÑþ×îtäßý¿�ïgÆe_Œn¿·IÏ$£ƒ¡s·ûOõuœÛ_K/²‹†8¡oYð2•õ*N
à`³¥VŽASCè¡äØÔ(JŠ­9´!ùÒŸÓãâ&wÏzúógXcÀ¢_õàYÓê±ÑGVòåÁ��AjU
~›ng�…ºÌ›—gÛcM©õ{ê'·¨À_z ÿùâg?ÝM°…°¡974˜Jµ9¾Ñ÷ø@Nm%©*ñU=ð„Ò=Ó¾ãÁ.céž³ÞÎ{,-n‰­Õeß^¬VVïmk?Ü“Syï+¢ôêábgMñí¶ù}yž-¥Z}Ûè}M­ìÈÖo3””š·o1ª«c{uiŠ¶±ßV¦g|;-Xƒh˜½‘uJdp±m›X20ñ>ãЦå{LŒºÞ08ôqT$•ýLféœÆ_}¶¶ž¨]lVþ`&cבüøȲõr{ôûŽÈE|2óú|Ehܲtì«nÛßœ ,Í5÷3‘Åÿ£}¤lmý,]mÛW—bnž® M!Ô˾3»
+Qp[ŽãLéÌÚf¦ÉÊ…¶!^'Ç'Î�cv‹t«€Â0á£+"¤LHXLNG8ïª"S“©þ?<~i™	ÿU/ÏÐÈ…t+u]™žú0Y ú[èxÖí^ì&&…V“Ç©qfß,b1Ä"Ä«y…ã¡äz¡šp‰›ã£Nb”lDë“.�<.‡Áp]/7¤È£éÅ—èŸÐ¿ú9½ÀOT
oàås&5
+£Ód×9ç–|¯VºÏô{"åri8‹Kí´Ü,¢foίǿkûîúŸ÷’þ@¾ùôÆÌεü»�qè >²oÔ_p±â
+Ö‘èy¡\•*•–š$�(,1ò±”la¸L•{�HXl/Ä×âõ©RúÄoµ™õ.|ñýä4i$X36!*¹ ž¾V4kŽ·9\ÊÏ5E‰ƒÇ­u—@„qÀK_!/Þò0{kXeU‘—ŠÉ×é+3L\ñAm›Fu!
³b±(>°I& ãØF·º`WÂŒ^³Ò}ÚŠ˜­Dš�ý•º{Z¦«ßÚ·¤	šÛ
+úï«é:Ôeȳ )}®*«:ŠË¦›Íþü™ÈÔjœÖ½#սӵȥ4E�ÄQUa£¹ Òê6Åk›ô,ÿwFžZày>£*'Yß0ÛtæTw6w{©ðj
ïW„ÈèØ(¨	Ûþ„"n7ÌØàÀ!…:ƒ˜šÉÝy²ßÞ]k��J¡_Šaª f1Åàž¤ ¦»°ÿäÎ\Ú^?\,“¹†Êv8’’^BÿÈï•JÍ%©§Ûzî@ýx¿¦#Ýl1ÕX“Kþt<rÖ?|v<?üé‘Ñ3#¶à¾ÐiÐsÚJ\Ü$Æ35e ‘ Ê|çï,/Ÿýgoñœ¯¸³#F_šcßQ–òðÓ;ÔD‹2[îÝù±³WîËKÌÙj­,0{\ÚÌ‘‹ü®¾(25IS‘èÅA.õ&«¯¢µ(·fÃ
+‰E§7b^Iè¡»}¢x*’QŽ�~:ž'±4c³XI’ÅÞÇ3tZý°Ô5ÒPÚíHºã*«›—LÕ¬VŽ®h.;SW{Ž½w£# )AÁøÓÃü>€—¼
+zâ1šÂjn˜ŠÝ‰¬1±Ôd¬’“!a™˜�Àï%ä4ký?ÞëúâƒÞScöe‘V;¾ÅÚáÎ�$f¶ ¿zù'
÷uçÜ\ª>òÎ<V`µsöÅ™®ñf%¤Z’¸:©¢²0•‰G�È{¸i(´µ–¬–ÐN~Åb€%Ð�Xˆç—°Åô«¯fwÝ×T?V*O48´QŠ}¦=%«è�˜â	V;Èëë<Ô�%Öå(“2’£vc’º´Ç5ã]FÌšeúc-¢¬ÔjA#hoÐÓY±Ü°ÕV“€6=°»¹º«À®Wvã˲ý%	®ƒ�5�Á,Š¸Àz‡|)k”4-‰-KÓEƒ±ãàv&0òD)²˜8µIöçÎï5h]÷½}ðwï¦WvZÄ©JQqEf¹)ÑÜ}Ä«­rdEG§fÛÕ
+ƒ<zétB¡¯nì¡&µÌZgù׌†"Ýî–Þìò̸¦¾ÞfJ¯OF&ˆ£"£2¦[köwY1&1?A®“$Ê…cî’Ö{m§¶§†‡ËÓm*G[zlQC·¥íPOND\BTŒ^/LÖßL0Ôå)µ%6“C#ˆN¯!»ïÙ+wzK¸÷@ ~…¾‘úü¿ Ԟ냄m]|®8~À°5ËïoŒüÎwZtšÒ ¶�L°zœÅÛræ� }W¢‚3É!•'¿bò¢55ñËÒÁ*­©e¶š®gª©@mg‚Ó€1�©²s×#–%qöŽÜ+e�jíWc•é‰	銸8EzBbº2–MÄ`á{–žÔ'œâ³<2RnN�kT”ŠZâÖ§´?òã™JÚ¥ušÚ(Ÿ*y´M�ë±+Xß�Ud$$d0²Ùk,徹ȴQ^¦»"÷²pÍm²öydòÿJYK†‰7-k&cߌè4�Ua9±Ð:TÎMn›lªÈxû1ÐíVÃH•!ågYð•õÄQz¸Ñã‰HÛZ†]ã/
+ÛÓ-ý%©%ÝlÅ	Ú¼tU´4ÚãéëøTsD7k«ï°”uE®³ï¤Ë¯†r¾q9`†W>ô~ˆu-›ø¦$˜»V®›ûç&Û½ü¾LS�.aÝ»d|EYm³9»½Ö'TT5´™ëîôƒ¾+±42[�’�aiG^Bˆ+s¬éó·¤AÖ©´0×Ûü9«iÌI…l�{JVœ�'õÌ3ïoÌóoLG¸¢Q.®–ñ••[Û²æÚLF?Á¬¿Š‰ß
ú6°ë°ò£
°E3]Ž	¼’	¤šÛÞ*þçÿ󳮿^cþ/óå¥Ãµµ;K’å%ìUNèé�èÿªxð½#�`Ê_>2ñÜtaáôsç'
+&Ï3òd×g@^ó†mca²VÏÄCG”Œ7]+#.l(NðþÕ²†þÇÆ¥ Å>ñZuC~¸±N¡kV’´Õ—–’Ì{Ã�›Ø|¢v²J}9Xä0v-ƒDµs�\¹qÓ62>�-!»¨ �‰£Ë?æ®Ô®ç‹Òíeã£bcUŽ¹PWhPÄñ˜{ù¡¦|ËØàÐÔU*mzqsuFe§·[O¿¶ê_�P3”P�LE¸Z[…hucÛ©ÛØu>W»¯Õ,Óbãsš�¹MùrI~�{ët�.×÷`Ë–ñ]mesG§ ä²†©ê”‚��Šd¹
¶´\e”­«2M–Už¦Ë5g+5®oiÅÈ�ÜR®Ë+˜HÈ,LÑç›
Iê’ºžâú=
©€Wëâ)N³¦…ŠO,Ờt51[WÄ
+­S•žeK¨¯ÒœÔ¶©51]8’¾ÞÜÊã¶s#Ã9*÷ÞVâ|£\£Úº4½\7ÔüMàÓŸPn¶†ÙXñ…Æ«u£rY‹Ð¯BĨnêÌn¸ËcØÈ/ÎÚæ,óÉ™Ý@È7±ár± *-ÚØs|ΚhÙÁ¬.sË^7^4ÛW÷�x°öOSà7«íÉxÈíý%Óçix’:<ÞÁ¨¤DÆ‘$+Gùá¥eÑøÅDöMýóWé#™>”¼îñ˜-B�„Þ—ÒÒT-�wÕÖkñCL£|±tž<À¼‰à!âþ	ð0ÝNÅ&]®†ÔoÒq!“ÿñv¤,AÄᆧ*|¼ˆÒr
¾(•gj åüöìu-ýŸOÑ×Yh\|CæpFp»ùñq1Ð0
+%Ò¨ËTÙò´ÍÛÜRË£½Ø-µ³0¡¶,�'Þ9°t.€Õã�FÐ,¡Ïi[[j¤Òò­�Zb˜ÅÓ Ž
þ*æ·!!˜É@ò¼Ä1&¦…[÷š'qh‹ªÀàjdl‘‰‹_�•g™²¿ÅCƒN¶ü%–+OXx(\Ã/(çÒ	qÚ¼ìl9&hÚÐl”<®Æ(å'Jì”$‘/i% ’rÒèOéáÂ,�§,B¢ÈT¾ôëH¥Z£I†ÙÉ-:\‡»­yO¸0>Rœ¦|éq�3èça>Ìé öÀɾ™ÚÌ!æ¢æ¹ÌvC,ý¯)ÅÛv>Ð;xltK"=/�ª2@ý_p�Ž°ðc…,žâFè¥áàC\Êp‹³½Ç†+Òc¼Î‘£rN™&å¯xÒQͶ†*©a¿{Å�§�¾Ar!ï³]Ipé­P‡sllÑÂ3µ‰Šs!«vb®ÊïÖiKZ-–Öí£ß?àè¨Ý5yÇXm‡ƒ¾‘^3Z†ûŠ³Ä„‡e5:qÿ¡ã­#ÃôS}óq„è^}jh¬­—+a¶Ñ@\®Õˆáªc‹´x6®J †÷¹}ÎŽÚÑ;&vÕv8ïøQ�‹‘ïÒéÜcU÷?76„{|÷Šˆ¸ù>Ü5<Òzüý„³1K ÄY�Eôɲњô€]úðóÄ~Š`~ϳ±úëK«ê+Èëq§§»{ò
+úªÒˆ÷›&Êåòò‰¦¦]ryŮ௢t¨M ï¡Óè9t
'á>|‰ ˆFb‘x�4’÷‘¯“ï’&—¨:ê8u�“Ãçœç|̵q�p_ãþ%,)l$ì|Ø<3ï^Þá1áíá'ÿá×ñ;ù"b"j"ÎF|™ùïQò¨®¨“Q×RÁƒ‚?D‹¢÷F¿Ss(æ]aŽð¤ð«ØÌØÁØûcïGL0B„Î7Ñ4œ%Ä,²ÀuŽ`vzgP'œà„s7œ8wÁ¹Î8»˜{„-Âu~õD¨•s²�ÕQŸ¡iÎ;p]‚ó%ÄìmMs[QñœÞúŒ¡‡íGu\Üû
+MR—áZ϶£êS”ÆùRp|€µÅrЭoÈ󷾡ö#ðÕ’_
–Ïà¬B»ˆë(—ªC&Ži‰‡�‰ðÝú”z>Ï"YØC(Ÿ“†ò©Sìó2òMTFžD�Ä;HÏ›¨§�û	"¨ÓˆOÍ#9Š|ÌI|‚úý0{ƒ¼ÃËçâ7Ñ5t]ø·«?â[9Ü,Å
–�A?Cœ
÷	SÔ5|î Î	ŽXÊWò7ȇ¿&Á!(EÔ¡)F{nÁ÷ØÍîÊ­[+Q1âÓ·x‡‰V%ÂO~ôXÈ
úDHˆäÌqˇ|›þ&Ï;gŽ@‘PÛÅ !Š_f~S�$P½'")ÔòI(²°©�¥@/¢Cz”
+(ÒóëCd-3dÑldAVdC¹PÁæC¤*D%Pû~}X…¶€¤jðôZT‡¶¢zÔ€Ñ6ÔŒ<P×·¢6ÔŽ:P'êBÝèÆaÓcCf³ËÌ"LÆ=«z3±h1ÅT4]0
+Йx8HÇ€þ± �@aèÙ �@ô“ �„ù¼¤“€ôJ�N!>–éaU�ÎAÑؤs�—é\³Š-©ñDð™0T†	ÒyHŒ¤óP:þï =‰ˆYá(•ÈÒùà£Û‚t>ê"îÒ#�œøc��
+	zõ×¥r² H�D…dk�…Œä#Azê$¤P:%Ò¨‰ª*õ�ÏL
N)³ÍYÙÊJ¿`¤_¹e¬×¨t�Œ(™[“ÊÆþÉþ‰;úûŒ¨ùÑ8š��5„Ð šÇÈ:€L퇿
4‚úa´�¡^d„O. ŒÀµqõ[“쨮ýÀëø߇Œuþ)¿r[ÿÄ�ÜÄOùá©mìCÈ×Ø?0=â�`¿6€¦�¡MÔúÇüS3ãyÔ;046 4(C¸Ô‡1–Ó `…¯
¿1ø¯÷Un&ëo#ñôOLùÇ”YFsŽrz¼˜¹1	·qJP†T’Ÿ¦Ñ ‹=2Ž,C–õФҫœšðöõ�z'†•~_¨æCD±ŠòÂ9¼ ¤~vhh~XÕß¡ôÛôÂ2þûúØøõ²þÉ¡�1åT¿wt“o—±dl:ÆBì^£eÞ)¯rzlphl
+<&È¡¿OÙ3£\eÛ¶¾4ÅÎqØ²P¦±ACS¢¯ÜLßf`§¦ÆL¦^_¿q€U±±×?j7
¿‰uÅ)ø~
DLÜÏr1�5�Yú(܇s,hS�óîÝ»�£Ái±¬'§¦û†ü8ïfÿŒÀe=ê5Þ“@›éàC5C½ýc“ ±é±¾þ	åÔ`¿Ò5îí…KðN¦rų�fˆªCÀ¥øN5Äè±�õIFƒ¬v\ ÏÏFë¿“	”�>œÍøpȽ,£bÀ4@1iªÙRZ^·­ÜÀ Ø|¾Þ©Fà<
:5�VC¥O¥¯²E,²rX”¬ô@ŽE˜ïøå>uÄŽèÂÿ!"xl{çÃÇÅ+WȽ(ü[^
+”.ìñÿ
Z†bh
 endstream
 endobj
-929 0 obj
+942 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAA+NotoSerif
-/FontFile2 928 0 R
+/FontFile2 941 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -57926,7 +59055,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-930 0 obj
+943 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -57936,10 +59065,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-931 0 obj
-[259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 559 559 500 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 1000 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
+944 0 obj
+[259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 559 559 500 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-932 0 obj
+945 0 obj
 << /Length1 11632
 /Length 7747
 /Filter [/FlateDecode]
@@ -57975,10 +59104,10 @@ p:
 ÎÛØ?;p¹õï) Í€tp¤Æ‘¾�±)ÐØÌXÿÀ¤fzx@S6ÑÛ_‰;VÍ¢ºìNˆ±#ÀeøN%4Ä豟uLFìvÊ@^/Œ‹_ÝþŒ(+ÙÅ8ò²9ö²ìã“CŽhÅ”£±®¢ªyU•�Aqçùö.“jΓ Shu¹ô) 4‚ãU@îh†5WK–•ÎF3,}ÿŸ.Þ˜VügÈ…lx»|íqÙâ7ä]$˜â3š¿˜Òþ7~Ÿï
 endstream
 endobj
-933 0 obj
+946 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAB+NotoSerif-Bold
-/FontFile2 932 0 R
+/FontFile2 945 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -57989,7 +59118,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-934 0 obj
+947 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -57999,10 +59128,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-935 0 obj
+948 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 310 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 559 1000 549 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 692 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 1000 522 487 404 666 605 855 645 579 528 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-936 0 obj
+949 0 obj
 << /Length1 5116
 /Length 3170
 /Filter [/FlateDecode]
@@ -58022,10 +59151,10 @@ a
 ÿ:´2õ]Û^Ô5 w,¥Âº*›Ó‹Œ58«mÖg·±nkÞÄ7cÙÞB4èÆa¯ÅÊD[NaéU‹<V¥Éó`ØÉ@V�΋š{KÙÀ—r¿­�ËS«¯ ðêó3³§e'ó(�×ÚÏ«-{�S}`-õy÷¢¦/²±ò‹ð79à]èp$xrë’¤ÏÊÃ'ý›"ZÞé³/izïþ›]’Wâ~ ïÝ–þ&ÌÁT
 endstream
 endobj
-937 0 obj
+950 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAC+NotoSerif-Italic
-/FontFile2 936 0 R
+/FontFile2 949 0 R
 /FontBBox [-254 -250 1238 1047]
 /Flags 70
 /StemV 0
@@ -58036,7 +59165,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-938 0 obj
+951 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -58046,10 +59175,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-939 0 obj
+952 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-940 0 obj
+953 0 obj
 << /Length1 3280
 /Length 2112
 /Filter [/FlateDecode]
@@ -58064,10 +59193,10 @@ x
 ˆ‡¶�€$W´¦ö"k8À
Vš­Ûi<êí!‹§–N..ðͶ&W+uXœ¶—¨:‹’j³†Z;Ù×cžOÎ-/²UFN¤ÓÉ6»][§)å%ÛÒâr*Ÿf©Ûf“R�ÓTó6°Óß<Qsäz‰B�–Ó^"KD/“çùŸÞ)ƒ�~™’¹T¾^õ‡i9šít-Ñ£\î‚céúìw='4‡î‚9÷F|ðÂBìßëV�bCAÿWAþö}½‚[Ï‹¸
1?¾ˆøbä¢Oe›Dm$ BD<yBT™'ÂÑ`Á"BY@Ü‹þS„ÃU´n�H²g#ü‡"–Ùª¬"Zø›b±Ù*r–@(Ü+DLVQa9YÅ‹Þ Áz#VQia¦&ÁôLøOÆßDŒ¤~`ü{Ä(˜Ä<sXô�ŠH‘áåYJ&Ƭ¢Êr±WÉ;¿:1a�`Ô–‹
’È»#Ê·èuü
»U,°ðÏ2'W	†»^T6úE†3ñL”gD«ÑdŠ3ÊqÌaa.:­Qk"Ä"CJ§ØÂÛE5„çû_t–óS“9¦WÂ<“k>Ã÷e|Q!ÃgÉ�ÀÀE/iR~L zãŒ!›RÉSûz•Édä×3T2 hŽÊ±™$5�Eà×eçŒM"FÂJh@È|f #D™A΄-VQËŽAOqëXŒÐÿG¶ÑÙ§΄™–Y(‰Ì÷YÙüSBF-òÁð!ãû´c°¼^ôvuaàŠ–Ú[š™òÑ0›Caa’¢ºŒ´ ÐE•÷†Â—¨¯»c]—�GZD>&VÇk·}•[D’R]h²²ß‘zÖóé?+wú_½î“ä
 endstream
 endobj
-941 0 obj
+954 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAD+mplus1mn-regular
-/FontFile2 940 0 R
+/FontFile2 953 0 R
 /FontBBox [0 -230 1000 860]
 /Flags 4
 /StemV 0
@@ -58078,7 +59207,7 @@ endobj
 /XHeight 0
 >>
 endobj
-942 0 obj
+955 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -58088,960 +59217,973 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-943 0 obj
+956 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 500 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
 xref
-0 944
+0 957
 0000000000 65535 f 
 0000000015 00000 n 
 0000000264 00000 n 
 0000000467 00000 n 
-0000000818 00000 n 
-0000000869 00000 n 
-0000001023 00000 n 
-0000001267 00000 n 
-0000001445 00000 n 
-0000001612 00000 n 
-0000032794 00000 n 
-0000033572 00000 n 
-0000066003 00000 n 
-0000066801 00000 n 
-0000098840 00000 n 
-0000099638 00000 n 
-0000131723 00000 n 
-0000132521 00000 n 
-0000163293 00000 n 
-0000164059 00000 n 
-0000166491 00000 n 
-0000166728 00000 n 
-0000166771 00000 n 
-0000166820 00000 n 
-0000166967 00000 n 
-0000167140 00000 n 
-0000167195 00000 n 
-0000167370 00000 n 
-0000167414 00000 n 
-0000182994 00000 n 
-0000183275 00000 n 
-0000183318 00000 n 
-0000183373 00000 n 
-0000183417 00000 n 
-0000183570 00000 n 
-0000183625 00000 n 
-0000183681 00000 n 
-0000183856 00000 n 
-0000183911 00000 n 
-0000183966 00000 n 
-0000184021 00000 n 
-0000184192 00000 n 
-0000184373 00000 n 
-0000184429 00000 n 
-0000199911 00000 n 
-0000200185 00000 n 
-0000200228 00000 n 
-0000200272 00000 n 
-0000200437 00000 n 
-0000200492 00000 n 
-0000200547 00000 n 
-0000200602 00000 n 
-0000200756 00000 n 
-0000200812 00000 n 
-0000200868 00000 n 
-0000200924 00000 n 
-0000200980 00000 n 
-0000201372 00000 n 
-0000201662 00000 n 
-0000201718 00000 n 
-0000218944 00000 n 
-0000219218 00000 n 
-0000219351 00000 n 
-0000219406 00000 n 
-0000219461 00000 n 
-0000219516 00000 n 
-0000219572 00000 n 
-0000219627 00000 n 
-0000219794 00000 n 
-0000219849 00000 n 
-0000219904 00000 n 
-0000219959 00000 n 
-0000220015 00000 n 
-0000235356 00000 n 
-0000235623 00000 n 
-0000235666 00000 n 
-0000235721 00000 n 
-0000235776 00000 n 
-0000235831 00000 n 
-0000236218 00000 n 
-0000236273 00000 n 
-0000236329 00000 n 
-0000236384 00000 n 
-0000236439 00000 n 
-0000236598 00000 n 
-0000236654 00000 n 
-0000236710 00000 n 
-0000253403 00000 n 
-0000253677 00000 n 
-0000253720 00000 n 
-0000253873 00000 n 
-0000253917 00000 n 
-0000254074 00000 n 
-0000254130 00000 n 
-0000254185 00000 n 
-0000254240 00000 n 
-0000254296 00000 n 
-0000254340 00000 n 
-0000254384 00000 n 
-0000254428 00000 n 
-0000269861 00000 n 
-0000270138 00000 n 
-0000270272 00000 n 
-0000270329 00000 n 
-0000270386 00000 n 
-0000270677 00000 n 
-0000270734 00000 n 
-0000270792 00000 n 
-0000270849 00000 n 
-0000271017 00000 n 
-0000271074 00000 n 
-0000271131 00000 n 
-0000271188 00000 n 
-0000271246 00000 n 
-0000288137 00000 n 
-0000288407 00000 n 
-0000288453 00000 n 
-0000288510 00000 n 
-0000288567 00000 n 
-0000288624 00000 n 
-0000288682 00000 n 
-0000288739 00000 n 
-0000288797 00000 n 
-0000288855 00000 n 
-0000289026 00000 n 
-0000304509 00000 n 
-0000304795 00000 n 
-0000304840 00000 n 
-0000304897 00000 n 
-0000305165 00000 n 
-0000305222 00000 n 
-0000305384 00000 n 
-0000305441 00000 n 
-0000305612 00000 n 
-0000305670 00000 n 
-0000305727 00000 n 
-0000305784 00000 n 
-0000305842 00000 n 
-0000306154 00000 n 
-0000306328 00000 n 
-0000306386 00000 n 
-0000324620 00000 n 
-0000324906 00000 n 
-0000324951 00000 n 
-0000324997 00000 n 
-0000325163 00000 n 
-0000325220 00000 n 
-0000325393 00000 n 
-0000325450 00000 n 
-0000325507 00000 n 
-0000325565 00000 n 
-0000325622 00000 n 
-0000325680 00000 n 
-0000325854 00000 n 
-0000325912 00000 n 
-0000326212 00000 n 
-0000340031 00000 n 
-0000340309 00000 n 
-0000340354 00000 n 
-0000340400 00000 n 
-0000340563 00000 n 
-0000340620 00000 n 
-0000340788 00000 n 
-0000340845 00000 n 
-0000340902 00000 n 
-0000340960 00000 n 
-0000341017 00000 n 
-0000341075 00000 n 
-0000341133 00000 n 
-0000341179 00000 n 
-0000360478 00000 n 
-0000360764 00000 n 
-0000360925 00000 n 
-0000360982 00000 n 
-0000361039 00000 n 
-0000361096 00000 n 
-0000361154 00000 n 
-0000361326 00000 n 
-0000361383 00000 n 
-0000361441 00000 n 
-0000361499 00000 n 
-0000361825 00000 n 
-0000361883 00000 n 
-0000362055 00000 n 
-0000375120 00000 n 
-0000375390 00000 n 
-0000375435 00000 n 
-0000375492 00000 n 
-0000375549 00000 n 
-0000375715 00000 n 
-0000375772 00000 n 
-0000375830 00000 n 
-0000375887 00000 n 
-0000375944 00000 n 
-0000376002 00000 n 
-0000376060 00000 n 
-0000376117 00000 n 
-0000393883 00000 n 
-0000394153 00000 n 
-0000394198 00000 n 
-0000394255 00000 n 
-0000394567 00000 n 
-0000394624 00000 n 
-0000395121 00000 n 
-0000395178 00000 n 
-0000395235 00000 n 
-0000395397 00000 n 
-0000395455 00000 n 
-0000395513 00000 n 
-0000395571 00000 n 
-0000395629 00000 n 
-0000411799 00000 n 
-0000412077 00000 n 
-0000412122 00000 n 
-0000412168 00000 n 
-0000412225 00000 n 
-0000412387 00000 n 
-0000412444 00000 n 
-0000412971 00000 n 
-0000413029 00000 n 
-0000413086 00000 n 
-0000413143 00000 n 
-0000413305 00000 n 
-0000413363 00000 n 
-0000413421 00000 n 
-0000413479 00000 n 
-0000432458 00000 n 
-0000432736 00000 n 
-0000432793 00000 n 
-0000432955 00000 n 
-0000433012 00000 n 
-0000433069 00000 n 
-0000433127 00000 n 
-0000433185 00000 n 
-0000433347 00000 n 
-0000433404 00000 n 
-0000433462 00000 n 
-0000433520 00000 n 
-0000451275 00000 n 
-0000451553 00000 n 
-0000451598 00000 n 
-0000451655 00000 n 
-0000451712 00000 n 
-0000451769 00000 n 
-0000451826 00000 n 
-0000451990 00000 n 
-0000452047 00000 n 
-0000452104 00000 n 
-0000452162 00000 n 
-0000452580 00000 n 
-0000452737 00000 n 
-0000452795 00000 n 
-0000468386 00000 n 
-0000468672 00000 n 
-0000468824 00000 n 
-0000468881 00000 n 
-0000468938 00000 n 
-0000468995 00000 n 
-0000469052 00000 n 
-0000469216 00000 n 
-0000469273 00000 n 
-0000469650 00000 n 
-0000469828 00000 n 
-0000469886 00000 n 
-0000469943 00000 n 
-0000470001 00000 n 
-0000487784 00000 n 
-0000488070 00000 n 
-0000488115 00000 n 
-0000488273 00000 n 
-0000488319 00000 n 
-0000488481 00000 n 
-0000488539 00000 n 
-0000488596 00000 n 
-0000488653 00000 n 
-0000488711 00000 n 
-0000488769 00000 n 
-0000488933 00000 n 
-0000488991 00000 n 
-0000507192 00000 n 
-0000507449 00000 n 
-0000507494 00000 n 
-0000507551 00000 n 
-0000507707 00000 n 
-0000507765 00000 n 
-0000527708 00000 n 
-0000527947 00000 n 
-0000528004 00000 n 
-0000528061 00000 n 
-0000549709 00000 n 
-0000549974 00000 n 
-0000550031 00000 n 
-0000550207 00000 n 
-0000550370 00000 n 
-0000570124 00000 n 
-0000570363 00000 n 
-0000570420 00000 n 
-0000570708 00000 n 
-0000570765 00000 n 
-0000591501 00000 n 
-0000591740 00000 n 
-0000591786 00000 n 
-0000611585 00000 n 
-0000611824 00000 n 
-0000611881 00000 n 
-0000611939 00000 n 
-0000633766 00000 n 
-0000634047 00000 n 
-0000634203 00000 n 
-0000634260 00000 n 
-0000634430 00000 n 
-0000634599 00000 n 
-0000634768 00000 n 
-0000655984 00000 n 
-0000656249 00000 n 
-0000656400 00000 n 
-0000656539 00000 n 
-0000656597 00000 n 
-0000678304 00000 n 
-0000678593 00000 n 
-0000678761 00000 n 
-0000678908 00000 n 
-0000679057 00000 n 
-0000679208 00000 n 
-0000679347 00000 n 
-0000679405 00000 n 
-0000701024 00000 n 
-0000701313 00000 n 
-0000701481 00000 n 
-0000701628 00000 n 
-0000701777 00000 n 
-0000701928 00000 n 
-0000702067 00000 n 
-0000723714 00000 n 
-0000724003 00000 n 
-0000724048 00000 n 
-0000724207 00000 n 
-0000724365 00000 n 
-0000724525 00000 n 
-0000724676 00000 n 
-0000724826 00000 n 
-0000747207 00000 n 
-0000747488 00000 n 
-0000747545 00000 n 
-0000747715 00000 n 
-0000747883 00000 n 
-0000748061 00000 n 
-0000748231 00000 n 
-0000769392 00000 n 
-0000769681 00000 n 
-0000769837 00000 n 
-0000769894 00000 n 
-0000770059 00000 n 
-0000770116 00000 n 
-0000770286 00000 n 
-0000770455 00000 n 
-0000770618 00000 n 
-0000780080 00000 n 
-0000780353 00000 n 
-0000780398 00000 n 
-0000780455 00000 n 
-0000780764 00000 n 
-0000780933 00000 n 
-0000781102 00000 n 
-0000781265 00000 n 
-0000781322 00000 n 
-0000781466 00000 n 
-0000781611 00000 n 
-0000781776 00000 n 
-0000781932 00000 n 
-0000782090 00000 n 
-0000782237 00000 n 
-0000782399 00000 n 
-0000782541 00000 n 
-0000782695 00000 n 
-0000782839 00000 n 
-0000783007 00000 n 
-0000783154 00000 n 
-0000783311 00000 n 
-0000783457 00000 n 
-0000783612 00000 n 
-0000783757 00000 n 
-0000783913 00000 n 
-0000784058 00000 n 
-0000784223 00000 n 
-0000784367 00000 n 
-0000784527 00000 n 
-0000784676 00000 n 
-0000784835 00000 n 
-0000784983 00000 n 
-0000785148 00000 n 
-0000785292 00000 n 
-0000785452 00000 n 
-0000785601 00000 n 
-0000785760 00000 n 
-0000785908 00000 n 
-0000786073 00000 n 
-0000786219 00000 n 
-0000786390 00000 n 
-0000786540 00000 n 
-0000786699 00000 n 
-0000786847 00000 n 
-0000787004 00000 n 
-0000787151 00000 n 
-0000787310 00000 n 
-0000787458 00000 n 
-0000787625 00000 n 
-0000787771 00000 n 
-0000787942 00000 n 
-0000788092 00000 n 
-0000788252 00000 n 
-0000788401 00000 n 
-0000788558 00000 n 
-0000788705 00000 n 
-0000788865 00000 n 
-0000789014 00000 n 
-0000789181 00000 n 
-0000789327 00000 n 
-0000789486 00000 n 
-0000789634 00000 n 
-0000789792 00000 n 
-0000789939 00000 n 
-0000790104 00000 n 
-0000790248 00000 n 
-0000790420 00000 n 
-0000790571 00000 n 
-0000790732 00000 n 
-0000790882 00000 n 
-0000791042 00000 n 
-0000791191 00000 n 
-0000791347 00000 n 
-0000791493 00000 n 
-0000791664 00000 n 
-0000791814 00000 n 
-0000791973 00000 n 
-0000792121 00000 n 
-0000792279 00000 n 
-0000792426 00000 n 
-0000792567 00000 n 
-0000792699 00000 n 
-0000792858 00000 n 
-0000792996 00000 n 
-0000793144 00000 n 
-0000793281 00000 n 
-0000793428 00000 n 
-0000793564 00000 n 
-0000793729 00000 n 
-0000793873 00000 n 
-0000794043 00000 n 
-0000794192 00000 n 
-0000794351 00000 n 
-0000794500 00000 n 
-0000794658 00000 n 
-0000794805 00000 n 
-0000794974 00000 n 
-0000795122 00000 n 
-0000795287 00000 n 
-0000795431 00000 n 
-0000795590 00000 n 
-0000795739 00000 n 
-0000795908 00000 n 
-0000796056 00000 n 
-0000796219 00000 n 
-0000796363 00000 n 
-0000796533 00000 n 
-0000796682 00000 n 
-0000796842 00000 n 
-0000796992 00000 n 
-0000797151 00000 n 
-0000797299 00000 n 
-0000797469 00000 n 
-0000797618 00000 n 
-0000797783 00000 n 
-0000797927 00000 n 
-0000798086 00000 n 
-0000798235 00000 n 
-0000798405 00000 n 
-0000798554 00000 n 
-0000798721 00000 n 
-0000798867 00000 n 
-0000799038 00000 n 
-0000799188 00000 n 
-0000799347 00000 n 
-0000799496 00000 n 
-0000799665 00000 n 
+0000000826 00000 n 
+0000000877 00000 n 
+0000001031 00000 n 
+0000001275 00000 n 
+0000001453 00000 n 
+0000001620 00000 n 
+0000032802 00000 n 
+0000033580 00000 n 
+0000066011 00000 n 
+0000066809 00000 n 
+0000098848 00000 n 
+0000099646 00000 n 
+0000131760 00000 n 
+0000132558 00000 n 
+0000164994 00000 n 
+0000165792 00000 n 
+0000168224 00000 n 
+0000168461 00000 n 
+0000168504 00000 n 
+0000168553 00000 n 
+0000168708 00000 n 
+0000168881 00000 n 
+0000168936 00000 n 
+0000169111 00000 n 
+0000169155 00000 n 
+0000184735 00000 n 
+0000185016 00000 n 
+0000185059 00000 n 
+0000185114 00000 n 
+0000185158 00000 n 
+0000185311 00000 n 
+0000185366 00000 n 
+0000185422 00000 n 
+0000185597 00000 n 
+0000185652 00000 n 
+0000185707 00000 n 
+0000185762 00000 n 
+0000185933 00000 n 
+0000186114 00000 n 
+0000186170 00000 n 
+0000201652 00000 n 
+0000201926 00000 n 
+0000201969 00000 n 
+0000202013 00000 n 
+0000202178 00000 n 
+0000202233 00000 n 
+0000202288 00000 n 
+0000202343 00000 n 
+0000202497 00000 n 
+0000202553 00000 n 
+0000202609 00000 n 
+0000202665 00000 n 
+0000202721 00000 n 
+0000203113 00000 n 
+0000203403 00000 n 
+0000203459 00000 n 
+0000220685 00000 n 
+0000220959 00000 n 
+0000221092 00000 n 
+0000221147 00000 n 
+0000221202 00000 n 
+0000221257 00000 n 
+0000221313 00000 n 
+0000221368 00000 n 
+0000221535 00000 n 
+0000221590 00000 n 
+0000221645 00000 n 
+0000221700 00000 n 
+0000221756 00000 n 
+0000237097 00000 n 
+0000237364 00000 n 
+0000237407 00000 n 
+0000237462 00000 n 
+0000237517 00000 n 
+0000237572 00000 n 
+0000237904 00000 n 
+0000237959 00000 n 
+0000238015 00000 n 
+0000238070 00000 n 
+0000238125 00000 n 
+0000238284 00000 n 
+0000238340 00000 n 
+0000238396 00000 n 
+0000255089 00000 n 
+0000255363 00000 n 
+0000255406 00000 n 
+0000255559 00000 n 
+0000255603 00000 n 
+0000255760 00000 n 
+0000255816 00000 n 
+0000255871 00000 n 
+0000255926 00000 n 
+0000255982 00000 n 
+0000256026 00000 n 
+0000256070 00000 n 
+0000256114 00000 n 
+0000271547 00000 n 
+0000271824 00000 n 
+0000271958 00000 n 
+0000272015 00000 n 
+0000272072 00000 n 
+0000272363 00000 n 
+0000272420 00000 n 
+0000272478 00000 n 
+0000272535 00000 n 
+0000272703 00000 n 
+0000272760 00000 n 
+0000272817 00000 n 
+0000272874 00000 n 
+0000272932 00000 n 
+0000289823 00000 n 
+0000290093 00000 n 
+0000290139 00000 n 
+0000290196 00000 n 
+0000290253 00000 n 
+0000290310 00000 n 
+0000290368 00000 n 
+0000290425 00000 n 
+0000290483 00000 n 
+0000290541 00000 n 
+0000290712 00000 n 
+0000306195 00000 n 
+0000306481 00000 n 
+0000306526 00000 n 
+0000306583 00000 n 
+0000306845 00000 n 
+0000306902 00000 n 
+0000307064 00000 n 
+0000307121 00000 n 
+0000307292 00000 n 
+0000307350 00000 n 
+0000307407 00000 n 
+0000307464 00000 n 
+0000307522 00000 n 
+0000307834 00000 n 
+0000308008 00000 n 
+0000308066 00000 n 
+0000326300 00000 n 
+0000326586 00000 n 
+0000326631 00000 n 
+0000326677 00000 n 
+0000326843 00000 n 
+0000326900 00000 n 
+0000327073 00000 n 
+0000327130 00000 n 
+0000327187 00000 n 
+0000327245 00000 n 
+0000327302 00000 n 
+0000327360 00000 n 
+0000327534 00000 n 
+0000327592 00000 n 
+0000327892 00000 n 
+0000341711 00000 n 
+0000341989 00000 n 
+0000342034 00000 n 
+0000342080 00000 n 
+0000342243 00000 n 
+0000342300 00000 n 
+0000342468 00000 n 
+0000342525 00000 n 
+0000342582 00000 n 
+0000342640 00000 n 
+0000342697 00000 n 
+0000342755 00000 n 
+0000342813 00000 n 
+0000342859 00000 n 
+0000362158 00000 n 
+0000362444 00000 n 
+0000362605 00000 n 
+0000362662 00000 n 
+0000362719 00000 n 
+0000362776 00000 n 
+0000362834 00000 n 
+0000363006 00000 n 
+0000363063 00000 n 
+0000363121 00000 n 
+0000363179 00000 n 
+0000363505 00000 n 
+0000363563 00000 n 
+0000363735 00000 n 
+0000376800 00000 n 
+0000377070 00000 n 
+0000377115 00000 n 
+0000377172 00000 n 
+0000377229 00000 n 
+0000377395 00000 n 
+0000377452 00000 n 
+0000377510 00000 n 
+0000377567 00000 n 
+0000377624 00000 n 
+0000377682 00000 n 
+0000377740 00000 n 
+0000377797 00000 n 
+0000395555 00000 n 
+0000395825 00000 n 
+0000395870 00000 n 
+0000395927 00000 n 
+0000396239 00000 n 
+0000396296 00000 n 
+0000396353 00000 n 
+0000396410 00000 n 
+0000396572 00000 n 
+0000396630 00000 n 
+0000396688 00000 n 
+0000396746 00000 n 
+0000396804 00000 n 
+0000412974 00000 n 
+0000413252 00000 n 
+0000413297 00000 n 
+0000413343 00000 n 
+0000413400 00000 n 
+0000413562 00000 n 
+0000413619 00000 n 
+0000414146 00000 n 
+0000414204 00000 n 
+0000414261 00000 n 
+0000414318 00000 n 
+0000414480 00000 n 
+0000414538 00000 n 
+0000414596 00000 n 
+0000414654 00000 n 
+0000433633 00000 n 
+0000433911 00000 n 
+0000433968 00000 n 
+0000434130 00000 n 
+0000434187 00000 n 
+0000434244 00000 n 
+0000434302 00000 n 
+0000434360 00000 n 
+0000434522 00000 n 
+0000434579 00000 n 
+0000434637 00000 n 
+0000434695 00000 n 
+0000452442 00000 n 
+0000452720 00000 n 
+0000452765 00000 n 
+0000452822 00000 n 
+0000452879 00000 n 
+0000452936 00000 n 
+0000452993 00000 n 
+0000453157 00000 n 
+0000453214 00000 n 
+0000453271 00000 n 
+0000453549 00000 n 
+0000453607 00000 n 
+0000454025 00000 n 
+0000454182 00000 n 
+0000454240 00000 n 
+0000469831 00000 n 
+0000470117 00000 n 
+0000470269 00000 n 
+0000470326 00000 n 
+0000470383 00000 n 
+0000470440 00000 n 
+0000470497 00000 n 
+0000470661 00000 n 
+0000470718 00000 n 
+0000471095 00000 n 
+0000471273 00000 n 
+0000471331 00000 n 
+0000471388 00000 n 
+0000471446 00000 n 
+0000489229 00000 n 
+0000489515 00000 n 
+0000489560 00000 n 
+0000489718 00000 n 
+0000489764 00000 n 
+0000489926 00000 n 
+0000489984 00000 n 
+0000490041 00000 n 
+0000490098 00000 n 
+0000490156 00000 n 
+0000490214 00000 n 
+0000490378 00000 n 
+0000490436 00000 n 
+0000508637 00000 n 
+0000508894 00000 n 
+0000508939 00000 n 
+0000508996 00000 n 
+0000509152 00000 n 
+0000509210 00000 n 
+0000529153 00000 n 
+0000529392 00000 n 
+0000529449 00000 n 
+0000529506 00000 n 
+0000551154 00000 n 
+0000551419 00000 n 
+0000551476 00000 n 
+0000551652 00000 n 
+0000551815 00000 n 
+0000571569 00000 n 
+0000571808 00000 n 
+0000571865 00000 n 
+0000572153 00000 n 
+0000572210 00000 n 
+0000592946 00000 n 
+0000593185 00000 n 
+0000593231 00000 n 
+0000613030 00000 n 
+0000613269 00000 n 
+0000613326 00000 n 
+0000613384 00000 n 
+0000632576 00000 n 
+0000632841 00000 n 
+0000632997 00000 n 
+0000633054 00000 n 
+0000633235 00000 n 
+0000633292 00000 n 
+0000633350 00000 n 
+0000656312 00000 n 
+0000656601 00000 n 
+0000656770 00000 n 
+0000656938 00000 n 
+0000657108 00000 n 
+0000657280 00000 n 
+0000657440 00000 n 
+0000679113 00000 n 
+0000679402 00000 n 
+0000679447 00000 n 
+0000679606 00000 n 
+0000679764 00000 n 
+0000679924 00000 n 
+0000680075 00000 n 
+0000680225 00000 n 
+0000701977 00000 n 
+0000702258 00000 n 
+0000702315 00000 n 
+0000702484 00000 n 
+0000702652 00000 n 
+0000702822 00000 n 
+0000702994 00000 n 
+0000724334 00000 n 
+0000724599 00000 n 
+0000724758 00000 n 
+0000724815 00000 n 
+0000724983 00000 n 
+0000746925 00000 n 
+0000747214 00000 n 
+0000747381 00000 n 
+0000747550 00000 n 
+0000747721 00000 n 
+0000747880 00000 n 
+0000747937 00000 n 
+0000748107 00000 n 
+0000771109 00000 n 
+0000771406 00000 n 
+0000771555 00000 n 
+0000771701 00000 n 
+0000771879 00000 n 
+0000772049 00000 n 
+0000772226 00000 n 
+0000772284 00000 n 
+0000772447 00000 n 
+0000791775 00000 n 
+0000792072 00000 n 
+0000792129 00000 n 
+0000792509 00000 n 
+0000792678 00000 n 
+0000792849 00000 n 
+0000793014 00000 n 
+0000793072 00000 n 
+0000793129 00000 n 
+0000793300 00000 n 
+0000793471 00000 n 
+0000793636 00000 n 
+0000796230 00000 n 
+0000796469 00000 n 
+0000796514 00000 n 
+0000796909 00000 n 
+0000797053 00000 n 
+0000797198 00000 n 
+0000797363 00000 n 
+0000797519 00000 n 
+0000797677 00000 n 
+0000797824 00000 n 
+0000797986 00000 n 
+0000798128 00000 n 
+0000798283 00000 n 
+0000798428 00000 n 
+0000798596 00000 n 
+0000798743 00000 n 
+0000798900 00000 n 
+0000799046 00000 n 
+0000799201 00000 n 
+0000799346 00000 n 
+0000799502 00000 n 
+0000799647 00000 n 
 0000799813 00000 n 
-0000799977 00000 n 
-0000800122 00000 n 
-0000800294 00000 n 
-0000800445 00000 n 
-0000800605 00000 n 
-0000800755 00000 n 
-0000800924 00000 n 
-0000801072 00000 n 
-0000801239 00000 n 
-0000801385 00000 n 
-0000801558 00000 n 
-0000801710 00000 n 
-0000801871 00000 n 
-0000802022 00000 n 
-0000802193 00000 n 
-0000802343 00000 n 
-0000802508 00000 n 
-0000802654 00000 n 
-0000802827 00000 n 
-0000802979 00000 n 
-0000803140 00000 n 
-0000803291 00000 n 
-0000803450 00000 n 
-0000803598 00000 n 
-0000803765 00000 n 
-0000803911 00000 n 
-0000804076 00000 n 
-0000804220 00000 n 
-0000804367 00000 n 
-0000804504 00000 n 
-0000804662 00000 n 
-0000804799 00000 n 
-0000804953 00000 n 
+0000799958 00000 n 
+0000800118 00000 n 
+0000800267 00000 n 
+0000800426 00000 n 
+0000800574 00000 n 
+0000800740 00000 n 
+0000800885 00000 n 
+0000801045 00000 n 
+0000801194 00000 n 
+0000801353 00000 n 
+0000801501 00000 n 
+0000801667 00000 n 
+0000801814 00000 n 
+0000801985 00000 n 
+0000802135 00000 n 
+0000802294 00000 n 
+0000802442 00000 n 
+0000802599 00000 n 
+0000802746 00000 n 
+0000802905 00000 n 
+0000803053 00000 n 
+0000803221 00000 n 
+0000803368 00000 n 
+0000803539 00000 n 
+0000803689 00000 n 
+0000803849 00000 n 
+0000803998 00000 n 
+0000804155 00000 n 
+0000804302 00000 n 
+0000804462 00000 n 
+0000804611 00000 n 
+0000804779 00000 n 
+0000804926 00000 n 
 0000805085 00000 n 
-0000805245 00000 n 
-0000805383 00000 n 
-0000805542 00000 n 
-0000805690 00000 n 
-0000805848 00000 n 
-0000805994 00000 n 
-0000806163 00000 n 
-0000806310 00000 n 
-0000806495 00000 n 
-0000806669 00000 n 
-0000806840 00000 n 
-0000806989 00000 n 
-0000807148 00000 n 
-0000807296 00000 n 
-0000807465 00000 n 
-0000807612 00000 n 
-0000807797 00000 n 
-0000807971 00000 n 
-0000808142 00000 n 
-0000808291 00000 n 
-0000808450 00000 n 
-0000808598 00000 n 
-0000808757 00000 n 
-0000808904 00000 n 
-0000809074 00000 n 
-0000809222 00000 n 
-0000809388 00000 n 
-0000809532 00000 n 
-0000809691 00000 n 
-0000809839 00000 n 
-0000810008 00000 n 
-0000810155 00000 n 
-0000810321 00000 n 
-0000810465 00000 n 
-0000810626 00000 n 
-0000810776 00000 n 
-0000810946 00000 n 
-0000811094 00000 n 
-0000811249 00000 n 
-0000811392 00000 n 
-0000811563 00000 n 
-0000811712 00000 n 
-0000811872 00000 n 
-0000812021 00000 n 
-0000812191 00000 n 
-0000812339 00000 n 
-0000812532 00000 n 
-0000812703 00000 n 
-0000812874 00000 n 
-0000813023 00000 n 
-0000813184 00000 n 
-0000813334 00000 n 
-0000813505 00000 n 
-0000813654 00000 n 
-0000813811 00000 n 
-0000813956 00000 n 
-0000814129 00000 n 
-0000814280 00000 n 
-0000814441 00000 n 
-0000814591 00000 n 
-0000814751 00000 n 
-0000814899 00000 n 
-0000815070 00000 n 
-0000815219 00000 n 
-0000815374 00000 n 
-0000815518 00000 n 
-0000815675 00000 n 
-0000815821 00000 n 
-0000815990 00000 n 
-0000816137 00000 n 
-0000816278 00000 n 
-0000816409 00000 n 
-0000816569 00000 n 
-0000816707 00000 n 
-0000816855 00000 n 
-0000816992 00000 n 
-0000817145 00000 n 
-0000817276 00000 n 
-0000817447 00000 n 
-0000817596 00000 n 
-0000817755 00000 n 
-0000817903 00000 n 
-0000818072 00000 n 
-0000818219 00000 n 
-0000818373 00000 n 
-0000818515 00000 n 
-0000818674 00000 n 
-0000818822 00000 n 
-0000818991 00000 n 
-0000819138 00000 n 
-0000819292 00000 n 
-0000819435 00000 n 
-0000819606 00000 n 
-0000819755 00000 n 
-0000819914 00000 n 
-0000820062 00000 n 
-0000820231 00000 n 
-0000820378 00000 n 
-0000820544 00000 n 
-0000820688 00000 n 
-0000820860 00000 n 
-0000821010 00000 n 
-0000821170 00000 n 
-0000821319 00000 n 
-0000821488 00000 n 
-0000821635 00000 n 
-0000821789 00000 n 
-0000821932 00000 n 
-0000822104 00000 n 
-0000822254 00000 n 
-0000822415 00000 n 
-0000822565 00000 n 
-0000822735 00000 n 
-0000822883 00000 n 
-0000823048 00000 n 
-0000823191 00000 n 
-0000823362 00000 n 
-0000823511 00000 n 
-0000823671 00000 n 
-0000823820 00000 n 
-0000823990 00000 n 
-0000824138 00000 n 
-0000824292 00000 n 
-0000824435 00000 n 
-0000824606 00000 n 
-0000824755 00000 n 
-0000824916 00000 n 
-0000825066 00000 n 
-0000825237 00000 n 
-0000825386 00000 n 
-0000825552 00000 n 
-0000825696 00000 n 
-0000825869 00000 n 
-0000826020 00000 n 
-0000826181 00000 n 
-0000826331 00000 n 
-0000826502 00000 n 
-0000826651 00000 n 
-0000826815 00000 n 
-0000826959 00000 n 
-0000827131 00000 n 
-0000827281 00000 n 
-0000827438 00000 n 
-0000827584 00000 n 
-0000827743 00000 n 
-0000827890 00000 n 
-0000828047 00000 n 
-0000828182 00000 n 
-0000828335 00000 n 
-0000828466 00000 n 
-0000828626 00000 n 
-0000828764 00000 n 
-0000828912 00000 n 
-0000829049 00000 n 
-0000829208 00000 n 
-0000829355 00000 n 
-0000829524 00000 n 
-0000829671 00000 n 
-0000829832 00000 n 
-0000829974 00000 n 
-0000830145 00000 n 
-0000830294 00000 n 
-0000830453 00000 n 
-0000830601 00000 n 
-0000830760 00000 n 
-0000830907 00000 n 
-0000831076 00000 n 
-0000831223 00000 n 
-0000831377 00000 n 
-0000831519 00000 n 
-0000831690 00000 n 
-0000831839 00000 n 
-0000831998 00000 n 
-0000832146 00000 n 
-0000832316 00000 n 
-0000832464 00000 n 
-0000832634 00000 n 
+0000805233 00000 n 
+0000805391 00000 n 
+0000805538 00000 n 
+0000805704 00000 n 
+0000805849 00000 n 
+0000806021 00000 n 
+0000806172 00000 n 
+0000806333 00000 n 
+0000806483 00000 n 
+0000806643 00000 n 
+0000806792 00000 n 
+0000806949 00000 n 
+0000807096 00000 n 
+0000807267 00000 n 
+0000807417 00000 n 
+0000807576 00000 n 
+0000807724 00000 n 
+0000807882 00000 n 
+0000808029 00000 n 
+0000808171 00000 n 
+0000808304 00000 n 
+0000808463 00000 n 
+0000808601 00000 n 
+0000808749 00000 n 
+0000808886 00000 n 
+0000809033 00000 n 
+0000809169 00000 n 
+0000809335 00000 n 
+0000809480 00000 n 
+0000809650 00000 n 
+0000809799 00000 n 
+0000809958 00000 n 
+0000810107 00000 n 
+0000810265 00000 n 
+0000810412 00000 n 
+0000810581 00000 n 
+0000810729 00000 n 
+0000810895 00000 n 
+0000811040 00000 n 
+0000811199 00000 n 
+0000811348 00000 n 
+0000811517 00000 n 
+0000811665 00000 n 
+0000811829 00000 n 
+0000811974 00000 n 
+0000812144 00000 n 
+0000812293 00000 n 
+0000812453 00000 n 
+0000812603 00000 n 
+0000812762 00000 n 
+0000812910 00000 n 
+0000813080 00000 n 
+0000813229 00000 n 
+0000813395 00000 n 
+0000813540 00000 n 
+0000813699 00000 n 
+0000813848 00000 n 
+0000814018 00000 n 
+0000814167 00000 n 
+0000814335 00000 n 
+0000814482 00000 n 
+0000814653 00000 n 
+0000814803 00000 n 
+0000814962 00000 n 
+0000815111 00000 n 
+0000815280 00000 n 
+0000815428 00000 n 
+0000815593 00000 n 
+0000815739 00000 n 
+0000815911 00000 n 
+0000816062 00000 n 
+0000816222 00000 n 
+0000816372 00000 n 
+0000816541 00000 n 
+0000816689 00000 n 
+0000816857 00000 n 
+0000817004 00000 n 
+0000817177 00000 n 
+0000817329 00000 n 
+0000817490 00000 n 
+0000817641 00000 n 
+0000817812 00000 n 
+0000817962 00000 n 
+0000818128 00000 n 
+0000818275 00000 n 
+0000818448 00000 n 
+0000818600 00000 n 
+0000818761 00000 n 
+0000818912 00000 n 
+0000819071 00000 n 
+0000819219 00000 n 
+0000819386 00000 n 
+0000819532 00000 n 
+0000819698 00000 n 
+0000819843 00000 n 
+0000819990 00000 n 
+0000820127 00000 n 
+0000820285 00000 n 
+0000820422 00000 n 
+0000820577 00000 n 
+0000820710 00000 n 
+0000820870 00000 n 
+0000821008 00000 n 
+0000821167 00000 n 
+0000821315 00000 n 
+0000821473 00000 n 
+0000821619 00000 n 
+0000821788 00000 n 
+0000821935 00000 n 
+0000822120 00000 n 
+0000822294 00000 n 
+0000822465 00000 n 
+0000822614 00000 n 
+0000822773 00000 n 
+0000822921 00000 n 
+0000823090 00000 n 
+0000823237 00000 n 
+0000823422 00000 n 
+0000823596 00000 n 
+0000823767 00000 n 
+0000823916 00000 n 
+0000824075 00000 n 
+0000824223 00000 n 
+0000824382 00000 n 
+0000824529 00000 n 
+0000824699 00000 n 
+0000824847 00000 n 
+0000825014 00000 n 
+0000825159 00000 n 
+0000825318 00000 n 
+0000825466 00000 n 
+0000825635 00000 n 
+0000825782 00000 n 
+0000825949 00000 n 
+0000826094 00000 n 
+0000826255 00000 n 
+0000826405 00000 n 
+0000826575 00000 n 
+0000826723 00000 n 
+0000826879 00000 n 
+0000827023 00000 n 
+0000827194 00000 n 
+0000827343 00000 n 
+0000827503 00000 n 
+0000827652 00000 n 
+0000827822 00000 n 
+0000827970 00000 n 
+0000828163 00000 n 
+0000828334 00000 n 
+0000828505 00000 n 
+0000828654 00000 n 
+0000828815 00000 n 
+0000828965 00000 n 
+0000829136 00000 n 
+0000829285 00000 n 
+0000829443 00000 n 
+0000829589 00000 n 
+0000829762 00000 n 
+0000829913 00000 n 
+0000830074 00000 n 
+0000830224 00000 n 
+0000830384 00000 n 
+0000830532 00000 n 
+0000830703 00000 n 
+0000830852 00000 n 
+0000831008 00000 n 
+0000831153 00000 n 
+0000831310 00000 n 
+0000831456 00000 n 
+0000831625 00000 n 
+0000831772 00000 n 
+0000831914 00000 n 
+0000832046 00000 n 
+0000832206 00000 n 
+0000832344 00000 n 
+0000832492 00000 n 
+0000832629 00000 n 
 0000832782 00000 n 
-0000832944 00000 n 
-0000833095 00000 n 
-0000833260 00000 n 
-0000833414 00000 n 
-0000833570 00000 n 
-0000833715 00000 n 
-0000833882 00000 n 
-0000834027 00000 n 
-0000834196 00000 n 
-0000834343 00000 n 
-0000834519 00000 n 
-0000834673 00000 n 
-0000834840 00000 n 
-0000834997 00000 n 
-0000835167 00000 n 
-0000835315 00000 n 
-0000835486 00000 n 
-0000835637 00000 n 
-0000835805 00000 n 
-0000835951 00000 n 
-0000836119 00000 n 
-0000836265 00000 n 
-0000836431 00000 n 
-0000836575 00000 n 
-0000836734 00000 n 
-0000836882 00000 n 
-0000837055 00000 n 
-0000837206 00000 n 
-0000837370 00000 n 
-0000837512 00000 n 
-0000837679 00000 n 
-0000837824 00000 n 
-0000838002 00000 n 
-0000838158 00000 n 
-0000838324 00000 n 
-0000838468 00000 n 
-0000838645 00000 n 
-0000838800 00000 n 
-0000838966 00000 n 
-0000839112 00000 n 
-0000839397 00000 n 
-0000839476 00000 n 
-0000839640 00000 n 
-0000839831 00000 n 
-0000840059 00000 n 
-0000840276 00000 n 
-0000840446 00000 n 
-0000840664 00000 n 
-0000841042 00000 n 
-0000841220 00000 n 
-0000841419 00000 n 
-0000841615 00000 n 
-0000841796 00000 n 
-0000842076 00000 n 
-0000842261 00000 n 
-0000842443 00000 n 
-0000842699 00000 n 
-0000842873 00000 n 
-0000843054 00000 n 
-0000843382 00000 n 
-0000843571 00000 n 
-0000843771 00000 n 
-0000843967 00000 n 
-0000844149 00000 n 
-0000844458 00000 n 
-0000844648 00000 n 
-0000844847 00000 n 
-0000845042 00000 n 
-0000845223 00000 n 
-0000845504 00000 n 
-0000845689 00000 n 
-0000845870 00000 n 
-0000846194 00000 n 
-0000846383 00000 n 
-0000846583 00000 n 
-0000846752 00000 n 
-0000847080 00000 n 
-0000847269 00000 n 
-0000847468 00000 n 
-0000847649 00000 n 
-0000847954 00000 n 
-0000848143 00000 n 
-0000848342 00000 n 
-0000848524 00000 n 
-0000848833 00000 n 
-0000849014 00000 n 
-0000849206 00000 n 
-0000849406 00000 n 
-0000849591 00000 n 
-0000849871 00000 n 
-0000850061 00000 n 
-0000850235 00000 n 
-0000850544 00000 n 
-0000850726 00000 n 
-0000850930 00000 n 
-0000851130 00000 n 
-0000851316 00000 n 
-0000851642 00000 n 
-0000851832 00000 n 
-0000852018 00000 n 
-0000852399 00000 n 
-0000852593 00000 n 
-0000852798 00000 n 
-0000852973 00000 n 
-0000853358 00000 n 
-0000853552 00000 n 
-0000853756 00000 n 
-0000853943 00000 n 
-0000854304 00000 n 
-0000854499 00000 n 
-0000854704 00000 n 
-0000854878 00000 n 
-0000855239 00000 n 
-0000855433 00000 n 
-0000855637 00000 n 
-0000855838 00000 n 
-0000856024 00000 n 
-0000856285 00000 n 
-0000856476 00000 n 
-0000856663 00000 n 
-0000856980 00000 n 
-0000857163 00000 n 
-0000857367 00000 n 
-0000857567 00000 n 
-0000857753 00000 n 
-0000858107 00000 n 
-0000858301 00000 n 
-0000858506 00000 n 
-0000858693 00000 n 
+0000832915 00000 n 
+0000833086 00000 n 
+0000833235 00000 n 
+0000833394 00000 n 
+0000833542 00000 n 
+0000833711 00000 n 
+0000833858 00000 n 
+0000834014 00000 n 
+0000834158 00000 n 
+0000834317 00000 n 
+0000834465 00000 n 
+0000834634 00000 n 
+0000834781 00000 n 
+0000834936 00000 n 
+0000835080 00000 n 
+0000835251 00000 n 
+0000835400 00000 n 
+0000835559 00000 n 
+0000835707 00000 n 
+0000835876 00000 n 
+0000836023 00000 n 
+0000836190 00000 n 
+0000836335 00000 n 
+0000836507 00000 n 
+0000836657 00000 n 
+0000836817 00000 n 
+0000836966 00000 n 
+0000837135 00000 n 
+0000837282 00000 n 
+0000837437 00000 n 
+0000837581 00000 n 
+0000837753 00000 n 
+0000837903 00000 n 
+0000838064 00000 n 
+0000838214 00000 n 
+0000838384 00000 n 
+0000838532 00000 n 
+0000838698 00000 n 
+0000838842 00000 n 
+0000839013 00000 n 
+0000839162 00000 n 
+0000839322 00000 n 
+0000839471 00000 n 
+0000839641 00000 n 
+0000839789 00000 n 
+0000839945 00000 n 
+0000840090 00000 n 
+0000840261 00000 n 
+0000840410 00000 n 
+0000840571 00000 n 
+0000840721 00000 n 
+0000840892 00000 n 
+0000841041 00000 n 
+0000841207 00000 n 
+0000841353 00000 n 
+0000841526 00000 n 
+0000841677 00000 n 
+0000841838 00000 n 
+0000841988 00000 n 
+0000842159 00000 n 
+0000842308 00000 n 
+0000842474 00000 n 
+0000842620 00000 n 
+0000842792 00000 n 
+0000842942 00000 n 
+0000843099 00000 n 
+0000843245 00000 n 
+0000843404 00000 n 
+0000843551 00000 n 
+0000843708 00000 n 
+0000843843 00000 n 
+0000843998 00000 n 
+0000844131 00000 n 
+0000844291 00000 n 
+0000844429 00000 n 
+0000844577 00000 n 
+0000844714 00000 n 
+0000844873 00000 n 
+0000845020 00000 n 
+0000845189 00000 n 
+0000845336 00000 n 
+0000845499 00000 n 
+0000845643 00000 n 
+0000845814 00000 n 
+0000845963 00000 n 
+0000846122 00000 n 
+0000846270 00000 n 
+0000846429 00000 n 
+0000846576 00000 n 
+0000846745 00000 n 
+0000846892 00000 n 
+0000847048 00000 n 
+0000847192 00000 n 
+0000847363 00000 n 
+0000847512 00000 n 
+0000847671 00000 n 
+0000847819 00000 n 
+0000847989 00000 n 
+0000848137 00000 n 
+0000848307 00000 n 
+0000848455 00000 n 
+0000848617 00000 n 
+0000848768 00000 n 
+0000848933 00000 n 
+0000849087 00000 n 
+0000849243 00000 n 
+0000849388 00000 n 
+0000849555 00000 n 
+0000849700 00000 n 
+0000849869 00000 n 
+0000850016 00000 n 
+0000850192 00000 n 
+0000850346 00000 n 
+0000850513 00000 n 
+0000850670 00000 n 
+0000850840 00000 n 
+0000850988 00000 n 
+0000851159 00000 n 
+0000851310 00000 n 
+0000851478 00000 n 
+0000851624 00000 n 
+0000851800 00000 n 
+0000851954 00000 n 
+0000852134 00000 n 
+0000852292 00000 n 
+0000852461 00000 n 
+0000852608 00000 n 
+0000852776 00000 n 
+0000852922 00000 n 
+0000853081 00000 n 
+0000853229 00000 n 
+0000853402 00000 n 
+0000853553 00000 n 
+0000853717 00000 n 
+0000853859 00000 n 
+0000854026 00000 n 
+0000854171 00000 n 
+0000854349 00000 n 
+0000854505 00000 n 
+0000854670 00000 n 
+0000854813 00000 n 
+0000854986 00000 n 
+0000855137 00000 n 
+0000855302 00000 n 
+0000855447 00000 n 
+0000855732 00000 n 
+0000855811 00000 n 
+0000855975 00000 n 
+0000856166 00000 n 
+0000856394 00000 n 
+0000856611 00000 n 
+0000856781 00000 n 
+0000856999 00000 n 
+0000857377 00000 n 
+0000857555 00000 n 
+0000857754 00000 n 
+0000857950 00000 n 
+0000858131 00000 n 
+0000858411 00000 n 
+0000858596 00000 n 
+0000858778 00000 n 
 0000859034 00000 n 
-0000859217 00000 n 
-0000859421 00000 n 
-0000859621 00000 n 
-0000859807 00000 n 
-0000860073 00000 n 
-0000860263 00000 n 
-0000860450 00000 n 
-0000860720 00000 n 
-0000860899 00000 n 
-0000861085 00000 n 
-0000861450 00000 n 
-0000861644 00000 n 
-0000861849 00000 n 
-0000862035 00000 n 
-0000862373 00000 n 
-0000862568 00000 n 
-0000862773 00000 n 
-0000862947 00000 n 
-0000863284 00000 n 
-0000863478 00000 n 
-0000863682 00000 n 
-0000863883 00000 n 
-0000864069 00000 n 
-0000864338 00000 n 
-0000864529 00000 n 
-0000864716 00000 n 
-0000865025 00000 n 
-0000865207 00000 n 
-0000865397 00000 n 
-0000865722 00000 n 
-0000865916 00000 n 
-0000866120 00000 n 
-0000866307 00000 n 
-0000866593 00000 n 
-0000866784 00000 n 
-0000866971 00000 n 
-0000867280 00000 n 
-0000867463 00000 n 
-0000867667 00000 n 
-0000867853 00000 n 
+0000859208 00000 n 
+0000859389 00000 n 
+0000859717 00000 n 
+0000859906 00000 n 
+0000860106 00000 n 
+0000860302 00000 n 
+0000860484 00000 n 
+0000860793 00000 n 
+0000860983 00000 n 
+0000861182 00000 n 
+0000861377 00000 n 
+0000861558 00000 n 
+0000861839 00000 n 
+0000862024 00000 n 
+0000862205 00000 n 
+0000862529 00000 n 
+0000862718 00000 n 
+0000862918 00000 n 
+0000863087 00000 n 
+0000863415 00000 n 
+0000863604 00000 n 
+0000863803 00000 n 
+0000863984 00000 n 
+0000864289 00000 n 
+0000864478 00000 n 
+0000864677 00000 n 
+0000864859 00000 n 
+0000865168 00000 n 
+0000865349 00000 n 
+0000865541 00000 n 
+0000865741 00000 n 
+0000865926 00000 n 
+0000866206 00000 n 
+0000866396 00000 n 
+0000866570 00000 n 
+0000866879 00000 n 
+0000867061 00000 n 
+0000867265 00000 n 
+0000867465 00000 n 
+0000867651 00000 n 
+0000867977 00000 n 
 0000868167 00000 n 
-0000868361 00000 n 
-0000868565 00000 n 
-0000868752 00000 n 
-0000869054 00000 n 
-0000869249 00000 n 
-0000869453 00000 n 
-0000869639 00000 n 
-0000869948 00000 n 
-0000870143 00000 n 
-0000870348 00000 n 
-0000870534 00000 n 
-0000870888 00000 n 
-0000871083 00000 n 
-0000871275 00000 n 
-0000871461 00000 n 
-0000871794 00000 n 
-0000871988 00000 n 
-0000872192 00000 n 
-0000872378 00000 n 
-0000872755 00000 n 
-0000872950 00000 n 
-0000873155 00000 n 
-0000873355 00000 n 
-0000873541 00000 n 
-0000873926 00000 n 
-0000874120 00000 n 
-0000874324 00000 n 
-0000874525 00000 n 
-0000874711 00000 n 
-0000875101 00000 n 
-0000875283 00000 n 
-0000875476 00000 n 
-0000875677 00000 n 
-0000875863 00000 n 
-0000876130 00000 n 
-0000876325 00000 n 
-0000876530 00000 n 
-0000876717 00000 n 
-0000876945 00000 n 
-0000877143 00000 n 
-0000877372 00000 n 
-0000877564 00000 n 
-0000877752 00000 n 
-0000877944 00000 n 
-0000878168 00000 n 
-0000878408 00000 n 
-0000878601 00000 n 
-0000878813 00000 n 
-0000879010 00000 n 
-0000879206 00000 n 
-0000879399 00000 n 
-0000879600 00000 n 
-0000879800 00000 n 
-0000879976 00000 n 
-0000880164 00000 n 
-0000880396 00000 n 
-0000880568 00000 n 
-0000880796 00000 n 
-0000880978 00000 n 
-0000881635 00000 n 
-0000889474 00000 n 
-0000889690 00000 n 
-0000891053 00000 n 
-0000892121 00000 n 
-0000899960 00000 n 
-0000900181 00000 n 
-0000901544 00000 n 
-0000902619 00000 n 
-0000905880 00000 n 
-0000906106 00000 n 
-0000907469 00000 n 
-0000908585 00000 n 
-0000910788 00000 n 
-0000911002 00000 n 
-0000912365 00000 n 
+0000868353 00000 n 
+0000868734 00000 n 
+0000868928 00000 n 
+0000869133 00000 n 
+0000869308 00000 n 
+0000869693 00000 n 
+0000869887 00000 n 
+0000870091 00000 n 
+0000870278 00000 n 
+0000870639 00000 n 
+0000870834 00000 n 
+0000871039 00000 n 
+0000871213 00000 n 
+0000871574 00000 n 
+0000871768 00000 n 
+0000871972 00000 n 
+0000872173 00000 n 
+0000872359 00000 n 
+0000872620 00000 n 
+0000872811 00000 n 
+0000872998 00000 n 
+0000873315 00000 n 
+0000873498 00000 n 
+0000873702 00000 n 
+0000873902 00000 n 
+0000874088 00000 n 
+0000874442 00000 n 
+0000874636 00000 n 
+0000874841 00000 n 
+0000875028 00000 n 
+0000875369 00000 n 
+0000875552 00000 n 
+0000875756 00000 n 
+0000875956 00000 n 
+0000876142 00000 n 
+0000876408 00000 n 
+0000876598 00000 n 
+0000876785 00000 n 
+0000877055 00000 n 
+0000877234 00000 n 
+0000877420 00000 n 
+0000877785 00000 n 
+0000877979 00000 n 
+0000878184 00000 n 
+0000878370 00000 n 
+0000878708 00000 n 
+0000878903 00000 n 
+0000879108 00000 n 
+0000879282 00000 n 
+0000879619 00000 n 
+0000879813 00000 n 
+0000880017 00000 n 
+0000880218 00000 n 
+0000880404 00000 n 
+0000880673 00000 n 
+0000880864 00000 n 
+0000881051 00000 n 
+0000881360 00000 n 
+0000881542 00000 n 
+0000881732 00000 n 
+0000882041 00000 n 
+0000882235 00000 n 
+0000882439 00000 n 
+0000882626 00000 n 
+0000882912 00000 n 
+0000883103 00000 n 
+0000883290 00000 n 
+0000883599 00000 n 
+0000883782 00000 n 
+0000883986 00000 n 
+0000884172 00000 n 
+0000884486 00000 n 
+0000884680 00000 n 
+0000884884 00000 n 
+0000885071 00000 n 
+0000885373 00000 n 
+0000885568 00000 n 
+0000885772 00000 n 
+0000885958 00000 n 
+0000886267 00000 n 
+0000886462 00000 n 
+0000886667 00000 n 
+0000886853 00000 n 
+0000887207 00000 n 
+0000887402 00000 n 
+0000887594 00000 n 
+0000887780 00000 n 
+0000888097 00000 n 
+0000888291 00000 n 
+0000888495 00000 n 
+0000888681 00000 n 
+0000889058 00000 n 
+0000889253 00000 n 
+0000889458 00000 n 
+0000889658 00000 n 
+0000889844 00000 n 
+0000890229 00000 n 
+0000890423 00000 n 
+0000890627 00000 n 
+0000890828 00000 n 
+0000891014 00000 n 
+0000891404 00000 n 
+0000891586 00000 n 
+0000891779 00000 n 
+0000891980 00000 n 
+0000892166 00000 n 
+0000892433 00000 n 
+0000892628 00000 n 
+0000892833 00000 n 
+0000893020 00000 n 
+0000893248 00000 n 
+0000893446 00000 n 
+0000893675 00000 n 
+0000893867 00000 n 
+0000894055 00000 n 
+0000894247 00000 n 
+0000894471 00000 n 
+0000894711 00000 n 
+0000894904 00000 n 
+0000895116 00000 n 
+0000895313 00000 n 
+0000895541 00000 n 
+0000895789 00000 n 
+0000895986 00000 n 
+0000896166 00000 n 
+0000896366 00000 n 
+0000896578 00000 n 
+0000896754 00000 n 
+0000896943 00000 n 
+0000897175 00000 n 
+0000897360 00000 n 
+0000897588 00000 n 
+0000897758 00000 n 
+0000898432 00000 n 
+0000906440 00000 n 
+0000906656 00000 n 
+0000908019 00000 n 
+0000909086 00000 n 
+0000916925 00000 n 
+0000917146 00000 n 
+0000918509 00000 n 
+0000919584 00000 n 
+0000922845 00000 n 
+0000923071 00000 n 
+0000924434 00000 n 
+0000925550 00000 n 
+0000927753 00000 n 
+0000927967 00000 n 
+0000929330 00000 n 
 trailer
-<< /Size 944
+<< /Size 957
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-913490
+930455
 %%EOF
diff --git a/extra/bin-for-dev/start-backend.sh b/extra/bin-for-dev/start-backend.sh
new file mode 100755
index 000000000..ab1551d5f
--- /dev/null
+++ b/extra/bin-for-dev/start-backend.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. All rights
+#                             reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END============================================
+# ===================================================================
+# 
+###
+
+# Start Clamp backend in DEBUG mode
+java -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9999 -jar ../../target/clamp.jar --spring.config.name=application-noaaf
\ No newline at end of file
diff --git a/extra/bin-for-dev/start-frontend.sh b/extra/bin-for-dev/start-frontend.sh
new file mode 100755
index 000000000..7a268bf6d
--- /dev/null
+++ b/extra/bin-for-dev/start-frontend.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. All rights
+#                             reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END============================================
+# ===================================================================
+# 
+###
+
+cd ../../target/ui-react
+./node/npm start
diff --git a/pom.xml b/pom.xml
index f857945e9..cc6e528fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,1258 +20,1266 @@
   ============LICENSE_END============================================
   ===================================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-		<modelVersion>4.0.0</modelVersion>
-		<groupId>org.onap.clamp</groupId>
-		<artifactId>clds</artifactId>
-		<version>4.1.1-SNAPSHOT</version>
-		<name>clamp</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.onap.clamp</groupId>
+	<artifactId>clds</artifactId>
+	<version>4.1.1-SNAPSHOT</version>
+	<name>clamp</name>
 
 
-		<parent>
-				<groupId>org.onap.oparent</groupId>
-				<artifactId>oparent</artifactId>
-				<version>2.0.0</version>
-		</parent>
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>2.0.0</version>
+	</parent>
 
-		<description>
-           This project build the ONAP CLAMP JAR that contains CLAMP back-end code and its UI part.
+	<description>
+	       This is the MAVEN project that builds everything for ONAP CLAMP.
+	       Docker engine is normally requires to perfom all possible tasks (including integration tests)
+	       
+           It can build:
+           - The ONAP CLAMP JAR that contains CLAMP back-end code.
+           - The DOCKER images for:
+                * CLAMP backend (Java Spring)
+                * CLAMP frontend (Javscript React)
+                * The dashboard - Elastic search
+                * The dashboard - Logstash
+                * The dashboard - Kibana
 
-           By Default "mvn clean install" command will execute also the unit tests
-           and the integration tests. The integration tests require a docker engine running.
+           It can test:
+            - The CLAMP backend, JAVA unit testing
+            - The CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python)
+            - The CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React)
+           
+           The test coverage for dev's can be found after a "clean install" build in:
+            - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged)
+                or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec
+            - Clamp frontend: target/ui-react/coverage
 
-           If you want to skip the integration test you can by doing:
-           "mvn clean install -DskipITs=true"
+           Useful mvn commands:
+            - mvn clean install: Build Clamp backend JAR + unit tests + integration tests + NPM tests (+coverage for all)
+            - mvn clean install -DskipITs=true: Build Clamp backend JAR + unit tests + NPM tests (+coverage for all), it does not require a DOCKER engine
+            - mvn clean install -DskipTests -P docker: Build Clamp backend JAR + all docker images
 
-           For Spring it's possible to specify the application.properties location
-           "mvn clean install -Dspring.config.location=classpath:application-test.properties"
+           To start CLAMP (Build it before):
+            - Use docker-compose file in ./extra/docker/clamp/docker-compose.yml
+            - Use the script located in ./extra/bin/start-backend.sh + start-frontend.sh
+            - Use your IDE to use the Jar or start NVM/NPM
 
-           The application.properties contains the location of the CLAMP parameters files:
-				- org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
-				- org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
+        </description>
 
-		</description>
+	<properties>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+		<clamp.project.version>${project.version}</clamp.project.version>
+		<clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<properties>
-				<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-				<clamp.project.version>${project.version}</clamp.project.version>
-				<clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
-				<maven.compiler.source>1.8</maven.compiler.source>
-				<maven.compiler.target>1.8</maven.compiler.target>
-				<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-				<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<eelf.core.version>1.0.0</eelf.core.version>
+		<camel.version>2.24.0</camel.version>
+		<springboot.version>2.1.5.RELEASE</springboot.version>
 
-				<eelf.core.version>1.0.0</eelf.core.version>
-				<camel.version>2.24.0</camel.version>
-				<springboot.version>2.1.5.RELEASE</springboot.version>
+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+		<!-- Enable language to disable javascript analysis -->
+		<!-- <sonar.language>java</sonar.language> -->
+		<!-- Parameters for Javascript coverage -->
+		<sonar.sources>src/main,${project.build.directory}/${ui.react.src}</sonar.sources>
+		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
 
-				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-				<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-				<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
-				<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
-				<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-				<sonar.projectVersion>${project.version}</sonar.projectVersion>
-				<!-- Enable language to disable javascript analysis -->
-				<sonar.language>java</sonar.language>
-				<!-- Parameters for Javascript coverage
-					<sonar.sources>src/main,${project.build.directory}/clamp-ui/designer</sonar.sources>
-					<sonar.javascript.lcov.reportPaths>${project.build.directory}/clamp-ui/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
-				 -->
-				<sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
+		<sonar.exclusions>src/main/resources/**,**/clamp-ui/designer/lib/*</sonar.exclusions>
 
-				<docker.push.registry>localhost:5000</docker.push.registry>
-				<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
-				<docker.skip.build>true</docker.skip.build>
-				<docker.skip.push>true</docker.skip.push>
-				<docker.skip.tag>true</docker.skip.tag>
-				<skip.staging.artifacts>false</skip.staging.artifacts>
-				<python.http.proxy.param/>
-				<tomcat.version>9.0.20</tomcat.version>
-				<ui.react.src>ui-react</ui.react.src>
-				<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
-		</properties>
+		<docker.push.registry>localhost:5000</docker.push.registry>
+		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+		<docker.skip.build>true</docker.skip.build>
+		<docker.skip.push>true</docker.skip.push>
+		<docker.skip.tag>true</docker.skip.tag>
+		<skip.staging.artifacts>false</skip.staging.artifacts>
+		<python.http.proxy.param />
+		<tomcat.version>9.0.20</tomcat.version>
+		<ui.react.src>ui-react</ui.react.src>
+		<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
+	</properties>
 
-		<profiles>
-				<profile>
-						<id>without-test</id>
-						<activation>
-							<property>
-								<name>maven.test.skip</name>
-								<value>true</value>
-							</property>
-						</activation>
-						<properties>
-							<docker.skip.run>true</docker.skip.run>
-							<docker.skip>true</docker.skip>
-						</properties>
-				</profile>
-				<profile>
-						<id>without-IT-only</id>
-						<activation>
-							<property>
-								<name>skipITs</name>
-								<value>true</value>
-							</property>
-						</activation>
-						<properties>
-							<docker.skip.run>true</docker.skip.run>
-							<docker.skip>true</docker.skip>
-						</properties>
-				</profile>
-				<profile>
-						<id>without-IT-only2</id>
-						<activation>
-							<property>
-								<name>skipTests</name>
-								<value>true</value>
-							</property>
-						</activation>
-						<properties>
-							<docker.skip.run>true</docker.skip.run>
-							<docker.skip>true</docker.skip>
-						</properties>
-				</profile>
-				<profile>
-						<id>docker</id>
-						<properties>
-								<skip.staging.artifacts>true</skip.staging.artifacts>
-								<docker.skip.build>false</docker.skip.build>
-								<docker.skip.tag>false</docker.skip.tag>
-								<docker.skip.push>false</docker.skip.push>
-								<docker.skip>false</docker.skip>
-						</properties>
-				</profile>
-		</profiles>
+	<profiles>
+		<profile>
+			<id>without-test</id>
+			<activation>
+				<property>
+					<name>maven.test.skip</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<properties>
+				<docker.skip.run>true</docker.skip.run>
+				<docker.skip>true</docker.skip>
+			</properties>
+		</profile>
+		<profile>
+			<id>without-IT-only</id>
+			<activation>
+				<property>
+					<name>skipITs</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<properties>
+				<docker.skip.run>true</docker.skip.run>
+				<docker.skip>true</docker.skip>
+			</properties>
+		</profile>
+		<profile>
+			<id>without-IT-only2</id>
+			<activation>
+				<property>
+					<name>skipTests</name>
+					<value>true</value>
+				</property>
+			</activation>
+			<properties>
+				<docker.skip.run>true</docker.skip.run>
+				<docker.skip>true</docker.skip>
+			</properties>
+		</profile>
+		<profile>
+			<id>docker</id>
+			<properties>
+				<skip.staging.artifacts>true</skip.staging.artifacts>
+				<docker.skip.build>false</docker.skip.build>
+				<docker.skip.tag>false</docker.skip.tag>
+				<docker.skip.push>false</docker.skip.push>
+				<docker.skip>false</docker.skip>
+			</properties>
+		</profile>
+	</profiles>
 
-		<distributionManagement>
-				<repository>
-						<id>ecomp-releases</id>
-						<name>Clamp Release Repository</name>
-						<url>https://nexus.onap.org/content/repositories/releases/</url>
-				</repository>
-				<snapshotRepository>
-						<id>ecomp-snapshots</id>
-						<name>Clamp Snapshot Repository</name>
-						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
-				</snapshotRepository>
-				<site>
-						<id>ecomp-site</id>
-						<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
-				</site>
-		</distributionManagement>
+	<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>Clamp Release Repository</name>
+			<url>https://nexus.onap.org/content/repositories/releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<name>Clamp Snapshot Repository</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots/</url>
+		</snapshotRepository>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
+		</site>
+	</distributionManagement>
 
-		<repositories>
-				<repository>
-					<id>onap-public</id>
-					<name>onap-public</name>
-					<url>https://nexus.onap.org/content/repositories/public/</url>
-					<releases>
-						<enabled>true</enabled>
-					</releases>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-						<id>ecomp-releases</id>
-						<name>ONAP Release Repository</name>
-						<url>https://nexus.onap.org/content/repositories/releases/</url>
-				</repository>
-				<repository>
-						<id>ecomp-staging</id>
-						<name>ONAP Staging Repository</name>
-						<url>https://nexus.onap.org/content/repositories/staging/</url>
-				</repository>
-				<repository>
-						<id>ecomp-snapshots</id>
-						<name>ONAP Snapshot Repository</name>
-						<url>https://nexus.onap.org/content/repositories/snapshots/</url>
-						<snapshots>
-								<enabled>true</enabled>
-						</snapshots>
-						<releases>
-								<enabled>false</enabled>
-						</releases>
-				</repository>
-				<repository>
-					<id>central</id>
-					<url>http://repo1.maven.org/maven2/</url>
-				</repository>
-		</repositories>
-		<pluginRepositories>
-			<pluginRepository>
-				<id>onap-public</id>
-				<name>onap-public</name>
-				<url>https://nexus.onap.org/content/repositories/public/</url>
-				<releases>
-					<enabled>true</enabled>
-				</releases>
-				<snapshots>
-					<enabled>false</enabled>
-				</snapshots>
-			</pluginRepository>
-			<pluginRepository>
-				<id>central</id>
-				<url>http://repo1.maven.org/maven2/</url>
-			</pluginRepository>
-		</pluginRepositories>
-
-		<dependencyManagement>
-				<dependencies>
-						<!-- Spring Boot BOM -->
-						<dependency>
-								<groupId>org.springframework.boot</groupId>
-								<artifactId>spring-boot-dependencies</artifactId>
-								<version>${springboot.version}</version>
-								<type>pom</type>
-								<scope>import</scope>
-						</dependency>
-						<!-- Camel BOM -->
-						<dependency>
-								<groupId>org.apache.camel</groupId>
-								<artifactId>camel-spring-boot-dependencies</artifactId>
-								<version>${camel.version}</version>
-								<type>pom</type>
-								<scope>import</scope>
-						</dependency>
-				</dependencies>
-		</dependencyManagement>
+	<repositories>
+		<repository>
+			<id>onap-public</id>
+			<name>onap-public</name>
+			<url>https://nexus.onap.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>ONAP Release Repository</name>
+			<url>https://nexus.onap.org/content/repositories/releases/</url>
+		</repository>
+		<repository>
+			<id>ecomp-staging</id>
+			<name>ONAP Staging Repository</name>
+			<url>https://nexus.onap.org/content/repositories/staging/</url>
+		</repository>
+		<repository>
+			<id>ecomp-snapshots</id>
+			<name>ONAP Snapshot Repository</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2/</url>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-public</id>
+			<name>onap-public</name>
+			<url>https://nexus.onap.org/content/repositories/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2/</url>
+		</pluginRepository>
+	</pluginRepositories>
 
+	<dependencyManagement>
 		<dependencies>
+			<!-- Spring Boot BOM -->
 			<dependency>
-				<groupId>org.apache.xmlgraphics</groupId>
-				<artifactId>batik-svggen</artifactId>
-				<version>1.11</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.xmlgraphics</groupId>
-				<artifactId>batik-svg-dom</artifactId>
-				<version>1.11</version>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${springboot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
+			<!-- Camel BOM -->
 			<dependency>
-				<groupId>org.apache.xmlgraphics</groupId>
-				<artifactId>batik-transcoder</artifactId>
-				<version>1.11</version>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>camel-spring-boot-dependencies</artifactId>
+				<version>${camel.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
-				<dependency>
-						<groupId>com.att.eelf</groupId>
-						<artifactId>eelf-core</artifactId>
-						<version>${eelf.core.version}</version>
-				</dependency>
-				<dependency>
-						<groupId>org.codehaus.janino</groupId>
-						<artifactId>janino</artifactId>
-						<version>3.0.8</version>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.tomcat.embed</groupId>
-						<artifactId>tomcat-embed-core</artifactId>
-						<version>${tomcat.version}</version>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.tomcat.embed</groupId>
-						<artifactId>tomcat-embed-el</artifactId>
-						<version>${tomcat.version}</version>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.tomcat.embed</groupId>
-						<artifactId>tomcat-embed-websocket</artifactId>
-						<version>${tomcat.version}</version>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.tomcat</groupId>
-						<artifactId>tomcat-annotations-api</artifactId>
-						<version>${tomcat.version}</version>
-				</dependency>
-				<!-- For CAMEL -->
-				<dependency>
-					<groupId>org.apache.camel</groupId>
-					<artifactId>camel-http4-starter</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.camel</groupId>
-						<artifactId>camel-spring-boot-starter</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.camel</groupId>
-						<artifactId>camel-jaxb-starter</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.camel</groupId>
-						<artifactId>camel-servlet-starter</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.camel</groupId>
-						<artifactId>camel-gson-starter</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.camel</groupId>
-					<artifactId>camel-swagger-java-starter</artifactId>
-					<exclusions>
-						<exclusion>
-							<groupId>javax.ws.rs</groupId>
-							<artifactId>jsr311-api</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>org.slf4j</groupId>
-							<artifactId>slf4j-ext</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>com.fasterxml.jackson.core</groupId>
-							<artifactId>jackson-databind</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>javax.xml.bind</groupId>
-						<artifactId>jaxb-api</artifactId>
-						<version>2.3.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.glassfish.jersey.core</groupId>
-					<artifactId>jersey-common</artifactId>
-					<version>2.27</version>
-				</dependency>
-				<!-- Spring famework -->
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-web</artifactId>
-						<exclusions>
-							<exclusion>
-								<groupId>org.springframework.boot</groupId>
-								<artifactId>spring-boot-starter-json</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-tomcat</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-jdbc</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-security</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-autoconfigure</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-test</artifactId>
-						<scope>test</scope>
-						<exclusions>
-								<exclusion>
-										<groupId>com.vaadin.external.google</groupId>
-										<artifactId>android-json</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-data-jpa</artifactId>
-				</dependency>
-				<!-- Others dependencies -->
-				<dependency>
-					<groupId>org.onap.aaf.authz</groupId>
-					<artifactId>aaf-cadi-aaf</artifactId>
-					<version>2.1.10</version>
-					<exclusions>
-						<exclusion>
-							<groupId>javax.servlet</groupId>
-							<artifactId>servlet-api</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>ch.qos.logback</groupId>
-						<artifactId>logback-core</artifactId>
-						<version>1.2.3</version>
-				</dependency>
-				<dependency>
-						<groupId>ch.qos.logback</groupId>
-						<artifactId>logback-classic</artifactId>
-						<version>1.2.3</version>
-				</dependency>
-				<dependency>
-						<groupId>commons-dbcp</groupId>
-						<artifactId>commons-dbcp</artifactId>
-						<version>1.4</version>
-				</dependency>
-				<dependency>
-						<groupId>commons-io</groupId>
-						<artifactId>commons-io</artifactId>
-						<version>2.6</version>
-				</dependency>
-				<dependency>
-						<groupId>com.googlecode.json-simple</groupId>
-						<artifactId>json-simple</artifactId>
-						<version>1.1.1</version>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-vfs2</artifactId>
-						<version>2.2</version>
-				</dependency>
-				<dependency>
-						<groupId>joda-time</groupId>
-						<artifactId>joda-time</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-api</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>javax.ws.rs</groupId>
-						<artifactId>javax.ws.rs-api</artifactId>
-						<version>2.0</version>
-				</dependency>
-				<dependency>
-						<groupId>junit</groupId>
-						<artifactId>junit</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>javax.transaction</groupId>
-						<artifactId>jta</artifactId>
-						<version>1.1</version>
-				</dependency>
-				<dependency>
-						<groupId>javax.persistence</groupId>
-						<artifactId>persistence-api</artifactId>
-						<version>1.0.2</version>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.engine</groupId>
-						<artifactId>PolicyEngineAPI</artifactId>
-						<version>1.3.3</version>
-						<exclusions>
-								<exclusion>
-										<groupId>com.google.guava</groupId>
-										<artifactId>guava</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>mysql</groupId>
-										<artifactId>mysql-connector-java</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>commons-io</groupId>
-										<artifactId>commons-io</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>grizzly-http-server</artifactId>
-										<groupId>org.glassfish.grizzly</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
-										<artifactId>dmaapClient</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.onap.policy.common</groupId>
-										<artifactId>integrity-monitor</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.onap.policy.common</groupId>
-										<artifactId>integrity-audit</artifactId>
-								</exclusion>
-								<exclusion>
-									<groupId>com.fasterxml.jackson.core</groupId>
-									<artifactId>jackson-databind</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.onap.aaf.cadi</groupId>
-										<artifactId>cadi-aaf</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>javax.jms</groupId>
-										<artifactId>jms</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>commons-fileupload</groupId>
-										<artifactId>commons-fileupload</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>com.att.research.xacml</groupId>
-										<artifactId>xacml</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.common</groupId>
-						<artifactId>ONAP-Logging</artifactId>
-						<version>1.2.3</version>
-						<exclusions>
-								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-						<artifactId>policy-yaml</artifactId>
-						<version>1.2.3</version>
-						<exclusions>
-								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-						<artifactId>sdc</artifactId>
-						<version>1.2.3</version>
-						<exclusions>
-								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
-						<artifactId>aai</artifactId>
-						<version>1.2.3</version>
-						<exclusions>
-								<exclusion>
-										<artifactId>log4j</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-								<exclusion>
-										<groupId>org.slf4j</groupId>
-										<artifactId>slf4j-log4j12</artifactId>
-								</exclusion>
-								<exclusion>
-										<artifactId>apache-log4j-extras</artifactId>
-										<groupId>log4j</groupId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<dependency>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-csv</artifactId>
-						<version>1.3</version>
-				</dependency>
-				<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
-				<dependency>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-utils</artifactId>
-						<version>3.0.24</version>
-				</dependency>
-				<dependency>
-						<groupId>org.jboss.spec.javax.ws.rs</groupId>
-						<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
-						<version>1.0.1.Final</version>
-				</dependency>
-				<dependency>
-						<groupId>com.google.guava</groupId>
-						<artifactId>guava</artifactId>
-						<version>27.0-jre</version>
-				</dependency>
-				<!-- Remove the MYSQL connector and replace it by Mariadb -->
-				<dependency>
-						<groupId>org.mariadb.jdbc</groupId>
-						<artifactId>mariadb-java-client</artifactId>
-						<version>2.2.1</version>
-				</dependency>
-				<!-- For SDC Controller -->
-				<dependency>
-						<groupId>org.onap.sdc.sdc-distribution-client</groupId>
-						<artifactId>sdc-distribution-client</artifactId>
-						<version>1.3.0</version>
-				</dependency>
-				<dependency>
-						<groupId>org.onap.sdc.sdc-tosca</groupId>
-						<artifactId>sdc-tosca</artifactId>
-						<version>1.5.1</version>
-				</dependency>
-				<!-- TESTING -->
-				<dependency>
-						<groupId>org.assertj</groupId>
-						<artifactId>assertj-core</artifactId>
-						<version>3.10.0</version>
-						<scope>test</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-					<version>1.10.19</version>
-					<scope>test</scope>
-				</dependency>
 		</dependencies>
+	</dependencyManagement>
 
-		<build>
-				<finalName>clamp</finalName>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-svggen</artifactId>
+			<version>1.11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-svg-dom</artifactId>
+			<version>1.11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>batik-transcoder</artifactId>
+			<version>1.11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.att.eelf</groupId>
+			<artifactId>eelf-core</artifactId>
+			<version>${eelf.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.janino</groupId>
+			<artifactId>janino</artifactId>
+			<version>3.0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-el</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-websocket</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-annotations-api</artifactId>
+			<version>${tomcat.version}</version>
+		</dependency>
+		<!-- For CAMEL -->
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-http4-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-jaxb-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-servlet-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-gson-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-swagger-java-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.ws.rs</groupId>
+					<artifactId>jsr311-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-ext</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-common</artifactId>
+			<version>2.27</version>
+		</dependency>
+		<!-- Spring famework -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-json</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin.external.google</groupId>
+					<artifactId>android-json</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<!-- Others dependencies -->
+		<dependency>
+			<groupId>org.onap.aaf.authz</groupId>
+			<artifactId>aaf-cadi-aaf</artifactId>
+			<version>2.1.10</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-vfs2</artifactId>
+			<version>2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.transaction</groupId>
+			<artifactId>jta</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>persistence-api</artifactId>
+			<version>1.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.policy.engine</groupId>
+			<artifactId>PolicyEngineAPI</artifactId>
+			<version>1.3.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>apache-log4j-extras</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-io</groupId>
+					<artifactId>commons-io</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>grizzly-http-server</artifactId>
+					<groupId>org.glassfish.grizzly</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.onap.policy.common</groupId>
+					<artifactId>integrity-monitor</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.onap.policy.common</groupId>
+					<artifactId>integrity-audit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-databind</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.onap.aaf.cadi</groupId>
+					<artifactId>cadi-aaf</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.jms</groupId>
+					<artifactId>jms</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-fileupload</groupId>
+					<artifactId>commons-fileupload</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.att.research.xacml</groupId>
+					<artifactId>xacml</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.policy.common</groupId>
+			<artifactId>ONAP-Logging</artifactId>
+			<version>1.2.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>apache-log4j-extras</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+			<artifactId>policy-yaml</artifactId>
+			<version>1.2.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>apache-log4j-extras</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+			<artifactId>sdc</artifactId>
+			<version>1.2.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>apache-log4j-extras</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+			<artifactId>aai</artifactId>
+			<version>1.2.3</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>apache-log4j-extras</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-csv</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<!-- Other dependencies to fix nexus IQ reported vulnerabilities -->
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>3.0.24</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.spec.javax.ws.rs</groupId>
+			<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+			<version>1.0.1.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>27.0-jre</version>
+		</dependency>
+		<!-- Remove the MYSQL connector and replace it by Mariadb -->
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>2.2.1</version>
+		</dependency>
+		<!-- For SDC Controller -->
+		<dependency>
+			<groupId>org.onap.sdc.sdc-distribution-client</groupId>
+			<artifactId>sdc-distribution-client</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.sdc.sdc-tosca</groupId>
+			<artifactId>sdc-tosca</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<!-- TESTING -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.10.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
-				<testResources>
-						<testResource>
-								<directory>src/test/resources</directory>
-								<excludes>
-										<exclude>**/*.jks</exclude>
-										<exclude>**/*.csar</exclude>
-								</excludes>
-								<filtering>true</filtering>
-						</testResource>
-						<testResource>
-								<directory>src/test/resources/https</directory>
-								<includes>
-										<include>**.jks</include>
-								</includes>
-								<filtering>false</filtering>
-								<targetPath>https</targetPath>
-						</testResource>
-						<testResource>
-								<directory>src/test/resources/example/sdc</directory>
-								<includes>
-										<include>**.csar</include>
-								</includes>
-								<filtering>false</filtering>
-								<targetPath>example/sdc</targetPath>
-						</testResource>
+	<build>
+		<finalName>clamp</finalName>
 
-						<!-- Copy the NPM package.json for CLAMP UI javascript testing framework -->
-						<testResource>
-								<directory>src/test/javascript</directory>
-								<includes>
-										<include>**/**.json</include>
-								</includes>
-								<filtering>true</filtering>
-								<targetPath>${project.build.directory}/clamp-ui</targetPath>
-						</testResource>
-						<testResource>
-								<directory>src/main/resources/META-INF/resources/designer</directory>
-								<filtering>false</filtering>
-								<targetPath>${project.build.directory}/clamp-ui/designer</targetPath>
-						</testResource>
-				</testResources>
-				<resources>
-						<!--  For AAF folder maven should not try to filter Keystores/Truststores ...
-							  Otherwise they will be broken and unreadable
-						-->
-						<resource>
-								<directory>src/main/resources</directory>
-								<filtering>true</filtering>
-								<excludes>
-									<exclude>clds/aaf/**</exclude>
-								</excludes>
-						</resource>
-						<resource>
-								<directory>src/main/resources</directory>
-								<filtering>false</filtering>
-								<includes>
-									<include>clds/aaf/**</include>
-								</includes>
-						</resource>
-						<resource>
-							<directory>${ui.react.src}</directory>
-							<includes>
-								<include>src/**</include>
-								<include>public/**</include>
-								<include>package.json</include>
-								<include>package-lock.json</include>
-							</includes>
-							<filtering>false</filtering>
-							<targetPath>${project.build.directory}/${ui.react.src}</targetPath>
-						</resource>
-				</resources>
+		<testResources>
+			<testResource>
+				<directory>src/test/resources</directory>
+				<excludes>
+					<exclude>**/*.jks</exclude>
+					<exclude>**/*.csar</exclude>
+				</excludes>
+				<filtering>true</filtering>
+			</testResource>
+			<testResource>
+				<directory>src/test/resources/https</directory>
+				<includes>
+					<include>**.jks</include>
+				</includes>
+				<filtering>false</filtering>
+				<targetPath>https</targetPath>
+			</testResource>
+			<testResource>
+				<directory>src/test/resources/example/sdc</directory>
+				<includes>
+					<include>**.csar</include>
+				</includes>
+				<filtering>false</filtering>
+				<targetPath>example/sdc</targetPath>
+			</testResource>
+		</testResources>
+		<resources>
+			<!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise 
+				they will be broken and unreadable -->
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>clds/aaf/**</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>clds/aaf/**</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>${ui.react.src}</directory>
+				<includes>
+					<include>src/**</include>
+					<include>public/**</include>
+					<include>package.json</include>
+					<include>package-lock.json</include>
+				</includes>
+				<filtering>true</filtering>
+				<targetPath>${project.build.directory}/${ui.react.src}</targetPath>
+			</resource>
+		</resources>
 
-				<plugins>
-						<plugin>
-							<groupId>de.jpdigital</groupId>
-							<artifactId>hibernate52-ddl-maven-plugin</artifactId>
-							<version>2.2.0</version>
-							<dependencies>
-								<dependency>
-									<groupId>javax.xml.bind</groupId>
-									<artifactId>jaxb-api</artifactId>
-									<version>2.3.0</version>
-								</dependency>
-							</dependencies>
-							<executions>
-								<execution>
-									<phase>process-classes</phase>
-									<goals>
-										<goal>gen-ddl</goal>
-									</goals>
-									<configuration>
-										<packages><param>org.onap.clamp.dao.model</param></packages>
-										<dialects><param>MARIADB53</param></dialects>
-										<outputDirectory>${project.basedir}/extra/sql/bulkload/</outputDirectory>
-										<outputFileNameSuffix>create-tables</outputFileNameSuffix>
-										<!-- <createDropStatements>true</createDropStatements> -->
-										<omitDialectFromFileName>true</omitDialectFromFileName>
-									</configuration>
-								</execution>
-							</executions>
+		<plugins>
+			<plugin>
+				<groupId>de.jpdigital</groupId>
+				<artifactId>hibernate52-ddl-maven-plugin</artifactId>
+				<version>2.2.0</version>
+				<dependencies>
+					<dependency>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+						<version>2.3.0</version>
+					</dependency>
+				</dependencies>
+				<executions>
+					<execution>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>gen-ddl</goal>
+						</goals>
+						<configuration>
+							<packages>
+								<param>org.onap.clamp.dao.model</param>
+							</packages>
+							<dialects>
+								<param>MARIADB53</param>
+							</dialects>
+							<outputDirectory>${project.basedir}/extra/sql/bulkload/</outputDirectory>
+							<outputFileNameSuffix>create-tables</outputFileNameSuffix>
+							<!-- <createDropStatements>true</createDropStatements> -->
+							<omitDialectFromFileName>true</omitDialectFromFileName>
+						</configuration>
+					</execution>
+				</executions>
 
-						</plugin>
-						<!-- Read the swagger.json file and the definition from SwaggerConfig.java;
-							generate a list of .adoc files containing the APIs info in more structured
-							way -->
-						<plugin>
-								<groupId>io.github.swagger2markup</groupId>
-								<artifactId>swagger2markup-maven-plugin</artifactId>
-								<version>1.3.3</version>
-								<dependencies>
-										<dependency>
-												<groupId>io.github.swagger2markup</groupId>
-												<artifactId>swagger2markup-import-files-ext</artifactId>
-												<version>1.3.3</version>
-										</dependency>
-										<dependency>
-												<groupId>io.github.swagger2markup</groupId>
-												<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
-												<version>1.3.3</version>
-										</dependency>
-								</dependencies>
-								<configuration>
-										<swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
-										<outputDir>${project.build.directory}/asciidoc/generated</outputDir>
-										<config>
-												<swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
-										</config>
-								</configuration>
-								<executions>
-										<execution>
-												<phase>post-integration-test</phase>
-												<goals>
-														<goal>convertSwagger2markup</goal>
-												</goals>
-										</execution>
-								</executions>
-						</plugin>
+			</plugin>
+			<!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate 
+				a list of .adoc files containing the APIs info in more structured way -->
+			<plugin>
+				<groupId>io.github.swagger2markup</groupId>
+				<artifactId>swagger2markup-maven-plugin</artifactId>
+				<version>1.3.3</version>
+				<dependencies>
+					<dependency>
+						<groupId>io.github.swagger2markup</groupId>
+						<artifactId>swagger2markup-import-files-ext</artifactId>
+						<version>1.3.3</version>
+					</dependency>
+					<dependency>
+						<groupId>io.github.swagger2markup</groupId>
+						<artifactId>swagger2markup-spring-restdocs-ext</artifactId>
+						<version>1.3.3</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<swaggerInput>${project.basedir}/docs/swagger/swagger.json</swaggerInput>
+					<outputDir>${project.build.directory}/asciidoc/generated</outputDir>
+					<config>
+						<swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
+					</config>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>convertSwagger2markup</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
-						<!-- Run the generated asciidoc through Asciidoctor to generate other
-								documentation types, such as PDFs or HTML5 -->
-						<plugin>
-								<groupId>org.asciidoctor</groupId>
-								<artifactId>asciidoctor-maven-plugin</artifactId>
-								<version>1.5.7.1</version>
-								<dependencies>
-										<dependency>
-												<groupId>org.asciidoctor</groupId>
-												<artifactId>asciidoctorj-pdf</artifactId>
-												<version>1.5.0-alpha.10.1</version>
-										</dependency>
-								</dependencies>
-								<configuration>
-										<sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
-										<sourceDocumentName>swagger.adoc</sourceDocumentName>
-										<attributes>
-												<doctype>book</doctype>
-												<toc>left</toc>
-												<toclevels>3</toclevels>
-												<numbered/>
-												<hardbreaks/>
-												<sectlinks/>
-												<sectanchors/>
-												<generated>${project.build.directory}/asciidoc/generated</generated>
-										</attributes>
-								</configuration>
+			<!-- Run the generated asciidoc through Asciidoctor to generate other documentation 
+				types, such as PDFs or HTML5 -->
+			<plugin>
+				<groupId>org.asciidoctor</groupId>
+				<artifactId>asciidoctor-maven-plugin</artifactId>
+				<version>1.5.7.1</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctorj-pdf</artifactId>
+						<version>1.5.0-alpha.10.1</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<sourceDirectory>${project.basedir}/src/main/resources/asciidoc</sourceDirectory>
+					<sourceDocumentName>swagger.adoc</sourceDocumentName>
+					<attributes>
+						<doctype>book</doctype>
+						<toc>left</toc>
+						<toclevels>3</toclevels>
+						<numbered />
+						<hardbreaks />
+						<sectlinks />
+						<sectanchors />
+						<generated>${project.build.directory}/asciidoc/generated</generated>
+					</attributes>
+				</configuration>
 
-								<executions>
-										<execution>
-												<id>output-html</id>
-												<phase>post-integration-test</phase>
-												<goals>
-														<goal>process-asciidoc</goal>
-												</goals>
-												<configuration>
-														<backend>html5</backend>
-														<outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
-														<outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
-												</configuration>
-										</execution>
-										<execution>
-												<id>output-pdf</id>
-												<phase>post-integration-test</phase>
-												<goals>
-														<goal>process-asciidoc</goal>
-												</goals>
-												<configuration>
-														<backend>pdf</backend>
-														<outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
-												</configuration>
-										</execution>
-								</executions>
-						</plugin>
-						<plugin>
-								<groupId>org.codehaus.groovy.maven</groupId>
-								<artifactId>gmaven-plugin</artifactId>
-								<version>1.0</version>
-								<executions>
-										<execution>
-												<phase>validate</phase>
-												<goals>
-														<goal>execute</goal>
-												</goals>
-												<configuration>
-														<source>${project.basedir}/src/main/script/TagVersion.groovy</source>
-												</configuration>
-										</execution>
-								</executions>
-						</plugin>
-						<plugin>
-								<groupId>org.apache.maven.plugins</groupId>
-								<artifactId>maven-jar-plugin</artifactId>
-								<version>3.0.2</version>
-								<executions>
-										<execution>
-												<id>jar-with-only-classes</id>
-												<phase>package</phase>
-												<goals>
-														<goal>jar</goal>
-												</goals>
-												<configuration>
-														<classifier>classes</classifier>
-														<includes>
-																<include>org/**</include>
-														</includes>
-												</configuration>
-										</execution>
-								</executions>
-						</plugin>
-						<plugin>
-								<groupId>org.codehaus.mojo</groupId>
-								<artifactId>build-helper-maven-plugin</artifactId>
-								<version>3.0.0</version>
-								<executions>
-										<execution>
-												<goals>
-														<goal>attach-artifact</goal>
-												</goals>
-												<phase>package</phase>
-												<configuration>
-														<artifacts>
-																<artifact>
-																		<file>${project.build.directory}/clamp-classes.jar</file>
-																		<type>jar</type>
-																		<classifier>classes</classifier>
-																</artifact>
-														</artifacts>
-												</configuration>
-										</execution>
-										<execution>
-											<id>reserve-port-for-tests</id>
-											<phase>process-resources</phase>
-											<goals>
-												<goal>reserve-network-port</goal>
-											</goals>
-											<configuration>
-												<portNames>
-													<portName>docker.mariadb.port.host</portName>
-													<portName>docker.http-cache.port.host</portName>
-													<portName>clamp.it.tests.http-redirected</portName>
-													<portName>clamp.it.tests.https</portName>
-													<portName>clamp.it.tests.http</portName>
-												</portNames>
-											</configuration>
-										</execution>
-								</executions>
-						</plugin>
+				<executions>
+					<execution>
+						<id>output-html</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>process-asciidoc</goal>
+						</goals>
+						<configuration>
+							<backend>html5</backend>
+							<outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+							<outputDirectory>${project.basedir}/src/main/resources/META-INF/resources/</outputDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>output-pdf</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>process-asciidoc</goal>
+						</goals>
+						<configuration>
+							<backend>pdf</backend>
+							<outputDirectory>${project.basedir}/docs/swagger</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>${project.basedir}/src/main/script/TagVersion.groovy</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.0.2</version>
+				<executions>
+					<execution>
+						<id>jar-with-only-classes</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>classes</classifier>
+							<includes>
+								<include>org/**</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/clamp-classes.jar</file>
+									<type>jar</type>
+									<classifier>classes</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+					<execution>
+						<id>reserve-port-for-tests</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>reserve-network-port</goal>
+						</goals>
+						<configuration>
+							<portNames>
+								<portName>docker.mariadb.port.host</portName>
+								<portName>docker.http-cache.port.host</portName>
+								<portName>clamp.it.tests.http-redirected</portName>
+								<portName>clamp.it.tests.https</portName>
+								<portName>clamp.it.tests.http</portName>
+							</portNames>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
-						<plugin>
-								<groupId>org.springframework.boot</groupId>
-								<artifactId>spring-boot-maven-plugin</artifactId>
-								<!-- Temporary fix -->
-								<version>1.5.13.RELEASE</version>
-								<!-- <version>${springboot.version}</version> -->
-								<executions>
-										<execution>
-												<goals>
-														<goal>repackage</goal>
-												</goals>
-												<phase>package</phase>
-										</execution>
-								</executions>
-						</plugin>
-						<plugin>
-								<groupId>org.apache.maven.plugins</groupId>
-								<artifactId>maven-surefire-plugin</artifactId>
-								<version>2.22.1</version>
-								<configuration>
-										<forkCount>1C</forkCount>
-										<reuseForks>true</reuseForks>
-										<useSystemClassLoader>false</useSystemClassLoader>
-										<argLine>${surefireArgLine}</argLine>
-								</configuration>
-						</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<!-- Temporary fix -->
+				<version>1.5.13.RELEASE</version>
+				<!-- <version>${springboot.version}</version> -->
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<phase>package</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.1</version>
+				<configuration>
+					<forkCount>1C</forkCount>
+					<reuseForks>true</reuseForks>
+					<useSystemClassLoader>false</useSystemClassLoader>
+					<argLine>${surefireArgLine}</argLine>
+				</configuration>
+			</plugin>
 
-						<plugin>
-								<groupId>org.apache.maven.plugins</groupId>
-								<artifactId>maven-failsafe-plugin</artifactId>
-								<version>2.22.1</version>
-								<executions>
-										<execution>
-												<id>integration-tests</id>
-												<goals>
-														<goal>integration-test</goal>
-														<goal>verify</goal>
-												</goals>
-												<configuration>
-														<additionalClasspathElements>
-															<additionalClasspathElement>${project.build.directory}/classes</additionalClasspathElement>
-														</additionalClasspathElements>
-														<includes>
-																<include>**/*ItCase.java</include>
-														</includes>
-														<forkCount>1</forkCount>
-														<reuseForks>true</reuseForks>
-														<useSystemClassLoader>false</useSystemClassLoader>
-														<argLine>${failsafeArgLine}</argLine>
-												</configuration>
-										</execution>
-								</executions>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.22.1</version>
+				<executions>
+					<execution>
+						<id>integration-tests</id>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+						<configuration>
+							<additionalClasspathElements>
+								<additionalClasspathElement>${project.build.directory}/classes</additionalClasspathElement>
+							</additionalClasspathElements>
+							<includes>
+								<include>**/*ItCase.java</include>
+							</includes>
+							<forkCount>1</forkCount>
+							<reuseForks>true</reuseForks>
+							<useSystemClassLoader>false</useSystemClassLoader>
+							<argLine>${failsafeArgLine}</argLine>
+						</configuration>
+					</execution>
+				</executions>
 
-						</plugin>
-						<plugin>
-								<groupId>io.fabric8</groupId>
-								<artifactId>docker-maven-plugin</artifactId>
-								<version>0.27.2</version>
-								<dependencies>
-									<dependency>
-										<groupId>org.apache.httpcomponents</groupId>
-										<artifactId>httpclient</artifactId>
-										<version>4.5.5</version>
-									</dependency>
-								</dependencies>
-								<configuration>
-										<verbose>true</verbose>
-										<apiVersion>1.35</apiVersion>
-										<images>
-												<image>
-														<name>library/mariadb:10.3.12</name>
-														<alias>mariadb</alias>
-														<run>
-																<env>
-																		<MYSQL_ROOT_PASSWORD>strong_pitchou</MYSQL_ROOT_PASSWORD>
-																</env>
-																<hostname>mariadb</hostname>
-																<volumes>
-																		<bind>
-																				<volume>${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d</volume>
-																				<volume>${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d</volume>
-																		</bind>
-																</volumes>
-																<wait>
-																		<log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
-																		<time>600000</time>
-																</wait>
-																<ports>
-																		<port>${docker.mariadb.port.host}:3306</port>
-																</ports>
-														</run>
-												</image>
-												<image>
-														<name>library/python:2-slim</name>
-														<alias>python</alias>
-														<run>
-																<hostname>python</hostname>
-																<volumes>
-																		<bind>
-																				<volume>${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app</volume>
-																				<volume>${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache</volume>
-																		</bind>
-																</volumes>
-																<wait>
-																		<tcp>
-																				<ports>
-																						<port>8080</port>
-																				</ports>
-																				<mode>direct</mode>
-																		</tcp>
-																		<time>120000</time>
-																</wait>
-																<ports>
-																		<port>${docker.http-cache.port.host}:8080</port>
-																</ports>
-																<workingDir>/usr/src/http-cache-app</workingDir>
-																<cmd>
-																		<shell>./start_http_cache.sh ${python.http.proxy.param} --python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
-																</cmd>
-														</run>
-												</image>
-												<image>
-														<name>onap/clamp-backend</name>
-														<alias>onap-clamp-backend</alias>
-														<run>
-															<skip>true</skip>
-														</run>
-														<build>
-																<cleanup>true</cleanup>
-																<tags>
-																		<tag>latest</tag>
-																		<tag>${project.docker.latesttagtimestamp.version}</tag>
-																		<tag>${project.docker.latesttag.version}</tag>
-																</tags>
-																<!-- A relative path is looked up in ${project.basedir}/src/main/docker
-																		by default -->
-																<dockerFile>backend/Dockerfile</dockerFile>
-																<assembly>
-																		<descriptor>backend/backend-files.xml</descriptor>
-																		<name>onap-clamp-backend</name>
-																</assembly>
-														</build>
-												</image>
-												<image>
-														<name>onap/clamp-frontend</name>
-														<alias>onap-clamp-frontend</alias>
-														<run>
-															<skip>true</skip>
-														</run>
-														<build>
-																<cleanup>true</cleanup>
-																<tags>
-																		<tag>latest</tag>
-																		<tag>${project.docker.latesttagtimestamp.version}</tag>
-																		<tag>${project.docker.latesttag.version}</tag>
-																</tags>
-																<!-- A relative path is looked up in ${project.basedir}/src/main/docker
-																		by default -->
-																<dockerFile>frontend/Dockerfile</dockerFile>
-																<assembly>
-																		<descriptor>frontend/frontend-files.xml</descriptor>
-																		<name>onap-clamp-frontend</name>
-																</assembly>
-														</build>
-												</image>
-												<image>
-														<name>onap/clamp-dashboard-elasticsearch</name>
-														<alias>onap-clamp-dashboard-elasticsearch</alias>
-														<run>
-															<skip>true</skip>
-														</run>
-														<build>
-																<cleanup>true</cleanup>
-																<tags>
-																		<tag>latest</tag>
-																		<tag>${project.docker.latesttagtimestamp.version}</tag>
-																		<tag>${project.docker.latesttag.version}</tag>
-																</tags>
-																<dockerFile>elasticsearch/Dockerfile</dockerFile>
-														</build>
-												</image>
-												<image>
-														<name>onap/clamp-dashboard-logstash</name>
-														<alias>onap-clamp-dashboard-logstash</alias>
-														<run>
-															<skip>true</skip>
-														</run>
-														<build>
-																<cleanup>true</cleanup>
-																<tags>
-																		<tag>latest</tag>
-																		<tag>${project.docker.latesttagtimestamp.version}</tag>
-																		<tag>${project.docker.latesttag.version}</tag>
-																</tags>
-																<dockerFile>logstash/Dockerfile</dockerFile>
-														</build>
-												</image>
-												<image>
-														<name>onap/clamp-dashboard-kibana</name>
-														<alias>onap-clamp-dashboard-kibana</alias>
-														<run>
-															<skip>true</skip>
-														</run>
-														<build>
-																<cleanup>true</cleanup>
-																<tags>
-																		<tag>latest</tag>
-																		<tag>${project.docker.latesttagtimestamp.version}</tag>
-																		<tag>${project.docker.latesttag.version}</tag>
-																</tags>
-																<dockerFile>kibana/Dockerfile</dockerFile>
-														</build>
-												</image>
-										</images>
-								</configuration>
+			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.27.2</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.httpcomponents</groupId>
+						<artifactId>httpclient</artifactId>
+						<version>4.5.5</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<verbose>true</verbose>
+					<apiVersion>1.35</apiVersion>
+					<images>
+						<image>
+							<name>library/mariadb:10.3.12</name>
+							<alias>mariadb</alias>
+							<run>
+								<env>
+									<MYSQL_ROOT_PASSWORD>strong_pitchou</MYSQL_ROOT_PASSWORD>
+								</env>
+								<hostname>mariadb</hostname>
+								<volumes>
+									<bind>
+										<volume>${project.basedir}/extra/sql/:/docker-entrypoint-initdb.d</volume>
+										<volume>${project.basedir}/extra/docker/mariadb/conf1:/etc/mysql/conf.d</volume>
+									</bind>
+								</volumes>
+								<wait>
+									<log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
+									<time>600000</time>
+								</wait>
+								<ports>
+									<port>${docker.mariadb.port.host}:3306</port>
+								</ports>
+							</run>
+						</image>
+						<image>
+							<name>library/python:2-slim</name>
+							<alias>python</alias>
+							<run>
+								<hostname>python</hostname>
+								<volumes>
+									<bind>
+										<volume>${project.basedir}/src/test/resources/http-cache/:/usr/src/http-cache-app</volume>
+										<volume>${project.basedir}/src/test/resources/http-cache/example/:/usr/src/http-cache-app/data-cache</volume>
+									</bind>
+								</volumes>
+								<wait>
+									<tcp>
+										<ports>
+											<port>8080</port>
+										</ports>
+										<mode>direct</mode>
+									</tcp>
+									<time>120000</time>
+								</wait>
+								<ports>
+									<port>${docker.http-cache.port.host}:8080</port>
+								</ports>
+								<workingDir>/usr/src/http-cache-app</workingDir>
+								<cmd>
+									<shell>./start_http_cache.sh ${python.http.proxy.param}
+										--python_proxyaddress=localhost:${docker.http-cache.port.host}</shell>
+								</cmd>
+							</run>
+						</image>
+						<image>
+							<name>onap/clamp-backend</name>
+							<alias>onap-clamp-backend</alias>
+							<run>
+								<skip>true</skip>
+							</run>
+							<build>
+								<cleanup>true</cleanup>
+								<tags>
+									<tag>latest</tag>
+									<tag>${project.docker.latesttagtimestamp.version}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
+								</tags>
+								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by 
+									default -->
+								<dockerFile>backend/Dockerfile</dockerFile>
+								<assembly>
+									<descriptor>backend/backend-files.xml</descriptor>
+									<name>onap-clamp-backend</name>
+								</assembly>
+							</build>
+						</image>
+						<image>
+							<name>onap/clamp-frontend</name>
+							<alias>onap-clamp-frontend</alias>
+							<run>
+								<skip>true</skip>
+							</run>
+							<build>
+								<cleanup>true</cleanup>
+								<tags>
+									<tag>latest</tag>
+									<tag>${project.docker.latesttagtimestamp.version}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
+								</tags>
+								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by 
+									default -->
+								<dockerFile>frontend/Dockerfile</dockerFile>
+								<assembly>
+									<descriptor>frontend/frontend-files.xml</descriptor>
+									<name>onap-clamp-frontend</name>
+								</assembly>
+							</build>
+						</image>
+						<image>
+							<name>onap/clamp-dashboard-elasticsearch</name>
+							<alias>onap-clamp-dashboard-elasticsearch</alias>
+							<run>
+								<skip>true</skip>
+							</run>
+							<build>
+								<cleanup>true</cleanup>
+								<tags>
+									<tag>latest</tag>
+									<tag>${project.docker.latesttagtimestamp.version}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
+								</tags>
+								<dockerFile>elasticsearch/Dockerfile</dockerFile>
+							</build>
+						</image>
+						<image>
+							<name>onap/clamp-dashboard-logstash</name>
+							<alias>onap-clamp-dashboard-logstash</alias>
+							<run>
+								<skip>true</skip>
+							</run>
+							<build>
+								<cleanup>true</cleanup>
+								<tags>
+									<tag>latest</tag>
+									<tag>${project.docker.latesttagtimestamp.version}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
+								</tags>
+								<dockerFile>logstash/Dockerfile</dockerFile>
+							</build>
+						</image>
+						<image>
+							<name>onap/clamp-dashboard-kibana</name>
+							<alias>onap-clamp-dashboard-kibana</alias>
+							<run>
+								<skip>true</skip>
+							</run>
+							<build>
+								<cleanup>true</cleanup>
+								<tags>
+									<tag>latest</tag>
+									<tag>${project.docker.latesttagtimestamp.version}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
+								</tags>
+								<dockerFile>kibana/Dockerfile</dockerFile>
+							</build>
+						</image>
+					</images>
+				</configuration>
 
-								<executions>
-										<execution>
-												<id>generate-images</id>
-												<phase>install</phase>
-												<goals>
-														<goal>build</goal>
-												</goals>
-										</execution>
-										<execution>
-												<id>push-images</id>
-												<phase>deploy</phase>
-												<goals>
-														<goal>push</goal>
-												</goals>
-										</execution>
-										<execution>
-												<id>docker-start-for-it</id>
-												<phase>pre-integration-test</phase>
-												<goals>
-														<goal>start</goal>
-												</goals>
-										</execution>
-										<execution>
-												<id>docker-stop-for-it</id>
-												<phase>post-integration-test</phase>
-												<goals>
-														<goal>stop</goal>
-												</goals>
-										</execution>
-								</executions>
-						</plugin>
+				<executions>
+					<execution>
+						<id>generate-images</id>
+						<phase>install</phase>
+						<goals>
+							<goal>build</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>push-images</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>push</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>docker-start-for-it</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>start</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>docker-stop-for-it</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
-						<plugin>
-								<groupId>org.jacoco</groupId>
-								<artifactId>jacoco-maven-plugin</artifactId>
-								<version>0.8.2</version>
-								<configuration>
-										<dumpOnExit>true</dumpOnExit>
-										<append>true</append>
-										<includes>
-												<include>org.onap.clamp.*</include>
-										</includes>
-								</configuration>
-								<executions>
-										<execution>
-												<id>pre-unit-test</id>
-												<goals>
-														<goal>prepare-agent</goal>
-												</goals>
-												<configuration>
-														<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-														<propertyName>surefireArgLine</propertyName>
-														<!-- <append>true</append> -->
-												</configuration>
-										</execution>
-										<execution>
-												<id>pre-integration-test</id>
-												<phase>pre-integration-test</phase>
-												<goals>
-														<goal>prepare-agent</goal>
-												</goals>
-												<configuration>
-														<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-														<propertyName>failsafeArgLine</propertyName>
-														<!-- <append>true</append> -->
-												</configuration>
-										</execution>
-										<execution>
-												<goals>
-														<goal>merge</goal>
-												</goals>
-												<phase>post-integration-test</phase>
-												<configuration>
-														<fileSets>
-																<fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-																		<directory>${project.build.directory}/coverage-reports</directory>
-																		<includes>
-																				<include>*.exec</include>
-																		</includes>
-																</fileSet>
-														</fileSets>
-														<destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-												</configuration>
-										</execution>
-								</executions>
-						</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.2</version>
+				<configuration>
+					<dumpOnExit>true</dumpOnExit>
+					<append>true</append>
+					<includes>
+						<include>org.onap.clamp.*</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>pre-unit-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+							<propertyName>surefireArgLine</propertyName>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+						<id>pre-integration-test</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+							<propertyName>failsafeArgLine</propertyName>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+						<goals>
+							<goal>merge</goal>
+						</goals>
+						<phase>post-integration-test</phase>
+						<configuration>
+							<fileSets>
+								<fileSet
+									implementation="org.apache.maven.shared.model.fileset.FileSet">
+									<directory>${project.build.directory}/coverage-reports</directory>
+									<includes>
+										<include>*.exec</include>
+									</includes>
+								</fileSet>
+							</fileSets>
+							<destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
-						<!-- This plugin will be useful when we will have multi-modules project -->
-						<plugin>
-								<groupId>org.codehaus.mojo</groupId>
-								<artifactId>versions-maven-plugin</artifactId>
-								<version>1.3.1</version>
-						</plugin>
+			<!-- This plugin will be useful when we will have multi-modules project -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<version>1.3.1</version>
+			</plugin>
 
-					<plugin>
-						<groupId>com.github.eirslett</groupId>
-						<artifactId>frontend-maven-plugin</artifactId>
-						<version>1.8.0</version>
+			<plugin>
+				<groupId>com.github.eirslett</groupId>
+				<artifactId>frontend-maven-plugin</artifactId>
+				<version>1.8.0</version>
+				<configuration>
+					<installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
+					<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
+				</configuration>
+				<executions>
+					<execution>
+						<id>install_node_and_npm</id>
+						<goals>
+							<goal>install-node-and-npm</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<nodeVersion>v12.10.0</nodeVersion>
+							<npmVersion>6.10.3</npmVersion>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_install</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>install</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_test</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>test</phase>
+						<configuration>
+							<arguments>run-script test:coverage</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_publish</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>deploy</phase>
 						<configuration>
-							<installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
-							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
+							<skip>true</skip>
+							<arguments>publish --registry ${npm.publish.url}</arguments>
 						</configuration>
-						<executions>
-							<execution>
-								<id>install_node_and_npm</id>
-								<goals>
-									<goal>install-node-and-npm</goal>
-								</goals>
-								<phase>generate-sources</phase>
-								<configuration>
-									<nodeVersion>v8.11.1</nodeVersion>
-									<npmVersion>5.6.0</npmVersion>
-								</configuration>
-							</execution>
-							<execution>
-								<id>npm_install</id>
-								<goals>
-									<goal>npm</goal>
-								</goals>
-								<phase>compile</phase>
-								<configuration>
-									<arguments>install</arguments>
-								</configuration>
-							</execution>
-							<execution>
-								<id>npm_test</id>
-								<goals>
-									<goal>npm</goal>
-								</goals>
-								<phase>test</phase>
-								<configuration>
-									<arguments>run-script test</arguments>
-								</configuration>
-							</execution>
-								<execution>
-									<id>npm_publish</id>
-									<goals>
-										<goal>npm</goal>
-									</goals>
-									<phase>deploy</phase>
-									<configuration>
-									    <skip>true</skip>
-										<arguments>publish --registry ${npm.publish.url}</arguments>
-									</configuration>
-								</execution>
-						</executions>
-					</plugin>
-				</plugins>
-		</build>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile
index 8cdad3088..279e94d50 100644
--- a/src/main/docker/frontend/Dockerfile
+++ b/src/main/docker/frontend/Dockerfile
@@ -22,7 +22,7 @@
 ###
 
 # build environment
-FROM node:12.4-alpine as build
+FROM node:12.10.0-alpine as build
 WORKDIR /app
 #ENV PATH /app/node_modules/.bin:$PATH
 COPY onap-clamp-frontend/ /app/
@@ -48,7 +48,7 @@ RUN chmod a+rwx /var/log/onap
 COPY --from=build /app/build /usr/share/nginx/html
 COPY --from=build /app/ssl /etc/ssl
 RUN rm /etc/nginx/conf.d/default.conf
-#COPY onap-clamp-frontend/nginx/nginx.conf /etc/nginx/conf.d
+RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
 COPY nginx/nginx.conf /etc/nginx/conf.d
 EXPOSE 443
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 8257d87d5..0a0a877cd 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,7 +444,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route23">2.1. PUT /v1/clds/action/{action}/{modelName}?test={test}</a>
+<li><a href="#_route187">2.1. PUT /v1/clds/action/{action}/{modelName}?test={test}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters">2.1.1. Parameters</a></li>
 <li><a href="#_responses">2.1.2. Responses</a></li>
@@ -452,19 +452,19 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces">2.1.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route15">2.2. GET /v1/clds/cldsDetails</a>
+<li><a href="#_route179">2.2. GET /v1/clds/cldsDetails</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route16">2.3. GET /v1/clds/cldsInfo</a>
+<li><a href="#_route180">2.3. GET /v1/clds/cldsInfo</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route24">2.4. POST /v1/clds/dcae/event?test={test}</a>
+<li><a href="#_route188">2.4. POST /v1/clds/dcae/event?test={test}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_2">2.4.1. Parameters</a></li>
 <li><a href="#_responses_4">2.4.2. Responses</a></li>
@@ -472,7 +472,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_4">2.4.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route26">2.5. PUT /v1/clds/deploy/{modelName}</a>
+<li><a href="#_route190">2.5. PUT /v1/clds/deploy/{modelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_3">2.5.1. Parameters</a></li>
 <li><a href="#_responses_5">2.5.2. Responses</a></li>
@@ -480,34 +480,34 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_5">2.5.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route22">2.6. GET /v1/clds/model-names</a>
+<li><a href="#_route186">2.6. GET /v1/clds/model-names</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_6">2.6.1. Responses</a></li>
 <li><a href="#_produces_6">2.6.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route18">2.7. GET /v1/clds/model/bpmn/{modelName}</a>
+<li><a href="#_route182">2.7. GET /v1/clds/model/bpmn/{modelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_4">2.7.1. Parameters</a></li>
 <li><a href="#_responses_7">2.7.2. Responses</a></li>
 <li><a href="#_produces_7">2.7.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route19">2.8. GET /v1/clds/model/image/{modelName}</a>
+<li><a href="#_route183">2.8. GET /v1/clds/model/image/{modelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_5">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
 <li><a href="#_produces_8">2.8.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route20">2.9. GET /v1/clds/model/{modelName}</a>
+<li><a href="#_route184">2.9. GET /v1/clds/model/{modelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_6">2.9.1. Parameters</a></li>
 <li><a href="#_responses_9">2.9.2. Responses</a></li>
 <li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route21">2.10. PUT /v1/clds/model/{modelName}</a>
+<li><a href="#_route185">2.10. PUT /v1/clds/model/{modelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_7">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
@@ -515,13 +515,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_10">2.10.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route25">2.11. GET /v1/clds/properties</a>
+<li><a href="#_route189">2.11. GET /v1/clds/properties</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_11">2.11.1. Responses</a></li>
 <li><a href="#_produces_11">2.11.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route27">2.12. PUT /v1/clds/undeploy/{modelName}</a>
+<li><a href="#_route191">2.12. PUT /v1/clds/undeploy/{modelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_8">2.12.1. Parameters</a></li>
 <li><a href="#_responses_12">2.12.2. Responses</a></li>
@@ -529,34 +529,34 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_12">2.12.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route32">2.13. GET /v1/cldsTempate/template-names</a>
+<li><a href="#_route196">2.13. GET /v1/cldsTempate/template-names</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_13">2.13.1. Responses</a></li>
 <li><a href="#_produces_13">2.13.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route28">2.14. GET /v1/cldsTempate/template/bpmn/{templateName}</a>
+<li><a href="#_route192">2.14. GET /v1/cldsTempate/template/bpmn/{templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_14">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route29">2.15. GET /v1/cldsTempate/template/image/{templateName}</a>
+<li><a href="#_route193">2.15. GET /v1/cldsTempate/template/image/{templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_10">2.15.1. Parameters</a></li>
 <li><a href="#_responses_15">2.15.2. Responses</a></li>
 <li><a href="#_produces_15">2.15.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route30">2.16. GET /v1/cldsTempate/template/{templateName}</a>
+<li><a href="#_route194">2.16. GET /v1/cldsTempate/template/{templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_11">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_16">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route31">2.17. PUT /v1/cldsTempate/template/{templateName}</a>
+<li><a href="#_route195">2.17. PUT /v1/cldsTempate/template/{templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_12">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
@@ -564,13 +564,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_17">2.17.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route40">2.18. GET /v1/dictionary</a>
+<li><a href="#_route204">2.18. GET /v1/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_18">2.18.1. Responses</a></li>
 <li><a href="#_produces_18">2.18.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route39">2.19. PUT /v1/dictionary/{dictionaryName}</a>
+<li><a href="#_route203">2.19. PUT /v1/dictionary/{dictionaryName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_13">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
@@ -593,19 +593,19 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_21">2.21.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route17">2.22. GET /v1/healthcheck</a>
+<li><a href="#_route181">2.22. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_22">2.22.1. Responses</a></li>
 <li><a href="#_produces_22">2.22.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route36">2.23. GET /v1/tosca/models</a>
+<li><a href="#_route200">2.23. GET /v1/tosca/models</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_23">2.23.1. Responses</a></li>
 <li><a href="#_produces_23">2.23.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route34">2.24. GET /v1/tosca/models/policyType/{policyType}</a>
+<li><a href="#_route198">2.24. GET /v1/tosca/models/policyType/{policyType}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_16">2.24.1. Parameters</a></li>
 <li><a href="#_responses_24">2.24.2. Responses</a></li>
@@ -619,7 +619,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_25">2.25.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route33">2.26. PUT /v1/tosca/models/{toscaModelName}</a>
+<li><a href="#_route197">2.26. PUT /v1/tosca/models/{toscaModelName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_18">2.26.1. Parameters</a></li>
 <li><a href="#_responses_26">2.26.2. Responses</a></li>
@@ -627,74 +627,74 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_26">2.26.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route41">2.27. GET /v1/user/getUser</a>
+<li><a href="#_route205">2.27. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_27">2.27.1. Responses</a></li>
 <li><a href="#_produces_27">2.27.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route13">2.28. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route177">2.28. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_19">2.28.1. Parameters</a></li>
 <li><a href="#_responses_28">2.28.2. Responses</a></li>
 </ul>
 </li>
-<li><a href="#_route8">2.29. PUT /v2/loop/deployLoop/{loopName}</a>
+<li><a href="#_route172">2.29. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_20">2.29.1. Parameters</a></li>
 <li><a href="#_responses_29">2.29.2. Responses</a></li>
 <li><a href="#_produces_28">2.29.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route2">2.30. GET /v2/loop/getAllNames</a>
+<li><a href="#_route166">2.30. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_30">2.30.1. Responses</a></li>
 <li><a href="#_produces_29">2.30.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route14">2.31. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route178">2.31. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_21">2.31.1. Parameters</a></li>
 <li><a href="#_responses_31">2.31.2. Responses</a></li>
 <li><a href="#_produces_30">2.31.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route11">2.32. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route175">2.32. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_22">2.32.1. Parameters</a></li>
 <li><a href="#_responses_32">2.32.2. Responses</a></li>
 <li><a href="#_produces_31">2.32.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route10">2.33. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route174">2.33. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_23">2.33.1. Parameters</a></li>
 <li><a href="#_responses_33">2.33.2. Responses</a></li>
 <li><a href="#_produces_32">2.33.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route12">2.34. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route176">2.34. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_24">2.34.1. Parameters</a></li>
 <li><a href="#_responses_34">2.34.2. Responses</a></li>
 <li><a href="#_produces_33">2.34.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route4">2.35. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route168">2.35. GET /v2/loop/svgRepresentation/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_25">2.35.1. Parameters</a></li>
 <li><a href="#_responses_35">2.35.2. Responses</a></li>
 <li><a href="#_produces_34">2.35.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route9">2.36. PUT /v2/loop/undeployLoop/{loopName}</a>
+<li><a href="#_route173">2.36. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_26">2.36.1. Parameters</a></li>
 <li><a href="#_responses_36">2.36.2. Responses</a></li>
 <li><a href="#_produces_35">2.36.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route5">2.37. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route169">2.37. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_27">2.37.1. Parameters</a></li>
 <li><a href="#_responses_37">2.37.2. Responses</a></li>
@@ -702,7 +702,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_36">2.37.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route7">2.38. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route171">2.38. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_28">2.38.1. Parameters</a></li>
 <li><a href="#_responses_38">2.38.2. Responses</a></li>
@@ -710,7 +710,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_37">2.38.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route6">2.39. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route170">2.39. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_29">2.39.1. Parameters</a></li>
 <li><a href="#_responses_39">2.39.2. Responses</a></li>
@@ -718,7 +718,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_38">2.39.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route3">2.40. GET /v2/loop/{loopName}</a>
+<li><a href="#_route167">2.40. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_30">2.40.1. Parameters</a></li>
 <li><a href="#_responses_40">2.40.2. Responses</a></li>
@@ -739,16 +739,18 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_cldstemplate">3.8. CldsTemplate</a></li>
 <li><a href="#_cldstoscamodel">3.9. CldsToscaModel</a></li>
 <li><a href="#_dcaeevent">3.10. DcaeEvent</a></li>
-<li><a href="#_jsonarray">3.11. JsonArray</a></li>
-<li><a href="#_jsonnull">3.12. JsonNull</a></li>
-<li><a href="#_jsonobject">3.13. JsonObject</a></li>
-<li><a href="#_jsonprimitive">3.14. JsonPrimitive</a></li>
-<li><a href="#_loop">3.15. Loop</a></li>
-<li><a href="#_looplog">3.16. LoopLog</a></li>
-<li><a href="#_microservicepolicy">3.17. MicroServicePolicy</a></li>
-<li><a href="#_number">3.18. Number</a></li>
-<li><a href="#_operationalpolicy">3.19. OperationalPolicy</a></li>
-<li><a href="#_valueitem">3.20. ValueItem</a></li>
+<li><a href="#_externalcomponent">3.11. ExternalComponent</a></li>
+<li><a href="#_externalcomponentstate">3.12. ExternalComponentState</a></li>
+<li><a href="#_jsonarray">3.13. JsonArray</a></li>
+<li><a href="#_jsonnull">3.14. JsonNull</a></li>
+<li><a href="#_jsonobject">3.15. JsonObject</a></li>
+<li><a href="#_jsonprimitive">3.16. JsonPrimitive</a></li>
+<li><a href="#_loop">3.17. Loop</a></li>
+<li><a href="#_looplog">3.18. LoopLog</a></li>
+<li><a href="#_microservicepolicy">3.19. MicroServicePolicy</a></li>
+<li><a href="#_number">3.20. Number</a></li>
+<li><a href="#_operationalpolicy">3.21. OperationalPolicy</a></li>
+<li><a href="#_valueitem">3.22. ValueItem</a></li>
 </ul>
 </li>
 </ul>
@@ -761,13 +763,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_version_information"><a class="anchor" href="#_version_information"></a><a class="link" href="#_version_information">1.1. Version information</a></h3>
 <div class="paragraph">
-<p><em>Version</em> : 4.0.3-SNAPSHOT</p>
+<p><em>Version</em> : 4.1.1-SNAPSHOT</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:46235<br>
+<p><em>Host</em> : localhost:43819<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -778,7 +780,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route23"><a class="anchor" href="#_route23"></a><a class="link" href="#_route23">2.1. PUT /v1/clds/action/{action}/{modelName}?test={test}</a></h3>
+<h3 id="_route187"><a class="anchor" href="#_route187"></a><a class="link" href="#_route187">2.1. PUT /v1/clds/action/{action}/{modelName}?test={test}</a></h3>
 <div class="sect3">
 <h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.1.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -859,7 +861,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.2. GET /v1/clds/cldsDetails</a></h3>
+<h3 id="_route179"><a class="anchor" href="#_route179"></a><a class="link" href="#_route179">2.2. GET /v1/clds/cldsDetails</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -896,7 +898,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route16"><a class="anchor" href="#_route16"></a><a class="link" href="#_route16">2.3. GET /v1/clds/cldsInfo</a></h3>
+<h3 id="_route180"><a class="anchor" href="#_route180"></a><a class="link" href="#_route180">2.3. GET /v1/clds/cldsInfo</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -933,7 +935,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route24"><a class="anchor" href="#_route24"></a><a class="link" href="#_route24">2.4. POST /v1/clds/dcae/event?test={test}</a></h3>
+<h3 id="_route188"><a class="anchor" href="#_route188"></a><a class="link" href="#_route188">2.4. POST /v1/clds/dcae/event?test={test}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_2"><a class="anchor" href="#_parameters_2"></a><a class="link" href="#_parameters_2">2.4.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1002,7 +1004,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.5. PUT /v1/clds/deploy/{modelName}</a></h3>
+<h3 id="_route190"><a class="anchor" href="#_route190"></a><a class="link" href="#_route190">2.5. PUT /v1/clds/deploy/{modelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_3"><a class="anchor" href="#_parameters_3"></a><a class="link" href="#_parameters_3">2.5.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1077,7 +1079,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.6. GET /v1/clds/model-names</a></h3>
+<h3 id="_route186"><a class="anchor" href="#_route186"></a><a class="link" href="#_route186">2.6. GET /v1/clds/model-names</a></h3>
 <div class="sect3">
 <h4 id="_responses_6"><a class="anchor" href="#_responses_6"></a><a class="link" href="#_responses_6">2.6.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1114,7 +1116,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.7. GET /v1/clds/model/bpmn/{modelName}</a></h3>
+<h3 id="_route182"><a class="anchor" href="#_route182"></a><a class="link" href="#_route182">2.7. GET /v1/clds/model/bpmn/{modelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.7.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1173,7 +1175,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route19"><a class="anchor" href="#_route19"></a><a class="link" href="#_route19">2.8. GET /v1/clds/model/image/{modelName}</a></h3>
+<h3 id="_route183"><a class="anchor" href="#_route183"></a><a class="link" href="#_route183">2.8. GET /v1/clds/model/image/{modelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_5"><a class="anchor" href="#_parameters_5"></a><a class="link" href="#_parameters_5">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1232,7 +1234,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.9. GET /v1/clds/model/{modelName}</a></h3>
+<h3 id="_route184"><a class="anchor" href="#_route184"></a><a class="link" href="#_route184">2.9. GET /v1/clds/model/{modelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.9.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1294,7 +1296,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route21"><a class="anchor" href="#_route21"></a><a class="link" href="#_route21">2.10. PUT /v1/clds/model/{modelName}</a></h3>
+<h3 id="_route185"><a class="anchor" href="#_route185"></a><a class="link" href="#_route185">2.10. PUT /v1/clds/model/{modelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1372,7 +1374,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.11. GET /v1/clds/properties</a></h3>
+<h3 id="_route189"><a class="anchor" href="#_route189"></a><a class="link" href="#_route189">2.11. GET /v1/clds/properties</a></h3>
 <div class="sect3">
 <h4 id="_responses_11"><a class="anchor" href="#_responses_11"></a><a class="link" href="#_responses_11">2.11.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1406,7 +1408,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route27"><a class="anchor" href="#_route27"></a><a class="link" href="#_route27">2.12. PUT /v1/clds/undeploy/{modelName}</a></h3>
+<h3 id="_route191"><a class="anchor" href="#_route191"></a><a class="link" href="#_route191">2.12. PUT /v1/clds/undeploy/{modelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.12.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1481,7 +1483,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route32"><a class="anchor" href="#_route32"></a><a class="link" href="#_route32">2.13. GET /v1/cldsTempate/template-names</a></h3>
+<h3 id="_route196"><a class="anchor" href="#_route196"></a><a class="link" href="#_route196">2.13. GET /v1/cldsTempate/template-names</a></h3>
 <div class="sect3">
 <h4 id="_responses_13"><a class="anchor" href="#_responses_13"></a><a class="link" href="#_responses_13">2.13.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1518,7 +1520,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route28"><a class="anchor" href="#_route28"></a><a class="link" href="#_route28">2.14. GET /v1/cldsTempate/template/bpmn/{templateName}</a></h3>
+<h3 id="_route192"><a class="anchor" href="#_route192"></a><a class="link" href="#_route192">2.14. GET /v1/cldsTempate/template/bpmn/{templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1577,7 +1579,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.15. GET /v1/cldsTempate/template/image/{templateName}</a></h3>
+<h3 id="_route193"><a class="anchor" href="#_route193"></a><a class="link" href="#_route193">2.15. GET /v1/cldsTempate/template/image/{templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.15.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1636,7 +1638,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.16. GET /v1/cldsTempate/template/{templateName}</a></h3>
+<h3 id="_route194"><a class="anchor" href="#_route194"></a><a class="link" href="#_route194">2.16. GET /v1/cldsTempate/template/{templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1698,7 +1700,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.17. PUT /v1/cldsTempate/template/{templateName}</a></h3>
+<h3 id="_route195"><a class="anchor" href="#_route195"></a><a class="link" href="#_route195">2.17. PUT /v1/cldsTempate/template/{templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1776,7 +1778,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route40"><a class="anchor" href="#_route40"></a><a class="link" href="#_route40">2.18. GET /v1/dictionary</a></h3>
+<h3 id="_route204"><a class="anchor" href="#_route204"></a><a class="link" href="#_route204">2.18. GET /v1/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_responses_18"><a class="anchor" href="#_responses_18"></a><a class="link" href="#_responses_18">2.18.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1813,7 +1815,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route39"><a class="anchor" href="#_route39"></a><a class="link" href="#_route39">2.19. PUT /v1/dictionary/{dictionaryName}</a></h3>
+<h3 id="_route203"><a class="anchor" href="#_route203"></a><a class="link" href="#_route203">2.19. PUT /v1/dictionary/{dictionaryName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2031,7 +2033,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route17"><a class="anchor" href="#_route17"></a><a class="link" href="#_route17">2.22. GET /v1/healthcheck</a></h3>
+<h3 id="_route181"><a class="anchor" href="#_route181"></a><a class="link" href="#_route181">2.22. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses_22"><a class="anchor" href="#_responses_22"></a><a class="link" href="#_responses_22">2.22.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2065,7 +2067,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route36"><a class="anchor" href="#_route36"></a><a class="link" href="#_route36">2.23. GET /v1/tosca/models</a></h3>
+<h3 id="_route200"><a class="anchor" href="#_route200"></a><a class="link" href="#_route200">2.23. GET /v1/tosca/models</a></h3>
 <div class="sect3">
 <h4 id="_responses_23"><a class="anchor" href="#_responses_23"></a><a class="link" href="#_responses_23">2.23.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2102,7 +2104,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route34"><a class="anchor" href="#_route34"></a><a class="link" href="#_route34">2.24. GET /v1/tosca/models/policyType/{policyType}</a></h3>
+<h3 id="_route198"><a class="anchor" href="#_route198"></a><a class="link" href="#_route198">2.24. GET /v1/tosca/models/policyType/{policyType}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.24.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2226,7 +2228,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route33"><a class="anchor" href="#_route33"></a><a class="link" href="#_route33">2.26. PUT /v1/tosca/models/{toscaModelName}</a></h3>
+<h3 id="_route197"><a class="anchor" href="#_route197"></a><a class="link" href="#_route197">2.26. PUT /v1/tosca/models/{toscaModelName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.26.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2301,7 +2303,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route41"><a class="anchor" href="#_route41"></a><a class="link" href="#_route41">2.27. GET /v1/user/getUser</a></h3>
+<h3 id="_route205"><a class="anchor" href="#_route205"></a><a class="link" href="#_route205">2.27. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_27"><a class="anchor" href="#_responses_27"></a><a class="link" href="#_responses_27">2.27.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2335,7 +2337,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.28. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route177"><a class="anchor" href="#_route177"></a><a class="link" href="#_route177">2.28. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_19"><a class="anchor" href="#_parameters_19"></a><a class="link" href="#_parameters_19">2.28.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2384,7 +2386,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.29. PUT /v2/loop/deployLoop/{loopName}</a></h3>
+<h3 id="_route172"><a class="anchor" href="#_route172"></a><a class="link" href="#_route172">2.29. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_20"><a class="anchor" href="#_parameters_20"></a><a class="link" href="#_parameters_20">2.29.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2446,7 +2448,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.30. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route166"><a class="anchor" href="#_route166"></a><a class="link" href="#_route166">2.30. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
 <h4 id="_responses_30"><a class="anchor" href="#_responses_30"></a><a class="link" href="#_responses_30">2.30.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2483,7 +2485,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.31. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route178"><a class="anchor" href="#_route178"></a><a class="link" href="#_route178">2.31. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.31.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2545,7 +2547,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.32. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route175"><a class="anchor" href="#_route175"></a><a class="link" href="#_route175">2.32. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_22"><a class="anchor" href="#_parameters_22"></a><a class="link" href="#_parameters_22">2.32.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2607,7 +2609,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.33. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route174"><a class="anchor" href="#_route174"></a><a class="link" href="#_route174">2.33. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_23"><a class="anchor" href="#_parameters_23"></a><a class="link" href="#_parameters_23">2.33.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2669,7 +2671,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.34. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route176"><a class="anchor" href="#_route176"></a><a class="link" href="#_route176">2.34. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_24"><a class="anchor" href="#_parameters_24"></a><a class="link" href="#_parameters_24">2.34.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2731,7 +2733,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.35. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route168"><a class="anchor" href="#_route168"></a><a class="link" href="#_route168">2.35. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_25"><a class="anchor" href="#_parameters_25"></a><a class="link" href="#_parameters_25">2.35.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2793,7 +2795,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.36. PUT /v2/loop/undeployLoop/{loopName}</a></h3>
+<h3 id="_route173"><a class="anchor" href="#_route173"></a><a class="link" href="#_route173">2.36. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_26"><a class="anchor" href="#_parameters_26"></a><a class="link" href="#_parameters_26">2.36.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2855,7 +2857,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.37. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route169"><a class="anchor" href="#_route169"></a><a class="link" href="#_route169">2.37. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_27"><a class="anchor" href="#_parameters_27"></a><a class="link" href="#_parameters_27">2.37.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2933,7 +2935,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.38. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route171"><a class="anchor" href="#_route171"></a><a class="link" href="#_route171">2.38. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_28"><a class="anchor" href="#_parameters_28"></a><a class="link" href="#_parameters_28">2.38.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -3011,7 +3013,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.39. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route170"><a class="anchor" href="#_route170"></a><a class="link" href="#_route170">2.39. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_29"><a class="anchor" href="#_parameters_29"></a><a class="link" href="#_parameters_29">2.39.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -3089,7 +3091,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.40. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route167"><a class="anchor" href="#_route167"></a><a class="link" href="#_route167">2.40. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_30"><a class="anchor" href="#_parameters_30"></a><a class="link" href="#_parameters_30">2.40.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -3786,7 +3788,66 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonarray"><a class="anchor" href="#_jsonarray"></a><a class="link" href="#_jsonarray">3.11. JsonArray</a></h3>
+<h3 id="_externalcomponent"><a class="anchor" href="#_externalcomponent"></a><a class="link" href="#_externalcomponent">3.11. ExternalComponent</a></h3>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 42.8571%;">
+<col style="width: 57.1429%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>componentName</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>state</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_externalcomponentstate">ExternalComponentState</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_externalcomponentstate"><a class="anchor" href="#_externalcomponentstate"></a><a class="link" href="#_externalcomponentstate">3.12. ExternalComponentState</a></h3>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 42.8571%;">
+<col style="width: 57.1429%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>description</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>level</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int32)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>stateName</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_jsonarray"><a class="anchor" href="#_jsonarray"></a><a class="link" href="#_jsonarray">3.13. JsonArray</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3903,7 +3964,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonnull"><a class="anchor" href="#_jsonnull"></a><a class="link" href="#_jsonnull">3.12. JsonNull</a></h3>
+<h3 id="_jsonnull"><a class="anchor" href="#_jsonnull"></a><a class="link" href="#_jsonnull">3.14. JsonNull</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4020,7 +4081,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonobject"><a class="anchor" href="#_jsonobject"></a><a class="link" href="#_jsonobject">3.13. JsonObject</a></h3>
+<h3 id="_jsonobject"><a class="anchor" href="#_jsonobject"></a><a class="link" href="#_jsonobject">3.15. JsonObject</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4137,7 +4198,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonprimitive"><a class="anchor" href="#_jsonprimitive"></a><a class="link" href="#_jsonprimitive">3.14. JsonPrimitive</a></h3>
+<h3 id="_jsonprimitive"><a class="anchor" href="#_jsonprimitive"></a><a class="link" href="#_jsonprimitive">3.16. JsonPrimitive</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4269,7 +4330,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_loop"><a class="anchor" href="#_loop"></a><a class="link" href="#_loop">3.15. Loop</a></h3>
+<h3 id="_loop"><a class="anchor" href="#_loop"></a><a class="link" href="#_loop">3.17. Loop</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4288,6 +4349,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>components</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; string, <a href="#_externalcomponent">ExternalComponent</a> &gt; map</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeBlueprintId</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -4346,7 +4412,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_looplog"><a class="anchor" href="#_looplog"></a><a class="link" href="#_looplog">3.16. LoopLog</a></h3>
+<h3 id="_looplog"><a class="anchor" href="#_looplog"></a><a class="link" href="#_looplog">3.18. LoopLog</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4365,6 +4431,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>logComponent</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>logInstant</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
@@ -4388,7 +4459,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_microservicepolicy"><a class="anchor" href="#_microservicepolicy"></a><a class="link" href="#_microservicepolicy">3.17. MicroServicePolicy</a></h3>
+<h3 id="_microservicepolicy"><a class="anchor" href="#_microservicepolicy"></a><a class="link" href="#_microservicepolicy">3.19. MicroServicePolicy</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4440,13 +4511,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_number"><a class="anchor" href="#_number"></a><a class="link" href="#_number">3.18. Number</a></h3>
+<h3 id="_number"><a class="anchor" href="#_number"></a><a class="link" href="#_number">3.20. Number</a></h3>
 <div class="paragraph">
 <p><em>Type</em> : object</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_operationalpolicy"><a class="anchor" href="#_operationalpolicy"></a><a class="link" href="#_operationalpolicy">3.19. OperationalPolicy</a></h3>
+<h3 id="_operationalpolicy"><a class="anchor" href="#_operationalpolicy"></a><a class="link" href="#_operationalpolicy">3.21. OperationalPolicy</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4483,7 +4554,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_valueitem"><a class="anchor" href="#_valueitem"></a><a class="link" href="#_valueitem">3.20. ValueItem</a></h3>
+<h3 id="_valueitem"><a class="anchor" href="#_valueitem"></a><a class="link" href="#_valueitem">3.22. ValueItem</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -4509,7 +4580,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2019-08-12 03:34:46 PDT
+Last updated 2019-08-12 12:34:46 CEST
 </div>
 </div>
 </body>
diff --git a/ui-react/package-lock.json b/ui-react/package-lock.json
deleted file mode 100644
index 4f64bb353..000000000
--- a/ui-react/package-lock.json
+++ /dev/null
@@ -1,13918 +0,0 @@
-{
-  "name": "onap-clamp-ui",
-  "version": "4.1.0-SNAPSHOT",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-      "requires": {
-        "@babel/highlight": "^7.0.0"
-      }
-    },
-    "@babel/core": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
-      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.5.5",
-        "@babel/helpers": "^7.5.5",
-        "@babel/parser": "^7.5.5",
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5",
-        "convert-source-map": "^1.1.0",
-        "debug": "^4.1.0",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
-      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
-      "requires": {
-        "@babel/types": "^7.5.5",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0",
-        "trim-right": "^1.0.1"
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
-      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
-      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-builder-react-jsx": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz",
-      "integrity": "sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==",
-      "requires": {
-        "@babel/types": "^7.3.0",
-        "esutils": "^2.0.0"
-      }
-    },
-    "@babel/helper-call-delegate": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
-      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz",
-      "integrity": "sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==",
-      "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-member-expression-to-functions": "^7.5.5",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5",
-        "@babel/helper-split-export-declaration": "^7.4.4"
-      }
-    },
-    "@babel/helper-define-map": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
-      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
-      "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.5.5",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
-      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
-      "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
-      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
-      "requires": {
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
-      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
-      "requires": {
-        "@babel/types": "^7.5.5"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
-      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
-      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/template": "^7.4.4",
-        "@babel/types": "^7.5.5",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
-      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="
-    },
-    "@babel/helper-regex": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
-      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
-      "requires": {
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
-      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-wrap-function": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
-      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.5.5",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
-      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
-      "requires": {
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-      "requires": {
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
-      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
-      "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.2.0"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
-      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
-      "requires": {
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
-      "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g=="
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
-      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0",
-        "@babel/plugin-syntax-async-generators": "^7.2.0"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz",
-      "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.5.5",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz",
-      "integrity": "sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-decorators": "^7.2.0"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
-      "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.0"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
-      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz",
-      "integrity": "sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
-      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
-      "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
-      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz",
-      "integrity": "sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
-      "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-flow": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz",
-      "integrity": "sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
-      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz",
-      "integrity": "sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
-      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
-      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz",
-      "integrity": "sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
-      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
-      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
-      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz",
-      "integrity": "sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
-      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.5.5",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
-      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz",
-      "integrity": "sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
-      "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
-      "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
-      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz",
-      "integrity": "sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-flow": "^7.2.0"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
-      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
-      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
-      "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
-      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
-      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
-      "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz",
-      "integrity": "sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
-      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
-      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
-      "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
-      "requires": {
-        "regexp-tree": "^0.1.6"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
-      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
-      "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
-      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
-      "requires": {
-        "@babel/helper-call-delegate": "^7.4.4",
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
-      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-react-constant-elements": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz",
-      "integrity": "sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz",
-      "integrity": "sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz",
-      "integrity": "sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==",
-      "requires": {
-        "@babel/helper-builder-react-jsx": "^7.3.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz",
-      "integrity": "sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz",
-      "integrity": "sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
-      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
-      "requires": {
-        "regenerator-transform": "^0.14.0"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
-      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz",
-      "integrity": "sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
-      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz",
-      "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
-      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
-      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
-      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz",
-      "integrity": "sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.5.5",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-typescript": "^7.2.0"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
-      "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.5.4"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz",
-      "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.5.0",
-        "@babel/plugin-proposal-json-strings": "^7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-syntax-async-generators": "^7.2.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-transform-arrow-functions": "^7.2.0",
-        "@babel/plugin-transform-async-to-generator": "^7.5.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-        "@babel/plugin-transform-block-scoping": "^7.5.5",
-        "@babel/plugin-transform-classes": "^7.5.5",
-        "@babel/plugin-transform-computed-properties": "^7.2.0",
-        "@babel/plugin-transform-destructuring": "^7.5.0",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/plugin-transform-duplicate-keys": "^7.5.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
-        "@babel/plugin-transform-for-of": "^7.4.4",
-        "@babel/plugin-transform-function-name": "^7.4.4",
-        "@babel/plugin-transform-literals": "^7.2.0",
-        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
-        "@babel/plugin-transform-modules-amd": "^7.5.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.5.0",
-        "@babel/plugin-transform-modules-umd": "^7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
-        "@babel/plugin-transform-new-target": "^7.4.4",
-        "@babel/plugin-transform-object-super": "^7.5.5",
-        "@babel/plugin-transform-parameters": "^7.4.4",
-        "@babel/plugin-transform-property-literals": "^7.2.0",
-        "@babel/plugin-transform-regenerator": "^7.4.5",
-        "@babel/plugin-transform-reserved-words": "^7.2.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
-        "@babel/plugin-transform-spread": "^7.2.0",
-        "@babel/plugin-transform-sticky-regex": "^7.2.0",
-        "@babel/plugin-transform-template-literals": "^7.4.4",
-        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
-        "@babel/plugin-transform-unicode-regex": "^7.4.4",
-        "@babel/types": "^7.5.5",
-        "browserslist": "^4.6.0",
-        "core-js-compat": "^3.1.1",
-        "invariant": "^2.2.2",
-        "js-levenshtein": "^1.1.3",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "@babel/preset-react": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0.tgz",
-      "integrity": "sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-transform-react-display-name": "^7.0.0",
-        "@babel/plugin-transform-react-jsx": "^7.0.0",
-        "@babel/plugin-transform-react-jsx-self": "^7.0.0",
-        "@babel/plugin-transform-react-jsx-source": "^7.0.0"
-      }
-    },
-    "@babel/preset-typescript": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz",
-      "integrity": "sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-transform-typescript": "^7.3.2"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
-      "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
-      "requires": {
-        "regenerator-runtime": "^0.13.2"
-      }
-    },
-    "@babel/template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.4",
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
-      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.5.5",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.5.5",
-        "@babel/types": "^7.5.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/types": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
-      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
-      "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@cnakazawa/watch": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
-      "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
-      "requires": {
-        "exec-sh": "^0.3.2",
-        "minimist": "^1.2.0"
-      }
-    },
-    "@csstools/convert-colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
-      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
-    },
-    "@csstools/normalize.css": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-9.0.1.tgz",
-      "integrity": "sha512-6It2EVfGskxZCQhuykrfnALg7oVeiI6KclWSmGDqB0AiInVrTGB9Jp9i4/Ad21u9Jde/voVQz6eFX/eSg/UsPA=="
-    },
-    "@emotion/cache": {
-      "version": "10.0.15",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.15.tgz",
-      "integrity": "sha512-8VthgeKhlGeTXSW1JN7I14AnAaiFPbOrqNqg3dPoGCZ3bnMjkrmRU0zrx0BtBw9esBaPaQgDB9y0tVgAGT2Mrg==",
-      "requires": {
-        "@emotion/sheet": "0.9.3",
-        "@emotion/stylis": "0.8.4",
-        "@emotion/utils": "0.11.2",
-        "@emotion/weak-memoize": "0.2.3"
-      }
-    },
-    "@emotion/core": {
-      "version": "10.0.15",
-      "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.15.tgz",
-      "integrity": "sha512-VHwwl3k/ddMfQOHYgOJryXOs2rGJ5AfKLQGm5AVolNonnr6tkmDI4nzIMNaPpveoXVs7sP0OrF24UunIPxveQw==",
-      "requires": {
-        "@babel/runtime": "^7.4.3",
-        "@emotion/cache": "^10.0.15",
-        "@emotion/css": "^10.0.14",
-        "@emotion/serialize": "^0.11.9",
-        "@emotion/sheet": "0.9.3",
-        "@emotion/utils": "0.11.2"
-      }
-    },
-    "@emotion/css": {
-      "version": "10.0.14",
-      "resolved": "https://registry.npmjs.org/@emotion/css/-/css-10.0.14.tgz",
-      "integrity": "sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==",
-      "requires": {
-        "@emotion/serialize": "^0.11.8",
-        "@emotion/utils": "0.11.2",
-        "babel-plugin-emotion": "^10.0.14"
-      }
-    },
-    "@emotion/hash": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.2.tgz",
-      "integrity": "sha512-RMtr1i6E8MXaBWwhXL3yeOU8JXRnz8GNxHvaUfVvwxokvayUY0zoBeWbKw1S9XkufmGEEdQd228pSZXFkAln8Q=="
-    },
-    "@emotion/is-prop-valid": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.2.tgz",
-      "integrity": "sha512-ZQIMAA2kLUWiUeMZNJDTeCwYRx1l8SQL0kHktze4COT22occKpDML1GDUXP5/sxhOMrZO8vZw773ni4H5Snrsg==",
-      "requires": {
-        "@emotion/memoize": "0.7.2"
-      }
-    },
-    "@emotion/memoize": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.2.tgz",
-      "integrity": "sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w=="
-    },
-    "@emotion/serialize": {
-      "version": "0.11.9",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.9.tgz",
-      "integrity": "sha512-/Cn4V81z3ZyFiDQRw8nhGFaHkxHtmCSSBUit4vgTuLA1BqxfJUYiqSq97tq/vV8z9LfIoqs6a9v6QrUFWZpK7A==",
-      "requires": {
-        "@emotion/hash": "0.7.2",
-        "@emotion/memoize": "0.7.2",
-        "@emotion/unitless": "0.7.4",
-        "@emotion/utils": "0.11.2",
-        "csstype": "^2.5.7"
-      }
-    },
-    "@emotion/sheet": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.3.tgz",
-      "integrity": "sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A=="
-    },
-    "@emotion/stylis": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.4.tgz",
-      "integrity": "sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ=="
-    },
-    "@emotion/unitless": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.4.tgz",
-      "integrity": "sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ=="
-    },
-    "@emotion/utils": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.2.tgz",
-      "integrity": "sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA=="
-    },
-    "@emotion/weak-memoize": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz",
-      "integrity": "sha512-zVgvPwGK7c1aVdUVc9Qv7SqepOGRDrqCw7KZPSZziWGxSlbII3gmvGLPzLX4d0n0BMbamBacUrN22zOMyFFEkQ=="
-    },
-    "@hapi/address": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.0.0.tgz",
-      "integrity": "sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw=="
-    },
-    "@hapi/bourne": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
-      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="
-    },
-    "@hapi/hoek": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.2.1.tgz",
-      "integrity": "sha512-JPiBy+oSmsq3St7XlipfN5pNA6bDJ1kpa73PrK/zR29CVClDVqy04AanM/M/qx5bSF+I61DdCfAvRrujau+zRg=="
-    },
-    "@hapi/joi": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
-      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
-      "requires": {
-        "@hapi/address": "2.x.x",
-        "@hapi/bourne": "1.x.x",
-        "@hapi/hoek": "8.x.x",
-        "@hapi/topo": "3.x.x"
-      }
-    },
-    "@hapi/topo": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz",
-      "integrity": "sha512-JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==",
-      "requires": {
-        "@hapi/hoek": "8.x.x"
-      }
-    },
-    "@jest/console": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
-      "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
-      "requires": {
-        "@jest/source-map": "^24.9.0",
-        "chalk": "^2.0.1",
-        "slash": "^2.0.0"
-      }
-    },
-    "@jest/core": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
-      "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/reporters": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.1.15",
-        "jest-changed-files": "^24.9.0",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-resolve-dependencies": "^24.9.0",
-        "jest-runner": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "jest-watcher": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "p-each-series": "^1.0.0",
-        "realpath-native": "^1.1.0",
-        "rimraf": "^2.5.4",
-        "slash": "^2.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
-        },
-        "jest-resolve": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "browser-resolve": "^1.11.3",
-            "chalk": "^2.0.1",
-            "jest-pnp-resolver": "^1.2.1",
-            "realpath-native": "^1.1.0"
-          }
-        }
-      }
-    },
-    "@jest/environment": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
-      "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
-      "requires": {
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0"
-      }
-    },
-    "@jest/fake-timers": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
-      "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0"
-      }
-    },
-    "@jest/reporters": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
-      "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "istanbul-lib-coverage": "^2.0.2",
-        "istanbul-lib-instrument": "^3.0.1",
-        "istanbul-lib-report": "^2.0.4",
-        "istanbul-lib-source-maps": "^3.0.1",
-        "istanbul-reports": "^2.2.6",
-        "jest-haste-map": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "node-notifier": "^5.4.2",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^2.0.0"
-      },
-      "dependencies": {
-        "jest-resolve": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "browser-resolve": "^1.11.3",
-            "chalk": "^2.0.1",
-            "jest-pnp-resolver": "^1.2.1",
-            "realpath-native": "^1.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "@jest/source-map": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
-      "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
-      "requires": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.1.15",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "@jest/test-result": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
-      "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
-      "requires": {
-        "@jest/console": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/istanbul-lib-coverage": "^2.0.0"
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
-      "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
-      "requires": {
-        "@jest/test-result": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-runner": "^24.9.0",
-        "jest-runtime": "^24.9.0"
-      }
-    },
-    "@jest/transform": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
-      "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^24.9.0",
-        "babel-plugin-istanbul": "^5.1.0",
-        "chalk": "^2.0.1",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.1.15",
-        "jest-haste-map": "^24.9.0",
-        "jest-regex-util": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "pirates": "^4.0.1",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "2.4.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "@jest/types": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-      "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^13.0.0"
-      }
-    },
-    "@json-editor/json-editor": {
-      "version": "1.4.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@json-editor/json-editor/-/json-editor-1.4.0-beta.0.tgz",
-      "integrity": "sha512-8fF7IqaT/KegVVsoe/Ewf1uwvGcRTF2jzlaJ+BzD5MrLu5l4IOxK5H6u+sl3nx0gWnLSZeSoNXCTJpnLLLEGcg=="
-    },
-    "@mrmlnc/readdir-enhanced": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
-    },
-    "@react-bootstrap/react-popper": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@react-bootstrap/react-popper/-/react-popper-1.2.1.tgz",
-      "integrity": "sha512-4l3q7LcZEhrSkI4d3Ie3g4CdrXqqTexXX4PFT45CB0z5z2JUbaxgRwKNq7r5j2bLdVpZm+uvUGqxJw8d9vgbJQ==",
-      "requires": {
-        "babel-runtime": "6.x.x",
-        "create-react-context": "^0.2.1",
-        "popper.js": "^1.14.4",
-        "prop-types": "^15.6.1",
-        "typed-styles": "^0.0.5",
-        "warning": "^3.0.0"
-      },
-      "dependencies": {
-        "warning": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
-          "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
-          "requires": {
-            "loose-envify": "^1.0.0"
-          }
-        }
-      }
-    },
-    "@restart/context": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
-    },
-    "@restart/hooks": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.12.tgz",
-      "integrity": "sha512-nltMFo5JkYcnntf0Cs3Kq7jskrKeGcftAKOqbEEa74sxlx0bfO3RjBly2aiRb7hnsYJCB8/99l+acQcl2lnq1w=="
-    },
-    "@svgr/babel-plugin-add-jsx-attribute": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
-      "integrity": "sha512-j7KnilGyZzYr/jhcrSYS3FGWMZVaqyCG0vzMCwzvei0coIkczuYMcniK07nI0aHJINciujjH11T72ICW5eL5Ig=="
-    },
-    "@svgr/babel-plugin-remove-jsx-attribute": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.2.0.tgz",
-      "integrity": "sha512-3XHLtJ+HbRCH4n28S7y/yZoEQnRpl0tvTZQsHqvaeNXPra+6vE5tbRliH3ox1yZYPCxrlqaJT/Mg+75GpDKlvQ=="
-    },
-    "@svgr/babel-plugin-remove-jsx-empty-expression": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.2.0.tgz",
-      "integrity": "sha512-yTr2iLdf6oEuUE9MsRdvt0NmdpMBAkgK8Bjhl6epb+eQWk6abBaX3d65UZ3E3FWaOwePyUgNyNCMVG61gGCQ7w=="
-    },
-    "@svgr/babel-plugin-replace-jsx-attribute-value": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz",
-      "integrity": "sha512-U9m870Kqm0ko8beHawRXLGLvSi/ZMrl89gJ5BNcT452fAjtF2p4uRzXkdzvGJJJYBgx7BmqlDjBN/eCp5AAX2w=="
-    },
-    "@svgr/babel-plugin-svg-dynamic-title": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz",
-      "integrity": "sha512-p6z6JJroP989jHWcuraeWpzdejehTmLUpyC9smhTBWyPN0VVGe2phbYxpPTV7Vh8XzmFrcG55idrnfWn/2oQEw=="
-    },
-    "@svgr/babel-plugin-svg-em-dimensions": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.2.0.tgz",
-      "integrity": "sha512-C0Uy+BHolCHGOZ8Dnr1zXy/KgpBOkEUYY9kI/HseHVPeMbluaX3CijJr7D4C5uR8zrc1T64nnq/k63ydQuGt4w=="
-    },
-    "@svgr/babel-plugin-transform-react-native-svg": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.2.0.tgz",
-      "integrity": "sha512-7YvynOpZDpCOUoIVlaaOUU87J4Z6RdD6spYN4eUb5tfPoKGSF9OG2NuhgYnq4jSkAxcpMaXWPf1cePkzmqTPNw=="
-    },
-    "@svgr/babel-plugin-transform-svg-component": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz",
-      "integrity": "sha512-hYfYuZhQPCBVotABsXKSCfel2slf/yvJY8heTVX1PCTaq/IgASq1IyxPPKJ0chWREEKewIU/JMSsIGBtK1KKxw=="
-    },
-    "@svgr/babel-preset": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-4.3.1.tgz",
-      "integrity": "sha512-rPFKLmyhlh6oeBv3j2vEAj2nd2QbWqpoJLKzBLjwQVt+d9aeXajVaPNEqrES2spjXKR4OxfgSs7U0NtmAEkr0Q==",
-      "requires": {
-        "@svgr/babel-plugin-add-jsx-attribute": "^4.2.0",
-        "@svgr/babel-plugin-remove-jsx-attribute": "^4.2.0",
-        "@svgr/babel-plugin-remove-jsx-empty-expression": "^4.2.0",
-        "@svgr/babel-plugin-replace-jsx-attribute-value": "^4.2.0",
-        "@svgr/babel-plugin-svg-dynamic-title": "^4.3.1",
-        "@svgr/babel-plugin-svg-em-dimensions": "^4.2.0",
-        "@svgr/babel-plugin-transform-react-native-svg": "^4.2.0",
-        "@svgr/babel-plugin-transform-svg-component": "^4.2.0"
-      }
-    },
-    "@svgr/core": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-4.3.2.tgz",
-      "integrity": "sha512-N+tP5CLFd1hP9RpO83QJPZY3NL8AtrdqNbuhRgBkjE/49RnMrrRsFm1wY8pueUfAGvzn6tSXUq29o6ah8RuR5w==",
-      "requires": {
-        "@svgr/plugin-jsx": "^4.3.2",
-        "camelcase": "^5.3.1",
-        "cosmiconfig": "^5.2.1"
-      }
-    },
-    "@svgr/hast-util-to-babel-ast": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz",
-      "integrity": "sha512-JioXclZGhFIDL3ddn4Kiq8qEqYM2PyDKV0aYno8+IXTLuYt6TOgHUbUAAFvqtb0Xn37NwP0BTHglejFoYr8RZg==",
-      "requires": {
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@svgr/plugin-jsx": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz",
-      "integrity": "sha512-+1GW32RvmNmCsOkMoclA/TppNjHPLMnNZG3/Ecscxawp051XJ2MkO09Hn11VcotdC2EPrDfT8pELGRo+kbZ1Eg==",
-      "requires": {
-        "@babel/core": "^7.4.5",
-        "@svgr/babel-preset": "^4.3.1",
-        "@svgr/hast-util-to-babel-ast": "^4.3.2",
-        "svg-parser": "^2.0.0"
-      }
-    },
-    "@svgr/plugin-svgo": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-4.3.1.tgz",
-      "integrity": "sha512-PrMtEDUWjX3Ea65JsVCwTIXuSqa3CG9px+DluF1/eo9mlDrgrtFE7NE/DjdhjJgSM9wenlVBzkzneSIUgfUI/w==",
-      "requires": {
-        "cosmiconfig": "^5.2.1",
-        "merge-deep": "^3.0.2",
-        "svgo": "^1.2.2"
-      }
-    },
-    "@svgr/webpack": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-4.3.2.tgz",
-      "integrity": "sha512-F3VE5OvyOWBEd2bF7BdtFRyI6E9it3mN7teDw0JQTlVtc4HZEYiiLSl+Uf9Uub6IYHVGc+qIrxxDyeedkQru2w==",
-      "requires": {
-        "@babel/core": "^7.4.5",
-        "@babel/plugin-transform-react-constant-elements": "^7.0.0",
-        "@babel/preset-env": "^7.4.5",
-        "@babel/preset-react": "^7.0.0",
-        "@svgr/core": "^4.3.2",
-        "@svgr/plugin-jsx": "^4.3.2",
-        "@svgr/plugin-svgo": "^4.3.1",
-        "loader-utils": "^1.2.3"
-      }
-    },
-    "@types/babel__core": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.2.tgz",
-      "integrity": "sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.0.2.tgz",
-      "integrity": "sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz",
-      "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
-      "requires": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "@types/eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag=="
-    },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="
-    },
-    "@types/istanbul-lib-report": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
-      "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "@types/istanbul-reports": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "*",
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz",
-      "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A=="
-    },
-    "@types/node": {
-      "version": "12.7.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.1.tgz",
-      "integrity": "sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==",
-      "dev": true
-    },
-    "@types/q": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
-    },
-    "@types/stack-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="
-    },
-    "@types/yargs": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.2.tgz",
-      "integrity": "sha512-lwwgizwk/bIIU+3ELORkyuOgDjCh7zuWDFqRtPPhhVgq9N1F7CvLNKg1TX4f2duwtKQ0p044Au9r1PLIXHrIzQ==",
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.0.0.tgz",
-      "integrity": "sha512-wBlsw+8n21e6eTd4yVv8YD/E3xq0O6nNnJIquutAsFGE7EyMKz7W6RNT6BRu1SmdgmlCZ9tb0X+j+D6HGr8pZw=="
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz",
-      "integrity": "sha512-WQHCozMnuNADiqMtsNzp96FNox5sOVpU8Xt4meaT4em8lOG1SrOv92/mUbEHQVh90sldKSfcOc/I0FOb/14G1g==",
-      "requires": {
-        "@typescript-eslint/experimental-utils": "1.13.0",
-        "eslint-utils": "^1.3.1",
-        "functional-red-black-tree": "^1.0.1",
-        "regexpp": "^2.0.1",
-        "tsutils": "^3.7.0"
-      }
-    },
-    "@typescript-eslint/experimental-utils": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz",
-      "integrity": "sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==",
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "1.13.0",
-        "eslint-scope": "^4.0.0"
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz",
-      "integrity": "sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==",
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "1.13.0",
-        "@typescript-eslint/typescript-estree": "1.13.0",
-        "eslint-visitor-keys": "^1.0.0"
-      }
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz",
-      "integrity": "sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==",
-      "requires": {
-        "lodash.unescape": "4.0.1",
-        "semver": "5.5.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
-        }
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-      "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-    },
-    "abab": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
-      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "acorn": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
-      "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ=="
-    },
-    "acorn-globals": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
-      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
-      "requires": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
-        }
-      }
-    },
-    "acorn-jsx": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz",
-      "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw=="
-    },
-    "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
-    },
-    "address": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.1.0.tgz",
-      "integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ=="
-    },
-    "adjust-sourcemap-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
-      "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
-      "requires": {
-        "assert": "1.4.1",
-        "camelcase": "5.0.0",
-        "loader-utils": "1.2.3",
-        "object-path": "0.11.4",
-        "regex-parser": "2.2.10"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
-        }
-      }
-    },
-    "airbnb-prop-types": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.14.0.tgz",
-      "integrity": "sha512-Yb09vUkr3KP9r9NqfRuYtDYZG76wt8mhTUi2Vfzsghk+qkg01/gOc9NU8n63ZcMCLzpAdMEXyKjCHlxV62yN1A==",
-      "dev": true,
-      "requires": {
-        "array.prototype.find": "^2.1.0",
-        "function.prototype.name": "^1.1.1",
-        "has": "^1.0.3",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.0",
-        "prop-types": "^15.7.2",
-        "prop-types-exact": "^1.2.0",
-        "react-is": "^16.8.6"
-      }
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
-    },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
-    },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
-    },
-    "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="
-    },
-    "ansi-escapes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz",
-      "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==",
-      "requires": {
-        "type-fest": "^0.5.2"
-      }
-    },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
-    },
-    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "aria-query": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
-      "requires": {
-        "ast-types-flow": "0.0.7",
-        "commander": "^2.11.0"
-      }
-    },
-    "arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U="
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
-    },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
-    },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-    },
-    "array-includes": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
-      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
-      }
-    },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
-    },
-    "array.prototype.find": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz",
-      "integrity": "sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.13.0"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz",
-      "integrity": "sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.10.0",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "requires": {
-        "util": "0.10.3"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
-    },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
-    },
-    "autoprefixer": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
-      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
-      "requires": {
-        "browserslist": "^4.6.3",
-        "caniuse-lite": "^1.0.30000980",
-        "chalk": "^2.4.2",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.17",
-        "postcss-value-parser": "^4.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
-          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ=="
-        }
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-    },
-    "axobject-query": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
-      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
-      "requires": {
-        "ast-types-flow": "0.0.7"
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
-      }
-    },
-    "babel-eslint": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.2.tgz",
-      "integrity": "sha512-UdsurWPtgiPgpJ06ryUnuaSXC2s0WoSZnQmEpbAH65XZSdwowgN5MvyP7e88nW07FYXv72erVtpBkxyDVKhH1Q==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.0.0",
-        "@babel/traverse": "^7.0.0",
-        "@babel/types": "^7.0.0",
-        "eslint-scope": "3.7.1",
-        "eslint-visitor-keys": "^1.0.0"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "3.7.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-          "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        }
-      }
-    },
-    "babel-extract-comments": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz",
-      "integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==",
-      "requires": {
-        "babylon": "^6.18.0"
-      }
-    },
-    "babel-jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
-      "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
-      "requires": {
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/babel__core": "^7.1.0",
-        "babel-plugin-istanbul": "^5.1.0",
-        "babel-preset-jest": "^24.9.0",
-        "chalk": "^2.4.2",
-        "slash": "^2.0.0"
-      }
-    },
-    "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
-      "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
-      }
-    },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "babel-plugin-emotion": {
-      "version": "10.0.15",
-      "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.15.tgz",
-      "integrity": "sha512-E3W68Zk8EcKpRUDW2tsFKi4gsavapMRjfr2/KKgG3l7l2zZpiKk0BxB59Ul9C0w0ekv6my/ylGOk2WroaqKXPw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@emotion/hash": "0.7.2",
-        "@emotion/memoize": "0.7.2",
-        "@emotion/serialize": "^0.11.9",
-        "babel-plugin-macros": "^2.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^1.0.5",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7"
-      }
-    },
-    "babel-plugin-istanbul": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
-      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "find-up": "^3.0.0",
-        "istanbul-lib-instrument": "^3.3.0",
-        "test-exclude": "^5.2.3"
-      }
-    },
-    "babel-plugin-jest-hoist": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
-      "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
-      "requires": {
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
-    "babel-plugin-macros": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz",
-      "integrity": "sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==",
-      "requires": {
-        "@babel/runtime": "^7.4.2",
-        "cosmiconfig": "^5.2.0",
-        "resolve": "^1.10.0"
-      }
-    },
-    "babel-plugin-named-asset-import": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz",
-      "integrity": "sha512-1XDRysF4894BUdMChT+2HHbtJYiO7zx5Be7U6bT8dISy7OdyETMGIAQBMPQCsY1YRf0xcubwnKKaDr5bk15JTA=="
-    },
-    "babel-plugin-styled-components": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.6.tgz",
-      "integrity": "sha512-gyQj/Zf1kQti66100PhrCRjI5ldjaze9O0M3emXRPAN80Zsf8+e1thpTpaXJXVHXtaM4/+dJEgZHyS9Its+8SA==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-module-imports": "^7.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
-      }
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
-    "babel-plugin-syntax-object-rest-spread": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
-    },
-    "babel-plugin-transform-object-rest-spread": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
-      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
-      "requires": {
-        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
-        "babel-runtime": "^6.26.0"
-      }
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "babel-preset-jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
-      "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
-      "requires": {
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "babel-plugin-jest-hoist": "^24.9.0"
-      }
-    },
-    "babel-preset-react-app": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-9.0.1.tgz",
-      "integrity": "sha512-v7MeY+QxdBhM9oU5uOQCIHLsErYkEbbjctXsb10II+KAnttbe0rvprvP785dRxfa9dI4ZbsGXsRU07Qdi5BtOw==",
-      "requires": {
-        "@babel/core": "7.5.5",
-        "@babel/plugin-proposal-class-properties": "7.5.5",
-        "@babel/plugin-proposal-decorators": "7.4.4",
-        "@babel/plugin-proposal-object-rest-spread": "7.5.5",
-        "@babel/plugin-syntax-dynamic-import": "7.2.0",
-        "@babel/plugin-transform-destructuring": "7.5.0",
-        "@babel/plugin-transform-flow-strip-types": "7.4.4",
-        "@babel/plugin-transform-react-display-name": "7.2.0",
-        "@babel/plugin-transform-runtime": "7.5.5",
-        "@babel/preset-env": "7.5.5",
-        "@babel/preset-react": "7.0.0",
-        "@babel/preset-typescript": "7.3.3",
-        "@babel/runtime": "7.5.5",
-        "babel-plugin-dynamic-import-node": "2.3.0",
-        "babel-plugin-macros": "2.6.1",
-        "babel-plugin-transform-react-remove-prop-types": "0.4.24"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-        }
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
-    },
-    "bluebird": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
-    },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
-    },
-    "bootstrap-css-only": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-css-only/-/bootstrap-css-only-4.3.1.tgz",
-      "integrity": "sha512-xPQNmTR6skX7boM3Q/K2vWDL8RFhfHm5PbTcn/vd7nZtkzg9tc6ScNreIIsMaP9QLUxeqvUx+OGnDaiK4KBRiQ=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
-    },
-    "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
-    },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
-        }
-      }
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "browserslist": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
-      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
-      "requires": {
-        "caniuse-lite": "^1.0.30000984",
-        "electron-to-chromium": "^1.3.191",
-        "node-releases": "^1.1.25"
-      }
-    },
-    "bser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
-      "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        }
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-    },
-    "cacache": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
-      "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "requires": {
-        "callsites": "^2.0.0"
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "requires": {
-        "caller-callsite": "^2.0.0"
-      }
-    },
-    "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
-    },
-    "camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-      "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30000989",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
-      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw=="
-    },
-    "capture-exit": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-      "requires": {
-        "rsvp": "^4.8.4"
-      }
-    },
-    "case-sensitive-paths-webpack-plugin": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz",
-      "integrity": "sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g=="
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "cheerio": {
-      "version": "1.0.0-rc.3",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
-      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
-      "dev": true,
-      "requires": {
-        "css-select": "~1.2.0",
-        "dom-serializer": "~0.1.1",
-        "entities": "~1.1.1",
-        "htmlparser2": "^3.9.1",
-        "lodash": "^4.15.0",
-        "parse5": "^3.0.1"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "dom-serializer": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
-          "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^1.3.0",
-            "entities": "^1.1.1"
-          }
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "entities": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-          "dev": true
-        },
-        "parse5": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-          "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*"
-          }
-        }
-      }
-    },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "dependencies": {
-        "fsevents": {
-          "version": "1.2.9",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
-          "optional": true,
-          "requires": {
-            "nan": "^2.12.1",
-            "node-pre-gyp": "^0.12.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "1.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "optional": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "optional": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "4.1.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            },
-            "deep-extend": {
-              "version": "0.6.0",
-              "bundled": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "1.0.3",
-              "bundled": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "1.2.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "7.1.3",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "has-unicode": {
-              "version": "2.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.4.24",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-              }
-            },
-            "ignore-walk": {
-              "version": "3.0.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "optional": true
-            },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "optional": true
-            },
-            "minipass": {
-              "version": "2.3.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.2.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "2.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.3.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "debug": "^4.1.0",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
-            "node-pre-gyp": {
-              "version": "0.12.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.1",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.2.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "1.0.6",
-              "bundled": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.4.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              }
-            },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.8",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
-                  "optional": true
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.3",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.1.3"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.2",
-              "bundled": true,
-              "optional": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.7.0",
-              "bundled": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-json-comments": {
-              "version": "2.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.3",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "string-width": "^1.0.2 || 2"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true,
-              "optional": true
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-        }
-      }
-    },
-    "chownr": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-      "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
-    },
-    "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
-    "clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
-    },
-    "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "clone-deep": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
-      "requires": {
-        "for-own": "^0.1.3",
-        "is-plain-object": "^2.0.1",
-        "kind-of": "^3.0.2",
-        "lazy-cache": "^1.0.3",
-        "shallow-clone": "^0.1.2"
-      }
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
-    },
-    "common-tags": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
-      "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
-    },
-    "compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "requires": {
-        "arity-n": "^1.0.4"
-      }
-    },
-    "compressible": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
-      "requires": {
-        "mime-db": ">= 1.40.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz",
-      "integrity": "sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTsblowlZg=="
-    },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "requires": {
-        "date-now": "^0.1.4"
-      }
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
-    },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
-    },
-    "core-js": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
-    },
-    "core-js-compat": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
-      "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
-      "requires": {
-        "browserslist": "^4.6.6",
-        "semver": "^6.3.0"
-      }
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "create-react-context": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
-      "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
-      "requires": {
-        "fbjs": "^0.8.0",
-        "gud": "^1.0.0"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "css": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.5.2",
-        "urix": "^0.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "css-blank-pseudo": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
-      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
-    },
-    "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "requires": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      }
-    },
-    "css-has-pseudo": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
-      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^5.0.0-rc.4"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "css-loader": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
-      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
-      "requires": {
-        "camelcase": "^5.2.0",
-        "icss-utils": "^4.1.0",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.14",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^2.0.6",
-        "postcss-modules-scope": "^2.1.0",
-        "postcss-modules-values": "^2.0.0",
-        "postcss-value-parser": "^3.3.0",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-        }
-      }
-    },
-    "css-prefers-color-scheme": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
-      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "css-select": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz",
-      "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==",
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^2.1.2",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-    },
-    "css-to-react-native": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.1.tgz",
-      "integrity": "sha512-yO+oEx1Lf+hDKasqQRVrAvzMCz825Huh1VMlEEDlRWyAhFb/FWb6I0KpEF1PkyKQ7NEdcx9d5M2ZEWgJAsgPvQ==",
-      "requires": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
-    "css-tree": {
-      "version": "1.0.0-alpha.33",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.33.tgz",
-      "integrity": "sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==",
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.5.3"
-      }
-    },
-    "css-unit-converter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
-      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY="
-    },
-    "css-what": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
-    },
-    "cssdb": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
-      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ=="
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
-    },
-    "cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
-      "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
-      }
-    },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8="
-    },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0="
-    },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="
-    },
-    "csso": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz",
-      "integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==",
-      "requires": {
-        "css-tree": "1.0.0-alpha.29"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.0.0-alpha.29",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz",
-          "integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==",
-          "requires": {
-            "mdn-data": "~1.1.0",
-            "source-map": "^0.5.3"
-          }
-        },
-        "mdn-data": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz",
-          "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA=="
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "cssstyle": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
-      "requires": {
-        "cssom": "0.3.x"
-      }
-    },
-    "csstype": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.6.tgz",
-      "integrity": "sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg=="
-    },
-    "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA="
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "damerau-levenshtein": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
-      "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA=="
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
-      "requires": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
-      },
-      "dependencies": {
-        "whatwg-url": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
-      }
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
-    },
-    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-      "requires": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
-      }
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-      "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-            }
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
-    },
-    "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
-    },
-    "detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "requires": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "diff-sequences": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
-      "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew=="
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "dir-glob": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-      "requires": {
-        "arrify": "^1.0.1",
-        "path-type": "^3.0.0"
-      }
-    },
-    "discontinuous-range": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-      "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=",
-      "dev": true
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
-    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-helpers": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-      "requires": {
-        "@babel/runtime": "^7.1.2"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
-      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
-        }
-      }
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "requires": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-      "requires": {
-        "is-obj": "^1.0.0"
-      }
-    },
-    "dotenv": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-      "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="
-    },
-    "dotenv-expand": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz",
-      "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU="
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "electron-to-chromium": {
-      "version": "1.3.237",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz",
-      "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg=="
-    },
-    "elliptic": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
-      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
-      }
-    },
-    "entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
-    },
-    "enzyme": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.10.0.tgz",
-      "integrity": "sha512-p2yy9Y7t/PFbPoTvrWde7JIYB2ZyGC+NgTNbVEGvZ5/EyoYSr9aG/2rSbVvyNvMHEhw9/dmGUJHWtfQIEiX9pg==",
-      "dev": true,
-      "requires": {
-        "array.prototype.flat": "^1.2.1",
-        "cheerio": "^1.0.0-rc.2",
-        "function.prototype.name": "^1.1.0",
-        "has": "^1.0.3",
-        "html-element-map": "^1.0.0",
-        "is-boolean-object": "^1.0.0",
-        "is-callable": "^1.1.4",
-        "is-number-object": "^1.0.3",
-        "is-regex": "^1.0.4",
-        "is-string": "^1.0.4",
-        "is-subset": "^0.1.1",
-        "lodash.escape": "^4.0.1",
-        "lodash.isequal": "^4.5.0",
-        "object-inspect": "^1.6.0",
-        "object-is": "^1.0.1",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.0.4",
-        "object.values": "^1.0.4",
-        "raf": "^3.4.0",
-        "rst-selector-parser": "^2.2.3",
-        "string.prototype.trim": "^1.1.2"
-      }
-    },
-    "enzyme-adapter-react-16": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.14.0.tgz",
-      "integrity": "sha512-7PcOF7pb4hJUvjY7oAuPGpq3BmlCig3kxXGi2kFx0YzJHppqX1K8IIV9skT1IirxXlu8W7bneKi+oQ10QRnhcA==",
-      "dev": true,
-      "requires": {
-        "enzyme-adapter-utils": "^1.12.0",
-        "has": "^1.0.3",
-        "object.assign": "^4.1.0",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.8.6",
-        "react-test-renderer": "^16.0.0-0",
-        "semver": "^5.7.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
-        }
-      }
-    },
-    "enzyme-adapter-utils": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz",
-      "integrity": "sha512-wkZvE0VxcFx/8ZsBw0iAbk3gR1d9hK447ebnSYBf95+r32ezBq+XDSAvRErkc4LZosgH8J7et7H7/7CtUuQfBA==",
-      "dev": true,
-      "requires": {
-        "airbnb-prop-types": "^2.13.2",
-        "function.prototype.name": "^1.1.0",
-        "object.assign": "^4.1.0",
-        "object.fromentries": "^2.0.0",
-        "prop-types": "^15.7.2",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
-        }
-      }
-    },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
-      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
-      "requires": {
-        "es-to-primitive": "^1.2.0",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-keys": "^1.0.12"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.50",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
-      "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "^1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "requires": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
-      "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        }
-      }
-    },
-    "eslint": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.2.1.tgz",
-      "integrity": "sha512-ES7BzEzr0Q6m5TK9i+/iTpKjclXitOdDK4vT07OqbkBT2/VcN/gO9EL1C4HlK3TAOXYv2ItcmbVR9jO1MR0fJg==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.2",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.0",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^11.7.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^6.4.1",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "import-fresh": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
-          "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-        }
-      }
-    },
-    "eslint-config-react-app": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.0.1.tgz",
-      "integrity": "sha512-GYXP3F/0PSHlYfGHhahqnJze8rYKxzXgrzXVqRRd4rDO40ga4NA3aHM7/HKbwceDN0/C1Ij3BoAWFawJgRbXEw==",
-      "requires": {
-        "confusing-browser-globals": "^1.0.8"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
-      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
-      "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "eslint-loader": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
-      "integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
-      "requires": {
-        "loader-fs-cache": "^1.0.0",
-        "loader-utils": "^1.0.2",
-        "object-assign": "^4.0.1",
-        "object-hash": "^1.1.4",
-        "rimraf": "^2.6.1"
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
-      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
-      "requires": {
-        "debug": "^2.6.8",
-        "pkg-dir": "^2.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "requires": {
-            "find-up": "^2.1.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-flowtype": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz",
-      "integrity": "sha512-bhewp36P+t7cEV0b6OdmoRWJCBYRiHFlqPZAG1oS3SF+Y0LQkeDvFSM4oxoxvczD1OdONCXMlJfQFiWLcV9urw==",
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.18.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
-      "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
-      "requires": {
-        "array-includes": "^3.0.3",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.0",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.11.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-          "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz",
-      "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==",
-      "requires": {
-        "@babel/runtime": "^7.4.5",
-        "aria-query": "^3.0.0",
-        "array-includes": "^3.0.3",
-        "ast-types-flow": "^0.0.7",
-        "axobject-query": "^2.0.2",
-        "damerau-levenshtein": "^1.0.4",
-        "emoji-regex": "^7.0.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.2.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        }
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.14.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz",
-      "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==",
-      "requires": {
-        "array-includes": "^3.0.3",
-        "doctrine": "^2.1.0",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^2.1.0",
-        "object.entries": "^1.1.0",
-        "object.fromentries": "^2.0.0",
-        "object.values": "^1.1.0",
-        "prop-types": "^15.7.2",
-        "resolve": "^1.10.1"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz",
-      "integrity": "sha512-iXTCFcOmlWvw4+TOE8CLWj6yX1GwzT0Y6cUfHHZqWnSk144VmVIRcVGtUAzrLES7C798lmvnt02C7rxaOX1HNA=="
-    },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
-      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
-      "requires": {
-        "eslint-visitor-keys": "^1.0.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
-    },
-    "espree": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.0.tgz",
-      "integrity": "sha512-boA7CHRLlVWUSg3iL5Kmlt/xT3Q+sXnKoRYYzj1YeM10A76TEJBbotV5pKbnK42hEUIr121zTv+QLRM5LsCPXQ==",
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "eventemitter3": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
-    },
-    "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
-    },
-    "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-      "requires": {
-        "original": "^1.0.0"
-      }
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "exec-sh": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz",
-      "integrity": "sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw="
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "expect": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
-      "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "ansi-styles": "^3.2.0",
-        "jest-get-type": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-regex-util": "^24.9.0"
-      }
-    },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "path-to-regexp": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
-    },
-    "fast-glob": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-      "requires": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        }
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "faye-websocket": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "fb-watchman": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
-      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
-      "requires": {
-        "bser": "^2.0.0"
-      }
-    },
-    "fbjs": {
-      "version": "0.8.17",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
-      "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
-      "requires": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.18"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        }
-      }
-    },
-    "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="
-    },
-    "figures": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",
-      "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
-    "file-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
-      "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^1.0.0"
-      }
-    },
-    "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      }
-    },
-    "find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "requires": {
-        "locate-path": "^3.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      }
-    },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
-      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
-      "requires": {
-        "debug": "^3.2.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==",
-      "requires": {
-        "babel-code-frame": "^6.22.0",
-        "chalk": "^2.4.1",
-        "chokidar": "^2.0.4",
-        "micromatch": "^3.1.10",
-        "minimatch": "^3.0.4",
-        "semver": "^5.6.0",
-        "tapable": "^1.0.0",
-        "worker-rpc": "^0.1.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fsevents": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz",
-      "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==",
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.1.tgz",
-      "integrity": "sha512-e1NzkiJuw6xqVH7YSdiW/qDHebcmMhPNe6w+4ZYYEg0VA+LaLzx37RimbPLuonHhYGFGPx1ME2nSi74JiaCr/Q==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1",
-        "functions-have-names": "^1.1.1",
-        "is-callable": "^1.1.4"
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-    },
-    "functions-have-names": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.1.1.tgz",
-      "integrity": "sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz",
-      "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg=="
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
-      "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs="
-    },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "requires": {
-        "global-prefix": "^3.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "requires": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-    },
-    "globby": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-      "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-      "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "2.0.0",
-        "fast-glob": "^2.0.2",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
-        },
-        "slash": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
-    },
-    "growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
-    },
-    "gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
-    },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        }
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="
-    },
-    "handlebars": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
-      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "harmony-reflect": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz",
-      "integrity": "sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA=="
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        }
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
-    },
-    "hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
-    },
-    "history": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz",
-      "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "loose-envify": "^1.2.0",
-        "resolve-pathname": "^2.2.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0",
-        "value-equal": "^0.4.0"
-      }
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
-      "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
-      "requires": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
-      "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4="
-    },
-    "hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg="
-    },
-    "html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
-    },
-    "html-element-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.1.0.tgz",
-      "integrity": "sha512-iqiG3dTZmy+uUaTmHarTL+3/A2VW9ox/9uasKEZC+R/wAtUrTcRlXPSaPqsnWPfIu8wqn09jQNwMRqzL54jSYA==",
-      "dev": true,
-      "requires": {
-        "array-filter": "^1.0.0"
-      },
-      "dependencies": {
-        "array-filter": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz",
-          "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=",
-          "dev": true
-        }
-      }
-    },
-    "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-      "requires": {
-        "whatwg-encoding": "^1.0.1"
-      }
-    },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
-    },
-    "html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-        }
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "4.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz",
-      "integrity": "sha512-y5l4lGxOW3pz3xBTFdfB9rnnrWRPVxlAhX6nrBYIcW+2k2zC3mSp/3DxlWVCMBfnO6UAnoF8OcFn0IMy6kaKAQ==",
-      "requires": {
-        "html-minifier": "^3.5.20",
-        "loader-utils": "^1.1.0",
-        "lodash": "^4.17.11",
-        "pretty-error": "^2.1.1",
-        "tapable": "^1.1.0",
-        "util.promisify": "1.0.0"
-      }
-    },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-        },
-        "readable-stream": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
-      }
-    },
-    "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q="
-    },
-    "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-      "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-      "requires": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
-    },
-    "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "requires": {
-        "postcss": "^7.0.14"
-      }
-    },
-    "identity-obj-proxy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
-      "requires": {
-        "harmony-reflect": "^1.4.6"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-    },
-    "immer": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
-      "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="
-    },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "requires": {
-        "import-from": "^2.1.0"
-      }
-    },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
-    },
-    "inquirer": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz",
-      "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      }
-    },
-    "internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "requires": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      }
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
-    },
-    "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
-      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
-    },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "requires": {
-        "ci-info": "^2.0.0"
-      }
-    },
-    "is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "requires": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-        }
-      }
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "is-number-object": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
-      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
-      "dev": true
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk="
-    },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
-    },
-    "is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-string": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
-      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
-      "dev": true
-    },
-    "is-subset": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=",
-      "dev": true
-    },
-    "is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
-      "requires": {
-        "has-symbols": "^1.0.0"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-what": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.3.1.tgz",
-      "integrity": "sha512-seFn10yAXy+yJlTRO+8VfiafC+0QJanGLMPTBWLrJm/QPauuchy0UXh8B6H5o9VA8BAzk0iYievt6mNp6gfaqA=="
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-    },
-    "isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-      "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      }
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "istanbul-lib-coverage": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="
-    },
-    "istanbul-lib-instrument": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
-      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
-      "requires": {
-        "@babel/generator": "^7.4.0",
-        "@babel/parser": "^7.4.3",
-        "@babel/template": "^7.4.0",
-        "@babel/traverse": "^7.4.3",
-        "@babel/types": "^7.4.0",
-        "istanbul-lib-coverage": "^2.0.5",
-        "semver": "^6.0.0"
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
-      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-      "requires": {
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
-      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "rimraf": "^2.6.3",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
-      "requires": {
-        "handlebars": "^4.1.2"
-      }
-    },
-    "jest": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz",
-      "integrity": "sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==",
-      "requires": {
-        "import-local": "^2.0.0",
-        "jest-cli": "^24.8.0"
-      },
-      "dependencies": {
-        "jest-cli": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
-          "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
-          "requires": {
-            "@jest/core": "^24.9.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "chalk": "^2.0.1",
-            "exit": "^0.1.2",
-            "import-local": "^2.0.0",
-            "is-ci": "^2.0.0",
-            "jest-config": "^24.9.0",
-            "jest-util": "^24.9.0",
-            "jest-validate": "^24.9.0",
-            "prompts": "^2.0.1",
-            "realpath-native": "^1.1.0",
-            "yargs": "^13.3.0"
-          }
-        }
-      }
-    },
-    "jest-changed-files": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
-      "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "execa": "^1.0.0",
-        "throat": "^4.0.0"
-      }
-    },
-    "jest-config": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
-      "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "babel-jest": "^24.9.0",
-        "chalk": "^2.0.1",
-        "glob": "^7.1.1",
-        "jest-environment-jsdom": "^24.9.0",
-        "jest-environment-node": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "pretty-format": "^24.9.0",
-        "realpath-native": "^1.1.0"
-      },
-      "dependencies": {
-        "jest-resolve": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "browser-resolve": "^1.11.3",
-            "chalk": "^2.0.1",
-            "jest-pnp-resolver": "^1.2.1",
-            "realpath-native": "^1.1.0"
-          }
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
-      "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
-      "requires": {
-        "chalk": "^2.0.1",
-        "diff-sequences": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      }
-    },
-    "jest-docblock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz",
-      "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
-      "requires": {
-        "detect-newline": "^2.1.0"
-      }
-    },
-    "jest-each": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
-      "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "jest-get-type": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      }
-    },
-    "jest-environment-jsdom": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
-      "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jsdom": "^11.5.1"
-      }
-    },
-    "jest-environment-jsdom-fourteen": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz",
-      "integrity": "sha512-4vtoRMg7jAstitRzL4nbw83VmGH8Rs13wrND3Ud2o1fczDhMUF32iIrNKwYGgeOPUdfvZU4oy8Bbv+ni1fgVCA==",
-      "requires": {
-        "jest-mock": "^24.5.0",
-        "jest-util": "^24.5.0",
-        "jsdom": "^14.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
-        },
-        "jsdom": {
-          "version": "14.1.0",
-          "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz",
-          "integrity": "sha512-O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==",
-          "requires": {
-            "abab": "^2.0.0",
-            "acorn": "^6.0.4",
-            "acorn-globals": "^4.3.0",
-            "array-equal": "^1.0.0",
-            "cssom": "^0.3.4",
-            "cssstyle": "^1.1.1",
-            "data-urls": "^1.1.0",
-            "domexception": "^1.0.1",
-            "escodegen": "^1.11.0",
-            "html-encoding-sniffer": "^1.0.2",
-            "nwsapi": "^2.1.3",
-            "parse5": "5.1.0",
-            "pn": "^1.1.0",
-            "request": "^2.88.0",
-            "request-promise-native": "^1.0.5",
-            "saxes": "^3.1.9",
-            "symbol-tree": "^3.2.2",
-            "tough-cookie": "^2.5.0",
-            "w3c-hr-time": "^1.0.1",
-            "w3c-xmlserializer": "^1.1.2",
-            "webidl-conversions": "^4.0.2",
-            "whatwg-encoding": "^1.0.5",
-            "whatwg-mimetype": "^2.3.0",
-            "whatwg-url": "^7.0.0",
-            "ws": "^6.1.2",
-            "xml-name-validator": "^3.0.0"
-          }
-        },
-        "parse5": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
-        },
-        "whatwg-url": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-          "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        },
-        "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
-        }
-      }
-    },
-    "jest-environment-node": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
-      "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-util": "^24.9.0"
-      }
-    },
-    "jest-get-type": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-      "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="
-    },
-    "jest-haste-map": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
-      "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "anymatch": "^2.0.0",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^1.2.7",
-        "graceful-fs": "^4.1.15",
-        "invariant": "^2.2.4",
-        "jest-serializer": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
-      },
-      "dependencies": {
-        "fsevents": {
-          "version": "1.2.9",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
-          "optional": true,
-          "requires": {
-            "nan": "^2.12.1",
-            "node-pre-gyp": "^0.12.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "1.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "optional": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "optional": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "4.1.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            },
-            "deep-extend": {
-              "version": "0.6.0",
-              "bundled": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "1.0.3",
-              "bundled": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "1.2.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "7.1.3",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "has-unicode": {
-              "version": "2.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.4.24",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
-              }
-            },
-            "ignore-walk": {
-              "version": "3.0.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "1.0.6",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "optional": true
-            },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "optional": true
-            },
-            "minipass": {
-              "version": "2.3.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.2.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "2.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.3.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "debug": "^4.1.0",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
-            "node-pre-gyp": {
-              "version": "0.12.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.1",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.2.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "1.0.6",
-              "bundled": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.4.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              }
-            },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.8",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
-                  "optional": true
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.3",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.1.3"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.2",
-              "bundled": true,
-              "optional": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.7.0",
-              "bundled": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-json-comments": {
-              "version": "2.0.1",
-              "bundled": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.3",
-              "bundled": true,
-              "optional": true,
-              "requires": {
-                "string-width": "^1.0.2 || 2"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "optional": true
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true,
-              "optional": true
-            }
-          }
-        }
-      }
-    },
-    "jest-jasmine2": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
-      "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
-      "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "co": "^4.6.0",
-        "expect": "^24.9.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0",
-        "throat": "^4.0.0"
-      }
-    },
-    "jest-leak-detector": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
-      "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
-      "requires": {
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
-      "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
-      "requires": {
-        "chalk": "^2.0.1",
-        "jest-diff": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      }
-    },
-    "jest-message-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-      "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/stack-utils": "^1.0.1",
-        "chalk": "^2.0.1",
-        "micromatch": "^3.1.10",
-        "slash": "^2.0.0",
-        "stack-utils": "^1.0.1"
-      }
-    },
-    "jest-mock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
-      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
-      "requires": {
-        "@jest/types": "^24.9.0"
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ=="
-    },
-    "jest-regex-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-      "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA=="
-    },
-    "jest-resolve": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.8.0.tgz",
-      "integrity": "sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==",
-      "requires": {
-        "@jest/types": "^24.8.0",
-        "browser-resolve": "^1.11.3",
-        "chalk": "^2.0.1",
-        "jest-pnp-resolver": "^1.2.1",
-        "realpath-native": "^1.1.0"
-      }
-    },
-    "jest-resolve-dependencies": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
-      "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-snapshot": "^24.9.0"
-      }
-    },
-    "jest-runner": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
-      "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.4.2",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-docblock": "^24.3.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-leak-detector": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "jest-resolve": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "browser-resolve": "^1.11.3",
-            "chalk": "^2.0.1",
-            "jest-pnp-resolver": "^1.2.1",
-            "realpath-native": "^1.1.0"
-          }
-        }
-      }
-    },
-    "jest-runtime": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
-      "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/source-map": "^24.3.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "strip-bom": "^3.0.0",
-        "yargs": "^13.3.0"
-      },
-      "dependencies": {
-        "jest-resolve": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "browser-resolve": "^1.11.3",
-            "chalk": "^2.0.1",
-            "jest-pnp-resolver": "^1.2.1",
-            "realpath-native": "^1.1.0"
-          }
-        }
-      }
-    },
-    "jest-serializer": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
-      "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ=="
-    },
-    "jest-snapshot": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
-      "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
-      "requires": {
-        "@babel/types": "^7.0.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "expect": "^24.9.0",
-        "jest-diff": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^24.9.0",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "jest-resolve": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-          "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "browser-resolve": "^1.11.3",
-            "chalk": "^2.0.1",
-            "jest-pnp-resolver": "^1.2.1",
-            "realpath-native": "^1.1.0"
-          }
-        }
-      }
-    },
-    "jest-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
-      "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
-      "requires": {
-        "@jest/console": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/source-map": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "callsites": "^3.0.0",
-        "chalk": "^2.0.1",
-        "graceful-fs": "^4.1.15",
-        "is-ci": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "jest-validate": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
-      "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^2.0.1",
-        "jest-get-type": "^24.9.0",
-        "leven": "^3.1.0",
-        "pretty-format": "^24.9.0"
-      }
-    },
-    "jest-watch-typeahead": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.3.1.tgz",
-      "integrity": "sha512-cDIko96c4Yqg/7mfye1eEYZ6Pvugo9mnOOhGQod3Es7/KptNv1b+9gFVaotzdqNqTlwbkA80BnWHtzV4dc+trA==",
-      "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.4.1",
-        "jest-watcher": "^24.3.0",
-        "slash": "^2.0.0",
-        "string-length": "^2.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
-      "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
-      "requires": {
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.1",
-        "jest-util": "^24.9.0",
-        "string-length": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
-        }
-      }
-    },
-    "jest-worker": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
-      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
-    },
-    "jsdom": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
-        "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
-        "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
-        "w3c-hr-time": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.7.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
-        }
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "requires": {
-        "jsonify": "~0.0.0"
-      }
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "json3": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="
-    },
-    "json5": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "jsx-ast-utils": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz",
-      "integrity": "sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==",
-      "requires": {
-        "array-includes": "^3.0.3",
-        "object.assign": "^4.1.0"
-      }
-    },
-    "keycode": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
-      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
-    },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "requires": {
-        "is-buffer": "^1.1.5"
-      }
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
-    },
-    "last-call-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
-      "requires": {
-        "lodash": "^4.17.5",
-        "webpack-sources": "^1.1.0"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
-    },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
-    "left-pad": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="
-    },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "loader-fs-cache": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
-      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
-      "requires": {
-        "find-cache-dir": "^0.1.1",
-        "mkdirp": "0.5.1"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-          "requires": {
-            "commondir": "^1.0.1",
-            "mkdirp": "^0.5.1",
-            "pkg-dir": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-          "requires": {
-            "find-up": "^1.0.0"
-          }
-        }
-      }
-    },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
-    },
-    "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        }
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
-    },
-    "lodash.escape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
-      "dev": true
-    },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
-    "lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "lodash.unescape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
-      "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw="
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
-    },
-    "loglevel": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
-      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw="
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      }
-    },
-    "memoize-one": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.5.tgz",
-      "integrity": "sha512-ey6EpYv0tEaIbM/nTDOpHciXUvd+ackQrJgEzBwemhZZIWZjcyodqEcrmqDy2BKRTM3a65kKBV4WtLXJDt26SQ=="
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "merge-anything": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.0.tgz",
-      "integrity": "sha512-MhJcPOEcDUIbwU0LnEfx5S9s9dfQ/KPu4g2UA5T5G1LRKS0XmpDvJ9+UUfTkfhge+nA1gStE4tJAvx6lXLs+rg==",
-      "requires": {
-        "is-what": "^3.2.4"
-      }
-    },
-    "merge-deep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
-      "integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
-      "requires": {
-        "arr-union": "^3.1.0",
-        "clone-deep": "^0.2.4",
-        "kind-of": "^3.0.2"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "merge2": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz",
-      "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A=="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "microevent.ts": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz",
-      "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      }
-    },
-    "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-    },
-    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-    },
-    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "requires": {
-        "mime-db": "1.40.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "mini-create-react-context": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz",
-      "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==",
-      "requires": {
-        "@babel/runtime": "^7.4.0",
-        "gud": "^1.0.0",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "mini-css-extract-plugin": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-      "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
-      "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
-      },
-      "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE="
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
-      }
-    },
-    "moo": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/moo/-/moo-0.4.3.tgz",
-      "integrity": "sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==",
-      "dev": true
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
-    },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "optional": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
-    },
-    "nearley": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.18.0.tgz",
-      "integrity": "sha512-/zQOMCeJcioI0xJtd5RpBiWw2WP7wLe6vq8/3Yu0rEwgus/G/+pViX80oA87JdVgjRt2895mZSv2VfZmy4W1uw==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.19.0",
-        "moo": "^0.4.3",
-        "railroad-diagrams": "^1.0.0",
-        "randexp": "0.4.6",
-        "semver": "^5.4.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
-        }
-      }
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "requires": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node-fetch": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ=="
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        },
-        "util": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-          "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        }
-      }
-    },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA="
-    },
-    "node-notifier": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
-      "requires": {
-        "growly": "^1.3.0",
-        "is-wsl": "^1.1.0",
-        "semver": "^5.5.0",
-        "shellwords": "^0.1.1",
-        "which": "^1.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "node-releases": {
-      "version": "1.1.28",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz",
-      "integrity": "sha512-AQw4emh6iSXnCpDiFe0phYcThiccmkNWMZnFZ+lDJjAP8J0m2fVd59duvUUyuTirQOhIAajTFkzG6FHCLBO59g==",
-      "requires": {
-        "semver": "^5.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        }
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
-    },
-    "normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
-    },
-    "nwsapi": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
-      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "object-hash": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
-      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
-    },
-    "object-inspect": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
-      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object-path": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
-      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk="
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
-      "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.12.0",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz",
-      "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.11.0",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.values": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
-      "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.12.0",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "open": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-        }
-      }
-    },
-    "optimize-css-assets-webpack-plugin": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz",
-      "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==",
-      "requires": {
-        "cssnano": "^4.1.10",
-        "last-call-webpack-plugin": "^3.0.0"
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
-      }
-    },
-    "original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "requires": {
-        "url-parse": "^1.4.3"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
-    },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
-    "p-each-series": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
-      "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
-      "requires": {
-        "p-reduce": "^1.0.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
-    },
-    "p-limit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
-    },
-    "p-reduce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
-      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo="
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
-    },
-    "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-      "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "requires": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-        }
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
-      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
-      "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
-    },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
-    },
-    "path-to-regexp": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-      "requires": {
-        "isarray": "0.0.1"
-      }
-    },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "requires": {
-        "find-up": "^3.0.0"
-      }
-    },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "requires": {
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-        }
-      }
-    },
-    "pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
-    },
-    "pnp-webpack-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-jd9olUr9D7do+RN8Wspzhpxhgp1n6Vd0NtQ4SFkmIACZoEL1nkyAdW9Ygrinjec0vgDcWjscFQQ1gDW8rsfKTg==",
-      "requires": {
-        "ts-pnp": "^1.1.2"
-      }
-    },
-    "popper.js": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz",
-      "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA=="
-    },
-    "portfinder": {
-      "version": "1.0.23",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz",
-      "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==",
-      "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
-    },
-    "postcss": {
-      "version": "7.0.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
-      "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
-      "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-attribute-case-insensitive": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz",
-      "integrity": "sha512-L2YKB3vF4PetdTIthQVeT+7YiSzMoNMLLYxPXXppOOP7NoazEAy45sh2LvJ8leCQjfBcfkYQs8TtCcQjeZTp8A==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-browser-comments": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz",
-      "integrity": "sha512-xGG0UvoxwBc4Yx4JX3gc0RuDl1kc4bVihCzzk6UC72YPfq5fu3c717Nu8Un3nvnq1BJ31gBnFXIG/OaUTnpHgA==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-calc": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz",
-      "integrity": "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==",
-      "requires": {
-        "css-unit-converter": "^1.1.1",
-        "postcss": "^7.0.5",
-        "postcss-selector-parser": "^5.0.0-rc.4",
-        "postcss-value-parser": "^3.3.1"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-color-functional-notation": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
-      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-color-gray": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
-      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
-      "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-color-hex-alpha": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
-      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
-      "requires": {
-        "postcss": "^7.0.14",
-        "postcss-values-parser": "^2.0.1"
-      }
-    },
-    "postcss-color-mod-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
-      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
-      "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-color-rebeccapurple": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
-      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-custom-media": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
-      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
-      "requires": {
-        "postcss": "^7.0.14"
-      }
-    },
-    "postcss-custom-properties": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
-      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
-      "requires": {
-        "postcss": "^7.0.17",
-        "postcss-values-parser": "^2.0.1"
-      }
-    },
-    "postcss-custom-selectors": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
-      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-dir-pseudo-class": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
-      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-double-position-gradients": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
-      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
-      "requires": {
-        "postcss": "^7.0.5",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-env-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
-      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-flexbugs-fixes": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.1.0.tgz",
-      "integrity": "sha512-jr1LHxQvStNNAHlgco6PzY308zvLklh7SJVYuWUwyUQncofaAlD2l+P/gxKHOdqWKe7xJSkVLFF/2Tp+JqMSZA==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-focus-visible": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
-      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-focus-within": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
-      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-font-variant": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
-      "integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-gap-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
-      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-image-set-function": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
-      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-initial": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.1.tgz",
-      "integrity": "sha512-I2Sz83ZSHybMNh02xQDK609lZ1/QOyYeuizCjzEhlMgeV/HcDJapQiH4yTqLjZss0X6/6VvKFXUeObaHpJoINw==",
-      "requires": {
-        "lodash.template": "^4.5.0",
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-lab-function": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
-      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
-      "requires": {
-        "@csstools/convert-colors": "^1.4.0",
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-load-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
-      }
-    },
-    "postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
-      }
-    },
-    "postcss-logical": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
-      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-media-minmax": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
-      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
-          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
-          "requires": {
-            "dot-prop": "^4.1.1",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
-          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
-          "requires": {
-            "dot-prop": "^4.1.1",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
-      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0",
-        "postcss-value-parser": "^3.3.1"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
-      "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
-      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
-      "requires": {
-        "icss-replace-symbols": "^1.1.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "postcss-nesting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
-      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-normalize": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-7.0.1.tgz",
-      "integrity": "sha512-NOp1fwrG+6kVXWo7P9SizCHX6QvioxFD/hZcI2MLxPmVnFJFC0j0DDpIuNw2tUDeCFMni59gCVgeJ1/hYhj2OQ==",
-      "requires": {
-        "@csstools/normalize.css": "^9.0.1",
-        "browserslist": "^4.1.1",
-        "postcss": "^7.0.2",
-        "postcss-browser-comments": "^2.0.0"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-overflow-shorthand": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
-      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-page-break": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
-      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-place": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
-      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-values-parser": "^2.0.0"
-      }
-    },
-    "postcss-preset-env": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
-      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
-      "requires": {
-        "autoprefixer": "^9.6.1",
-        "browserslist": "^4.6.4",
-        "caniuse-lite": "^1.0.30000981",
-        "css-blank-pseudo": "^0.1.4",
-        "css-has-pseudo": "^0.10.0",
-        "css-prefers-color-scheme": "^3.1.1",
-        "cssdb": "^4.4.0",
-        "postcss": "^7.0.17",
-        "postcss-attribute-case-insensitive": "^4.0.1",
-        "postcss-color-functional-notation": "^2.0.1",
-        "postcss-color-gray": "^5.0.0",
-        "postcss-color-hex-alpha": "^5.0.3",
-        "postcss-color-mod-function": "^3.0.3",
-        "postcss-color-rebeccapurple": "^4.0.1",
-        "postcss-custom-media": "^7.0.8",
-        "postcss-custom-properties": "^8.0.11",
-        "postcss-custom-selectors": "^5.1.2",
-        "postcss-dir-pseudo-class": "^5.0.0",
-        "postcss-double-position-gradients": "^1.0.0",
-        "postcss-env-function": "^2.0.2",
-        "postcss-focus-visible": "^4.0.0",
-        "postcss-focus-within": "^3.0.0",
-        "postcss-font-variant": "^4.0.0",
-        "postcss-gap-properties": "^2.0.0",
-        "postcss-image-set-function": "^3.0.1",
-        "postcss-initial": "^3.0.0",
-        "postcss-lab-function": "^2.0.1",
-        "postcss-logical": "^3.0.0",
-        "postcss-media-minmax": "^4.0.0",
-        "postcss-nesting": "^7.0.0",
-        "postcss-overflow-shorthand": "^2.0.0",
-        "postcss-page-break": "^2.0.0",
-        "postcss-place": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^6.0.0",
-        "postcss-replace-overflow-wrap": "^3.0.0",
-        "postcss-selector-matches": "^4.0.0",
-        "postcss-selector-not": "^4.0.0"
-      }
-    },
-    "postcss-pseudo-class-any-link": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
-      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
-      "requires": {
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^5.0.0-rc.3"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="
-        },
-        "postcss-selector-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
-          "requires": {
-            "cssesc": "^2.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      }
-    },
-    "postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-safe-parser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz",
-      "integrity": "sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==",
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-selector-matches": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
-      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-selector-not": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz",
-      "integrity": "sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
-      "requires": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
-      "requires": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-    },
-    "postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
-    },
-    "pretty-bytes": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz",
-      "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="
-    },
-    "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-      "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
-      }
-    },
-    "pretty-format": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-      "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "ansi-regex": "^4.0.0",
-        "ansi-styles": "^3.2.0",
-        "react-is": "^16.8.4"
-      }
-    },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "requires": {
-        "asap": "~2.0.3"
-      }
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
-    },
-    "prompts": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz",
-      "integrity": "sha512-VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==",
-      "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.3"
-      }
-    },
-    "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "prop-types-exact": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
-      "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3",
-        "object.assign": "^4.1.0",
-        "reflect.ownkeys": "^0.2.0"
-      }
-    },
-    "prop-types-extra": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz",
-      "integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==",
-      "requires": {
-        "react-is": "^16.3.2",
-        "warning": "^3.0.0"
-      },
-      "dependencies": {
-        "warning": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
-          "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
-          "requires": {
-            "loose-envify": "^1.0.0"
-          }
-        }
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
-      }
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
-    },
-    "psl": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
-      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
-    },
-    "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
-    },
-    "raf": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "requires": {
-        "performance-now": "^2.1.0"
-      }
-    },
-    "railroad-diagrams": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-      "integrity": "sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=",
-      "dev": true
-    },
-    "randexp": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
-      "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
-      "dev": true,
-      "requires": {
-        "discontinuous-range": "1.0.0",
-        "ret": "~0.1.10"
-      }
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-        }
-      }
-    },
-    "react": {
-      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.9.0.tgz",
-      "integrity": "sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "react-app-polyfill": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-1.0.2.tgz",
-      "integrity": "sha512-yZcpLnIr0FOIzrOOz9JC37NWAWEuCaQWmYn9EWjEzlCW4cOmA5MkT5L3iP8QuUeFnoqVCTJgjIWYbXEJgNXhGA==",
-      "requires": {
-        "core-js": "3.1.4",
-        "object-assign": "4.1.1",
-        "promise": "8.0.3",
-        "raf": "3.4.1",
-        "regenerator-runtime": "0.13.3",
-        "whatwg-fetch": "3.0.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
-          "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="
-        },
-        "promise": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz",
-          "integrity": "sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==",
-          "requires": {
-            "asap": "~2.0.6"
-          }
-        }
-      }
-    },
-    "react-bootstrap": {
-      "version": "1.0.0-beta.12",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.12.tgz",
-      "integrity": "sha512-qBEAthAzqM+OTS2h5ZCfV5/yZUadQcMlaep4iPyPqsu92JzdcznhSDjw6b+asiepsyQgiS33t8OPeLLRiIDh9Q==",
-      "requires": {
-        "@babel/runtime": "^7.4.2",
-        "@react-bootstrap/react-popper": "1.2.1",
-        "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.11",
-        "classnames": "^2.2.6",
-        "dom-helpers": "^3.4.0",
-        "invariant": "^2.2.4",
-        "keycode": "^2.2.0",
-        "popper.js": "^1.14.7",
-        "prop-types": "^15.7.2",
-        "prop-types-extra": "^1.1.0",
-        "react-overlays": "^1.2.0",
-        "react-transition-group": "^4.0.0",
-        "uncontrollable": "^7.0.0",
-        "warning": "^4.0.3"
-      }
-    },
-    "react-context-toolbox": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/react-context-toolbox/-/react-context-toolbox-2.0.2.tgz",
-      "integrity": "sha512-tY4j0imkYC3n5ZlYSgFkaw7fmlCp3IoQQ6DxpqeNHzcD0hf+6V+/HeJxviLUZ1Rv1Yn3N3xyO2EhkkZwHn0m1A=="
-    },
-    "react-dev-utils": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-9.0.3.tgz",
-      "integrity": "sha512-OyInhcwsvycQ3Zr2pQN+HV4gtRXrky5mJXIy4HnqrWa+mI624xfYfqGuC9dYbxp4Qq3YZzP8GSGQjv0AgNU15w==",
-      "requires": {
-        "@babel/code-frame": "7.5.5",
-        "address": "1.1.0",
-        "browserslist": "4.6.6",
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "detect-port-alt": "1.1.6",
-        "escape-string-regexp": "1.0.5",
-        "filesize": "3.6.1",
-        "find-up": "3.0.0",
-        "fork-ts-checker-webpack-plugin": "1.5.0",
-        "global-modules": "2.0.0",
-        "globby": "8.0.2",
-        "gzip-size": "5.1.1",
-        "immer": "1.10.0",
-        "inquirer": "6.5.0",
-        "is-root": "2.1.0",
-        "loader-utils": "1.2.3",
-        "open": "^6.3.0",
-        "pkg-up": "2.0.0",
-        "react-error-overlay": "^6.0.1",
-        "recursive-readdir": "2.2.2",
-        "shell-quote": "1.6.1",
-        "sockjs-client": "1.3.0",
-        "strip-ansi": "5.2.0",
-        "text-table": "0.2.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "cli-cursor": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-          "requires": {
-            "restore-cursor": "^2.0.0"
-          }
-        },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "inquirer": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz",
-          "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==",
-          "requires": {
-            "ansi-escapes": "^3.2.0",
-            "chalk": "^2.4.2",
-            "cli-cursor": "^2.1.0",
-            "cli-width": "^2.0.0",
-            "external-editor": "^3.0.3",
-            "figures": "^2.0.0",
-            "lodash": "^4.17.12",
-            "mute-stream": "0.0.7",
-            "run-async": "^2.2.0",
-            "rxjs": "^6.4.0",
-            "string-width": "^2.1.0",
-            "strip-ansi": "^5.1.0",
-            "through": "^2.3.6"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-        },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        },
-        "restore-cursor": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-          "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        }
-      }
-    },
-    "react-dom": {
-      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.9.0.tgz",
-      "integrity": "sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.15.0"
-      }
-    },
-    "react-error-overlay": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.1.tgz",
-      "integrity": "sha512-V9yoTr6MeZXPPd4nV/05eCBvGH9cGzc52FN8fs0O0TVQ3HYYf1n7EgZVtHbldRq5xU9zEzoXIITjYNIfxDDdUw=="
-    },
-    "react-input-autosize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.1.tgz",
-      "integrity": "sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==",
-      "requires": {
-        "prop-types": "^15.5.8"
-      }
-    },
-    "react-is": {
-      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
-      "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
-    },
-    "react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-    },
-    "react-overlays": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-1.2.0.tgz",
-      "integrity": "sha512-i/FCV8wR6aRaI+Kz/dpJhOdyx+ah2tN1RhT9InPrexyC4uzf3N4bNayFTGtUeQVacj57j1Mqh1CwV60/5153Iw==",
-      "requires": {
-        "classnames": "^2.2.6",
-        "dom-helpers": "^3.4.0",
-        "prop-types": "^15.6.2",
-        "prop-types-extra": "^1.1.0",
-        "react-context-toolbox": "^2.0.2",
-        "react-popper": "^1.3.2",
-        "uncontrollable": "^6.0.0",
-        "warning": "^4.0.2"
-      },
-      "dependencies": {
-        "uncontrollable": {
-          "version": "6.2.3",
-          "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-6.2.3.tgz",
-          "integrity": "sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==",
-          "requires": {
-            "@babel/runtime": "^7.4.5",
-            "invariant": "^2.2.4"
-          }
-        }
-      }
-    },
-    "react-popper": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.4.tgz",
-      "integrity": "sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "create-react-context": "^0.3.0",
-        "popper.js": "^1.14.4",
-        "prop-types": "^15.6.1",
-        "typed-styles": "^0.0.7",
-        "warning": "^4.0.2"
-      },
-      "dependencies": {
-        "create-react-context": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
-          "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
-          "requires": {
-            "gud": "^1.0.0",
-            "warning": "^4.0.3"
-          }
-        },
-        "typed-styles": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
-          "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
-        }
-      }
-    },
-    "react-router": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.1.tgz",
-      "integrity": "sha512-EM7suCPNKb1NxcTZ2LEOWFtQBQRQXecLxVpdsP4DW4PbbqYWeRiLyV/Tt1SdCrvT2jcyXAXmVTmzvSzrPR63Bg==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "history": "^4.9.0",
-        "hoist-non-react-statics": "^3.1.0",
-        "loose-envify": "^1.3.1",
-        "mini-create-react-context": "^0.3.0",
-        "path-to-regexp": "^1.7.0",
-        "prop-types": "^15.6.2",
-        "react-is": "^16.6.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
-      }
-    },
-    "react-router-dom": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.1.tgz",
-      "integrity": "sha512-zaVHSy7NN0G91/Bz9GD4owex5+eop+KvgbxXsP/O+iW1/Ln+BrJ8QiIR5a6xNPtrdTvLkxqlDClx13QO1uB8CA==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "history": "^4.9.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-router": "5.0.1",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
-      }
-    },
-    "react-scripts": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.1.1.tgz",
-      "integrity": "sha512-dbjTG9vJC61OI62hIswQYg5xHvwlxDTH6QXz6ICEuA5AqkFQWk1LKl76sk8fVL2WsyumbBc4FErALwKcEV2vNA==",
-      "requires": {
-        "@babel/core": "7.5.5",
-        "@svgr/webpack": "4.3.2",
-        "@typescript-eslint/eslint-plugin": "1.13.0",
-        "@typescript-eslint/parser": "1.13.0",
-        "babel-eslint": "10.0.2",
-        "babel-jest": "^24.8.0",
-        "babel-loader": "8.0.6",
-        "babel-plugin-named-asset-import": "^0.3.3",
-        "babel-preset-react-app": "^9.0.1",
-        "camelcase": "^5.2.0",
-        "case-sensitive-paths-webpack-plugin": "2.2.0",
-        "css-loader": "2.1.1",
-        "dotenv": "6.2.0",
-        "dotenv-expand": "4.2.0",
-        "eslint": "^6.1.0",
-        "eslint-config-react-app": "^5.0.1",
-        "eslint-loader": "2.2.1",
-        "eslint-plugin-flowtype": "3.13.0",
-        "eslint-plugin-import": "2.18.2",
-        "eslint-plugin-jsx-a11y": "6.2.3",
-        "eslint-plugin-react": "7.14.3",
-        "eslint-plugin-react-hooks": "^1.6.1",
-        "file-loader": "3.0.1",
-        "fs-extra": "7.0.1",
-        "fsevents": "2.0.7",
-        "html-webpack-plugin": "4.0.0-beta.5",
-        "identity-obj-proxy": "3.0.0",
-        "is-wsl": "^1.1.0",
-        "jest": "24.8.0",
-        "jest-environment-jsdom-fourteen": "0.1.0",
-        "jest-resolve": "24.8.0",
-        "jest-watch-typeahead": "0.3.1",
-        "mini-css-extract-plugin": "0.5.0",
-        "optimize-css-assets-webpack-plugin": "5.0.3",
-        "pnp-webpack-plugin": "1.5.0",
-        "postcss-flexbugs-fixes": "4.1.0",
-        "postcss-loader": "3.0.0",
-        "postcss-normalize": "7.0.1",
-        "postcss-preset-env": "6.7.0",
-        "postcss-safe-parser": "4.0.1",
-        "react-app-polyfill": "^1.0.2",
-        "react-dev-utils": "^9.0.3",
-        "resolve": "1.12.0",
-        "resolve-url-loader": "3.1.0",
-        "sass-loader": "7.2.0",
-        "semver": "6.3.0",
-        "style-loader": "1.0.0",
-        "terser-webpack-plugin": "1.4.1",
-        "ts-pnp": "1.1.2",
-        "url-loader": "2.1.0",
-        "webpack": "4.39.1",
-        "webpack-dev-server": "3.2.1",
-        "webpack-manifest-plugin": "2.0.4",
-        "workbox-webpack-plugin": "4.3.1"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-          "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "react-select": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.0.4.tgz",
-      "integrity": "sha512-fbVISKa/lSUlLsltuatfUiKcWCNvdLXxFFyrzVQCBUsjxJZH/m7UMPdw/ywmRixAmwXAP++MdbNNZypOsiDEfA==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/cache": "^10.0.9",
-        "@emotion/core": "^10.0.9",
-        "@emotion/css": "^10.0.9",
-        "classnames": "^2.2.5",
-        "memoize-one": "^5.0.0",
-        "prop-types": "^15.6.0",
-        "raf": "^3.4.0",
-        "react-input-autosize": "^2.2.1",
-        "react-transition-group": "^2.2.1"
-      },
-      "dependencies": {
-        "react-transition-group": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
-          "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
-          "requires": {
-            "dom-helpers": "^3.4.0",
-            "loose-envify": "^1.4.0",
-            "prop-types": "^15.6.2",
-            "react-lifecycles-compat": "^3.0.4"
-          }
-        }
-      }
-    },
-    "react-test-renderer": {
-      "version": "16.9.0",
-      "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.9.0.tgz",
-      "integrity": "sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "react-is": "^16.9.0",
-        "scheduler": "^0.15.0"
-      },
-      "dependencies": {
-        "scheduler": {
-          "version": "0.15.0",
-          "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
-          "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
-          "dev": true,
-          "requires": {
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.1"
-          }
-        }
-      }
-    },
-    "react-transition-group": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.2.2.tgz",
-      "integrity": "sha512-uP0tjqewtvjb7kGZFpZYPoD/NlVZmIgts9eTt1w35pAaEApPxQGv94lD3VkqyXf2aMqrSGwhs6EV/DLaoKbLSw==",
-      "requires": {
-        "@babel/runtime": "^7.4.5",
-        "dom-helpers": "^3.4.0",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
-      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
-      "requires": {
-        "find-up": "^3.0.0",
-        "read-pkg": "^3.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        }
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "realpath-native": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
-      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
-    "reflect.ownkeys": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
-      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
-      "dev": true
-    },
-    "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
-    },
-    "regenerate-unicode-properties": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
-      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
-      "requires": {
-        "regenerate": "^1.4.0"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
-    },
-    "regenerator-transform": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
-      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
-      "requires": {
-        "private": "^0.1.6"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regex-parser": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
-      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA=="
-    },
-    "regexp-tree": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.11.tgz",
-      "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg=="
-    },
-    "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
-    },
-    "regexpu-core": {
-      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz",
-      "integrity": "sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==",
-      "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.1.0",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
-      }
-    },
-    "regjsgen": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
-      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA=="
-    },
-    "regjsparser": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
-      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
-        }
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
-    },
-    "renderkid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
-      "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "^0.2",
-        "htmlparser2": "^3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "^0.4.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "css-select": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        }
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
-      "requires": {
-        "lodash": "^4.17.11"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
-      "requires": {
-        "request-promise-core": "1.1.2",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
-    },
-    "resolve": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g="
-    },
-    "resolve-pathname": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
-      "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
-    },
-    "resolve-url-loader": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz",
-      "integrity": "sha512-2QcrA+2QgVqsMJ1Hn5NnJXIGCX1clQ1F6QJTqOeiaDw9ACo1G2k+8/shq3mtqne03HOFyskAClqfxKyFBriXZg==",
-      "requires": {
-        "adjust-sourcemap-loader": "2.0.0",
-        "camelcase": "5.0.0",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.6.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.14",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
-        "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
-    },
-    "rework": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "requires": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
-        }
-      }
-    },
-    "rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
-    },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE="
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM="
-    },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "rst-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=",
-      "dev": true,
-      "requires": {
-        "lodash.flattendeep": "^4.4.0",
-        "nearley": "^2.7.10"
-      }
-    },
-    "rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
-      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sane": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-      "requires": {
-        "@cnakazawa/watch": "^1.0.3",
-        "anymatch": "^2.0.0",
-        "capture-exit": "^2.0.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5"
-      }
-    },
-    "sass-loader": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz",
-      "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==",
-      "requires": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.0.1",
-        "neo-async": "^2.5.0",
-        "pify": "^4.0.1",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "clone-deep": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-          "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-          "requires": {
-            "is-plain-object": "^2.0.4",
-            "kind-of": "^6.0.2",
-            "shallow-clone": "^3.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "shallow-clone": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-          "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-          "requires": {
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
-      "requires": {
-        "xmlchars": "^2.1.1"
-      }
-    },
-    "scheduler": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.15.0.tgz",
-      "integrity": "sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      }
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
-    },
-    "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
-      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
-      "requires": {
-        "node-forge": "0.7.5"
-      }
-    },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-    },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-            }
-          }
-        },
-        "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz",
-      "integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg=="
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
-      "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^2.0.1",
-        "lazy-cache": "^0.2.3",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "requires": {
-            "is-buffer": "^1.0.2"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U="
-        }
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
-      }
-    },
-    "shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        }
-      }
-    },
-    "sisteransi": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz",
-      "integrity": "sha512-SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg=="
-    },
-    "slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        }
-      }
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "requires": {
-        "kind-of": "^3.2.0"
-      }
-    },
-    "sockjs": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-      "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
-      },
-      "dependencies": {
-        "faye-websocket": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-          "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        }
-      }
-    },
-    "sockjs-client": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-      "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
-    },
-    "spdy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-    },
-    "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-    },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
-    },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
-    },
-    "string-length": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
-      "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
-      "requires": {
-        "astral-regex": "^1.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string-width": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz",
-      "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^5.2.0"
-      }
-    },
-    "string.prototype.trim": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz",
-      "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.13.0",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "requires": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "requires": {
-        "ansi-regex": "^4.1.0"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-    },
-    "strip-comments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz",
-      "integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==",
-      "requires": {
-        "babel-extract-comments": "^1.0.0",
-        "babel-plugin-transform-object-rest-spread": "^6.26.0"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
-    },
-    "strip-json-comments": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
-    },
-    "style-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
-      "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==",
-      "requires": {
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^2.0.1"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
-          "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "styled-components": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.3.2.tgz",
-      "integrity": "sha512-NppHzIFavZ3TsIU3R1omtddJ0Bv1+j50AKh3ZWyXHuFvJq1I8qkQ5mZ7uQgD89Y8zJNx2qRo6RqAH1BmoVafHw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.0.0",
-        "@emotion/is-prop-valid": "^0.8.1",
-        "@emotion/unitless": "^0.7.0",
-        "babel-plugin-styled-components": ">= 1",
-        "css-to-react-native": "^2.2.2",
-        "memoize-one": "^5.0.0",
-        "merge-anything": "^2.2.4",
-        "prop-types": "^15.5.4",
-        "react-is": "^16.6.0",
-        "stylis": "^3.5.0",
-        "stylis-rule-sheet": "^0.0.10",
-        "supports-color": "^5.5.0"
-      }
-    },
-    "stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
-          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
-          "requires": {
-            "dot-prop": "^4.1.1",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "stylis": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
-      "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
-    },
-    "stylis-rule-sheet": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
-      "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "svg-parser": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.2.tgz",
-      "integrity": "sha512-1gtApepKFweigFZj3sGO8KT8LvVZK8io146EzXrpVuWCDAbISz/yMucco3hWTkpZNoPabM+dnMOpy6Swue68Zg=="
-    },
-    "svgo": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.0.tgz",
-      "integrity": "sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==",
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.33",
-        "csso": "^3.5.1",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      }
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
-    },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
-    },
-    "terser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz",
-      "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==",
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
-      "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
-      "requires": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "test-exclude": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
-      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
-      "requires": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "read-pkg-up": "^4.0.0",
-        "require-main-filename": "^2.0.0"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
-    },
-    "throat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
-      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo="
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "thunky": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow=="
-    },
-    "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
-    },
-    "tiny-invariant": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz",
-      "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA=="
-    },
-    "tiny-warning": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
-      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
-    },
-    "ts-pnp": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.2.tgz",
-      "integrity": "sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA=="
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
-    },
-    "tsutils": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "type": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz",
-      "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg=="
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-fest": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz",
-      "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typed-styles": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.5.tgz",
-      "integrity": "sha512-ht+rEe5UsdEBAa3gr64+QjUOqjOLJfWLvl5HZR5Ev9uo/OnD3p43wPeFSB1hNFc13GXQF/JU1Bn0YHLUqBRIlw=="
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-    },
-    "ua-parser-js": {
-      "version": "0.7.20",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
-      "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
-    },
-    "uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-      "requires": {
-        "commander": "~2.19.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "uncontrollable": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.0.0.tgz",
-      "integrity": "sha512-HFhKHDACiAsTYoV3el/LP4PqcLzqyWrNRHE6nMdr0h8f7qbvTPXIN2S4q+tdfc64PHEXaSFBs/fKVB2+UwSYOA==",
-      "requires": {
-        "@babel/runtime": "^7.4.5",
-        "invariant": "^2.2.4"
-      }
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ="
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        }
-      }
-    },
-    "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
-    },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        }
-      }
-    },
-    "url-loader": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.1.0.tgz",
-      "integrity": "sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==",
-      "requires": {
-        "loader-utils": "^1.2.3",
-        "mime": "^2.4.4",
-        "schema-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
-          "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
-    },
-    "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
-    },
-    "v8-compile-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "value-equal": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz",
-      "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw=="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "vendors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
-      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
-      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
-    },
-    "w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
-      "requires": {
-        "browser-process-hrtime": "^0.1.2"
-      }
-    },
-    "w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
-      "requires": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-      "requires": {
-        "makeerror": "1.0.x"
-      }
-    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "webpack": {
-      "version": "4.39.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.1.tgz",
-      "integrity": "sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==",
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.2.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.1",
-        "watchpack": "^1.6.0",
-        "webpack-sources": "^1.4.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
-      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
-      "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.2",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
-      "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
-      "requires": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^4.1.1",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "^0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.2.0",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
-        "sockjs": "0.3.19",
-        "sockjs-client": "1.3.0",
-        "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.5.1",
-        "webpack-log": "^2.0.0",
-        "yargs": "12.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "decamelize": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-          "requires": {
-            "xregexp": "4.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "yargs": {
-          "version": "12.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^10.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
-        }
-      }
-    },
-    "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "webpack-manifest-plugin": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz",
-      "integrity": "sha512-nejhOHexXDBKQOj/5v5IZSfCeTO3x1Dt1RZEcGfBSul891X/eLIcIVH31gwxPDdsi2Z8LKKFGpM4w9+oTBOSCg==",
-      "requires": {
-        "fs-extra": "^7.0.0",
-        "lodash": ">=3.5 <5",
-        "tapable": "^1.0.0"
-      }
-    },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
-      "requires": {
-        "http-parser-js": ">=0.4.0 <0.4.11",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
-    },
-    "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "requires": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "whatwg-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
-    },
-    "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
-    },
-    "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-    },
-    "workbox-background-sync": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz",
-      "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-broadcast-update": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz",
-      "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-build": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz",
-      "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==",
-      "requires": {
-        "@babel/runtime": "^7.3.4",
-        "@hapi/joi": "^15.0.0",
-        "common-tags": "^1.8.0",
-        "fs-extra": "^4.0.2",
-        "glob": "^7.1.3",
-        "lodash.template": "^4.4.0",
-        "pretty-bytes": "^5.1.0",
-        "stringify-object": "^3.3.0",
-        "strip-comments": "^1.0.2",
-        "workbox-background-sync": "^4.3.1",
-        "workbox-broadcast-update": "^4.3.1",
-        "workbox-cacheable-response": "^4.3.1",
-        "workbox-core": "^4.3.1",
-        "workbox-expiration": "^4.3.1",
-        "workbox-google-analytics": "^4.3.1",
-        "workbox-navigation-preload": "^4.3.1",
-        "workbox-precaching": "^4.3.1",
-        "workbox-range-requests": "^4.3.1",
-        "workbox-routing": "^4.3.1",
-        "workbox-strategies": "^4.3.1",
-        "workbox-streams": "^4.3.1",
-        "workbox-sw": "^4.3.1",
-        "workbox-window": "^4.3.1"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
-      }
-    },
-    "workbox-cacheable-response": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz",
-      "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-core": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz",
-      "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg=="
-    },
-    "workbox-expiration": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz",
-      "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-google-analytics": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz",
-      "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==",
-      "requires": {
-        "workbox-background-sync": "^4.3.1",
-        "workbox-core": "^4.3.1",
-        "workbox-routing": "^4.3.1",
-        "workbox-strategies": "^4.3.1"
-      }
-    },
-    "workbox-navigation-preload": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz",
-      "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-precaching": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz",
-      "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-range-requests": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz",
-      "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-routing": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz",
-      "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-strategies": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz",
-      "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-streams": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz",
-      "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "workbox-sw": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz",
-      "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w=="
-    },
-    "workbox-webpack-plugin": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz",
-      "integrity": "sha512-gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ==",
-      "requires": {
-        "@babel/runtime": "^7.0.0",
-        "json-stable-stringify": "^1.0.1",
-        "workbox-build": "^4.3.1"
-      }
-    },
-    "workbox-window": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz",
-      "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==",
-      "requires": {
-        "workbox-core": "^4.3.1"
-      }
-    },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "worker-rpc": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz",
-      "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==",
-      "requires": {
-        "microevent.ts": "~0.1.1"
-      }
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "write-file-atomic": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
-      "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ws": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
-    },
-    "xmlchars": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
-      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
-    },
-    "xregexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg=="
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-    },
-    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
-    },
-    "yallist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-    },
-    "yargs": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-      "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
-      "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    }
-  }
-}
diff --git a/ui-react/package.json b/ui-react/package.json
index 3d2f68124..dffe698c3 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -1,47 +1,83 @@
 {
-  "name": "onap-clamp-ui",
-  "version": "4.1.1-SNAPSHOT",
-  "description": "ONAP Clamp Loop Designer UI",
-  "author": "ONAP Clamp Team",
-  "license": "Apache-2.0",
-  "publishConfig": {
-    "registry": "https://nexus3.onap.org/repository/npm.snapshot/"
-  },
-  "main": "index.js",
-  "proxy": "https://localhost:8443",
-  "scripts": {
-    "start": "HTTPS=true react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom --watchAll=false",
-    "eject": "react-scripts eject",
-    "publish": "npm run publish"
-  },
-  "files": [
-    "src/*.js",
-    "src/*.png",
-    "src/api",
-    "src/components",
-    "src/theme"
-  ],
-  "dependencies": {
-    "@json-editor/json-editor": "1.4.0-beta.0",
-    "react": "16.9.0",
-    "react-dom": "16.9.0",
-    "react-scripts": "3.1.1",
-    "react-bootstrap": "1.0.0-beta.12",
-    "bootstrap-css-only": "4.3.1",
-    "styled-components": "4.3.2",
-    "react-router-dom": "5.0.1",
-    "react-select": "3.0.4"
-  },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ],
-  "devDependencies": {
-    "enzyme": "3.10.0",
-    "enzyme-adapter-react-16": "1.14.0"
-  }
+	"name": "onap-clamp-ui",
+	"version": "${project.version}",
+	"description": "ONAP Clamp Loop Designer UI",
+	"author": "ONAP Clamp Team",
+	"license": "Apache-2.0",
+	"publishConfig": {
+		"registry": "https://nexus3.onap.org/repository/npm.snapshot/"
+	},
+	"main": "index.js",
+	"proxy": "https://localhost:8443",
+	"scripts": {
+		"start": "HTTPS=true react-scripts start",
+		"build": "react-scripts build",
+		"test": "jest",
+		"test:watch": "jest --watch",
+		"test:coverage": "jest --coverage",
+		"eject": "react-scripts eject",
+		"publish": "npm run publish"
+	},
+	"files": [
+		"src/*.js",
+		"src/*.png",
+		"src/api",
+		"src/components",
+		"src/theme"
+	],
+	"dependencies": {
+		"@json-editor/json-editor": "1.4.0-beta.0",
+		"react": "16.9.0",
+		"react-dom": "16.9.0",
+		"react-scripts": "3.1.1",
+		"react-bootstrap": "1.0.0-beta.12",
+		"bootstrap-css-only": "4.3.1",
+		"styled-components": "4.3.2",
+		"react-router-dom": "5.0.1",
+		"react-select": "3.0.4"
+	},
+	"devDependencies": {
+		"jest": "24.8.0",
+		"babel-jest": "24.8.0",
+		"@babel/preset-env": "7.5.5",
+		"@babel/preset-react": "7.0.0",
+		"@babel/plugin-proposal-class-properties": "7.5.5",
+		"enzyme": "3.10.0",
+		"enzyme-adapter-react-16": "1.14.0",
+		"enzyme-to-json": "3.4.0",
+		"jest-fetch-mock": "2.1.2"
+	},
+	"browserslist": [
+		">0.2%",
+		"not dead",
+		"not ie <= 11",
+		"not op_mini all"
+	],
+	"jest": {
+		"verbose": true,
+		"coverageDirectory": "${project.build.directory}/${ui.react.src}/coverage",
+		"collectCoverageFrom": [
+			"**/*.{js,jsx}"
+		],
+		"rootDir": "${project.build.directory}/${ui.react.src}",
+		"coverageReporters": [
+			"lcov"
+		],
+		"setupFiles": ["./src/setupTests.js"],
+		"snapshotSerializers": ["enzyme-to-json/serializer"]
+	},
+	"babel": {
+		"presets": [
+			"@babel/preset-env",
+			"@babel/preset-react"
+		],
+		"plugins": [
+			[
+				"@babel/plugin-proposal-class-properties",
+				{
+					"loose": true
+				}
+			]
+		]
+	}
 }
diff --git a/ui-react/src/__test__/LoopCache.test.js b/ui-react/src/__test__/LoopCache.test.js
deleted file mode 100644
index 1efea6495..000000000
--- a/ui-react/src/__test__/LoopCache.test.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import LoopCache from '../api/LoopCache';
-
-const json = require('./LoopCache_mokeLoopJsonCache.json');
-
-describe('Verify LoopCache functions', () => {
-    const loopCache = new LoopCache(json);
-		it('getLoopName', () => {
-      expect(loopCache.getLoopName()).toBe("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
-		});
-
-    it('getOperationalPolicyConfigurationJson', () => {
-      const opPolicyConfig = {
-          "guard_policies": {},
-          "operational_policy": {
-            "controlLoop": {},
-            "policies": []
-          }
-      };
-      expect(loopCache.getOperationalPolicyConfigurationJson()).toStrictEqual(opPolicyConfig);
-    });
-
-    it('getOperationalPolicies', () => {
-      const opPolicy = [{
-        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
-        "configurationsJson": {
-          "guard_policies": {},
-          "operational_policy": {
-            "controlLoop": {},
-            "policies": []
-
-          }
-        }
-      }];
-      expect(loopCache.getOperationalPolicies()).toStrictEqual(opPolicy);
-    });
-
-    it('getGlobalProperties', () => {
-      const globelProp = {
-        "dcaeDeployParameters": {
-          "location_id": "",
-          "service_id": "",
-          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-        }
-      };
-      expect(loopCache.getGlobalProperties()).toStrictEqual(globelProp);
-    });
-
-    it('getDcaeDeploymentProperties', () => {
-      const deploymentProp = {
-          "location_id": "",
-          "service_id": "",
-          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-      };
-      expect(loopCache.getDcaeDeploymentProperties()).toStrictEqual(deploymentProp);
-    });
-
-    it('getMicroServiceForName', () => {
-      const msJson = {
-          "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-          "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-          "properties": {"domain": "measurementsForVfScaling"},
-          "shared": false,
-          "jsonRepresentation": {"schema": {}}
-      };
-      expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJson);
-      expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
-    });
-
-    it('getMicroServicePropertiesForName', () => {
-      const msProp = {"domain": "measurementsForVfScaling"};
-      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msProp);
-      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
-    });
-
-    it('getMicroServiceJsonRepresentationForName', () => {
-      const msJsonRepresentation = {"schema": {}};
-      expect(loopCache.getMicroServiceJsonRepresentationForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
-    });
-
-    it('getResourceDetailsVfProperty', () => {
-      const resourceVF = {
-        "vLoadBalancerMS 0": {
-          "resourceVendor": "Test",
-          "resourceVendorModelNumber": "",
-          "name": "vLoadBalancerMS",
-          "description": "vLBMS",
-          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-          "subcategory": "Load Balancer",
-          "category": "Application L4+",
-          "type": "VF",
-          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-          "version": "1.0",
-          "resourceVendorRelease": "1.0",
-          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
-        }
-      };
-      expect(loopCache.getResourceDetailsVfProperty()).toStrictEqual(resourceVF);
-    });
-
-    it('getResourceDetailsVfModuleProperty', () => {
-      const vfModule = {
-        "Vloadbalancerms..vpkg..module-1": {
-          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vpkg",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        }
-      };
-      expect(loopCache.getResourceDetailsVfModuleProperty()).toStrictEqual(vfModule);
-    });
-
-    it('getLoopLogsArray', () => {
-      const logs = [
-        {
-          "id": 1,
-          "logType": "INFO",
-          "logComponent": "CLAMP",
-          "message": "Operational and Guard policies UPDATED",
-          "logInstant": "2019-07-08T09:44:37Z"
-        }
-      ];
-      expect(loopCache.getLoopLogsArray()).toStrictEqual(logs);
-    });
-
-    it('getComponentStates', () => {
-      const component = {
-        "POLICY": {
-          "componentState": {
-            "stateName": "NOT_SENT",
-            "description": "The policies defined have NOT yet been created on the policy engine"
-          }
-        },
-        "DCAE": {
-          "componentState": {
-            "stateName": "BLUEPRINT_DEPLOYED",
-            "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
-          }
-        }
-      };
-      expect(loopCache.getComponentStates()).toStrictEqual(component);
-    });
-
-    it('updateGlobalProperties', () => {
-      const newGlobalProps = {
-        "dcaeDeployParameters": {
-          "location_id": "newLocation",
-          "service_id": "newServiceId",
-          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2"
-        }
-      };
-      loopCache.updateGlobalProperties(newGlobalProps);
-      expect(loopCache.getGlobalProperties()).toStrictEqual(newGlobalProps);
-    });
-
-    it('updateOperationalPolicyProperties', () => {
-      const newOpPolicy = [{
-        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca_new",
-        "configurationsJson": {
-          "guard_policies": {},
-          "operational_policy": {
-            "controlLoop": {},
-            "policies": []
-          }
-        }
-      }];
-      loopCache.updateOperationalPolicyProperties(newOpPolicy);
-      expect(loopCache.getOperationalPolicies()).toStrictEqual(newOpPolicy);
-    });
-
-    it('updateMicroServiceProperties', () => {
-      const newMsPolicyProperties = {"domain": "measurementsForVfScalingNew"};
-      loopCache.updateMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", newMsPolicyProperties);
-      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newMsPolicyProperties);
-    });
- });
diff --git a/ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json b/ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json
deleted file mode 100644
index 184eaf7cd..000000000
--- a/ui-react/src/__test__/LoopCache_mokeLoopJsonCache.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
-  "globalPropertiesJson": {
-    "dcaeDeployParameters": {
-      "location_id": "",
-      "service_id": "",
-      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-    }
-  },
-  "modelPropertiesJson": {
-    "serviceDetails": {
-      "serviceType": "",
-      "namingPolicy": "",
-      "environmentContext": "General_Revenue-Bearing",
-      "serviceEcompNaming": "true",
-      "serviceRole": "",
-      "name": "vLoadBalancerMS",
-      "description": "vLBMS",
-      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-      "ecompGeneratedNaming": "true",
-      "category": "Network L4+",
-      "type": "Service",
-      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-      "instantiationType": "A-la-carte"
-    },
-    "resourceDetails": {
-      "CP": {},
-      "VL": {},
-      "VF": {
-        "vLoadBalancerMS 0": {
-          "resourceVendor": "Test",
-          "resourceVendorModelNumber": "",
-          "name": "vLoadBalancerMS",
-          "description": "vLBMS",
-          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-          "subcategory": "Load Balancer",
-          "category": "Application L4+",
-          "type": "VF",
-          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-          "version": "1.0",
-          "resourceVendorRelease": "1.0",
-          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
-        }
-      },
-      "CR": {},
-      "VFC": {},
-      "PNF": {},
-      "Service": {},
-      "CVFC": {},
-      "Service Proxy": {},
-      "Configuration": {},
-      "AllottedResource": {},
-      "VFModule": {
-        "Vloadbalancerms..vpkg..module-1": {
-          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vpkg",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        }
-      }
-    }
-  },
-  "lastComputedState": "DESIGN",
-  "components": {
-    "POLICY": {
-      "componentState": {
-        "stateName": "NOT_SENT",
-        "description": "The policies defined have NOT yet been created on the policy engine"
-      }
-    },
-    "DCAE": {
-      "componentState": {
-        "stateName": "BLUEPRINT_DEPLOYED",
-        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
-      }
-    }
-  },
-  "operationalPolicies": [
-    {
-      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
-      "configurationsJson": {
-        "guard_policies": {},
-        "operational_policy": {
-          "controlLoop": {},
-          "policies": []
-        }
-      }
-    }
-  ],
-  "microServicePolicies": [
-    {
-      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "properties": {"domain": "measurementsForVfScaling"},
-      "shared": false,
-      "jsonRepresentation": {"schema": {}}
-    }
-  ],
-  "loopLogs": [
-    {
-      "id": 1,
-      "logType": "INFO",
-      "logComponent": "CLAMP",
-      "message": "Operational and Guard policies UPDATED",
-      "logInstant": "2019-07-08T09:44:37Z"
-    }
-  ]
-}
diff --git a/ui-react/src/__test__/OpenLoopModal.test.js b/ui-react/src/__test__/OpenLoopModal.test.js
deleted file mode 100644
index 044eeda89..000000000
--- a/ui-react/src/__test__/OpenLoopModal.test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import OpenLoopModal from '../components/dialogs/OpenLoop/OpenLoopModal';
-
-describe('Verify OpenLoopModal', () => {
-
-  it('Test the render method', () => {
-    const component = shallow(<OpenLoopModal/>);
-    expect(component).toMatchSnapshot();
-  });
-
-
-});
diff --git a/ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap
deleted file mode 100644
index cb8b8fd30..000000000
--- a/ui-react/src/__test__/__snapshots__/OpenLoopModal.test.js.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify OpenLoopModal Test the render method 1`] = `ShallowWrapper {}`;
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
new file mode 100644
index 000000000..f67bc0aa0
--- /dev/null
+++ b/ui-react/src/api/LoopCache.test.js
@@ -0,0 +1,205 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import LoopCache from '../api/LoopCache';
+
+const json = require('./LoopCache_mokeLoopJsonCache.json');
+
+describe('Verify LoopCache functions', () => {
+    const loopCache = new LoopCache(json);
+		it('getLoopName', () => {
+      expect(loopCache.getLoopName()).toBe("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
+		});
+
+    it('getOperationalPolicyConfigurationJson', () => {
+      const opPolicyConfig = {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
+          }
+      };
+      expect(loopCache.getOperationalPolicyConfigurationJson()).toStrictEqual(opPolicyConfig);
+    });
+
+    it('getOperationalPolicies', () => {
+      const opPolicy = [{
+        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+        "configurationsJson": {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
+
+          }
+        }
+      }];
+      expect(loopCache.getOperationalPolicies()).toStrictEqual(opPolicy);
+    });
+
+    it('getGlobalProperties', () => {
+      const globelProp = {
+        "dcaeDeployParameters": {
+          "location_id": "",
+          "service_id": "",
+          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+        }
+      };
+      expect(loopCache.getGlobalProperties()).toStrictEqual(globelProp);
+    });
+
+    it('getDcaeDeploymentProperties', () => {
+      const deploymentProp = {
+          "location_id": "",
+          "service_id": "",
+          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+      };
+      expect(loopCache.getDcaeDeploymentProperties()).toStrictEqual(deploymentProp);
+    });
+
+    it('getMicroServiceForName', () => {
+      const msJson = {
+          "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+          "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+          "properties": {"domain": "measurementsForVfScaling"},
+          "shared": false,
+          "jsonRepresentation": {"schema": {}}
+      };
+      expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJson);
+      expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
+    });
+
+    it('getMicroServicePropertiesForName', () => {
+      const msProp = {"domain": "measurementsForVfScaling"};
+      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msProp);
+      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2")).toBeNull();
+    });
+
+    it('getMicroServiceJsonRepresentationForName', () => {
+      const msJsonRepresentation = {"schema": {}};
+      expect(loopCache.getMicroServiceJsonRepresentationForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJsonRepresentation);
+    });
+
+    it('getResourceDetailsVfProperty', () => {
+      const resourceVF = {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      };
+      expect(loopCache.getResourceDetailsVfProperty()).toStrictEqual(resourceVF);
+    });
+
+    it('getResourceDetailsVfModuleProperty', () => {
+      const vfModule = {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      };
+      expect(loopCache.getResourceDetailsVfModuleProperty()).toStrictEqual(vfModule);
+    });
+
+    it('getLoopLogsArray', () => {
+      const logs = [
+        {
+          "id": 1,
+          "logType": "INFO",
+          "logComponent": "CLAMP",
+          "message": "Operational and Guard policies UPDATED",
+          "logInstant": "2019-07-08T09:44:37Z"
+        }
+      ];
+      expect(loopCache.getLoopLogsArray()).toStrictEqual(logs);
+    });
+
+    it('getComponentStates', () => {
+      const component = {
+        "POLICY": {
+          "componentState": {
+            "stateName": "NOT_SENT",
+            "description": "The policies defined have NOT yet been created on the policy engine"
+          }
+        },
+        "DCAE": {
+          "componentState": {
+            "stateName": "BLUEPRINT_DEPLOYED",
+            "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+          }
+        }
+      };
+      expect(loopCache.getComponentStates()).toStrictEqual(component);
+    });
+
+    it('updateGlobalProperties', () => {
+      const newGlobalProps = {
+        "dcaeDeployParameters": {
+          "location_id": "newLocation",
+          "service_id": "newServiceId",
+          "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca_2"
+        }
+      };
+      loopCache.updateGlobalProperties(newGlobalProps);
+      expect(loopCache.getGlobalProperties()).toStrictEqual(newGlobalProps);
+    });
+
+    it('updateOperationalPolicyProperties', () => {
+      const newOpPolicy = [{
+        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca_new",
+        "configurationsJson": {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
+          }
+        }
+      }];
+      loopCache.updateOperationalPolicyProperties(newOpPolicy);
+      expect(loopCache.getOperationalPolicies()).toStrictEqual(newOpPolicy);
+    });
+
+    it('updateMicroServiceProperties', () => {
+      const newMsPolicyProperties = {"domain": "measurementsForVfScalingNew"};
+      loopCache.updateMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", newMsPolicyProperties);
+      expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newMsPolicyProperties);
+    });
+ });
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
new file mode 100644
index 000000000..184eaf7cd
--- /dev/null
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -0,0 +1,117 @@
+{
+  "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
+  "globalPropertiesJson": {
+    "dcaeDeployParameters": {
+      "location_id": "",
+      "service_id": "",
+      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+    }
+  },
+  "modelPropertiesJson": {
+    "serviceDetails": {
+      "serviceType": "",
+      "namingPolicy": "",
+      "environmentContext": "General_Revenue-Bearing",
+      "serviceEcompNaming": "true",
+      "serviceRole": "",
+      "name": "vLoadBalancerMS",
+      "description": "vLBMS",
+      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+      "ecompGeneratedNaming": "true",
+      "category": "Network L4+",
+      "type": "Service",
+      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+      "instantiationType": "A-la-carte"
+    },
+    "resourceDetails": {
+      "CP": {},
+      "VL": {},
+      "VF": {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      },
+      "CR": {},
+      "VFC": {},
+      "PNF": {},
+      "Service": {},
+      "CVFC": {},
+      "Service Proxy": {},
+      "Configuration": {},
+      "AllottedResource": {},
+      "VFModule": {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      }
+    }
+  },
+  "lastComputedState": "DESIGN",
+  "components": {
+    "POLICY": {
+      "componentState": {
+        "stateName": "NOT_SENT",
+        "description": "The policies defined have NOT yet been created on the policy engine"
+      }
+    },
+    "DCAE": {
+      "componentState": {
+        "stateName": "BLUEPRINT_DEPLOYED",
+        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+      }
+    }
+  },
+  "operationalPolicies": [
+    {
+      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "configurationsJson": {
+        "guard_policies": {},
+        "operational_policy": {
+          "controlLoop": {},
+          "policies": []
+        }
+      }
+    }
+  ],
+  "microServicePolicies": [
+    {
+      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+      "properties": {"domain": "measurementsForVfScaling"},
+      "shared": false,
+      "jsonRepresentation": {"schema": {}}
+    }
+  ],
+  "loopLogs": [
+    {
+      "id": 1,
+      "logType": "INFO",
+      "logComponent": "CLAMP",
+      "message": "Operational and Guard policies UPDATED",
+      "logInstant": "2019-07-08T09:44:37Z"
+    }
+  ]
+}
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
new file mode 100644
index 000000000..6ba8f40a5
--- /dev/null
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import OpenLoopModal from './OpenLoopModal';
+
+describe('Verify OpenLoopModal', () => {
+
+  beforeEach(() => {
+      fetch.resetMocks()
+  })
+
+  it('Test the render method', () => {
+    fetch.mockResponseOnce(JSON.stringify([
+        "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca",
+        "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3",
+        "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2"
+      ]))
+      
+    const component = shallow(<OpenLoopModal/>);
+    expect(component).toMatchSnapshot();
+  });
+
+
+});
diff --git a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
new file mode 100644
index 000000000..5fd9e8aa5
--- /dev/null
+++ b/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
@@ -0,0 +1,92 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify OpenLoopModal Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Open Model
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formPlaintextEmail"
+    >
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+        Model Name
+      </FormLabel>
+      <Col
+        sm="10"
+      >
+        <StateManager
+          defaultInputValue=""
+          defaultMenuIsOpen={false}
+          defaultValue={null}
+          onChange={[Function]}
+          options={Array []}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      controlId="formBasicChecbox"
+    >
+      <FormCheck
+        disabled={false}
+        inline={false}
+        isInvalid={false}
+        isValid={false}
+        title=""
+        type="checkbox"
+      >
+        <FormCheckLabel
+          type="checkbox"
+        >
+          Read Only
+        </FormCheckLabel>
+        <Styled(FormCheckInput)
+          type="checkbox"
+        />
+      </FormCheck>
+    </FormGroup>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Open
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/setupTests.js b/ui-react/src/setupTests.js
index fc7b0dce1..55d746052 100644
--- a/ui-react/src/setupTests.js
+++ b/ui-react/src/setupTests.js
@@ -1,4 +1,28 @@
-import Enzyme from 'enzyme';
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 
-Enzyme.configure({ adapter: new Adapter() });
+configure({ adapter: new Adapter() });
+global.fetch = require('jest-fetch-mock');
\ No newline at end of file
-- 
cgit 1.2.3-korg


From 337f36602a553ecb937c041a27b1c7270571c647 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 6 Sep 2019 18:11:51 +0200
Subject: Fix sonar issues

FIx some issues reported incorrectly by sonar for the new javascript
code

Issue-ID: CLAMP-425
Change-Id: I485b727c3a6007c0f0f9301fcda526b028d6251f
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 pom.xml                                              |  4 ++--
 ui-react/src/api/LoopActionService.js                |  4 ++--
 ui-react/src/api/LoopService.js                      | 20 ++++++++++----------
 ui-react/src/api/UserService.js                      |  6 +++---
 .../ConfigurationPolicy/ConfigurationPolicyModal.js  |  2 +-
 ui-react/src/components/dialogs/LoopProperties.js    |  5 ++---
 .../OperationalPolicy/OperationalPolicyModal.js      |  2 +-
 ui-react/src/components/loop_viewer/logs/LoopLogs.js |  4 ++--
 .../src/components/loop_viewer/status/LoopStatus.js  |  4 ++--
 ui-react/src/components/loop_viewer/svg/LoopSvg.js   |  4 ++--
 version.properties                                   |  2 +-
 11 files changed, 28 insertions(+), 29 deletions(-)

(limited to 'ui-react/src')

diff --git a/pom.xml b/pom.xml
index efb95cad7..698717b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.clamp</groupId>
 	<artifactId>clds</artifactId>
-	<version>4.1.1-SNAPSHOT</version>
+	<version>4.1.2-SNAPSHOT</version>
 	<name>clamp</name>
 
 
@@ -93,7 +93,7 @@
 		<!-- Enable language to disable javascript analysis -->
 		<!-- <sonar.language>java</sonar.language> -->
 		<!-- Parameters for Javascript coverage -->
-		<sonar.sources>src/main,${project.build.directory}/${ui.react.src}</sonar.sources>
+		<sonar.sources>src/main,${project.build.directory}/${ui.react.src}/src</sonar.sources>
 		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
 
 		<sonar.exclusions>src/main/resources/**</sonar.exclusions>
diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js
index 6e45ce4b9..7e20e2f6c 100644
--- a/ui-react/src/api/LoopActionService.js
+++ b/ui-react/src/api/LoopActionService.js
@@ -28,7 +28,7 @@ export default class LoopActionService{
 		const svcAction = uiAction.toLowerCase();
  		return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, {
  				method: 'PUT',
- 				credentials: 'same-origin',
+ 				credentials: 'same-origin'
  			})
  		.then(function (response) {
  			if (response.ok) {
@@ -53,7 +53,7 @@ export default class LoopActionService{
 
 		return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, {
 			method: 'GET',
-			credentials: 'same-origin',
+			credentials: 'same-origin'
 		})
 		.then(function (response) {
 			if (response.ok) {
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index eece20c96..e2e234821 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -22,7 +22,7 @@
 
 export default class LoopService {
 	static getLoopNames() {
-		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin', })
+		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
 			.then(function (response) {
 				console.debug("GetLoopNames response received: ", response.status);
 				if (response.ok) {
@@ -42,9 +42,9 @@ export default class LoopService {
 		return fetch('/restservices/clds/v2/loop/' + loopName, {
 			method: 'GET',
 			headers: {
-				"Content-Type": "application/json",
+				"Content-Type": "application/json"
 			},
-			credentials: 'same-origin',
+			credentials: 'same-origin'
 		})
 			.then(function (response) {
 				console.debug("GetLoop response received: ", response.status);
@@ -64,7 +64,7 @@ export default class LoopService {
 	static getSvg(loopName) {
 		return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, {
 			method: 'GET',
-			credentials: 'same-origin',
+			credentials: 'same-origin'
 		})
 			.then(function (response) {
 				console.debug("svgRepresentation response received: ", response.status);
@@ -86,9 +86,9 @@ export default class LoopService {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
-				"Content-Type": "application/json",
+				"Content-Type": "application/json"
 			},
-			body: JSON.stringify(jsonData),
+			body: JSON.stringify(jsonData)
 		})
 			.then(function (response) {
 				console.debug("updateMicroservicePolicy response received: ", response.status);
@@ -110,9 +110,9 @@ export default class LoopService {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
-				"Content-Type": "application/json",
+				"Content-Type": "application/json"
 			},
-			body: JSON.stringify(jsonData),
+			body: JSON.stringify(jsonData)
 		})
 			.then(function (response) {
 				console.debug("updateOperationalPolicies response received: ", response.status);
@@ -134,9 +134,9 @@ export default class LoopService {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
-				"Content-Type": "application/json",
+				"Content-Type": "application/json"
 			},
-			body: JSON.stringify(jsonData),
+			body: JSON.stringify(jsonData)
 		})
 			.then(function (response) {
 				console.debug("updateGlobalProperties response received: ", response.status);
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 37ec73d1a..8da6e3a71 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -26,7 +26,7 @@ export default class UserService {
 	static login() {
 		return fetch('/restservices/clds/v1/user/getUser', {
 				method: 'GET',
-				credentials: 'same-origin',
+				credentials: 'same-origin'
 			})
 		.then(function (response) {
 			console.debug("getUser response received, status code:", response.status);
@@ -51,7 +51,7 @@ export default class UserService {
 	static logout() {
 		return fetch('/restservices/clds/v1/user/logout', {
 			method: 'POST',
-			credentials: 'same-origin',
+			credentials: 'same-origin'
 		})
 		.then(function (response) {
 			console.debug("logout response received, status code:", response.status);
@@ -76,7 +76,7 @@ export default class UserService {
 	static getUserInfo() {
 		return fetch('/restservices/clds/v1/clds/cldsInfo', {
 				method: 'GET',
-				credentials: 'same-origin',
+				credentials: 'same-origin'
 			})
 		.then(function (response) {
 			console.debug("getUserInfo response received, status code:", response.status);
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 9863ef721..b0f601ec2 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -38,7 +38,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 		show: true,
 		loopCache: this.props.loopCache,
 		jsonEditor: null,
-		componentName: this.props.match.params.componentName,
+		componentName: this.props.match.params.componentName
 	};
 
 	constructor(props, context) {
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
index fa82a7e48..990fe7754 100644
--- a/ui-react/src/components/dialogs/LoopProperties.js
+++ b/ui-react/src/components/dialogs/LoopProperties.js
@@ -35,7 +35,7 @@ export default class LoopProperties extends React.Component {
 	state = {
 		show: true,
 		loopCache: this.props.loopCache,
-		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
+		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties()))
 	};
 
 	constructor(props, context) {
@@ -53,8 +53,7 @@ export default class LoopProperties extends React.Component {
 	componentWillReceiveProps(newProps) {
 		this.setState({
 			loopCache: newProps.loopCache,
-			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties())),
-
+			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties()))
 		});
 	}
 
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 7f349a10f..1ebe5f0e8 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -37,7 +37,7 @@ export default class OperationalPolicyModal extends React.Component {
 	state = {
 		show: true,
 		loopCache: this.props.loopCache,
-		jsonEditor: null,
+		jsonEditor: null
 	};
 
 	constructor(props, context) {
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
index b6a777a40..6abdc4b4f 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
@@ -47,7 +47,7 @@ const TableRow = ({ logRow }) => (
 export default class LoopLogs extends React.Component {
 
 	state = {
-		loopCache: new LoopCache({}),
+		loopCache: new LoopCache({})
 	}
 	constructor(props) {
 		super(props);
@@ -61,7 +61,7 @@ export default class LoopLogs extends React.Component {
 
 	componentWillReceiveProps(newProps) {
 		this.setState({
-			loopCache: newProps.loopCache,
+			loopCache: newProps.loopCache
 		});
 	}
 
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.js b/ui-react/src/components/loop_viewer/status/LoopStatus.js
index 141a41f51..d960c31e6 100644
--- a/ui-react/src/components/loop_viewer/status/LoopStatus.js
+++ b/ui-react/src/components/loop_viewer/status/LoopStatus.js
@@ -46,7 +46,7 @@ const TableRow = ({ statusRow }) => (
 
 export default class LoopStatus extends React.Component {
 	state = {
-		loopCache: new LoopCache({}),
+		loopCache: new LoopCache({})
 	}
 
 	constructor(props) {
@@ -74,7 +74,7 @@ export default class LoopStatus extends React.Component {
 
 	componentWillReceiveProps(newProps) {
 		this.setState({
-			loopCache: newProps.loopCache,
+			loopCache: newProps.loopCache
 		});
 	}
 
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 1b1e24280..48f0335fc 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -45,7 +45,7 @@ class LoopViewSvg extends React.Component {
 	state = {
 		svgContent: LoopViewSvg.emptySvg,
 		loopCache: new LoopCache({}),
-		componentModalMapping: new Map([]),
+		componentModalMapping: new Map([])
 	}
 
 	constructor(props) {
@@ -65,7 +65,7 @@ class LoopViewSvg extends React.Component {
 		if (this.state.loopCache !== newProps.loopCache) {
 			this.setState({
 				loopCache: newProps.loopCache,
-				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache),
+				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache)
 			});
 			this.getSvg(newProps.loopCache.getLoopName());
 		}
diff --git a/version.properties b/version.properties
index 0a0ad216b..75f8a3b3a 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=4
 minor=1
-patch=1
+patch=2
 
 base_version=${major}.${minor}.${patch}
 
-- 
cgit 1.2.3-korg


From 58b44949714b002818d20ba40d01eb50c031614d Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 10 Sep 2019 16:02:01 +0200
Subject: Remove Dead code

Removal of useless code not used anymore in clamp because model are
received from CSAR

Issue-ID: CLAMP-487
Change-Id: Ifeb0411e7f7cd599cb5cf5d8f5b0e33d34bbf396
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../java/org/onap/clamp/clds/camel/CamelProxy.java |  62 -------
 .../org/onap/clamp/clds/model/sdc/SdcArtifact.java | 109 -----------
 .../org/onap/clamp/clds/model/sdc/SdcResource.java | 171 ------------------
 .../clamp/clds/model/sdc/SdcResourceBasicInfo.java | 200 ---------------------
 .../clamp/clds/model/sdc/SdcServiceDetail.java     | 139 --------------
 .../onap/clamp/clds/model/sdc/SdcServiceInfo.java  | 191 --------------------
 .../org/onap/clamp/clds/service/CldsService.java   |  14 --
 .../clds/model/sdc/SdcResourceBasicInfoTest.java   | 106 -----------
 ui-react/src/theme/globalStyle.js                  |   2 +-
 9 files changed, 1 insertion(+), 993 deletions(-)
 delete mode 100644 src/main/java/org/onap/clamp/clds/camel/CamelProxy.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceInfo.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfoTest.java

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/clds/camel/CamelProxy.java b/src/main/java/org/onap/clamp/clds/camel/CamelProxy.java
deleted file mode 100644
index f6265982b..000000000
--- a/src/main/java/org/onap/clamp/clds/camel/CamelProxy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.camel;
-
-import org.apache.camel.ExchangeProperty;
-
-/**
- * This interface describes the CamelProxy parameters that must be passed to the
- * Camel flow.
- */
-@FunctionalInterface
-public interface CamelProxy {
-
-    /**
-     * This method is called when invoking a camel flow.
-     *
-     * @param actionCommand       The action coming from the Clamp UI (like SUBMIT, UPDATE,
-     *                            DELETE, ...)
-     * @param modelProperties     The Model properties created based on the BPMN Json and
-     *                            Properties Json
-     * @param modelBpmnProperties The Json with all the properties describing the flow
-     * @param modelName           The model name
-     * @param controlName         The control loop name
-     * @param docText             The Global properties JSON containing YAML (coming from CLamp
-     *                            template)
-     * @param isTest              Is a test or not (flag coming from the UI)
-     * @param userId              The user ID coming from the UI
-     * @param isInsertTestEvent   Is a test or not (flag coming from the UI)
-     * @param eventAction         The latest event action in database (like CREATE, SUBMIT, ...)
-     * @return A string containing the result of the Camel flow execution
-     */
-    String executeAction(@ExchangeProperty("actionCd") String actionCommand,
-                         @ExchangeProperty("modelProp") String modelProperties,
-                         @ExchangeProperty("modelBpmnProp") String modelBpmnProperties,
-                         @ExchangeProperty("modelName") String modelName, @ExchangeProperty("controlName") String controlName,
-                         @ExchangeProperty("docText") String docText, @ExchangeProperty("isTest") boolean isTest,
-                         @ExchangeProperty("userid") String userId, @ExchangeProperty("isInsertTestEvent") boolean isInsertTestEvent,
-                         @ExchangeProperty("eventAction") String eventAction);
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java
deleted file mode 100644
index f886ee644..000000000
--- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.model.sdc;
-
-public class SdcArtifact {
-
-    private String artifactName;
-    private String artifactType;
-    private String artifactUrl;
-    private String artifactDescription;
-    private String artifactTimeout;
-    private String artifactChecksum;
-    private String artifactUuid;
-    private String artifactVersion;
-    private String generatedFromUuid;
-
-    public String getArtifactName() {
-        return artifactName;
-    }
-
-    public void setArtifactName(String artifactName) {
-        this.artifactName = artifactName;
-    }
-
-    public String getArtifactType() {
-        return artifactType;
-    }
-
-    public void setArtifactType(String artifactType) {
-        this.artifactType = artifactType;
-    }
-
-    public String getArtifactURL() {
-        return artifactUrl;
-    }
-
-    public void setArtifactURL(String artifactURL) {
-        this.artifactUrl = artifactURL;
-    }
-
-    public String getArtifactDescription() {
-        return artifactDescription;
-    }
-
-    public void setArtifactDescription(String artifactDescription) {
-        this.artifactDescription = artifactDescription;
-    }
-
-    public String getArtifactTimeout() {
-        return artifactTimeout;
-    }
-
-    public void setArtifactTimeout(String artifactTimeout) {
-        this.artifactTimeout = artifactTimeout;
-    }
-
-    public String getArtifactChecksum() {
-        return artifactChecksum;
-    }
-
-    public void setArtifactChecksum(String artifactChecksum) {
-        this.artifactChecksum = artifactChecksum;
-    }
-
-    public String getArtifactUUID() {
-        return artifactUuid;
-    }
-
-    public void setArtifactUUID(String artifactUUID) {
-        this.artifactUuid = artifactUUID;
-    }
-
-    public String getArtifactVersion() {
-        return artifactVersion;
-    }
-
-    public void setArtifactVersion(String artifactVersion) {
-        this.artifactVersion = artifactVersion;
-    }
-
-    public String getGeneratedFromUUID() {
-        return generatedFromUuid;
-    }
-
-    public void setGeneratedFromUUID(String generatedFromUUID) {
-        this.generatedFromUuid = generatedFromUUID;
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java
deleted file mode 100644
index 515e77dfe..000000000
--- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.model.sdc;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-public class SdcResource implements Comparable<SdcResource> {
-
-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcResource.class);
-    protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
-
-    private String resourceInstanceName;
-    private String resourceName;
-    private String resourceInvariantUUID;
-    private String resourceVersion;
-    private String resoucreType;
-    private String resourceUuid;
-    private List<SdcArtifact> artifacts;
-
-    public String getResourceInstanceName() {
-        return resourceInstanceName;
-    }
-
-    public void setResourceInstanceName(String resourceInstanceName) {
-        this.resourceInstanceName = resourceInstanceName;
-    }
-
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    public void setResourceName(String resourceName) {
-        this.resourceName = resourceName;
-    }
-
-    public String getResourceInvariantUUID() {
-        return resourceInvariantUUID;
-    }
-
-    public void setResourceInvariantUUID(String resourceInvUuid) {
-        this.resourceInvariantUUID = resourceInvUuid;
-    }
-
-    public String getResourceVersion() {
-        return resourceVersion;
-    }
-
-    public void setResourceVersion(String resourceVersion) {
-        this.resourceVersion = resourceVersion;
-    }
-
-    public String getResoucreType() {
-        return resoucreType;
-    }
-
-    public void setResoucreType(String resoucreType) {
-        this.resoucreType = resoucreType;
-    }
-
-    public String getResourceUUID() {
-        return resourceUuid;
-    }
-
-    public void setResourceUUID(String resourceUUID) {
-        this.resourceUuid = resourceUUID;
-    }
-
-    public List<SdcArtifact> getArtifacts() {
-        return artifacts;
-    }
-
-    public void setArtifacts(List<SdcArtifact> artifacts) {
-        this.artifacts = artifacts;
-    }
-
-    @Override
-    public int compareTo(SdcResource in) {
-        // Compares this object with the specified object for order.
-        // Returns a negative integer, zero, or a positive integer as this
-        // object is less than, equal to, or greater than the specified object.
-
-        // first compare based on name
-        int rtn = resourceInstanceName.compareToIgnoreCase(in.resourceInstanceName);
-
-        if (rtn == 0) {
-            BigDecimal myVersion = convertVersion(resourceVersion);
-            BigDecimal inVersion = convertVersion(in.resourceVersion);
-            rtn = myVersion.compareTo(inVersion);
-        }
-        return rtn;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((resourceInstanceName == null) ? 0 : resourceInstanceName.hashCode());
-        result = prime * result + ((resourceVersion == null) ? 0 : resourceVersion.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        SdcResource other = (SdcResource) obj;
-        if (resourceInstanceName == null) {
-            if (other.resourceInstanceName != null) {
-                return false;
-            }
-        } else if (!resourceInstanceName.equals(other.resourceInstanceName)) {
-            return false;
-        }
-        if (resourceVersion == null) {
-            if (other.resourceVersion != null) {
-                return false;
-            }
-        } else if (!resourceVersion.equals(other.resourceVersion)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Convert version String into a BigDecimal.
-     *
-     * @param versionText version
-     * @return version in BigDecimal
-     */
-    private BigDecimal convertVersion(String versionText) {
-        BigDecimal rtn = BigDecimal.valueOf(0.0);
-        try {
-            rtn = new BigDecimal(versionText);
-        } catch (NumberFormatException nfe) {
-            logger.warn("SDC version=" + versionText + " is not decimal for name=" + resourceInstanceName);
-        }
-        return rtn;
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java
deleted file mode 100644
index 47192a540..000000000
--- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.model.sdc;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.math.BigDecimal;
-
-public class SdcResourceBasicInfo implements Comparable<SdcResourceBasicInfo> {
-
-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcResourceBasicInfo.class);
-    protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
-
-    private String uuid;
-    private String invariantUUID;
-    private String name;
-    private String version;
-    private String toscaModelURL;
-    private String category;
-    private String subCategory;
-    private String resourceType;
-    private String lifecycleState;
-    private String lastUpdaterUserId;
-
-    @Override
-    public int compareTo(SdcResourceBasicInfo in) {
-        // Compares this object with the specified object for order.
-        // Returns a negative integer, zero, or a positive integer as this
-        // object is less than, equal to, or greater than the specified object.
-        // first compare based on name
-        int rtn = name.compareToIgnoreCase(in.name);
-
-        if (rtn == 0) {
-            BigDecimal myVersion = convertVersion(version);
-            BigDecimal inVersion = convertVersion(in.version);
-            rtn = myVersion.compareTo(inVersion);
-        }
-        return rtn;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        SdcResourceBasicInfo other = (SdcResourceBasicInfo) obj;
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
-        if (version == null) {
-            if (other.version != null) {
-                return false;
-            }
-        } else if (!version.equals(other.version)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Convert version String into a BigDecimal.
-     *
-     * @param version version
-     * @return version in BigDecimal
-     */
-    private BigDecimal convertVersion(String version) {
-        BigDecimal rtn = BigDecimal.valueOf(0.0);
-        try {
-            rtn = new BigDecimal(version);
-        } catch (NumberFormatException nfe) {
-            logger.warn("SDC version=" + version + " is not decimal for name=" + name);
-        }
-        return rtn;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getInvariantUUID() {
-        return invariantUUID;
-    }
-
-    public void setInvariantUUID(String invariantUUID) {
-        this.invariantUUID = invariantUUID;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getToscaModelURL() {
-        return toscaModelURL;
-    }
-
-    public void setToscaModelURL(String toscaModelURL) {
-        this.toscaModelURL = toscaModelURL;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getSubCategory() {
-        return subCategory;
-    }
-
-    public void setSubCategory(String subCategory) {
-        this.subCategory = subCategory;
-    }
-
-    public String getResourceType() {
-        return resourceType;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public String getLifecycleState() {
-        return lifecycleState;
-    }
-
-    public void setLifecycleState(String lifecycleState) {
-        this.lifecycleState = lifecycleState;
-    }
-
-    public String getLastUpdaterUserId() {
-        return lastUpdaterUserId;
-    }
-
-    public void setLastUpdaterUserId(String lastUpdaterUserId) {
-        this.lastUpdaterUserId = lastUpdaterUserId;
-    }
-
-    public EELFLogger getLOGGER() {
-        return logger;
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java
deleted file mode 100644
index e7265ff5d..000000000
--- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.model.sdc;
-
-import java.util.List;
-
-public class SdcServiceDetail {
-
-    private String uuid;
-    private String invariantUUID;
-    private String name;
-    private String version;
-    private String toscaModelURL;
-    private String category;
-    private String lifecycleState;
-    private String lastUpdaterUserId;
-    private String distributionStatus;
-    private String lastUpdaterFullName;
-    private List<SdcResource> resources;
-    private List<SdcArtifact> artifacts;
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getInvariantUUID() {
-        return invariantUUID;
-    }
-
-    public void setInvariantUUID(String invariantUUID) {
-        this.invariantUUID = invariantUUID;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getToscaModelURL() {
-        return toscaModelURL;
-    }
-
-    public void setToscaModelURL(String toscaModelURL) {
-        this.toscaModelURL = toscaModelURL;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getLifecycleState() {
-        return lifecycleState;
-    }
-
-    public void setLifecycleState(String lifecycleState) {
-        this.lifecycleState = lifecycleState;
-    }
-
-    public String getLastUpdaterUserId() {
-        return lastUpdaterUserId;
-    }
-
-    public void setLastUpdaterUserId(String lastUpdaterUserId) {
-        this.lastUpdaterUserId = lastUpdaterUserId;
-    }
-
-    public String getDistributionStatus() {
-        return distributionStatus;
-    }
-
-    public void setDistributionStatus(String distributionStatus) {
-        this.distributionStatus = distributionStatus;
-    }
-
-    public String getLastUpdaterFullName() {
-        return lastUpdaterFullName;
-    }
-
-    public void setLastUpdaterFullName(String lastUpdaterFullName) {
-        this.lastUpdaterFullName = lastUpdaterFullName;
-    }
-
-    public List<SdcResource> getResources() {
-        return resources;
-    }
-
-    public void setResources(List<SdcResource> resources) {
-        this.resources = resources;
-    }
-
-    public List<SdcArtifact> getArtifacts() {
-        return artifacts;
-    }
-
-    public void setArtifacts(List<SdcArtifact> artifacts) {
-        this.artifacts = artifacts;
-    }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceInfo.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceInfo.java
deleted file mode 100644
index bb9f3f8a5..000000000
--- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceInfo.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * 
- */
-
-package org.onap.clamp.clds.model.sdc;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.math.BigDecimal;
-
-public class SdcServiceInfo implements Comparable<SdcServiceInfo> {
-
-    protected static final EELFLogger logger      = EELFManager.getInstance().getLogger(SdcServiceInfo.class);
-    protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
-
-    private String                    uuid;
-    private String                    invariantUUID;
-    private String                    name;
-    private String                    version;
-    private String                    toscaModelURL;
-    private String                    category;
-    private String                    lifecycleState;
-    private String                    lastUpdaterUserId;
-    private String                    distributionStatus;
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public String getInvariantUUID() {
-        return invariantUUID;
-    }
-
-    public void setInvariantUUID(String invariantUUID) {
-        this.invariantUUID = invariantUUID;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getToscaModelURL() {
-        return toscaModelURL;
-    }
-
-    public void setToscaModelURL(String toscaModelURL) {
-        this.toscaModelURL = toscaModelURL;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getLifecycleState() {
-        return lifecycleState;
-    }
-
-    public void setLifecycleState(String lifecycleState) {
-        this.lifecycleState = lifecycleState;
-    }
-
-    public String getLastUpdaterUserId() {
-        return lastUpdaterUserId;
-    }
-
-    public void setLastUpdaterUserId(String lastUpdaterUserId) {
-        this.lastUpdaterUserId = lastUpdaterUserId;
-    }
-
-    public String getDistributionStatus() {
-        return distributionStatus;
-    }
-
-    public void setDistributionStatus(String distributionStatus) {
-        this.distributionStatus = distributionStatus;
-    }
-
-    /**
-     * Compare using name and then version. Version is converted to a decimal.
-     */
-    @Override
-    public int compareTo(SdcServiceInfo in) {
-        // Compares this object with the specified object for order.
-        // Returns a negative integer, zero, or a positive integer as this
-        // object is less than, equal to, or greater than the specified object.
-        // first compare based on name
-        int rtn = name.compareToIgnoreCase(in.name);
-
-        if (rtn == 0) {
-            BigDecimal myVersion = convertVersion(version);
-            BigDecimal inVersion = convertVersion(in.version);
-            rtn = myVersion.compareTo(inVersion);
-        }
-
-        return rtn;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        SdcServiceInfo other = (SdcServiceInfo) obj;
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
-            return false;
-        }
-        if (version == null) {
-            if (other.version != null) {
-                return false;
-            }
-        } else if (!version.equals(other.version)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Convert version String into a BigDecimal.
-     *
-     * @param versionText version
-     * @return version in BigDecimal
-     */
-    private BigDecimal convertVersion(String versionText) {
-        try {
-            return new BigDecimal(versionText);
-        } catch (NumberFormatException nfe) {
-            logger.warn("SDC version=" + versionText + " is not decimal for name=" + name);
-        }
-        return BigDecimal.valueOf(0.0);
-    }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java
index 3a2cb0926..0e809112a 100644
--- a/src/main/java/org/onap/clamp/clds/service/CldsService.java
+++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java
@@ -28,18 +28,12 @@ package org.onap.clamp.clds.service;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import com.google.gson.reflect.TypeToken;
 
-import java.lang.reflect.Type;
 import java.util.Date;
-import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.camel.Produce;
-import org.onap.clamp.clds.camel.CamelProxy;
 import org.onap.clamp.clds.model.CldsInfo;
-import org.onap.clamp.clds.model.sdc.SdcServiceInfo;
 import org.onap.clamp.clds.util.LoggingUtils;
 import org.onap.clamp.clds.util.ONAPLogConstants;
 import org.slf4j.event.Level;
@@ -52,14 +46,6 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class CldsService extends SecureServiceBase {
-
-    /**
-     * The constant LIST_OF_SDC_SERVICE_INFO_TYPE.
-     */
-    public static final Type LIST_OF_SDC_SERVICE_INFO_TYPE = new TypeToken<List<SdcServiceInfo>>() {
-    }.getType();
-    @Produce(uri = "direct:processSubmit")
-    private CamelProxy camelProxy;
     /**
      * The constant securityLogger.
      */
diff --git a/src/test/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfoTest.java b/src/test/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfoTest.java
deleted file mode 100644
index 5adb0647a..000000000
--- a/src/test/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfoTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- * Modifications copyright (c) 2018 Nokia
- * ================================================================================
- *
- */
-
-package org.onap.clamp.clds.model.sdc;
-
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class SdcResourceBasicInfoTest {
-
-    @Test
-    public void testHashCode() {
-        SdcResourceBasicInfo sdc1a = new SdcResourceBasicInfo();
-        sdc1a.setName("test1");
-        sdc1a.setVersion("1.0");
-
-        SdcResourceBasicInfo sdc2 = new SdcResourceBasicInfo();
-        sdc2.setName("test2");
-        sdc2.setVersion("2.0");
-
-        SdcResourceBasicInfo sdc1b = new SdcResourceBasicInfo();
-        sdc1b.setName("test1");
-        sdc1b.setVersion("2.0");
-
-        Assertions.assertThat(sdc1a.hashCode()).isNotEqualTo(sdc1b.hashCode());
-        Assertions.assertThat(sdc1b.hashCode()).isNotEqualTo(sdc2.hashCode());
-        sdc1b.setVersion("1.0");
-        Assertions.assertThat(sdc1a.hashCode()).isEqualTo(sdc1b.hashCode());
-
-    }
-
-    @Test
-    public void testCompareTo() {
-        SdcResourceBasicInfo sdc1a = new SdcResourceBasicInfo();
-        sdc1a.setName("test1");
-        sdc1a.setVersion("1.0");
-
-        SdcResourceBasicInfo sdc1b = new SdcResourceBasicInfo();
-        sdc1b.setName("test1");
-        sdc1b.setVersion("2.0");
-
-        SdcResourceBasicInfo sdc2 = new SdcResourceBasicInfo();
-        sdc2.setName("test2");
-        sdc2.setVersion("2.0");
-
-        Assertions.assertThat(sdc1a.compareTo(sdc1b)).isEqualTo(-1);
-        Assertions.assertThat(sdc1b.compareTo(sdc1a)).isEqualTo(1);
-        Assertions.assertThat(sdc1a.compareTo(sdc1a)).isEqualTo(0);
-        Assertions.assertThat(sdc1a.compareTo(sdc2)).isEqualTo(-1);
-    }
-
-    @Test
-    public void testEquals() {
-        SdcResourceBasicInfo sdc1a = new SdcResourceBasicInfo();
-        sdc1a.setName("test1");
-        sdc1a.setVersion("1.0");
-
-        SdcResourceBasicInfo sdc1b = new SdcResourceBasicInfo();
-        sdc1b.setName("test1");
-        sdc1b.setVersion("2.0");
-
-        SdcResourceBasicInfo sdc2 = new SdcResourceBasicInfo();
-        sdc2.setName("test2");
-        sdc2.setVersion("2.0");
-
-        Assertions.assertThat(sdc1a.equals(sdc1a)).isTrue();
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isFalse();
-
-        sdc1b.setVersion(null);
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isFalse();
-        sdc1b.setVersion("1.0");
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isTrue();
-        sdc1a.setVersion(null);
-        sdc1b.setVersion(null);
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isTrue();
-
-        sdc1b.setName(null);
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isFalse();
-        sdc1b.setName("test1");
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isTrue();
-        sdc1a.setName(null);
-        sdc1b.setName(null);
-        Assertions.assertThat(sdc1a.equals(sdc1b)).isTrue();
-    }
-
-}
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index a0c338cd4..bb41bc192 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -90,5 +90,5 @@ export const DefaultClampTheme = {
 	menuBackgroundColor: 'white',
 	menuFontColor: 'black',
 	menuHighlightedBackgroundColor: '#337ab7',
-	menuHighlightedFontColor: 'white',
+	menuHighlightedFontColor: 'white'
 };
-- 
cgit 1.2.3-korg


From 841ddaaa26c0faf16353d8e22093daa2553aad57 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Thu, 19 Sep 2019 14:23:14 +0200
Subject: Add unit tests for UI

Adding unit tests for React UI

Issue-ID: CLAMP-509
Change-Id: If31bbea7972736aa190fd0fed19336a1aa382af8
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 docs/swagger/swagger.pdf                           |   4 +-
 .../onap/clamp/clds/config/AafConfiguration.java   |   1 -
 src/main/resources/META-INF/resources/swagger.html |   2 +-
 ui-react/package.json                              |  11 +-
 ui-react/src/components/dialogs/DeployLoop.js      |   2 +-
 ui-react/src/components/dialogs/DeployLoop.test.js |  46 ++
 .../src/components/dialogs/LoopProperties.test.js  |  61 +++
 ui-react/src/components/dialogs/UserInfo.test.js   |  86 +++
 .../dialogs/__snapshots__/DeployLoop.test.js.snap  |  66 +++
 .../__snapshots__/LoopProperties.test.js.snap      |  59 ++
 .../dialogs/__snapshots__/UserInfo.test.js.snap    | 137 +++++
 .../components/loop_viewer/logs/LoopLogs.test.js   |  48 ++
 .../logs/__snapshots__/LoopLogs.test.js.snap       |  61 +++
 .../loop_viewer/status/LoopStatus.test.js          |  54 ++
 .../status/__snapshots__/LoopStatus.test.js.snap   |  64 +++
 .../src/components/loop_viewer/svg/LoopSvg.test.js |  34 ++
 .../svg/__snapshots__/LoopSvg.test.js.snap         |   7 +
 ui-react/src/components/menu/MenuBar.test.js       |  46 ++
 .../menu/__snapshots__/MenuBar.test.js.snap        | 594 +++++++++++++++++++++
 19 files changed, 1376 insertions(+), 7 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/DeployLoop.test.js
 create mode 100644 ui-react/src/components/dialogs/LoopProperties.test.js
 create mode 100644 ui-react/src/components/dialogs/UserInfo.test.js
 create mode 100644 ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap
 create mode 100644 ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap
 create mode 100644 ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap
 create mode 100644 ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
 create mode 100644 ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
 create mode 100644 ui-react/src/components/loop_viewer/status/LoopStatus.test.js
 create mode 100644 ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap
 create mode 100644 ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
 create mode 100644 ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
 create mode 100644 ui-react/src/components/menu/MenuBar.test.js
 create mode 100644 ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 12c221637..5f3307b6e 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20190911145449+02'00')
-/ModDate (D:20190911145449+02'00')
+/CreationDate (D:20190919142605+02'00')
+/ModDate (D:20190919142605+02'00')
 >>
 endobj
 2 0 obj
diff --git a/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java b/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java
index b137378d3..5bcb0c555 100644
--- a/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/AafConfiguration.java
@@ -60,7 +60,6 @@ public class AafConfiguration {
         registration.addUrlPatterns("/restservices/clds/v1/dictionary/*");
         registration.addUrlPatterns("/restservices/clds/v1/user/*");
         registration.addUrlPatterns("/restservices/clds/v2/loop/*");
-        //registration.addUrlPatterns("*");
         registration.setName("cadiFilter");
         registration.setOrder(0);
         return registration;
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 49bbe0f5a..17507b662 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -2388,7 +2388,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2019-09-11 13:30:19 CEST
+Last updated 2019-05-27 14:30:20 CEST
 </div>
 </div>
 </body>
diff --git a/ui-react/package.json b/ui-react/package.json
index dffe698c3..4a363ab51 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -63,8 +63,15 @@
 		"coverageReporters": [
 			"lcov"
 		],
-		"setupFiles": ["./src/setupTests.js"],
-		"snapshotSerializers": ["enzyme-to-json/serializer"]
+		"moduleNameMapper": {
+		"\\.(css|png)$": "identity-obj-proxy"
+		},
+		"setupFiles": [
+			"./src/setupTests.js"
+		],
+		"snapshotSerializers": [
+			"enzyme-to-json/serializer"
+		]
 	},
 	"babel": {
 		"presets": [
diff --git a/ui-react/src/components/dialogs/DeployLoop.js b/ui-react/src/components/dialogs/DeployLoop.js
index 2ec395d23..805f0f29b 100644
--- a/ui-react/src/components/dialogs/DeployLoop.js
+++ b/ui-react/src/components/dialogs/DeployLoop.js
@@ -58,7 +58,7 @@ export default class DeployLoop extends React.Component {
 	handleClose(){
 		this.props.history.push('/');
 	}
-	handleSave(e) {
+	handleSave() {
 		const loopName = this.props.loopCache.getLoopName();
 		// save the global propserties
 		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
diff --git a/ui-react/src/components/dialogs/DeployLoop.test.js b/ui-react/src/components/dialogs/DeployLoop.test.js
new file mode 100644
index 000000000..bb08baf10
--- /dev/null
+++ b/ui-react/src/components/dialogs/DeployLoop.test.js
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import DeployLoop from './DeployLoop';
+import LoopCache from '../../api/LoopCache';
+
+describe('Verify DeployLoop', () => {
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+		"globalPropertiesJson": {
+			"dcaeDeployParameters": {
+				"location_id": "",
+				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+			}
+		}
+	});
+
+	it('Test the render method', () => {
+		const component = shallow(
+			<DeployLoop loopCache={loopCache}/>
+		)
+
+	expect(component).toMatchSnapshot();
+	});
+});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/LoopProperties.test.js b/ui-react/src/components/dialogs/LoopProperties.test.js
new file mode 100644
index 000000000..fadb9099e
--- /dev/null
+++ b/ui-react/src/components/dialogs/LoopProperties.test.js
@@ -0,0 +1,61 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import LoopProperties from './LoopProperties';
+import LoopCache from '../../api/LoopCache';
+
+describe('Verify LoopProperties', () => {
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+		"globalPropertiesJson": {
+			"dcaeDeployParameters": {
+				"location_id": "",
+				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+			}
+		}
+	});
+
+	it('Test the render method', () => {
+		const component = shallow(
+			<LoopProperties loopCache={loopCache}/>
+		)
+		component.setState({ show: true,
+			temporaryPropertiesJson: {
+				"dcaeDeployParameters": {
+					"location_id": "",
+					"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+				}
+			}
+		});
+
+	expect(component.state('temporaryPropertiesJson')).toEqual({
+	"dcaeDeployParameters": {
+		"location_id": "",
+		"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"}
+	});
+	expect(component.state('show')).toEqual(true);
+
+	expect(component).toMatchSnapshot();
+	});
+});
diff --git a/ui-react/src/components/dialogs/UserInfo.test.js b/ui-react/src/components/dialogs/UserInfo.test.js
new file mode 100644
index 000000000..186dac832
--- /dev/null
+++ b/ui-react/src/components/dialogs/UserInfo.test.js
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import UserInfo from './UserInfo';
+
+describe('Verify UserInfo', () => {
+
+	beforeEach(() => {
+		fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"userName": "test",
+						"cldsVersion": "1.0.0",
+					});
+			}});
+		});
+	})
+
+	it('Test the render method full permission', () => {
+		const component = shallow(<UserInfo />)
+		component.setState({ userInfo: {
+			"userName": "test",
+			"cldsVersion": "1.0.0",
+			"permissionReadCl": true,
+			"permissionReadTemplate" : true,
+			"permissionReadTosca" : true,
+			"permissionUpdateTemplate" : true,
+			"permissionUpdateCl" : true,
+			"permissionUpdateTosca": true
+		}});
+		expect(component).toMatchSnapshot();
+	});
+
+	it('Test the render method no permission', () => {
+		const component = shallow(<UserInfo />)
+		component.setState({ userInfo: {}
+		});
+
+		expect(component.find('FormControl').length).toEqual(0);
+	});
+
+	it('Test the render method read permission', () => {
+		const component = shallow(<UserInfo />)
+		component.setState({ userInfo: {
+			"userName": "test",
+			"cldsVersion": "1.0.0",
+			"permissionReadCl": true,
+			"permissionReadTemplate" : true,
+			"permissionReadTosca" : true
+		}});
+
+		expect(component.find('FormControl').length).toEqual(5);
+
+		const forms = component.find('FormControl');
+		expect(forms.get(0).props.defaultValue).toEqual("test");
+		expect(forms.get(1).props.defaultValue).toEqual("1.0.0");
+		expect(forms.get(2).props.defaultValue).toEqual("Read Template");
+		expect(forms.get(3).props.defaultValue).toEqual("Read Model");
+		expect(forms.get(4).props.defaultValue).toEqual("Read Tosca");
+	});
+});
diff --git a/ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap
new file mode 100644
index 000000000..1fd4b1047
--- /dev/null
+++ b/ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap
@@ -0,0 +1,66 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify DeployLoop Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Deployment parameters
+    </ModalTitle>
+  </ModalHeader>
+  <Styled(FormGroup)>
+    <FormLabel
+      column={false}
+      srOnly={false}
+    >
+      location_id
+    </FormLabel>
+    <FormControl
+      defaultValue=""
+      name="location_id"
+      onChange={[Function]}
+      type="text"
+    />
+  </Styled(FormGroup)>
+  <Styled(FormGroup)>
+    <FormLabel
+      column={false}
+      srOnly={false}
+    >
+      policy_id
+    </FormLabel>
+    <FormControl
+      defaultValue="TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+      name="policy_id"
+      onChange={[Function]}
+      type="text"
+    />
+  </Styled(FormGroup)>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Deploy
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap
new file mode 100644
index 000000000..c7e81c392
--- /dev/null
+++ b/ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap
@@ -0,0 +1,59 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify LoopProperties Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Model Properties
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <Form
+      inline={false}
+    >
+      <FormGroup>
+        <FormLabel
+          column={false}
+          srOnly={false}
+        >
+          Deploy Parameters
+        </FormLabel>
+        <FormControl
+          as="textarea"
+          defaultValue="{\\"location_id\\":\\"\\",\\"policy_id\\":\\"TCA_h2NMX_v1_0_ResourceInstanceName1_tca\\"}"
+          name="dcaeDeployParameters"
+          onChange={[Function]}
+          rows="3"
+        />
+      </FormGroup>
+    </Form>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Save Changes
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap
new file mode 100644
index 000000000..1ae567a2d
--- /dev/null
+++ b/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap
@@ -0,0 +1,137 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify UserInfo Test the render method full permission 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      User Info
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="userName"
+    >
+      <FormLabel
+        column={true}
+        sm="3"
+        srOnly={false}
+      >
+        Current User:
+      </FormLabel>
+      <Col>
+        <FormControl
+          defaultValue="test"
+          plaintext={true}
+          readOnly={true}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="cldsVersion"
+    >
+      <FormLabel
+        column={true}
+        sm="3"
+        srOnly={false}
+      >
+        CLDS Version:
+      </FormLabel>
+      <Col>
+        <FormControl
+          defaultValue="1.0.0"
+          plaintext={true}
+          readOnly={true}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="userPermissions"
+    >
+      <FormLabel
+        column={true}
+        sm="3"
+        srOnly={false}
+      >
+        User Permissions:
+      </FormLabel>
+      <Col>
+        <FormControl
+          defaultValue="Read Template"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Read Model"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Read Tosca"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Edit Template"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Edit Model"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Edit Tosca"
+          plaintext={true}
+          readOnly={true}
+        />
+      </Col>
+    </FormGroup>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
new file mode 100644
index 000000000..3c76405c4
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import LoopLogs from './LoopLogs';
+import LoopCache from '../../../api/LoopCache';
+
+describe('Verify LoopLogs', () => {
+
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+			"loopLogs": [
+			{
+				"id": 1,
+				"logType": "INFO",
+				"logComponent": "CLAMP",
+				"message": "Operational and Guard policies UPDATED",
+				"logInstant": "2019-07-08T09:44:37Z"
+			}
+		]
+	});
+
+	it('Test the render method', () => {
+		const component = shallow(<LoopLogs loopCache={loopCache}/>)
+
+		expect(component).toMatchSnapshot();
+	});
+});
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
new file mode 100644
index 000000000..174a3202b
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
@@ -0,0 +1,61 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify LoopLogs Test the render method 1`] = `
+<styled.div>
+  <label>
+    Loop Logs
+  </label>
+  <Styled(Bootstrap(Table))
+    hover={true}
+    responsive={true}
+    striped={true}
+    variant={true}
+  >
+    <thead>
+      <tr>
+        <th>
+          <span
+            align="left"
+          >
+            Date
+          </span>
+        </th>
+        <th>
+          <span
+            align="left"
+          >
+            Type
+          </span>
+        </th>
+        <th>
+          <span
+            align="left"
+          >
+            Component
+          </span>
+        </th>
+        <th>
+          <span
+            align="right"
+          >
+            Log
+          </span>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <TableRow
+        logRow={
+          Object {
+            "id": 1,
+            "logComponent": "CLAMP",
+            "logInstant": "2019-07-08T09:44:37Z",
+            "logType": "INFO",
+            "message": "Operational and Guard policies UPDATED",
+          }
+        }
+      />
+    </tbody>
+  </Styled(Bootstrap(Table))>
+</styled.div>
+`;
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.test.js b/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
new file mode 100644
index 000000000..2be825edc
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import LoopStatus from './LoopStatus';
+import LoopCache from '../../../api/LoopCache';
+
+describe('Verify LoopStatus', () => {
+
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+		"lastComputedState": "DESIGN",
+		"components": {
+			"POLICY": {
+				"componentState": {
+					"stateName": "NOT_SENT",
+					"description": "The policies defined have NOT yet been created on the policy engine"
+				}
+			},
+			"DCAE": {
+				"componentState": {
+					"stateName": "BLUEPRINT_DEPLOYED",
+					"description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+				}
+			}
+		}
+	});
+
+	it('Test the render method', () => {
+		const component = shallow(<LoopStatus loopCache={loopCache}/>)
+
+		expect(component).toMatchSnapshot();
+	});
+});
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap b/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap
new file mode 100644
index 000000000..275933ee8
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/status/__snapshots__/LoopStatus.test.js.snap
@@ -0,0 +1,64 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify LoopStatus Test the render method 1`] = `
+<styled.div>
+  <label>
+    Loop Status: 
+    DESIGN
+  </label>
+  <div>
+    <Styled(Bootstrap(Table))
+      hover={true}
+      responsive={true}
+      striped={true}
+      variant={true}
+    >
+      <thead>
+        <tr>
+          <th>
+            <span
+              align="left"
+            >
+              Component Name
+            </span>
+          </th>
+          <th>
+            <span
+              align="left"
+            >
+              Component State
+            </span>
+          </th>
+          <th>
+            <span
+              align="right"
+            >
+              Description
+            </span>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <TableRow
+          statusRow={
+            Object {
+              "componentName": "POLICY",
+              "description": "The policies defined have NOT yet been created on the policy engine",
+              "stateName": "NOT_SENT",
+            }
+          }
+        />
+        <TableRow
+          statusRow={
+            Object {
+              "componentName": "DCAE",
+              "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop",
+              "stateName": "BLUEPRINT_DEPLOYED",
+            }
+          }
+        />
+      </tbody>
+    </Styled(Bootstrap(Table))>
+  </div>
+</styled.div>
+`;
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
new file mode 100644
index 000000000..5a28328c9
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import LoopSvg from './LoopSvg';
+
+describe('Verify LoopSvg', () => {
+
+	it('Test the render method', () => {
+		const component = shallow(<LoopSvg />)
+
+		expect(component).toMatchSnapshot();
+	});
+});
diff --git a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
new file mode 100644
index 000000000..23d22256f
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify LoopSvg Test the render method 1`] = `
+<ContextConsumer>
+  <Component />
+</ContextConsumer>
+`;
diff --git a/ui-react/src/components/menu/MenuBar.test.js b/ui-react/src/components/menu/MenuBar.test.js
new file mode 100644
index 000000000..3e96dbf38
--- /dev/null
+++ b/ui-react/src/components/menu/MenuBar.test.js
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import MenuBar from './MenuBar';
+
+describe('Verify MenuBar', () => {
+
+	it('Test the render method', () => {
+		const component = shallow(<MenuBar />)
+
+		expect(component).toMatchSnapshot();
+	});
+
+	it('Update loopName', () => {
+		const component = shallow(<MenuBar />)
+		component.setProps({ loopName: "newLoop" });
+		expect(component.state('disabled')).toBe(false);
+	});
+
+	it('Default loopName', () => {
+		const component = shallow(<MenuBar />)
+		component.setProps({ loopName: "Empty (NO loop loaded yet)" });
+		expect(component.state('disabled')).toBe(true);
+	});
+});
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
new file mode 100644
index 000000000..3ee733463
--- /dev/null
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -0,0 +1,594 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify MenuBar Test the render method 1`] = `
+<NavbarCollapse>
+  <Styled(NavDropdown)
+    title="Closed Loop"
+  >
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/openLoop"
+    >
+      Open CL
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/loopProperties"
+    >
+      Properties CL
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/closeLoop"
+    >
+      Close Model
+    </DropdownItem>
+  </Styled(NavDropdown)>
+  <Styled(NavDropdown)
+    title="Manage"
+  >
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/submit"
+    >
+      Submit
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/stop"
+    >
+      Stop
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/restart"
+    >
+      Restart
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/delete"
+    >
+      Delete
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/deploy"
+    >
+      Deploy
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/undeploy"
+    >
+      UnDeploy
+    </DropdownItem>
+  </Styled(NavDropdown)>
+  <Styled(NavDropdown)
+    title="View"
+  >
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={true}
+      to="/refreshStatus"
+    >
+      Refresh Status
+    </DropdownItem>
+  </Styled(NavDropdown)>
+  <Styled(NavDropdown)
+    title="Help"
+  >
+    <Styled(NavLink)
+      href="https://wiki.onap.org/"
+      target="_blank"
+    >
+      Wiki
+    </Styled(NavLink)>
+    <Styled(NavLink)
+      href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect."
+    >
+      Contact Us
+    </Styled(NavLink)>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-kpOJdX",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-kpOJdX",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/userInfo"
+    >
+      User Info
+    </DropdownItem>
+  </Styled(NavDropdown)>
+</NavbarCollapse>
+`;
-- 
cgit 1.2.3-korg


From 83fe2b0afab57482c548ccb360fc1266891fa051 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 25 Sep 2019 11:23:18 +0200
Subject: Fix the ooperational policy ui issue

Update the css of the Jsoneditor tab component so that the operational
policy UI will not have names overlapped.

Issue-ID: CLAMP-511
Change-Id: I05806a398cd7f642290d7dbef1e58533a8bdac1c
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../OperationalPolicy/OperationalPolicyModal.js        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 1ebe5f0e8..4dc1f90a0 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -77,8 +77,22 @@ export default class OperationalPolicyModal extends React.Component {
 	}
 
 	setDefaultJsonEditorOptions() {
-		JSONEditor.defaults.options.theme = 'bootstrap4';
-
+		JSONEditor.defaults.themes.myBootstrap4 = JSONEditor.defaults.themes.bootstrap4.extend({
+			getTab: function(text,tabId) {
+				var liel = document.createElement('li');
+				liel.classList.add('nav-item');
+				var ael = document.createElement("a");
+				ael.classList.add("nav-link");
+				ael.setAttribute("style",'padding:10px;max-width:160px;');
+				ael.setAttribute("href", "#" + tabId);
+				ael.setAttribute('data-toggle', 'tab');
+				text.setAttribute("style",'word-wrap:break-word;');
+				ael.appendChild(text);
+				liel.appendChild(ael);
+				return liel;
+			}
+		});
+		JSONEditor.defaults.options.theme = 'myBootstrap4';
 		JSONEditor.defaults.options.object_layout = 'grid';
 		JSONEditor.defaults.options.disable_properties = true;
 		JSONEditor.defaults.options.disable_edit_json = false;
-- 
cgit 1.2.3-korg


From 233e3cdba0aec0f0c21cc5986654feb33cb7eb3d Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 1 Oct 2019 15:34:53 +0200
Subject: Add react ui tests

Add more tests for react UI.

Issue-ID: CLAMP-509
Change-Id: I58f6408bcd8667fa8b16b0b2f31f8287bdfac8c9
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/package.json                              |  3 +
 .../ConfigurationPolicyModal.test.js               | 79 +++++++++++++++++++++
 .../dialogs/OpenLoop/OpenLoopModal.test.js         | 50 ++++++++++++--
 .../OperationalPolicyModal.test.js                 | 80 ++++++++++++++++++++++
 .../components/loop_viewer/logs/LoopLogs.test.js   | 24 ++++++-
 .../loop_viewer/status/LoopStatus.test.js          | 24 +++++++
 6 files changed, 253 insertions(+), 7 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
 create mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 4a363ab51..f1b111f8f 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -84,6 +84,9 @@
 				{
 					"loose": true
 				}
+			],
+			[
+				"@babel/plugin-transform-runtime"
 			]
 		]
 	}
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
new file mode 100644
index 000000000..934fa492d
--- /dev/null
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { mount } from 'enzyme';
+import ConfigurationPolicyModal from './ConfigurationPolicyModal';
+import LoopCache from '../../../api/LoopCache';
+
+
+describe('Verify DeployLoop', () => {
+    beforeEach(() => {
+        fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "OK"
+			});
+		});
+    })
+    const loopCache = new LoopCache({
+            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+            "microServicePolicies": [{
+                "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+                "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                "properties": {"domain": "measurementsForVfScaling"},
+                "shared": false,
+                "jsonRepresentation": {"schema": {}}
+        }]
+    });
+    const historyMock = { push: jest.fn() };
+    const matchMock = { params:{ componentName: "TCA_h2NMX_v1_0_ResourceInstanceName1_tca" } } 
+    const flushPromises = () => new Promise(setImmediate);
+	
+    it('Test handleClose', () => {
+      const handleClose = jest.spyOn(ConfigurationPolicyModal.prototype,'handleClose');
+      const component = mount(<ConfigurationPolicyModal history={historyMock} loopCache={loopCache} match={matchMock}/>)
+
+      component.find('[variant="secondary"]').prop('onClick')();
+
+      expect(handleClose).toHaveBeenCalledTimes(1);
+      expect(component.state('show')).toEqual(false);
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    });
+
+    it('Test handleSave', async () => {
+        const loadLoopFunction = jest.fn();
+        const handleSave = jest.spyOn(ConfigurationPolicyModal.prototype,'handleSave');
+        const component = mount(<ConfigurationPolicyModal history={historyMock} match={matchMock} loopCache={loopCache} loadLoopFunction={loadLoopFunction}/>)
+
+        component.find('[variant="primary"]').prop('onClick')();
+        await flushPromises();
+        component.update();
+
+        expect(handleSave).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(false);
+        expect(component.state('componentName')).toEqual("TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    });
+});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
index 6ba8f40a5..5153de956 100644
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
@@ -27,19 +27,57 @@ import OpenLoopModal from './OpenLoopModal';
 describe('Verify OpenLoopModal', () => {
 
   beforeEach(() => {
-      fetch.resetMocks()
-  })
-
-  it('Test the render method', () => {
-    fetch.mockResponseOnce(JSON.stringify([
+      fetch.resetMocks();
+          fetch.mockResponseOnce(JSON.stringify([
         "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca",
         "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3",
         "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2"
-      ]))
+      ]));
+  })
+  
+    it('Test the render method', () => {
       
     const component = shallow(<OpenLoopModal/>);
     expect(component).toMatchSnapshot();
   });
 
+  it('Onchange event', () => {
+    const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'};
+    const component = shallow(<OpenLoopModal/>);
+	const forms = component.find('StateManager');
+
+    component.find('StateManager').simulate('change', event);
+    component.update();
+    expect(component.state('chosenLoopName')).toEqual("LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3");
+  });
+
+  it('Test handleClose', () => {
+    const historyMock = { push: jest.fn() }; 
+    const handleClose = jest.spyOn(OpenLoopModal.prototype,'handleClose');
+    const component = shallow(<OpenLoopModal history={historyMock} />)
+
+    component.find('[variant="secondary"]').prop('onClick')();
+
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    
+    handleClose.mockClear();
+  });
+
+    it('Test handleSubmit', () => {
+    const historyMock = { push: jest.fn() };
+    const loadLoopFunction = jest.fn();  
+    const handleOpen = jest.spyOn(OpenLoopModal.prototype,'handleOpen');
+    const component = shallow(<OpenLoopModal history={historyMock} loadLoopFunction={loadLoopFunction}/>)
+
+    component.find('[variant="primary"]').prop('onClick')();
+
+    expect(handleOpen).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    
+    handleOpen.mockClear();
+  });
 
 });
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
new file mode 100644
index 000000000..da60b6717
--- /dev/null
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
@@ -0,0 +1,80 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { mount } from 'enzyme';
+import OperationalPolicyModal from './OperationalPolicyModal';
+import LoopCache from '../../../api/LoopCache';
+
+describe('Verify OperationalPolicyModal', () => {
+    beforeEach(() => {
+        fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "OK"
+			});
+		});
+    })
+    const loopCache = new LoopCache({
+            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+            "operationalPolicies": [{
+                "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+                "configurationsJson": {
+                    "guard_policies": {},
+                    "operational_policy": {
+                        "controlLoop": {},
+                        "policies": []
+                    }
+                }
+             }],
+            "operationalPolicySchema": {"schema": {}}
+    });
+    const historyMock = { push: jest.fn() };
+    const flushPromises = () => new Promise(setImmediate);
+	
+    it('Test handleClose', () => {
+      const handleClose = jest.spyOn(OperationalPolicyModal.prototype,'handleClose');
+      const component = mount(<OperationalPolicyModal history={historyMock} loopCache={loopCache}/>)
+
+      component.find('[variant="secondary"]').prop('onClick')();
+
+      expect(handleClose).toHaveBeenCalledTimes(1);
+      expect(component.state('show')).toEqual(false);
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    });
+
+    it('Test handleSave', async () => {
+        const loadLoopFunction = jest.fn();
+        const handleSave = jest.spyOn(OperationalPolicyModal.prototype,'handleSave');
+        const component = mount(<OperationalPolicyModal history={historyMock} loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
+
+        component.find('[variant="primary"]').prop('onClick')();
+        await flushPromises();
+        component.update();
+
+        expect(handleSave).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(false);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    });
+});
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
index 3c76405c4..5c478f6a5 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
@@ -42,7 +42,29 @@ describe('Verify LoopLogs', () => {
 
 	it('Test the render method', () => {
 		const component = shallow(<LoopLogs loopCache={loopCache}/>)
-
 		expect(component).toMatchSnapshot();
+
+		const loopCacheUpdated = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+			"loopLogs": [
+			{
+				"id": 1,
+				"logType": "INFO",
+				"logComponent": "CLAMP",
+				"message": "Operational and Guard policies UPDATED",
+				"logInstant": "2019-07-08T09:44:37Z"
+			},
+			{
+				"id": 2,
+				"logType": "INFO",
+				"logComponent": "CLAMP",
+				"message": "Operational and Guard policies UPDATED",
+				"logInstant": "2019-07-08T09:44:50Z"
+			}
+			]
+		});
+
+		component.setProps({ loopCache: loopCacheUpdated });
+		expect(component.find('TableRow').length).toEqual(2);
 	});
 });
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/status/LoopStatus.test.js b/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
index 2be825edc..8d0448796 100644
--- a/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
+++ b/ui-react/src/components/loop_viewer/status/LoopStatus.test.js
@@ -50,5 +50,29 @@ describe('Verify LoopStatus', () => {
 		const component = shallow(<LoopStatus loopCache={loopCache}/>)
 
 		expect(component).toMatchSnapshot();
+		
+		const loopCacheUpdated = new LoopCache({
+			"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+			"lastComputedState": "SUBMIT",
+			"components": {
+				"POLICY": {
+					"componentState": {
+						"stateName": "SENT",
+						"description": "The policies defined have NOT yet been created on the policy engine"
+					}
+				},
+				"DCAE": {
+					"componentState": {
+						"stateName": "BLUEPRINT_DEPLOYED",
+						"description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+					}
+				}
+			}
+		});
+		component.setProps({ loopCache: loopCacheUpdated });
+
+		const forms = component.find('TableRow');
+		expect(forms.get(0).props.statusRow.stateName).toEqual("SENT");
+		expect(component.find('label').text()).toContain('SUBMIT');
 	});
 });
\ No newline at end of file
-- 
cgit 1.2.3-korg


From 564fdb0c2e601df73813a4e9d080bd1666befce4 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 2 Oct 2019 11:18:10 +0200
Subject: Add react ui test

Add react ui test to improve code coverage.

Issue-ID: CLAMP-509
Change-Id: Ic9c974a78ee453dddb8f985f3e9c9067f66e95d9
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../ConfigurationPolicyModal.test.js               | 18 ++---
 ui-react/src/components/dialogs/DeployLoop.test.js | 65 ++++++++++++++++
 .../src/components/dialogs/LoopProperties.test.js  | 47 ++++++++++++
 .../dialogs/OpenLoop/OpenLoopModal.test.js         | 11 ++-
 .../OperationalPolicyModal.test.js                 | 23 +++---
 .../src/components/dialogs/PerformActions.test.js  | 88 ++++++++++++++++++++++
 .../src/components/dialogs/RefreshStatus.test.js   | 72 ++++++++++++++++++
 ui-react/src/components/dialogs/UserInfo.test.js   |  2 +-
 8 files changed, 299 insertions(+), 27 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/PerformActions.test.js
 create mode 100644 ui-react/src/components/dialogs/RefreshStatus.test.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
index 934fa492d..e0aa8c6b0 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
@@ -29,13 +29,13 @@ import LoopCache from '../../../api/LoopCache';
 describe('Verify DeployLoop', () => {
     beforeEach(() => {
         fetch.resetMocks();
-		fetch.mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				text: () => "OK"
-			});
-		});
+        fetch.mockImplementation(() => {
+            return Promise.resolve({
+                ok: true,
+                status: 200,
+                text: () => "OK"
+            });
+        });
     })
     const loopCache = new LoopCache({
             "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
@@ -59,7 +59,7 @@ describe('Verify DeployLoop', () => {
 
       expect(handleClose).toHaveBeenCalledTimes(1);
       expect(component.state('show')).toEqual(false);
-      expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     });
 
     it('Test handleSave', async () => {
@@ -74,6 +74,6 @@ describe('Verify DeployLoop', () => {
         expect(handleSave).toHaveBeenCalledTimes(1);
         expect(component.state('show')).toEqual(false);
         expect(component.state('componentName')).toEqual("TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
-        expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     });
 });
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/DeployLoop.test.js b/ui-react/src/components/dialogs/DeployLoop.test.js
index bb08baf10..2959ed652 100644
--- a/ui-react/src/components/dialogs/DeployLoop.test.js
+++ b/ui-react/src/components/dialogs/DeployLoop.test.js
@@ -24,6 +24,8 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import DeployLoop from './DeployLoop';
 import LoopCache from '../../api/LoopCache';
+import LoopActionService from '../../api/LoopActionService';
+import LoopService from '../../api/LoopService';
 
 describe('Verify DeployLoop', () => {
 	const loopCache = new LoopCache({
@@ -43,4 +45,67 @@ describe('Verify DeployLoop', () => {
 
 	expect(component).toMatchSnapshot();
 	});
+	
+	it('Test handleClose', () => {
+		const historyMock = { push: jest.fn() };
+		const handleClose = jest.spyOn(DeployLoop.prototype,'handleClose');
+		const component = shallow(<DeployLoop history={historyMock} loopCache={loopCache}/>)
+
+		component.find('[variant="secondary"]').prop('onClick')();
+
+		expect(handleClose).toHaveBeenCalledTimes(1);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	});
+
+	it('Test handleSave successful', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const updateLoopFunction = jest.fn();
+		const handleSave = jest.spyOn(DeployLoop.prototype,'handleSave');
+		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "OK"
+			});
+		});
+		LoopActionService.performAction = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+		const jsdomAlert = window.alert;
+		window.alert = () => {};
+		const component = shallow(<DeployLoop history={historyMock} 
+						loopCache={loopCache} updateLoopFunction={updateLoopFunction} />)
+
+		component.find('[variant="primary"]').prop('onClick')();
+		await flushPromises();
+		component.update();
+
+		expect(handleSave).toHaveBeenCalledTimes(1);
+		expect(component.state('show')).toEqual(false);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		window.alert = jsdomAlert;
+		handleSave.mockClear();
+	});
+
+	it('Onchange event', () => {
+		const event = { target: { name: "location_id", value: "testLocation"} };
+		const component = shallow(<DeployLoop loopCache={loopCache}/>);
+		const forms = component.find('StateManager');
+
+		component.find('[name="location_id"]').simulate('change', event);
+		component.update();
+		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
+	});
 });
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/LoopProperties.test.js b/ui-react/src/components/dialogs/LoopProperties.test.js
index fadb9099e..9b74fe76a 100644
--- a/ui-react/src/components/dialogs/LoopProperties.test.js
+++ b/ui-react/src/components/dialogs/LoopProperties.test.js
@@ -24,6 +24,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import LoopProperties from './LoopProperties';
 import LoopCache from '../../api/LoopCache';
+import LoopService from '../../api/LoopService';
 
 describe('Verify LoopProperties', () => {
 	const loopCache = new LoopCache({
@@ -58,4 +59,50 @@ describe('Verify LoopProperties', () => {
 
 	expect(component).toMatchSnapshot();
 	});
+
+	it('Test handleClose', () => {
+		const historyMock = { push: jest.fn() };
+		const handleClose = jest.spyOn(LoopProperties.prototype,'handleClose');
+		const component = shallow(<LoopProperties history={historyMock} loopCache={loopCache}/>)
+
+		component.find('[variant="secondary"]').prop('onClick')();
+
+		expect(handleClose).toHaveBeenCalledTimes(1);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	});
+
+	it('Test handleSave successful', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const loadLoopFunction = jest.fn();
+		const handleSave = jest.spyOn(LoopProperties.prototype,'handleSave');
+		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "OK"
+			});
+		});
+
+		const component = shallow(<LoopProperties history={historyMock} 
+						loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
+
+		component.find('[variant="primary"]').prop('onClick')();
+		await flushPromises();
+		component.update();
+
+		expect(handleSave).toHaveBeenCalledTimes(1);
+		expect(component.state('show')).toEqual(false);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	});
+
+	it('Onchange event', () => {
+		const event = {target:{name:"dcaeDeployParameters", value:"{\"location_id\": \"testLocation\",\"policy_id\": \"TCA_h2NMX_v1_0_ResourceInstanceName1_tca\"}"}};
+		const component = shallow(<LoopProperties loopCache={loopCache}/>);
+
+		component.find('FormControl').simulate('change', event);
+		component.update();
+
+		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
+	});
 });
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
index 5153de956..208c947c3 100644
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
+++ b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
@@ -34,9 +34,9 @@ describe('Verify OpenLoopModal', () => {
         "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2"
       ]));
   })
-  
+
     it('Test the render method', () => {
-      
+
     const component = shallow(<OpenLoopModal/>);
     expect(component).toMatchSnapshot();
   });
@@ -44,7 +44,6 @@ describe('Verify OpenLoopModal', () => {
   it('Onchange event', () => {
     const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'};
     const component = shallow(<OpenLoopModal/>);
-	const forms = component.find('StateManager');
 
     component.find('StateManager').simulate('change', event);
     component.update();
@@ -60,7 +59,7 @@ describe('Verify OpenLoopModal', () => {
 
     expect(handleClose).toHaveBeenCalledTimes(1);
     expect(component.state('show')).toEqual(false);
-    expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     
     handleClose.mockClear();
   });
@@ -75,8 +74,8 @@ describe('Verify OpenLoopModal', () => {
 
     expect(handleOpen).toHaveBeenCalledTimes(1);
     expect(component.state('show')).toEqual(false);
-    expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
-    
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+
     handleOpen.mockClear();
   });
 
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
index da60b6717..9c7da3108 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
@@ -28,13 +28,13 @@ import LoopCache from '../../../api/LoopCache';
 describe('Verify OperationalPolicyModal', () => {
     beforeEach(() => {
         fetch.resetMocks();
-		fetch.mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				text: () => "OK"
-			});
-		});
+        fetch.mockImplementation(() => {
+            return Promise.resolve({
+                ok: true,
+                status: 200,
+                text: () => "OK"
+            });
+        });
     })
     const loopCache = new LoopCache({
             "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
@@ -52,7 +52,7 @@ describe('Verify OperationalPolicyModal', () => {
     });
     const historyMock = { push: jest.fn() };
     const flushPromises = () => new Promise(setImmediate);
-	
+
     it('Test handleClose', () => {
       const handleClose = jest.spyOn(OperationalPolicyModal.prototype,'handleClose');
       const component = mount(<OperationalPolicyModal history={historyMock} loopCache={loopCache}/>)
@@ -61,13 +61,14 @@ describe('Verify OperationalPolicyModal', () => {
 
       expect(handleClose).toHaveBeenCalledTimes(1);
       expect(component.state('show')).toEqual(false);
-      expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     });
 
     it('Test handleSave', async () => {
         const loadLoopFunction = jest.fn();
         const handleSave = jest.spyOn(OperationalPolicyModal.prototype,'handleSave');
-        const component = mount(<OperationalPolicyModal history={historyMock} loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
+        const component = mount(<OperationalPolicyModal history={historyMock} 
+                          loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
 
         component.find('[variant="primary"]').prop('onClick')();
         await flushPromises();
@@ -75,6 +76,6 @@ describe('Verify OperationalPolicyModal', () => {
 
         expect(handleSave).toHaveBeenCalledTimes(1);
         expect(component.state('show')).toEqual(false);
-        expect(historyMock.push.mock.calls[0]).toEqual([ '/', ]);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     });
 });
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/PerformActions.test.js b/ui-react/src/components/dialogs/PerformActions.test.js
new file mode 100644
index 000000000..56fdcf39b
--- /dev/null
+++ b/ui-react/src/components/dialogs/PerformActions.test.js
@@ -0,0 +1,88 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import PerformActions from './PerformActions';
+import LoopCache from '../../api/LoopCache';
+import LoopActionService from '../../api/LoopActionService';
+
+describe('Verify PerformActions', () => {
+
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca"
+	});
+
+	it('Test the render method action failed', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const updateLoopFunction = jest.fn();
+		
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+		const jsdomAlert = window.alert;
+		window.alert = () => {};
+		const component = shallow(<PerformActions loopCache={loopCache} 
+					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} />)
+		await flushPromises();
+		component.update();
+
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		window.alert = jsdomAlert;
+	});
+
+	it('Test the render method action successful', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const updateLoopFunction = jest.fn();
+
+		LoopActionService.performAction = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});		
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+		const jsdomAlert = window.alert;
+		window.alert = () => {};
+		const component = shallow(<PerformActions loopCache={loopCache} 
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} />)
+		await flushPromises();
+		component.update();
+
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		window.alert = jsdomAlert;
+	});
+
+});
diff --git a/ui-react/src/components/dialogs/RefreshStatus.test.js b/ui-react/src/components/dialogs/RefreshStatus.test.js
new file mode 100644
index 000000000..cb782ad23
--- /dev/null
+++ b/ui-react/src/components/dialogs/RefreshStatus.test.js
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import RefreshStatus from './RefreshStatus';
+import LoopCache from '../../api/LoopCache';
+import LoopActionService from '../../api/LoopActionService';
+
+describe('Verify RefreshStatus', () => {
+
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca"
+	});
+
+	it('Test refresh status failed', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+
+		const jsdomAlert = window.alert;
+		window.alert = () => {};
+		const component = shallow(<RefreshStatus loopCache={loopCache} history={historyMock} />)
+		await flushPromises();
+		component.update();
+
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		window.alert = jsdomAlert;
+	});
+
+	it('Test refresh status successful', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const updateLoopFunction = jest.fn();
+
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+		const jsdomAlert = window.alert;
+		window.alert = () => {};
+		const component = shallow(<RefreshStatus loopCache={loopCache} 
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} />)
+		await flushPromises();
+		component.update();
+
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		window.alert = jsdomAlert;
+	});
+
+});
diff --git a/ui-react/src/components/dialogs/UserInfo.test.js b/ui-react/src/components/dialogs/UserInfo.test.js
index 186dac832..beddde148 100644
--- a/ui-react/src/components/dialogs/UserInfo.test.js
+++ b/ui-react/src/components/dialogs/UserInfo.test.js
@@ -35,7 +35,7 @@ describe('Verify UserInfo', () => {
 				json: () => {
 					return Promise.resolve({
 						"userName": "test",
-						"cldsVersion": "1.0.0",
+						"cldsVersion": "1.0.0"
 					});
 			}});
 		});
-- 
cgit 1.2.3-korg


From 52432d6512d2477ad16d46f5ab31a8f77e9f77bd Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Fri, 4 Oct 2019 16:11:22 +0200
Subject: Fix loopUI issue

Fix the issue that loopName doesn't show correctly.

Issue-ID: CLAMP-529
Change-Id: I2f7916eb300cecc311b0752df92926c747b8eb71
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index fb595ded0..b6dd0cb07 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -199,7 +199,8 @@ export default class LoopUI extends React.Component {
 	}
 
 	updateLoopCache(loopJson) {
-		this.setState({ loopCache: new LoopCache(loopJson), loopName: this.state.loopCache.getLoopName() });
+		this.setState({ loopCache: new LoopCache(loopJson) });
+		this.setState({ loopName: this.state.loopCache.getLoopName() });
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
 
-- 
cgit 1.2.3-korg


From 0efeb6b141cb4abe84af8eb38e26d5ed1ab73bb0 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 7 Oct 2019 14:36:34 +0200
Subject: Fix Sonar vulnerabilities

Fix the vulnerabilities reported by Sonar.

Issue-ID: CLAMP-530
Change-Id: I9f6a7fe9ce042045085c371ef3777188b11ffb36
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js                             | 39 +++++++++++++++++-----
 ui-react/src/api/LoopActionService.js              |  8 ++---
 ui-react/src/components/dialogs/DeployLoop.js      |  7 ++--
 ui-react/src/components/dialogs/DeployLoop.test.js |  7 ++--
 .../OperationalPolicy/OperationalPolicyModal.js    |  2 +-
 ui-react/src/components/dialogs/PerformActions.js  |  6 ++--
 .../src/components/dialogs/PerformActions.test.js  | 12 +++----
 ui-react/src/components/dialogs/RefreshStatus.js   |  7 ++--
 .../src/components/dialogs/RefreshStatus.test.js   | 13 +++-----
 9 files changed, 56 insertions(+), 45 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index b6dd0cb07..ad970d811 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -44,6 +44,7 @@ import LoopService from './api/LoopService';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoop from './components/dialogs/DeployLoop';
+import Alert from 'react-bootstrap/Alert';
 
 import { Link } from 'react-router-dom';
 
@@ -100,7 +101,8 @@ export default class LoopUI extends React.Component {
 	state = {
 		userName: null,
 		loopName: LoopUI.defaultLoopName,
-		loopCache: new LoopCache({})
+		loopCache: new LoopCache({}),
+		showAlert: false
 	};
 
 	constructor() {
@@ -110,6 +112,8 @@ export default class LoopUI extends React.Component {
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
 		this.closeLoop = this.closeLoop.bind(this);
+		this.showAlert =  this.showAlert.bind(this);
+		this.disableAlert =  this.disableAlert.bind(this);
 	}
 
 	componentWillMount() {
@@ -155,6 +159,14 @@ export default class LoopUI extends React.Component {
 		);
 	}
 
+	renderAlertBar() {
+		return (
+				<Alert variant="danger" show={this.state.showAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
+		);
+	}
+
 	renderNavBar() {
 		return (
 			<Navbar >
@@ -204,6 +216,14 @@ export default class LoopUI extends React.Component {
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
 
+	showAlert(message) {
+		this.setState ({ showAlert: true, showMessage:message });
+	}
+
+	disableAlert() {
+		this.setState ({ showAlert: false });
+	}
+
 	loadLoop(loopName) {
 		LoopService.getLoop(loopName).then(loop => {
 			console.debug("Updating loopCache");
@@ -220,21 +240,22 @@ export default class LoopUI extends React.Component {
 		return (
 				<StyledMainDiv id="main_div">
 				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
 				<Route path="/closeLoop" render={this.closeLoop} />
-				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
-				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/logout" render={this.logout} />
 				<GlobalClampStyle />
+					{this.renderAlertBar()}
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
 				</StyledMainDiv>
diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js
index 7e20e2f6c..7cea3ff9f 100644
--- a/ui-react/src/api/LoopActionService.js
+++ b/ui-react/src/api/LoopActionService.js
@@ -24,7 +24,7 @@
 export default class LoopActionService{
 
 	static performAction(cl_name, uiAction) {
-		console.log("LoopActionService perform action: " + uiAction + " closedloopName=" + cl_name);
+		console.info("LoopActionService perform action: " + uiAction + " closedloopName=" + cl_name);
 		const svcAction = uiAction.toLowerCase();
  		return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, {
  				method: 'PUT',
@@ -38,18 +38,18 @@ export default class LoopActionService{
  			}
  		})
  		.then(function (data) {
-			alert("Action Successful: " + uiAction);
+			console.info("Action Successful: " + uiAction);
  			return data;
  		})
  		.catch(function(error) {
- 			console.log("Action Failure: " + uiAction);
+ 			console.info("Action Failure: " + uiAction);
  			return Promise.reject(error);
  		});
  	}
 
 
 	static refreshStatus(cl_name) {
-		console.log("Refresh the status for closedloopName=" + cl_name);
+		console.info("Refresh the status for closedloopName=" + cl_name);
 
 		return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, {
 			method: 'GET',
diff --git a/ui-react/src/components/dialogs/DeployLoop.js b/ui-react/src/components/dialogs/DeployLoop.js
index 805f0f29b..d71af9240 100644
--- a/ui-react/src/components/dialogs/DeployLoop.js
+++ b/ui-react/src/components/dialogs/DeployLoop.js
@@ -64,14 +64,13 @@ export default class DeployLoop extends React.Component {
 		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
 			this.setState({ show: false });
 
-			console.log("Perform action: deploy");
 			LoopActionService.performAction(loopName, "deploy").then(pars => {
-				alert("Action deploy successfully performed");
+				this.props.showAlert("Action deploy successfully performed");
 				// refresh status and update loop logs
 				this.refreshStatus(loopName);
 			})
 			.catch(error => {
-				alert("Action deploy failed");
+				this.props.showAlert("Action deploy failed");
 				// refresh status and update loop logs
 				this.refreshStatus(loopName);
 			});
@@ -84,7 +83,7 @@ export default class DeployLoop extends React.Component {
 			this.props.history.push('/');
 		})
 		.catch(error => {
-			alert("Refresh status failed");
+			this.props.showAlert("Refresh status failed");
 			this.props.history.push('/');
 		});
 	}
diff --git a/ui-react/src/components/dialogs/DeployLoop.test.js b/ui-react/src/components/dialogs/DeployLoop.test.js
index 2959ed652..44bc78379 100644
--- a/ui-react/src/components/dialogs/DeployLoop.test.js
+++ b/ui-react/src/components/dialogs/DeployLoop.test.js
@@ -61,6 +61,7 @@ describe('Verify DeployLoop', () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
+		const showAlert = jest.fn();
 		const handleSave = jest.spyOn(DeployLoop.prototype,'handleSave');
 		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -83,10 +84,9 @@ describe('Verify DeployLoop', () => {
 				json: () => {}
 			});
 		});
-		const jsdomAlert = window.alert;
-		window.alert = () => {};
+
 		const component = shallow(<DeployLoop history={historyMock} 
-						loopCache={loopCache} updateLoopFunction={updateLoopFunction} />)
+						loopCache={loopCache} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
 
 		component.find('[variant="primary"]').prop('onClick')();
 		await flushPromises();
@@ -95,7 +95,6 @@ describe('Verify DeployLoop', () => {
 		expect(handleSave).toHaveBeenCalledTimes(1);
 		expect(component.state('show')).toEqual(false);
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		window.alert = jsdomAlert;
 		handleSave.mockClear();
 	});
 
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 4dc1f90a0..5c5f0241a 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -54,7 +54,7 @@ export default class OperationalPolicyModal extends React.Component {
 
 		if (errors.length !== 0) {
 			console.error("Errors detected during config policy data validation ", errors);
-			alert(errors);
+			this.props.showAlert(errors);
 		}
 		else {
 			console.info("NO validation errors found in config policy data");
diff --git a/ui-react/src/components/dialogs/PerformActions.js b/ui-react/src/components/dialogs/PerformActions.js
index 9c34e141b..66b192863 100644
--- a/ui-react/src/components/dialogs/PerformActions.js
+++ b/ui-react/src/components/dialogs/PerformActions.js
@@ -50,14 +50,14 @@ export default class PerformActions extends React.Component {
 	componentDidMount() {
 		const action = this.state.loopAction;
 		const loopName = this.state.loopName;
-		console.log("Perform action:" + action);
+
 		LoopActionService.performAction(loopName, action).then(pars => {
-			alert("Action " + action + " successfully performed");
+			this.props.showAlert("Action " + action + " successfully performed");
 			// refresh status and update loop logs
 			this.refreshStatus(loopName);
 		})
 		.catch(error => {
-			alert("Action " + action + " failed");
+			this.props.showAlert("Action " + action + " failed");
 			// refresh status and update loop logs
 			this.refreshStatus(loopName);
 		});
diff --git a/ui-react/src/components/dialogs/PerformActions.test.js b/ui-react/src/components/dialogs/PerformActions.test.js
index 56fdcf39b..0b0786290 100644
--- a/ui-react/src/components/dialogs/PerformActions.test.js
+++ b/ui-react/src/components/dialogs/PerformActions.test.js
@@ -36,6 +36,7 @@ describe('Verify PerformActions', () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
+		const showAlert = jest.fn();
 		
 		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -44,21 +45,19 @@ describe('Verify PerformActions', () => {
 				json: () => {}
 			});
 		});
-		const jsdomAlert = window.alert;
-		window.alert = () => {};
 		const component = shallow(<PerformActions loopCache={loopCache} 
-					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} />)
+					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
 		await flushPromises();
 		component.update();
 
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		window.alert = jsdomAlert;
 	});
 
 	it('Test the render method action successful', async () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
+		const showAlert = jest.fn();
 
 		LoopActionService.performAction = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -74,15 +73,12 @@ describe('Verify PerformActions', () => {
 				json: () => {}
 			});
 		});
-		const jsdomAlert = window.alert;
-		window.alert = () => {};
 		const component = shallow(<PerformActions loopCache={loopCache} 
-						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} />)
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
 		await flushPromises();
 		component.update();
 
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		window.alert = jsdomAlert;
 	});
 
 });
diff --git a/ui-react/src/components/dialogs/RefreshStatus.js b/ui-react/src/components/dialogs/RefreshStatus.js
index cf08655ee..64b35d99b 100644
--- a/ui-react/src/components/dialogs/RefreshStatus.js
+++ b/ui-react/src/components/dialogs/RefreshStatus.js
@@ -22,7 +22,7 @@
  */
 import React from 'react';
 import LoopActionService from '../../api/LoopActionService';
-import Spinner from 'react-bootstrap/Spinner'
+import Spinner from 'react-bootstrap/Spinner';
 import styled from 'styled-components';
 
 const StyledSpinnerDiv = styled.div`
@@ -42,15 +42,14 @@ export default class RefreshStatus extends React.Component {
 	}
 
 	componentDidMount() {
-		console.log("Refresh status for: " + this.state.loopName);
 		// refresh status and update loop logs
 		LoopActionService.refreshStatus(this.state.loopName).then(data => {
-			alert("Status successfully refreshed")
+			this.props.showAlert("Status successfully refreshed");
 			this.props.updateLoopFunction(data);
 			this.props.history.push('/');
 		})
 		.catch(error => {
-			alert("Status refreshing failed");
+			this.props.showAlert("Status refreshing failed");
 			this.props.history.push('/');
 		});
 	}
diff --git a/ui-react/src/components/dialogs/RefreshStatus.test.js b/ui-react/src/components/dialogs/RefreshStatus.test.js
index cb782ad23..3038eb321 100644
--- a/ui-react/src/components/dialogs/RefreshStatus.test.js
+++ b/ui-react/src/components/dialogs/RefreshStatus.test.js
@@ -35,21 +35,20 @@ describe('Verify RefreshStatus', () => {
 	it('Test refresh status failed', async () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
+		const showAlert = jest.fn();
 
-		const jsdomAlert = window.alert;
-		window.alert = () => {};
-		const component = shallow(<RefreshStatus loopCache={loopCache} history={historyMock} />)
+		const component = shallow(<RefreshStatus loopCache={loopCache} history={historyMock} showAlert={showAlert} />)
 		await flushPromises();
 		component.update();
 
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		window.alert = jsdomAlert;
 	});
 
 	it('Test refresh status successful', async () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
+		const showAlert = jest.fn();
 
 		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -58,15 +57,13 @@ describe('Verify RefreshStatus', () => {
 				json: () => {}
 			});
 		});
-		const jsdomAlert = window.alert;
-		window.alert = () => {};
+
 		const component = shallow(<RefreshStatus loopCache={loopCache} 
-						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} />)
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
 		await flushPromises();
 		component.update();
 
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		window.alert = jsdomAlert;
 	});
 
 });
-- 
cgit 1.2.3-korg


From ac42c4b3e7161a76bfa67cae9636ea63d7bd81f8 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 9 Oct 2019 16:12:37 +0200
Subject: Fix policy status issue

Change the initial status of policy from SENT_AND_DEPLOYED to NOT_SENT.

Issue-ID: CLAMP-533
Change-Id: If4fa22fc2e3fb33500502bab41e49de9000dd7e7
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../loop/components/external/PolicyComponent.java  |   2 +-
 .../org/onap/clamp/loop/PolicyComponentTest.java   | 227 ---------------------
 ui-react/src/LoopUI.js                             |  10 +-
 3 files changed, 10 insertions(+), 229 deletions(-)
 delete mode 100644 src/test/java/org/onap/clamp/loop/PolicyComponentTest.java

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
index 13ccea5eb..9321423a9 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
@@ -62,7 +62,7 @@ public class PolicyComponent extends ExternalComponent {
          * on by one, each time we increase the level we can't decrease it anymore.
          * That's why it starts with the lowest one SENT_AND_DEPLOYED.
          */
-        super(NOT_SENT);
+        super(SENT_AND_DEPLOYED);
     }
 
     @Override
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
deleted file mode 100644
index 4be8d2310..000000000
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.clamp.loop.components.external.ExternalComponentState;
-import org.onap.clamp.loop.components.external.PolicyComponent;
-
-public class PolicyComponentTest {
-
-    /**
-     * Test the computeState method. oldState newState expectedFinalState NOT_SENT
-     * SENT_AND_DEPLOYED NOT_SENT NOT_SENT SENT NOT_SENT NOT_SENT NOT_SENT NOT_SENT
-     * NOT_SENT IN_ERROR IN_ERROR
-     */
-    @Test
-    public void computeStateTestOriginalStateNotSent() {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-
-        // policy found + deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState state = policy.computeState(exchange);
-
-        assertThat(state.getStateName()).isEqualTo("NOT_SENT");
-
-        // policy found + not deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-
-        assertThat(state2.getStateName()).isEqualTo("NOT_SENT");
-
-        // policy not found + not deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-
-        // policy not found + deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-
-    }
-
-    /**
-     * Test the computeState method. oldState newState expectedFinalState SENT SENT
-     * SENT SENT SENT_AND_DEPLOYED SENT SENT IN_ERROR IN_ERROR SENT NOT_SENT
-     * NOT_SENT
-     */
-    @Test
-    public void computeStateTestOriginalStateSent() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState SENT = new ExternalComponentState("SENT",
-                "The policies defined have been created but NOT deployed on the policy engine", 50);
-        policy.setState(SENT);
-
-        // new policy state SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state = policy.computeState(exchange);
-
-        assertThat(state.getStateName()).isEqualTo("SENT");
-
-        // new policy state SENT_AND_DEPLOYED
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state2 = policy.computeState(exchange);
-
-        assertThat(state2.getStateName()).isEqualTo("SENT");
-
-        // new policy state IN_ERROR
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-
-        // new policy state NOT_SENT
-        policy.setState(SENT);
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-    }
-
-    /**
-     * Test the computeState method. oldState newState expectedFinalState
-     * SENT_AND_DEPLOYED SENT_AND_DEPLOYED SENT_AND_DEPLOYED SENT_AND_DEPLOYED SENT
-     * SENT SENT_AND_DEPLOYED IN_ERROR IN_ERROR SENT_AND_DEPLOYED NOT_SENT NOT_SENT
-     */
-    @Test
-    public void computeStateTestOriginalStateSentAndDeployed() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState SENT_AND_DEPLOYED = new ExternalComponentState("SENT_AND_DEPLOYED",
-                "The policies defined have been created and deployed on the policy engine", 10);
-        policy.setState(SENT_AND_DEPLOYED);
-
-        // new policy state SENT_AND_DEPLOYED
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state = policy.computeState(exchange);
-
-        assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
-
-        // new policy state SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-
-        assertThat(state2.getStateName()).isEqualTo("SENT");
-
-        // new policy state IN_ERROR
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-
-        // new policy state NOT_SENT
-        policy.setState(SENT_AND_DEPLOYED);
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-    }
-
-    /**
-     * Test the computeState method. oldState newState expectedFinalState IN_ERROR
-     * SENT_AND_DEPLOYED IN_ERROR IN_ERROR SENT IN_ERROR IN_ERROR IN_ERROR IN_ERROR
-     * IN_ERROR NOT_SENT IN_ERROR
-     */
-    @Test
-    public void computeStateTestOriginalStateInError() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState IN_ERROR = new ExternalComponentState("IN_ERROR",
-                "There was an error during the sending to policy, the policy engine may be corrupted or inconsistent",
-                100);
-        policy.setState(IN_ERROR);
-
-        // new policy state SENT_AND_DEPLOYED
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state = policy.computeState(exchange);
-
-        assertThat(state.getStateName()).isEqualTo("IN_ERROR");
-
-        // new policy state SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-
-        assertThat(state2.getStateName()).isEqualTo("IN_ERROR");
-
-        // new policy state IN_ERROR
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-
-        // new policy state NOT_SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-
-        assertThat(state4.getStateName()).isEqualTo("IN_ERROR");
-    }
-}
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index ad970d811..ff3c4445a 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -33,6 +33,7 @@ import LoopLogs from './components/loop_viewer/logs/LoopLogs';
 import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
 import LoopCache from './api/LoopCache';
+import LoopActionService from './api/LoopActionService';
 
 import { Route } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
@@ -227,7 +228,14 @@ export default class LoopUI extends React.Component {
 	loadLoop(loopName) {
 		LoopService.getLoop(loopName).then(loop => {
 			console.debug("Updating loopCache");
-			this.updateLoopCache(loop);
+			LoopActionService.refreshStatus(loopName).then(data => {
+				this.updateLoopCache(data);
+				this.props.history.push('/');
+			})
+			.catch(error => {
+				this.updateLoopCache(loop);
+				this.props.history.push('/');
+			});
 		});
 	}
 
-- 
cgit 1.2.3-korg


From 524b364a12f834e826f4e8be1119b61ba14b503c Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Fri, 11 Oct 2019 15:41:49 +0200
Subject: Add unit tests

Add unit tests for backend and frontend.

Issue-ID: CLAMP-512
Change-Id: I713ba2dce3bd132e7e3e713f4e91e3662df7aafd
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../loop/components/external/PolicyComponent.java  |   4 +-
 .../org/onap/clamp/clds/it/CldsServiceItCase.java  | 155 ++++++++++---
 .../model/jsontype/JsonTypeDescriptorTest.java     |  96 ++++++++
 .../org/onap/clamp/loop/DcaeComponentTest.java     |  61 +++++
 .../clamp/loop/ExternalComponentStateTest.java     |  82 +++++++
 .../org/onap/clamp/loop/PolicyComponentTest.java   | 246 +++++++++++++++++++++
 ui-react/src/LoopUI.test.js                        | 171 ++++++++++++++
 ui-react/src/NotFound.test.js                      |  36 +++
 ui-react/src/OnapClamp.test.js                     |  36 +++
 ui-react/src/__snapshots__/LoopUI.test.js.snap     | 154 +++++++++++++
 ui-react/src/__snapshots__/NotFound.test.js.snap   |  26 +++
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  | 176 +++++++++++++++
 12 files changed, 1214 insertions(+), 29 deletions(-)
 create mode 100644 src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
 create mode 100644 src/test/java/org/onap/clamp/loop/ExternalComponentStateTest.java
 create mode 100644 src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
 create mode 100644 ui-react/src/LoopUI.test.js
 create mode 100644 ui-react/src/NotFound.test.js
 create mode 100644 ui-react/src/OnapClamp.test.js
 create mode 100644 ui-react/src/__snapshots__/LoopUI.test.js.snap
 create mode 100644 ui-react/src/__snapshots__/NotFound.test.js.snap
 create mode 100644 ui-react/src/__snapshots__/OnapClamp.test.js.snap

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
index 9321423a9..44ee52262 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
@@ -52,6 +52,8 @@ public class PolicyComponent extends ExternalComponent {
             "The policies defined have been created but NOT deployed on the policy engine", 50);
     public static final ExternalComponentState SENT_AND_DEPLOYED = new ExternalComponentState("SENT_AND_DEPLOYED",
             "The policies defined have been created and deployed on the policy engine", 10);
+    public static final ExternalComponentState UNKNOWN = new ExternalComponentState("UNKNOWN",
+            "The current status is not clear. Need to regresh the status to get the current status.", 0);
 
     /**
      * Default constructor.
@@ -62,7 +64,7 @@ public class PolicyComponent extends ExternalComponent {
          * on by one, each time we increase the level we can't decrease it anymore.
          * That's why it starts with the lowest one SENT_AND_DEPLOYED.
          */
-        super(SENT_AND_DEPLOYED);
+        super(UNKNOWN);
     }
 
     @Override
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
index 8745cc5d2..072d57712 100644
--- a/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
@@ -23,10 +23,13 @@
 
 package org.onap.clamp.clds.it;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -35,6 +38,7 @@ import java.util.List;
 import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.NotAuthorizedException;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +48,6 @@ import org.mockito.Mockito;
 import org.onap.clamp.clds.model.CldsInfo;
 import org.onap.clamp.clds.service.CldsService;
 import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -66,15 +69,12 @@ public class CldsServiceItCase {
 
     @Autowired
     private CldsService cldsService;
-    private String bpmnText;
-    private String imageText;
-    private String bpmnPropText;
-    private String docText;
 
-    private Authentication authentication;
-    private List<GrantedAuthority> authList = new LinkedList<GrantedAuthority>();
     private LoggingUtils util;
-
+    private SecurityContext securityContext = mock(SecurityContext.class);
+    private Authentication auth = Mockito.mock(Authentication.class);
+    private UserDetails userDetails = Mockito.mock(UserDetails.class);
+    private List<GrantedAuthority> authorityList = new LinkedList<GrantedAuthority>();
     /**
      * Setup the variable before the tests execution.
      *
@@ -82,20 +82,6 @@ public class CldsServiceItCase {
      */
     @Before
     public void setupBefore() throws IOException {
-        bpmnText = ResourceFileUtil.getResourceAsString("example/model-properties/tca_new/tca-template.xml");
-        imageText = ResourceFileUtil.getResourceAsString("example/model-properties/tca_new/tca-img.xml");
-        bpmnPropText = ResourceFileUtil.getResourceAsString("example/model-properties/tca_new/model-properties.json");
-        docText = ResourceFileUtil.getResourceAsString("example/model-properties/tca_new/doc-text.yaml");
-
-        authList.add(new SimpleGrantedAuthority("permission-type-cl-manage|dev|*"));
-        authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|read"));
-        authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|update"));
-        authList.add(new SimpleGrantedAuthority("permission-type-template|dev|read"));
-        authList.add(new SimpleGrantedAuthority("permission-type-template|dev|update"));
-        authList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|*"));
-        authList.add(new SimpleGrantedAuthority("permission-type-cl-event|dev|*"));
-        authentication = new UsernamePasswordAuthenticationToken(new User("admin", "", authList), "", authList);
-
         util = Mockito.mock(LoggingUtils.class);
         Mockito.doNothing().when(util).entering(Matchers.any(HttpServletRequest.class), Matchers.any(String.class));
         cldsService.setLoggingUtil(util);
@@ -104,12 +90,9 @@ public class CldsServiceItCase {
 
     @Test
     public void testCldsInfoNotAuthorized() {
-        SecurityContext securityContext = Mockito.mock(SecurityContext.class);
-        Authentication localAuth = Mockito.mock(Authentication.class);
-        UserDetails userDetails = Mockito.mock(UserDetails.class);
         Mockito.when(userDetails.getUsername()).thenReturn("admin");
-        Mockito.when(securityContext.getAuthentication()).thenReturn(localAuth);
-        Mockito.when(localAuth.getPrincipal()).thenReturn(userDetails);
+        Mockito.when(securityContext.getAuthentication()).thenReturn(auth);
+        Mockito.when(auth.getPrincipal()).thenReturn(userDetails);
 
         cldsService.setSecurityContext(securityContext);
         CldsInfo cldsInfo = cldsService.getCldsInfo();
@@ -121,7 +104,17 @@ public class CldsServiceItCase {
 
     @Test
     public void testCldsInfoAuthorized() throws Exception {
-        SecurityContext securityContext = Mockito.mock(SecurityContext.class);
+        Authentication authentication;
+        List<GrantedAuthority> authList = new LinkedList<GrantedAuthority>();
+        authList.add(new SimpleGrantedAuthority("permission-type-cl-manage|dev|*"));
+        authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|read"));
+        authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|update"));
+        authList.add(new SimpleGrantedAuthority("permission-type-template|dev|read"));
+        authList.add(new SimpleGrantedAuthority("permission-type-template|dev|update"));
+        authList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|*"));
+        authList.add(new SimpleGrantedAuthority("permission-type-cl-event|dev|*"));
+        authentication = new UsernamePasswordAuthenticationToken(new User("admin", "", authList), "", authList);
+
         Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);
 
         cldsService.setSecurityContext(securityContext);
@@ -138,4 +131,110 @@ public class CldsServiceItCase {
         assertEquals(cldsInfo.getCldsVersion(), prop.getProperty("clds.version"));
         assertEquals(cldsInfo.getUserName(), "admin");
     }
+
+    @Test(expected = NotAuthorizedException.class)
+    public void isAuthorizedForVfTestNotAuthorized1() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test(expected = NotAuthorizedException.class)
+    public void isAuthorizedForVfTestNotAuthorized2() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|prod|*"));
+        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test(expected = NotAuthorizedException.class)
+    public void isAuthorizedForVfTestNotAuthorized3() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|testId2"));
+        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void isAuthorizedForVfTestNotAuthorized4() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        when(securityContext.getAuthentication()).thenReturn(null);
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test
+    public void isAuthorizedForVfTest1() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|*|*"));
+        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test
+    public void isAuthorizedForVfTest2() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|*"));
+        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test
+    public void isAuthorizedForVfTest3() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|testId"));
+        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test
+    public void isAuthorizedForVfTest4() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|*|testId"));
+        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+
+        cldsService.setSecurityContext(securityContext);
+        boolean res = cldsService.isAuthorizedForVf("testId");
+        assertThat(res).isTrue();
+    }
+
+    @Test
+    public void getUserIdTest() throws Exception {
+        when(userDetails.getUsername()).thenReturn("testName");
+        when(auth.getPrincipal()).thenReturn(userDetails);
+        when(securityContext.getAuthentication()).thenReturn(auth);
+
+        cldsService.setSecurityContext(securityContext);
+        assertThat(cldsService.getUserId()).isEqualTo("testName");
+    }
 }
diff --git a/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java b/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
new file mode 100644
index 000000000..560f54cf4
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Samsung. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.model.jsontype;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.gson.JsonObject;
+
+import org.hibernate.HibernateException;
+import org.junit.Test;
+import org.onap.clamp.dao.model.jsontype.JsonTypeDescriptor;
+
+public class JsonTypeDescriptorTest {
+
+    private JsonTypeDescriptor descriptor = new JsonTypeDescriptor();
+
+    @Test
+    public void testFromString() {
+        JsonObject object = new JsonObject();
+        object.addProperty("one","oneValue");
+        JsonObject child = new JsonObject();
+        child.addProperty("two","twoValue");
+        object.add("child",child);
+
+        JsonObject jsonResult = descriptor.fromString("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
+
+        assertThat(jsonResult).isEqualTo(object);
+    }
+
+    @Test
+    public void testUnwrap() {
+        JsonObject res1 = descriptor.unwrap(null, null, null);
+        assertThat(res1).isNull();
+
+        JsonObject object = new JsonObject();
+        object.addProperty("one","oneValue");
+        JsonObject child = new JsonObject();
+        child.addProperty("two","twoValue");
+        object.add("child",child);
+        String res2 = descriptor.unwrap(object, String.class, null);
+        assertThat(res2.replace("\n", "").replace(" ", ""))
+                .isEqualTo("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
+
+        Object res3 = descriptor.unwrap(object, JsonObject.class, null);
+        String res3Str = ((String) res3).replace(" ", "").replace("\\n", "").replace("\\", "")
+                .replace("\"{", "{").replace("}\"", "}");
+        assertThat(res3Str).isEqualTo("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
+    }
+
+    @Test(expected = HibernateException.class)
+    public void testUnwrapExpectationThrown() {
+        JsonObject object = new JsonObject();
+        object.addProperty("one","oneValue");
+
+        descriptor.unwrap(object, Integer.class, null);
+    }
+
+    @Test
+    public void testWrap() {
+        JsonObject res1 = descriptor.wrap(null, null);
+        assertThat(res1).isNull();
+
+        JsonObject object = new JsonObject();
+        object.addProperty("one","oneValue");
+        JsonObject child = new JsonObject();
+        child.addProperty("two","twoValue");
+        object.add("child",child);
+        JsonObject res2 = descriptor.wrap("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}", null);
+        assertThat(res2).isEqualTo(object);
+    }
+
+    @Test(expected = HibernateException.class)
+    public void testWrapExpectationThrown() {
+        descriptor.wrap(1, null);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
index 0a3c1e167..557fdcecf 100644
--- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
@@ -31,9 +31,13 @@ import com.google.gson.JsonObject;
 import java.io.IOException;
 import java.util.HashSet;
 
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.onap.clamp.clds.model.dcae.DcaeOperationStatusResponse;
 import org.onap.clamp.loop.components.external.DcaeComponent;
+import org.onap.clamp.loop.components.external.ExternalComponentState;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 
 public class DcaeComponentTest {
@@ -90,4 +94,61 @@ public class DcaeComponentTest {
         assertThat(unDeploymentPayload).isEqualTo(expectedPayload);
     }
 
+    @Test
+    public void computeStateTest() throws IOException {
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
+        Mockito.when(exchange2.getProperty("dcaeResponse")).thenReturn(null);
+
+        DcaeComponent dcae = new DcaeComponent();
+
+        // initial state
+        ExternalComponentState state = dcae.computeState(exchange);
+        assertThat(state.getStateName()).isEqualTo("BLUEPRINT_DEPLOYED");
+
+        // OperationalType = install
+        DcaeOperationStatusResponse dcaeResponse = Mockito.mock(DcaeOperationStatusResponse.class); 
+        Mockito.when(dcaeResponse.getOperationType()).thenReturn("install");
+
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("succeeded");
+        Mockito.when(exchange2.getProperty("dcaeResponse")).thenReturn(dcaeResponse);
+        ExternalComponentState state2 = dcae.computeState(exchange);
+        assertThat(state2.getStateName()).isEqualTo("MICROSERVICE_INSTALLED_SUCCESSFULLY");
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("processing");
+        ExternalComponentState state3 = dcae.computeState(exchange);
+        assertThat(state3.getStateName()).isEqualTo("PROCESSING_MICROSERVICE_INSTALLATION");
+
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("failed");
+        ExternalComponentState state4 = dcae.computeState(exchange);
+        assertThat(state4.getStateName()).isEqualTo("MICROSERVICE_INSTALLATION_FAILED");
+
+        // OperationalType = uninstall
+        Mockito.when(dcaeResponse.getOperationType()).thenReturn("uninstall");
+
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("succeeded");
+        Mockito.when(exchange2.getProperty("dcaeResponse")).thenReturn(dcaeResponse);
+        ExternalComponentState state5 = dcae.computeState(exchange);
+        assertThat(state5.getStateName()).isEqualTo("MICROSERVICE_UNINSTALLED_SUCCESSFULLY");
+
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("processing");
+        ExternalComponentState state6 = dcae.computeState(exchange);
+        assertThat(state6.getStateName()).isEqualTo("PROCESSING_MICROSERVICE_UNINSTALLATION");
+
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("failed");
+        ExternalComponentState state7 = dcae.computeState(exchange);
+        assertThat(state7.getStateName()).isEqualTo("MICROSERVICE_UNINSTALLATION_FAILED");
+
+        // error cases
+        Mockito.when(dcaeResponse.getOperationType()).thenReturn("whatever");
+        ExternalComponentState state8 = dcae.computeState(exchange);
+        assertThat(state8.getStateName()).isEqualTo("IN_ERROR");
+
+        Mockito.when(dcaeResponse.getOperationType()).thenReturn("install");
+        Mockito.when(dcaeResponse.getStatus()).thenReturn("anythingelse");
+        ExternalComponentState state9 = dcae.computeState(exchange);
+        assertThat(state9.getStateName()).isEqualTo("IN_ERROR");
+    }
 }
diff --git a/src/test/java/org/onap/clamp/loop/ExternalComponentStateTest.java b/src/test/java/org/onap/clamp/loop/ExternalComponentStateTest.java
new file mode 100644
index 000000000..34fcc077f
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/ExternalComponentStateTest.java
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.onap.clamp.loop.components.external.ExternalComponentState;
+
+public class ExternalComponentStateTest {
+    private ExternalComponentState state =  new ExternalComponentState("NOT_SENT",
+            "The policies defined have NOT yet been created on the policy engine", 90);
+
+    @Test
+    public void generalTest() {
+        assertThat(state.toString()).isEqualTo("NOT_SENT");
+        state.setLevel(70);
+        assertThat(state.getLevel()).isEqualTo(70);
+    }
+
+    @Test
+    public void equalsTest() {
+        assertThat(state.equals(null)).isEqualTo(false);
+
+        ExternalComponentState state2 =  new ExternalComponentState("NOT_SENT",
+               "The policies defined have NOT yet been created on the policy engine", 90);
+        assertThat(state.equals(state2)).isEqualTo(true);
+
+        assertThat(state.equals(12)).isEqualTo(false);
+
+        state2.setLevel(70);
+        assertThat(state.equals(state2)).isEqualTo(true);
+
+        ExternalComponentState state3 =  new ExternalComponentState("SENT",
+                "The policies defined have NOT yet been created on the policy engine", 90);
+        assertThat(state.equals(state3)).isEqualTo(false);
+
+        ExternalComponentState state4 =  new ExternalComponentState(null,
+                "The policies defined have NOT yet been created on the policy engine", 90);
+        ExternalComponentState state5 =  new ExternalComponentState(null,
+                "The policies defined have NOT yet been", 50);
+        assertThat(state4.equals(state3)).isEqualTo(false);
+        assertThat(state4.equals(state5)).isEqualTo(true);
+    }
+
+    @Test
+    public void compareToTest() {
+        ExternalComponentState state2 =  new ExternalComponentState("NOT_SENT",
+               "The policies defined have NOT yet been created on the policy engine", 90);
+        assertThat(state.compareTo(state2)).isEqualTo(0);
+
+        ExternalComponentState state3 =  new ExternalComponentState("SENT",
+                "The policies defined have NOT yet been created on the policy engine", 50);
+        assertThat(state.compareTo(state3)).isEqualTo(1);
+
+        ExternalComponentState state4 =  new ExternalComponentState(null,
+                "The policies defined have NOT yet been created on the policy engine", 100);
+        assertThat(state.compareTo(state4)).isEqualTo(-1);
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
new file mode 100644
index 000000000..e822dfb1a
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
@@ -0,0 +1,246 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.clamp.loop.components.external.ExternalComponentState;
+import org.onap.clamp.loop.components.external.PolicyComponent;
+
+public class PolicyComponentTest {
+
+    /**
+    * Test the computeState method. 
+    * oldState           newState        expectedFinalState
+    * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
+    * NOT_SENT             SENT                NOT_SENT
+    * NOT_SENT           NOT_SENT              NOT_SENT
+    * NOT_SENT           IN_ERROR              IN_ERROR
+    */
+    @Test
+    public void computeStateTestOriginalStateUnknown() {
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
+        // policy found + deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        PolicyComponent policy = new PolicyComponent();
+
+        ExternalComponentState state = policy.computeState(exchange);
+        assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
+        // policy found + not deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
+        assertThat(state2.getStateName()).isEqualTo("SENT");
+        // policy not found + not deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+        // policy not found + deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+    }
+    /**
+    * Test the computeState method. 
+    * oldState           newState        expectedFinalState
+    * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
+    * NOT_SENT             SENT                NOT_SENT
+    * NOT_SENT           NOT_SENT              NOT_SENT
+    * NOT_SENT           IN_ERROR              IN_ERROR
+    */
+    @Test
+    public void computeStateTestOriginalStateNotSent() {
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
+        // policy found + deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState notSent = new ExternalComponentState("NOT_SENT",
+                "The policies defined have NOT yet been created on the policy engine", 90);
+        policy.setState(notSent);
+        ExternalComponentState state = policy.computeState(exchange);
+        assertThat(state.getStateName()).isEqualTo("NOT_SENT");
+        // policy found + not deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
+        assertThat(state2.getStateName()).isEqualTo("NOT_SENT");
+        // policy not found + not deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+        // policy not found + deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+    }
+
+
+    /**
+    * Test the computeState method. 
+    * oldState           newState        expectedFinalState
+    * SENT                 SENT                SENT
+    * SENT          SENT_AND_DEPLOYED          SENT
+    * SENT              IN_ERROR              IN_ERROR
+    * SENT              NOT_SENT              NOT_SENT
+    */
+    @Test
+    public void computeStateTestOriginalStateSent() throws IOException {
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState sent = new ExternalComponentState("SENT",
+                "The policies defined have been created but NOT deployed on the policy engine", 50);
+        policy.setState(sent);
+        // new policy state SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state = policy.computeState(exchange);
+        assertThat(state.getStateName()).isEqualTo("SENT");
+        // new policy state SENT_AND_DEPLOYED
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state2 = policy.computeState(exchange);
+        assertThat(state2.getStateName()).isEqualTo("SENT");
+        // new policy state IN_ERROR
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        // new policy state NOT_SENT
+        policy.setState(sent);
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+    }
+
+    /**
+    * Test the computeState method. 
+    * oldState                   newState        expectedFinalState
+    * SENT_AND_DEPLOYED     SENT_AND_DEPLOYED    SENT_AND_DEPLOYED
+    * SENT_AND_DEPLOYED            SENT                SENT
+    * SENT_AND_DEPLOYED          IN_ERROR            IN_ERROR
+    * SENT_AND_DEPLOYED          NOT_SENT            NOT_SENT
+    */
+    @Test
+    public void computeStateTestOriginalStateSentAndDeployed() throws IOException {
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState sendDeployed = new ExternalComponentState("SENT_AND_DEPLOYED",
+                "The policies defined have been created and deployed on the policy engine", 10);
+        policy.setState(sendDeployed);
+        // new policy state SENT_AND_DEPLOYED
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state = policy.computeState(exchange);
+        assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
+        // new policy state SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
+        assertThat(state2.getStateName()).isEqualTo("SENT");
+        // new policy state IN_ERROR
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        // new policy state NOT_SENT
+        policy.setState(sendDeployed);
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+    }
+
+
+    /**
+    * Test the computeState method. 
+    * oldState           newState        expectedFinalState
+    * IN_ERROR     SENT_AND_DEPLOYED         IN_ERROR
+    * IN_ERROR            SENT               IN_ERROR
+    * IN_ERROR          IN_ERROR             IN_ERROR
+    * IN_ERROR          NOT_SENT             IN_ERROR
+    */
+    @Test
+    public void computeStateTestOriginalStateInError() throws IOException {
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState inError = new ExternalComponentState("IN_ERROR",
+                "There was an error during the sending to policy, the policy engine may be corrupted or inconsistent",
+                100);
+        policy.setState(inError);
+        // new policy state SENT_AND_DEPLOYED
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state = policy.computeState(exchange);
+        assertThat(state.getStateName()).isEqualTo("IN_ERROR");
+        // new policy state SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
+        assertThat(state2.getStateName()).isEqualTo("IN_ERROR");
+        // new policy state IN_ERROR
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        // new policy state NOT_SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
+
+        assertThat(state4.getStateName()).isEqualTo("IN_ERROR");
+    }
+}
diff --git a/ui-react/src/LoopUI.test.js b/ui-react/src/LoopUI.test.js
new file mode 100644
index 000000000..e28096bd4
--- /dev/null
+++ b/ui-react/src/LoopUI.test.js
@@ -0,0 +1,171 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import LoopUI from './LoopUI';
+
+import LoopCache from './api/LoopCache';
+import LoopActionService from './api/LoopActionService';
+import LoopService from './api/LoopService';
+
+describe('Verify LoopUI', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "testUser"
+
+			});
+		});
+	})
+
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+		"components": {
+			"POLICY": {
+				"componentState": {
+					"stateName": "UNKNOWN",
+					"description": "The policies defined have NOT yet been created on the policy engine"
+				}
+			},
+			"DCAE": {
+				"componentState": {
+					"stateName": "BLUEPRINT_DEPLOYED",
+					"description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+				}
+			}
+		}
+	});
+
+	it('Test the render method', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+
+		const component = shallow(<LoopUI />)
+		component.setState({
+			loopName: "testLoopName",
+			showAlert: false 
+		});
+		await flushPromises();
+		expect(component).toMatchSnapshot();
+	});
+
+	test('Test closeLoop method', () => {
+		const historyMock = { push: jest.fn() };
+		const component = shallow(<LoopUI history={historyMock}/>)
+		const instance = component.instance();
+		instance.closeLoop();
+			
+		expect(component.state('loopName')).toEqual("Empty (NO loop loaded yet)");
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	})
+
+	test('Test logout method', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const component = shallow(<LoopUI />)
+		const instance = component.instance();
+		instance.logout();
+		await flushPromises();
+		expect(component.state('userName')).toEqual("testUser");
+	})
+
+	test('Test loadLoop method refresh suc', async () => {
+		const historyMock = { push: jest.fn() };
+		LoopService.getLoop = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => {}
+			});
+		});
+
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.resolve({name: "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca"});
+		});
+
+		const flushPromises = () => new Promise(setImmediate);
+		const component = shallow(<LoopUI history={historyMock}/>)
+		const instance = component.instance();
+		instance.loadLoop("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
+
+		await flushPromises();
+
+		const resLoopCache = instance.getLoopCache();
+			
+		expect(resLoopCache.getComponentStates()).toBeUndefined();
+		expect(component.state('loopName')).toEqual("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
+	})
+
+	test('Test loadLoop method refresh fail', async () => {
+		const historyMock = { push: jest.fn() };
+		LoopService.getLoop = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+			name: "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+			"components": {
+				"POLICY": {
+					"componentState": {
+						"stateName": "UNKNOWN",
+						"description": "The policies defined have NOT yet been created on the policy engine"
+					}
+				},
+				"DCAE": {
+					"componentState": {
+						"stateName": "BLUEPRINT_DEPLOYED",
+						"description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+					}
+				}
+			}});
+		});
+
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.reject({error: "whatever"});
+		});
+
+		const flushPromises = () => new Promise(setImmediate);
+		const component = shallow(<LoopUI history={historyMock}/>)
+		const instance = component.instance();
+		instance.loadLoop("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
+
+		await flushPromises();
+
+		const resLoopCache = instance.getLoopCache();
+			
+		expect(resLoopCache).toEqual(loopCache);
+		expect(component.state('loopName')).toEqual("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
+	})
+
+	test('Test alert methods', () => {
+		const component = shallow(<LoopUI />)
+		expect(component.state('showAlert')).toEqual(false);
+
+		const instance = component.instance();
+		instance.showAlert("testAlert");
+		expect(component.state('showAlert')).toEqual(true);
+		expect(component.state('showMessage')).toEqual("testAlert");
+
+		instance.disableAlert();
+			
+		expect(component.state('showAlert')).toEqual(false);
+	})
+});
diff --git a/ui-react/src/NotFound.test.js b/ui-react/src/NotFound.test.js
new file mode 100644
index 000000000..3a5fc107d
--- /dev/null
+++ b/ui-react/src/NotFound.test.js
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import NotFound from './NotFound';
+
+describe('Verify OnapClamp', () => {
+
+	it('Test the render method',  () => {
+
+		const component = shallow(<NotFound />)
+
+		expect(component).toMatchSnapshot();
+	});
+
+});
diff --git a/ui-react/src/OnapClamp.test.js b/ui-react/src/OnapClamp.test.js
new file mode 100644
index 000000000..c3336a9ab
--- /dev/null
+++ b/ui-react/src/OnapClamp.test.js
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import OnapClamp from './OnapClamp';
+
+describe('Verify OnapClamp', () => {
+
+	it('Test the render method',  () => {
+
+		const component = shallow(<OnapClamp />)
+
+		expect(component).toMatchSnapshot();
+	});
+
+});
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
new file mode 100644
index 000000000..ecf439e4e
--- /dev/null
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -0,0 +1,154 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify LoopUI Test the render method 1`] = `
+<styled.div
+  id="main_div"
+>
+  <Route
+    path="/operationalPolicyModal"
+    render={[Function]}
+  />
+  <Route
+    path="/configurationPolicyModal/:componentName"
+    render={[Function]}
+  />
+  <Route
+    path="/openLoop"
+    render={[Function]}
+  />
+  <Route
+    path="/loopProperties"
+    render={[Function]}
+  />
+  <Route
+    path="/userInfo"
+    render={[Function]}
+  />
+  <Route
+    path="/closeLoop"
+    render={[Function]}
+  />
+  <Route
+    path="/submit"
+    render={[Function]}
+  />
+  <Route
+    path="/stop"
+    render={[Function]}
+  />
+  <Route
+    path="/restart"
+    render={[Function]}
+  />
+  <Route
+    path="/delete"
+    render={[Function]}
+  />
+  <Route
+    path="/undeploy"
+    render={[Function]}
+  />
+  <Route
+    path="/deploy"
+    render={[Function]}
+  />
+  <Route
+    path="/refreshStatus"
+    render={[Function]}
+  />
+  <Route
+    path="/logout"
+    render={[Function]}
+  />
+  <GlobalStyleComponent />
+  <Alert
+    closeLabel="Close alert"
+    dismissible={true}
+    onClose={[Function]}
+    show={false}
+    transition={
+      Object {
+        "$$typeof": Symbol(react.forward_ref),
+        "defaultProps": Object {
+          "appear": false,
+          "in": false,
+          "mountOnEnter": false,
+          "timeout": 300,
+          "unmountOnExit": false,
+        },
+        "displayName": "Fade",
+        "render": [Function],
+      }
+    }
+    variant="danger"
+  />
+  <Navbar
+    collapseOnSelect={false}
+    expand={true}
+    variant="light"
+  >
+    <NavbarBrand>
+      <img
+        alt=""
+        height="50px"
+        src={null}
+        width="234px"
+      />
+      <styled.a>
+        CLAMP
+      </styled.a>
+    </NavbarBrand>
+    <NavbarToggle
+      aria-controls="responsive-navbar-nav"
+      label="Toggle navigation"
+    />
+    <MenuBar
+      loopName="testLoopName"
+    />
+    <NavbarText>
+      <styled.a>
+        Signed in as: 
+      </styled.a>
+      <Styled(Link)
+        to="/userInfo"
+      >
+        testUser
+      </Styled(Link)>
+      <Styled(Link)
+        to="/logout/"
+      >
+         (logout)
+      </Styled(Link)>
+    </NavbarText>
+  </Navbar>
+  <styled.div>
+    <styled.div>
+      Loop Viewer - 
+      testLoopName
+    </styled.div>
+    <styled.div>
+      <withRouter(LoopViewSvg)
+        loopCache={
+          LoopCache {
+            "loopJsonCache": Object {},
+          }
+        }
+      />
+      <LoopStatus
+        loopCache={
+          LoopCache {
+            "loopJsonCache": Object {},
+          }
+        }
+      />
+      <LoopLogs
+        loopCache={
+          LoopCache {
+            "loopJsonCache": Object {},
+          }
+        }
+      />
+    </styled.div>
+  </styled.div>
+</styled.div>
+`;
diff --git a/ui-react/src/__snapshots__/NotFound.test.js.snap b/ui-react/src/__snapshots__/NotFound.test.js.snap
new file mode 100644
index 000000000..86bcfd1c4
--- /dev/null
+++ b/ui-react/src/__snapshots__/NotFound.test.js.snap
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify OnapClamp Test the render method 1`] = `
+<div
+  id="main"
+>
+  <div
+    class="divRow"
+  >
+    <b>
+      Page Not Found!
+    </b>
+  </div>
+  <div
+    class="divRow"
+  >
+    Please cick 
+    <a
+      href="/"
+    >
+      here
+    </a>
+     to go back to the main page.
+  </div>
+</div>
+`;
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
new file mode 100644
index 000000000..751c94b3b
--- /dev/null
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -0,0 +1,176 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify OnapClamp Test the render method 1`] = `
+<ThemeProvider
+  theme={
+    Object {
+      "backgroundColor": "#eeeeee",
+      "fontDanger": "#eb238e",
+      "fontDark": "#888888",
+      "fontFamily": "Arial, Sans-serif",
+      "fontHighlight": "#ffff00",
+      "fontLight": "#ffffff",
+      "fontNormal": "black",
+      "fontSize": "16px",
+      "fontWarning": "#eb238e",
+      "loopViewerBackgroundColor": "white",
+      "loopViewerFontColor": "yellow",
+      "loopViewerHeaderBackgroundColor": "#337ab7",
+      "loopViewerHeaderFontColor": "white",
+      "menuBackgroundColor": "white",
+      "menuFontColor": "black",
+      "menuHighlightedBackgroundColor": "#337ab7",
+      "menuHighlightedFontColor": "white",
+    }
+  }
+>
+  <styled.div
+    id="main_div"
+  >
+    <Route
+      path="/operationalPolicyModal"
+      render={[Function]}
+    />
+    <Route
+      path="/configurationPolicyModal/:componentName"
+      render={[Function]}
+    />
+    <Route
+      path="/openLoop"
+      render={[Function]}
+    />
+    <Route
+      path="/loopProperties"
+      render={[Function]}
+    />
+    <Route
+      path="/userInfo"
+      render={[Function]}
+    />
+    <Route
+      path="/closeLoop"
+      render={[Function]}
+    />
+    <Route
+      path="/submit"
+      render={[Function]}
+    />
+    <Route
+      path="/stop"
+      render={[Function]}
+    />
+    <Route
+      path="/restart"
+      render={[Function]}
+    />
+    <Route
+      path="/delete"
+      render={[Function]}
+    />
+    <Route
+      path="/undeploy"
+      render={[Function]}
+    />
+    <Route
+      path="/deploy"
+      render={[Function]}
+    />
+    <Route
+      path="/refreshStatus"
+      render={[Function]}
+    />
+    <Route
+      path="/logout"
+      render={[Function]}
+    />
+    <GlobalStyleComponent />
+    <Alert
+      closeLabel="Close alert"
+      dismissible={true}
+      onClose={[Function]}
+      show={false}
+      transition={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "appear": false,
+            "in": false,
+            "mountOnEnter": false,
+            "timeout": 300,
+            "unmountOnExit": false,
+          },
+          "displayName": "Fade",
+          "render": [Function],
+        }
+      }
+      variant="danger"
+    />
+    <Navbar
+      collapseOnSelect={false}
+      expand={true}
+      variant="light"
+    >
+      <NavbarBrand>
+        <img
+          alt=""
+          height="50px"
+          src={null}
+          width="234px"
+        />
+        <styled.a>
+          CLAMP
+        </styled.a>
+      </NavbarBrand>
+      <NavbarToggle
+        aria-controls="responsive-navbar-nav"
+        label="Toggle navigation"
+      />
+      <MenuBar
+        loopName="Empty (NO loop loaded yet)"
+      />
+      <NavbarText>
+        <styled.a>
+          Signed in as: 
+        </styled.a>
+        <Styled(Link)
+          to="/userInfo"
+        />
+        <Styled(Link)
+          to="/logout/"
+        >
+           (logout)
+        </Styled(Link)>
+      </NavbarText>
+    </Navbar>
+    <styled.div>
+      <styled.div>
+        Loop Viewer - 
+        Empty (NO loop loaded yet)
+      </styled.div>
+      <styled.div>
+        <withRouter(LoopViewSvg)
+          loopCache={
+            LoopCache {
+              "loopJsonCache": Object {},
+            }
+          }
+        />
+        <LoopStatus
+          loopCache={
+            LoopCache {
+              "loopJsonCache": Object {},
+            }
+          }
+        />
+        <LoopLogs
+          loopCache={
+            LoopCache {
+              "loopJsonCache": Object {},
+            }
+          }
+        />
+      </styled.div>
+    </styled.div>
+  </styled.div>
+</ThemeProvider>
+`;
-- 
cgit 1.2.3-korg


From cb54edb9a9e90bf4f24d5ba4ef73a43adbbc2169 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 21 Oct 2019 10:59:17 +0200
Subject: Add ui tests

Add more tests for react UI.

Issue-ID: CLAMP-512
Change-Id: Iab51ff107688164dfa85341a3758b8799fe60ecd
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/components/loop_viewer/svg/LoopSvg.js |   3 +
 .../src/components/loop_viewer/svg/LoopSvg.test.js | 107 ++++++++++++++++++++-
 .../svg/__snapshots__/LoopSvg.test.js.snap         |  33 ++++++-
 3 files changed, 136 insertions(+), 7 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 48f0335fc..bb4b6d03c 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -55,6 +55,7 @@ class LoopViewSvg extends React.Component {
 		this.state.loopCache = props.loopCache;
 		this.state.componentModalMapping = LoopComponentConverter.buildMapOfComponents(props.loopCache);
 		this.getSvg(props.loopCache.getLoopName());
+		console.log("!!!!!!!!!!!!!!!!!!!!!!!!:"+this.state.componentModalMapping);
 	}
 
 	shouldComponentUpdate(nextProps, nextState) {
@@ -62,7 +63,9 @@ class LoopViewSvg extends React.Component {
 	}
 
 	componentWillReceiveProps(newProps) {	
+	console.log("!!!!!!!!!!!!!!!!!!!!!!!!");
 		if (this.state.loopCache !== newProps.loopCache) {
+		console.log("!!!!!!!!!!!!!!!!!!!!!!!!changed");
 			this.setState({
 				loopCache: newProps.loopCache,
 				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache)
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
index 5a28328c9..635185463 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
@@ -23,12 +23,111 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import LoopSvg from './LoopSvg';
+import LoopCache from '../../../api/LoopCache';
+import LoopService from '../../../api/LoopService';
 
 describe('Verify LoopSvg', () => {
+    const loopCache = new LoopCache({
+        "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+        "microServicePolicies": [{
+            "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+            "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+            "properties": {"domain": "measurementsForVfScaling"},
+            "shared": false,
+            "jsonRepresentation": {"schema": {}}
+        }],
+        "operationalPolicies": [{
+            "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+            "configurationsJson": {
+                "guard_policies": {},
+                "operational_policy": {
+                    "controlLoop": {},
+                    "policies": []
+                }
+            }
+        }]
+    });
 
-	it('Test the render method', () => {
-		const component = shallow(<LoopSvg />)
+    it('Test the render method no loopName', () => {
+        const localLoopCache = new LoopCache({
+        "microServicePolicies": [{
+            "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+            "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+            "properties": {"domain": "measurementsForVfScaling"},
+            "shared": false,
+            "jsonRepresentation": {"schema": {}}
+          }]
+        });
+        const component = shallow(
+            <LoopSvg.WrappedComponent loopCache={localLoopCache}/>
+        );
 
-		expect(component).toMatchSnapshot();
-	});
+        expect(component).toMatchSnapshot();
+    });
+
+    it('Test the render method', () => {
+        const component = shallow(
+            <LoopSvg.WrappedComponent  loopCache={loopCache}/>
+        );
+
+        expect(component).toMatchSnapshot();
+    });
+
+    it('Test the render method svg not empty', async () => {
+        const flushPromises = () => new Promise(setImmediate);
+        LoopService.getSvg = jest.fn().mockImplementation(() => {
+            return Promise.resolve("<svg><text test</text></svg>");
+        });
+        const component = shallow(
+            <LoopSvg.WrappedComponent  loopCache={loopCache}/>
+        );
+        await flushPromises();
+        expect(component).toMatchSnapshot();
+    });
+
+    it('Test handleSvgClick', () => {
+        const historyMock = { push: jest.fn() };
+
+        const component = shallow(
+            <LoopSvg.WrappedComponent loopCache={loopCache} history={historyMock}/>
+        );
+        let dummyElement = document.createElement('div');
+        dummyElement.setAttribute("data-element-id","TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
+
+        const event = { target: { parentNode: { parentNode:{ parentNode: dummyElement }}}};
+
+        component.simulate('click', event);
+        component.update();
+
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/configurationPolicyModal/TCA_h2NMX_v1_0_ResourceInstanceName1_tca']);
+
+        //click operational policy
+        dummyElement.setAttribute("data-element-id","OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca");
+        const event2 = { target: { parentNode: { parentNode:{ parentNode: dummyElement }}}};
+
+        component.simulate('click', event2);
+        component.update();
+
+        expect(historyMock.push.mock.calls[1]).toEqual([ '/operationalPolicyModal']);
+    });
+
+    it('Test componentWillReceiveProps method', () => {
+        const localLoopCache = new LoopCache({
+        "microServicePolicies": [{
+            "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+            "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+            "properties": {"domain": "measurementsForVfScaling"},
+            "shared": false,
+            "jsonRepresentation": {"schema": {}}
+          }]
+        });
+        const component = shallow(
+            <LoopSvg.WrappedComponent loopCache={localLoopCache}/>
+        );
+
+        expect(component.state('componentModalMapping').size).toEqual(2);
+
+        component.setProps({loopCache: loopCache});
+        expect(component.state('componentModalMapping').size).toEqual(3);
+    });
 });
diff --git a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
index 23d22256f..cecfb425a 100644
--- a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
+++ b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
@@ -1,7 +1,34 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Verify LoopSvg Test the render method 1`] = `
-<ContextConsumer>
-  <Component />
-</ContextConsumer>
+<styled.div
+  dangerouslySetInnerHTML={
+    Object {
+      "__html": "<svg><text x=\\"20\\" y=\\"40\\">No LOOP (SVG)</text></svg>",
+    }
+  }
+  onClick={[Function]}
+/>
+`;
+
+exports[`Verify LoopSvg Test the render method no loopName 1`] = `
+<styled.div
+  dangerouslySetInnerHTML={
+    Object {
+      "__html": "<svg><text x=\\"20\\" y=\\"40\\">No LOOP (SVG)</text></svg>",
+    }
+  }
+  onClick={[Function]}
+/>
+`;
+
+exports[`Verify LoopSvg Test the render method svg not empty 1`] = `
+<styled.div
+  dangerouslySetInnerHTML={
+    Object {
+      "__html": "<svg><text test</text></svg>",
+    }
+  }
+  onClick={[Function]}
+/>
 `;
-- 
cgit 1.2.3-korg


From 4e2db35d3c6a586f544ed4e0d756f18a489a629f Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 21 Oct 2019 13:07:49 +0200
Subject: Fix issues

Fix issues from the previous commit.

Issue-ID: CLAMP-512
Change-Id: I84b97e9c457f34771b4c8e723dbeeb7fdfc3a18f
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 pom.xml                                            | 2 +-
 ui-react/src/components/loop_viewer/svg/LoopSvg.js | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'ui-react/src')

diff --git a/pom.xml b/pom.xml
index 910dc8464..62cdee900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
 		<sonar.javascript.lcov.reportPaths>${project.build.directory}/${ui.react.src}/coverage/lcov.info</sonar.javascript.lcov.reportPaths>
 
 		<sonar.exclusions>src/main/resources/**</sonar.exclusions>
-		<sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/*.py</sonar.coverage.exclusions>
+		<sonar.coverage.exclusions>src/main/resources/**,target/ui-react/src/**/*.test.js,target/ui-react/src/setupTests.js,src/main/docker/kibana/*.py</sonar.coverage.exclusions>
 		<docker.push.registry>localhost:5000</docker.push.registry>
 		<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 		<docker.skip.build>true</docker.skip.build>
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index bb4b6d03c..06cfd238f 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -55,17 +55,14 @@ class LoopViewSvg extends React.Component {
 		this.state.loopCache = props.loopCache;
 		this.state.componentModalMapping = LoopComponentConverter.buildMapOfComponents(props.loopCache);
 		this.getSvg(props.loopCache.getLoopName());
-		console.log("!!!!!!!!!!!!!!!!!!!!!!!!:"+this.state.componentModalMapping);
 	}
 
 	shouldComponentUpdate(nextProps, nextState) {
 		return this.state.svgContent !== nextState.svgContent;
 	}
 
-	componentWillReceiveProps(newProps) {	
-	console.log("!!!!!!!!!!!!!!!!!!!!!!!!");
+	componentWillReceiveProps(newProps) {
 		if (this.state.loopCache !== newProps.loopCache) {
-		console.log("!!!!!!!!!!!!!!!!!!!!!!!!changed");
 			this.setState({
 				loopCache: newProps.loopCache,
 				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache)
-- 
cgit 1.2.3-korg


From f6b2625c5876c5ef1b8ead0b3962362fb2924f95 Mon Sep 17 00:00:00 2001
From: drveerendra <vrajasekharaiah@att.com>
Date: Thu, 31 Oct 2019 12:45:30 -0400
Subject: Adding viewToscamodels menu

Updated package.json file to include material table and material UI
react libraries. Added ViewToscalModals folder which contains js file,
corresponding test file and its snapshots

Issue-ID: CLAMP-544
Change-Id: I6b9328d6270fc32b41a152c91a9fd872f3524beb
Signed-off-by: drveerendra <vrajasekharaiah@att.com>
---
 ui-react/package.json                              |   4 +
 ui-react/src/LoopUI.js                             |   2 +
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   4 +
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   4 +
 ui-react/src/api/TemplateMenu.js                   |  40 +++++
 .../dialogs/ViewToscaModals/ViewToscaModals.js     | 151 ++++++++++++++++++
 .../ViewToscaModals/ViewToscaModals.test.js        |  89 +++++++++++
 .../__snapshots__/ViewToscaModals.test.js.snap     | 169 +++++++++++++++++++++
 ui-react/src/components/menu/MenuBar.js            |   3 +
 .../menu/__snapshots__/MenuBar.test.js.snap        |  99 +++++++++---
 10 files changed, 543 insertions(+), 22 deletions(-)
 create mode 100644 ui-react/src/api/TemplateMenu.js
 create mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js
 create mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js
 create mode 100644 ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/package.json b/ui-react/package.json
index 0e0c6ab6b..d876b6c71 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -34,6 +34,9 @@
 		"bootstrap-css-only": "4.3.1",
 		"styled-components": "4.3.2",
 		"react-router-dom": "5.0.1",
+		"@material-ui/core": "4.3.2",
+ 		"@material-ui/icons": "4.2.1",
+		"material-table": "1.48.0",
 		"react-select": "3.0.4"
 	},
 	"devDependencies": {
@@ -91,3 +94,4 @@
 		]
 	}
 }
+
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index ff3c4445a..11808da38 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -42,6 +42,7 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C
 import LoopProperties from './components/dialogs/LoopProperties';
 import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
+import ViewToscaModals from './components/dialogs/ViewToscaModals/ViewToscaModals';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoop from './components/dialogs/DeployLoop';
@@ -247,6 +248,7 @@ export default class LoopUI extends React.Component {
 	render() {
 		return (
 				<StyledMainDiv id="main_div">
+				<Route path="/viewToscaModals" render={(routeProps) => (<ViewToscaModals {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index ecf439e4e..3c84e9564 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -4,6 +4,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
 <styled.div
   id="main_div"
 >
+  <Route
+    path="/viewToscaModals"
+    render={[Function]}
+  />
   <Route
     path="/operationalPolicyModal"
     render={[Function]}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 751c94b3b..abe6be4b4 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -27,6 +27,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
   <styled.div
     id="main_div"
   >
+    <Route
+      path="/viewToscaModals"
+      render={[Function]}
+    />
     <Route
       path="/operationalPolicyModal"
       render={[Function]}
diff --git a/ui-react/src/api/TemplateMenu.js b/ui-react/src/api/TemplateMenu.js
new file mode 100644
index 000000000..6bc60da5c
--- /dev/null
+++ b/ui-react/src/api/TemplateMenu.js
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class TemplateMenu {
+  static getToscaModals() {
+    return fetch('restservices/clds/v2/loop/tosca/models', { method: 'GET', credentials: 'same-origin', })
+      .then(function (response) {
+        console.debug("getToscaModels response received: ", response.status);
+        if (response.ok) {
+          return response.json();
+        } else {
+          console.error("getToscaModels query failed");
+          return {};
+        }
+      })
+      .catch(function (error) {
+        console.error("getToscaModels error received", error);
+        return {};
+      });
+  }
+}
diff --git a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js
new file mode 100644
index 000000000..8073dc357
--- /dev/null
+++ b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js
@@ -0,0 +1,151 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import MaterialTable from "material-table";
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import TemplateMenu from '../../../api/TemplateMenu';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const StyledToscaView = styled.textarea`
+`
+const StyledToscaDiv = styled.div`
+`
+const vtmCellStyle = { border: '1px solid black' };
+const vtmHeaderStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const vtmRowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ViewToscalModals extends React.Component {
+
+	state = {
+		show: true,
+		content: 'Please select Tosca model to view the details',
+		selectedRow: -1,
+		toscaNames: [],
+		toscaColumns: [
+			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Micro Service Name", field: "toscaModelName",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "PolicyType", field: "policyType",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Version", field: "version",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Uploaded By", field: "userId",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never',
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			}
+		],
+		tableIcons: {
+      FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+      LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+      NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+      PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+      ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+      Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+      SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />),
+		}
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getToscaModals = this.getToscaModals.bind(this);
+		this.handleYamlContent = this.handleYamlContent.bind(this);
+	}
+
+	componentWillMount() {
+		this.getToscaModals();
+	}
+
+	getToscaModals() {
+		TemplateMenu.getToscaModals().then(toscaNames => {
+			this.setState({ toscaNames: toscaNames });
+		});
+	}
+
+	handleYamlContent(event) {
+		console.log('inside handleYamlContent');
+		this.setState({ content: event.target.value });
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	render() {
+		return (
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title className="title">View Tosca Model</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<MaterialTable
+					title={"View ToscaModel"}
+					data={this.state.toscaNames}
+					columns={this.state.toscaColumns}
+					icons={this.state.tableIcons}
+					onRowClick={(event, rowData) => {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}}
+					options={{
+						headerStyle: vtmRowHeaderStyle,
+						rowStyle: rowData => ({
+							backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
+						})
+					}}
+					/>
+					<StyledToscaDiv>
+						<StyledToscaView value={this.state.content} onChange={this.handleYamlContent}/>
+					</StyledToscaDiv>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" onClick={this.handleClose}>Close</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js
new file mode 100644
index 000000000..4284dd3ed
--- /dev/null
+++ b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import ViewToscaModals from './ViewToscaModals';
+import { mount } from 'enzyme';
+
+
+describe('Verify ViewToscaModals', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+  					"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+	});
+
+	it('Test the tosca model view render method', () => {
+		const component = shallow(<ViewToscaModals/>);
+		component.setState({ toscaNames: {
+			"index": "1",
+			"toscaModelYaml": "MTCA",
+			"toscaModelName": "DCAE_MTCAConfig",
+			"version" : "16",
+			"userId" : "aj928f",
+			"policyType" : "mtca",
+			"lastUpdatedDate" : "05-07-2019 19:09:42"
+		}
+	});
+    expect(component).toMatchSnapshot();
+  });
+
+	it('Test Table icons', () => {
+		const component = mount(<ViewToscaModals/>);
+		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+
+  });
+
+	it('Test handleYamlContent', () => {
+		const yamlContent = 'MTCA Tosca model details';
+		const component = shallow(<ViewToscaModals/>);
+		component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }});
+    expect(component.state('content')).toEqual(yamlContent);
+  });
+
+	it('Test handleClose', () => {
+		const historyMock = { push: jest.fn() };
+    const handleClose = jest.spyOn(ViewToscaModals.prototype,'handleClose');
+    const component = shallow(<ViewToscaModals history={historyMock} />)
+    component.find('[variant="secondary"]').prop('onClick')();
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    handleClose.mockClear();
+  });
+});
diff --git a/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap b/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap
new file mode 100644
index 000000000..55137b928
--- /dev/null
+++ b/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap
@@ -0,0 +1,169 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify ViewToscaModals Test the tosca model view render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle
+      className="title"
+    >
+      View Tosca Model
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <WithStyles(Component)
+      columns={
+        Array [
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "index",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "render": [Function],
+            "title": "#",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "toscaModelName",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Micro Service Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "policyType",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "PolicyType",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "version",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Version",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "userId",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded By",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "lastUpdatedDate",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded Date",
+          },
+        ]
+      }
+      data={
+        Object {
+          "index": "1",
+          "lastUpdatedDate": "05-07-2019 19:09:42",
+          "policyType": "mtca",
+          "toscaModelName": "DCAE_MTCAConfig",
+          "toscaModelYaml": "MTCA",
+          "userId": "aj928f",
+          "version": "16",
+        }
+      }
+      icons={
+        Object {
+          "FirstPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "LastPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "NextPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "PreviousPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ResetSearch": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Search": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "SortArrow": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+        }
+      }
+      onRowClick={[Function]}
+      options={
+        Object {
+          "headerStyle": Object {
+            "backgroundColor": "#ddd",
+            "border": "1px solid black",
+            "fontSize": "15pt",
+            "text": "bold",
+          },
+          "rowStyle": [Function],
+        }
+      }
+      title="View ToscaModel"
+    />
+    <styled.div>
+      <styled.textarea
+        onChange={[Function]}
+        value="Please select Tosca model to view the details"
+      />
+    </styled.div>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+      variant="secondary"
+    >
+      Close
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index b68e2376a..2ce92b39d 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -87,6 +87,9 @@ export default class MenuBar extends React.Component {
 		return (
 
 				<Navbar.Collapse>
+					<StyledNavDropdown title="Template">
+							<NavDropdown.Item as={StyledLink} to="/viewToscaModals">View Tosca Model</NavDropdown.Item>
+					</StyledNavDropdown>
 					<StyledNavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties CL</NavDropdown.Item>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 3ee733463..1e13b3bdc 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -2,6 +2,61 @@
 
 exports[`Verify MenuBar Test the render method 1`] = `
 <NavbarCollapse>
+  <Styled(NavDropdown)
+    title="Template"
+  >
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-jKJlTe",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-jKJlTe",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/viewToscaModals"
+    >
+      View Tosca Model
+    </DropdownItem>
+  </Styled(NavDropdown)>
   <Styled(NavDropdown)
     title="Closed Loop"
   >
@@ -11,7 +66,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -44,7 +99,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -62,7 +117,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -95,7 +150,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -113,7 +168,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -146,7 +201,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -168,7 +223,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -201,7 +256,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -219,7 +274,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -252,7 +307,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -270,7 +325,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -303,7 +358,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -321,7 +376,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -354,7 +409,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -372,7 +427,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -405,7 +460,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -423,7 +478,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -456,7 +511,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -478,7 +533,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -511,7 +566,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -544,7 +599,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-kpOJdX",
+            "componentId": "sc-jKJlTe",
             "isStatic": false,
             "rules": Array [
               "
@@ -577,7 +632,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-kpOJdX",
+          "styledComponentId": "sc-jKJlTe",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
-- 
cgit 1.2.3-korg


From 81f5cab8902c7221013a751c72f3634b429fde29 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 6 Nov 2019 11:40:46 +0100
Subject: Upgrade the libs

Upgrade the version of some libraries for NPM so for React UI

Issue-ID: CLAMP-544
Change-Id: Ie5238c699a2b441892e6e12f3a6f17640d26b10c
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 pom.xml                                            |   4 +-
 ui-react/package.json                              |  10 +-
 ui-react/src/LoopUI.js                             |   4 +-
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   2 +-
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   2 +-
 ui-react/src/api/TemplateMenu.js                   |  40 -----
 ui-react/src/api/TemplateMenuService.js            |  40 +++++
 .../__snapshots__/OpenLoopModal.test.js.snap       |   4 +-
 .../dialogs/ViewToscaModal/ViewToscaModal.js       | 147 ++++++++++++++++++
 .../dialogs/ViewToscaModal/ViewToscaModal.test.js  |  89 +++++++++++
 .../__snapshots__/ViewToscaModal.test.js.snap      | 169 +++++++++++++++++++++
 .../dialogs/ViewToscaModals/ViewToscaModals.js     | 151 ------------------
 .../ViewToscaModals/ViewToscaModals.test.js        |  89 -----------
 .../__snapshots__/ViewToscaModals.test.js.snap     | 169 ---------------------
 ui-react/src/components/menu/MenuBar.js            |   2 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        |  50 +++---
 16 files changed, 483 insertions(+), 489 deletions(-)
 delete mode 100644 ui-react/src/api/TemplateMenu.js
 create mode 100644 ui-react/src/api/TemplateMenuService.js
 create mode 100644 ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js
 create mode 100644 ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js
 create mode 100644 ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap
 delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js
 delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js
 delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap

(limited to 'ui-react/src')

diff --git a/pom.xml b/pom.xml
index 76a0e4f1d..227b48f9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1091,8 +1091,8 @@
 						</goals>
 						<phase>generate-sources</phase>
 						<configuration>
-							<nodeVersion>v12.10.0</nodeVersion>
-							<npmVersion>6.10.3</npmVersion>
+						<nodeVersion>v12.13.0</nodeVersion>
+						<npmVersion>6.13.0</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
diff --git a/ui-react/package.json b/ui-react/package.json
index d876b6c71..2d70e270e 100644
--- a/ui-react/package.json
+++ b/ui-react/package.json
@@ -30,14 +30,14 @@
 		"react": "16.9.0",
 		"react-dom": "16.9.0",
 		"react-scripts": "3.1.1",
-		"react-bootstrap": "1.0.0-beta.12",
+		"react-bootstrap": "1.0.0-beta.14",
 		"bootstrap-css-only": "4.3.1",
 		"styled-components": "4.3.2",
 		"react-router-dom": "5.0.1",
-		"@material-ui/core": "4.3.2",
- 		"@material-ui/icons": "4.2.1",
-		"material-table": "1.48.0",
-		"react-select": "3.0.4"
+		"@material-ui/core": "4.6.0",
+ 		"@material-ui/icons": "4.5.1",
+		"material-table": "1.53.0",
+		"react-select": "3.0.8"
 	},
 	"devDependencies": {
 		"jest": "24.8.0",
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 11808da38..05f466bc6 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -42,7 +42,7 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C
 import LoopProperties from './components/dialogs/LoopProperties';
 import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
-import ViewToscaModals from './components/dialogs/ViewToscaModals/ViewToscaModals';
+import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoop from './components/dialogs/DeployLoop';
@@ -248,7 +248,7 @@ export default class LoopUI extends React.Component {
 	render() {
 		return (
 				<StyledMainDiv id="main_div">
-				<Route path="/viewToscaModals" render={(routeProps) => (<ViewToscaModals {...routeProps} />)} />
+				<Route path="/viewToscaModal" render={(routeProps) => (<ViewToscaModal {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 3c84e9564..ab4ea4999 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -5,7 +5,7 @@ exports[`Verify LoopUI Test the render method 1`] = `
   id="main_div"
 >
   <Route
-    path="/viewToscaModals"
+    path="/viewToscaModal"
     render={[Function]}
   />
   <Route
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index abe6be4b4..7a4d94570 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -28,7 +28,7 @@ exports[`Verify OnapClamp Test the render method 1`] = `
     id="main_div"
   >
     <Route
-      path="/viewToscaModals"
+      path="/viewToscaModal"
       render={[Function]}
     />
     <Route
diff --git a/ui-react/src/api/TemplateMenu.js b/ui-react/src/api/TemplateMenu.js
deleted file mode 100644
index 6bc60da5c..000000000
--- a/ui-react/src/api/TemplateMenu.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-export default class TemplateMenu {
-  static getToscaModals() {
-    return fetch('restservices/clds/v2/loop/tosca/models', { method: 'GET', credentials: 'same-origin', })
-      .then(function (response) {
-        console.debug("getToscaModels response received: ", response.status);
-        if (response.ok) {
-          return response.json();
-        } else {
-          console.error("getToscaModels query failed");
-          return {};
-        }
-      })
-      .catch(function (error) {
-        console.error("getToscaModels error received", error);
-        return {};
-      });
-  }
-}
diff --git a/ui-react/src/api/TemplateMenuService.js b/ui-react/src/api/TemplateMenuService.js
new file mode 100644
index 000000000..5d3f29a80
--- /dev/null
+++ b/ui-react/src/api/TemplateMenuService.js
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class TemplateMenuService {
+  static getToscaModels() {
+    return fetch('restservices/clds/v2/loop/tosca/models', { method: 'GET', credentials: 'same-origin' })
+      .then(function (response) {
+        console.debug("getToscaModels response received: ", response.status);
+        if (response.ok) {
+          return response.json();
+        } else {
+          console.error("getToscaModels query failed");
+          return {};
+        }
+      })
+      .catch(function (error) {
+        console.error("getToscaModels error received", error);
+        return {};
+      });
+  }
+}
diff --git a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
index 5fd9e8aa5..9e7222415 100644
--- a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
@@ -57,9 +57,7 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
         title=""
         type="checkbox"
       >
-        <FormCheckLabel
-          type="checkbox"
-        >
+        <FormCheckLabel>
           Read Only
         </FormCheckLabel>
         <Styled(FormCheckInput)
diff --git a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js b/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js
new file mode 100644
index 000000000..fbfb4a78c
--- /dev/null
+++ b/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js
@@ -0,0 +1,147 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import MaterialTable from "material-table";
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import TemplateMenuService from '../../../api/TemplateMenuService';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+const vtmCellStyle = { border: '1px solid black' };
+const vtmHeaderStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const vtmRowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ViewToscalModal extends React.Component {
+
+	state = {
+		show: true,
+		content: 'Please select Tosca model to view the details',
+		selectedRow: -1,
+		toscaNames: [],
+		toscaColumns: [
+			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Micro Service Name", field: "toscaModelName",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "PolicyType", field: "policyType",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Version", field: "version",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Uploaded By", field: "userId",
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			},
+			{ title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never',
+				cellStyle: vtmCellStyle,
+				headerStyle: vtmHeaderStyle
+			}
+		],
+		tableIcons: {
+		    FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+		    LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+		    NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+		    PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+		    ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+		    Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+		    SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
+		}
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getToscaModels = this.getToscaModels.bind(this);
+		this.handleYamlContent = this.handleYamlContent.bind(this);
+	}
+
+	componentWillMount() {
+		this.getToscaModels();
+	}
+
+	getToscaModels() {
+	    TemplateMenuService.getToscaModels().then(toscaNames => {
+			this.setState({ toscaNames: toscaNames });
+		});
+	}
+
+	handleYamlContent(event) {
+		this.setState({ content: event.target.value });
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	render() {
+		return (
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title className="title">View Tosca Model</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<MaterialTable
+					title={"View ToscaModel"}
+					data={this.state.toscaNames}
+					columns={this.state.toscaColumns}
+					icons={this.state.tableIcons}
+					onRowClick={(event, rowData) => {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}}
+					options={{
+						headerStyle: vtmRowHeaderStyle,
+						rowStyle: rowData => ({
+							backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
+						})
+					}}
+					/>
+					<div>
+						<textarea value={this.state.content} onChange={this.handleYamlContent}/>
+					</div>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" onClick={this.handleClose}>Close</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js b/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js
new file mode 100644
index 000000000..4dbe37615
--- /dev/null
+++ b/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import ViewToscaModal from './ViewToscaModal';
+import { mount } from 'enzyme';
+
+
+describe('Verify ViewToscaModal', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+  					"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+	});
+
+	it('Test the tosca model view render method', () => {
+		const component = shallow(<ViewToscaModal/>);
+		component.setState({ toscaNames: {
+			"index": "1",
+			"toscaModelYaml": "MTCA",
+			"toscaModelName": "DCAE_MTCAConfig",
+			"version" : "16",
+			"userId" : "aj928f",
+			"policyType" : "mtca",
+			"lastUpdatedDate" : "05-07-2019 19:09:42"
+		}
+	});
+    expect(component).toMatchSnapshot();
+  });
+
+	it('Test Table icons', () => {
+		const component = mount(<ViewToscaModal/>);
+		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+
+  });
+
+	it('Test handleYamlContent', () => {
+		const yamlContent = 'MTCA Tosca model details';
+		const component = shallow(<ViewToscaModal/>);
+		component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }});
+    expect(component.state('content')).toEqual(yamlContent);
+  });
+
+	it('Test handleClose', () => {
+		const historyMock = { push: jest.fn() };
+    const handleClose = jest.spyOn(ViewToscaModal.prototype,'handleClose');
+    const component = shallow(<ViewToscaModal history={historyMock} />)
+    component.find('[variant="secondary"]').prop('onClick')();
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    handleClose.mockClear();
+  });
+});
diff --git a/ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap b/ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap
new file mode 100644
index 000000000..3523adad3
--- /dev/null
+++ b/ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap
@@ -0,0 +1,169 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify ViewToscaModal Test the tosca model view render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle
+      className="title"
+    >
+      View Tosca Model
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <WithStyles(Component)
+      columns={
+        Array [
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "index",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "render": [Function],
+            "title": "#",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "toscaModelName",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Micro Service Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "policyType",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "PolicyType",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "version",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Version",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "userId",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded By",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "lastUpdatedDate",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded Date",
+          },
+        ]
+      }
+      data={
+        Object {
+          "index": "1",
+          "lastUpdatedDate": "05-07-2019 19:09:42",
+          "policyType": "mtca",
+          "toscaModelName": "DCAE_MTCAConfig",
+          "toscaModelYaml": "MTCA",
+          "userId": "aj928f",
+          "version": "16",
+        }
+      }
+      icons={
+        Object {
+          "FirstPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "LastPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "NextPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "PreviousPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ResetSearch": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Search": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "SortArrow": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+        }
+      }
+      onRowClick={[Function]}
+      options={
+        Object {
+          "headerStyle": Object {
+            "backgroundColor": "#ddd",
+            "border": "1px solid black",
+            "fontSize": "15pt",
+            "text": "bold",
+          },
+          "rowStyle": [Function],
+        }
+      }
+      title="View ToscaModel"
+    />
+    <div>
+      <textarea
+        onChange={[Function]}
+        value="Please select Tosca model to view the details"
+      />
+    </div>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+      variant="secondary"
+    >
+      Close
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js
deleted file mode 100644
index 8073dc357..000000000
--- a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React, { forwardRef } from 'react'
-import MaterialTable from "material-table";
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import styled from 'styled-components';
-import TemplateMenu from '../../../api/TemplateMenu';
-import ArrowUpward from '@material-ui/icons/ArrowUpward';
-import ChevronLeft from '@material-ui/icons/ChevronLeft';
-import ChevronRight from '@material-ui/icons/ChevronRight';
-import Clear from '@material-ui/icons/Clear';
-import FirstPage from '@material-ui/icons/FirstPage';
-import LastPage from '@material-ui/icons/LastPage';
-import Search from '@material-ui/icons/Search';
-
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-const StyledToscaView = styled.textarea`
-`
-const StyledToscaDiv = styled.div`
-`
-const vtmCellStyle = { border: '1px solid black' };
-const vtmHeaderStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
-const vtmRowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
-
-export default class ViewToscalModals extends React.Component {
-
-	state = {
-		show: true,
-		content: 'Please select Tosca model to view the details',
-		selectedRow: -1,
-		toscaNames: [],
-		toscaColumns: [
-			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Micro Service Name", field: "toscaModelName",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "PolicyType", field: "policyType",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Version", field: "version",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Uploaded By", field: "userId",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never',
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			}
-		],
-		tableIcons: {
-      FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
-      LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
-      NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-      PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
-      ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-      Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
-      SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />),
-		}
-	};
-
-	constructor(props, context) {
-		super(props, context);
-		this.handleClose = this.handleClose.bind(this);
-		this.getToscaModals = this.getToscaModals.bind(this);
-		this.handleYamlContent = this.handleYamlContent.bind(this);
-	}
-
-	componentWillMount() {
-		this.getToscaModals();
-	}
-
-	getToscaModals() {
-		TemplateMenu.getToscaModals().then(toscaNames => {
-			this.setState({ toscaNames: toscaNames });
-		});
-	}
-
-	handleYamlContent(event) {
-		console.log('inside handleYamlContent');
-		this.setState({ content: event.target.value });
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-	}
-
-	render() {
-		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
-				<Modal.Header closeButton>
-					<Modal.Title className="title">View Tosca Model</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<MaterialTable
-					title={"View ToscaModel"}
-					data={this.state.toscaNames}
-					columns={this.state.toscaColumns}
-					icons={this.state.tableIcons}
-					onRowClick={(event, rowData) => {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}}
-					options={{
-						headerStyle: vtmRowHeaderStyle,
-						rowStyle: rowData => ({
-							backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
-						})
-					}}
-					/>
-					<StyledToscaDiv>
-						<StyledToscaView value={this.state.content} onChange={this.handleYamlContent}/>
-					</StyledToscaDiv>
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" onClick={this.handleClose}>Close</Button>
-				</Modal.Footer>
-			</ModalStyled>
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js b/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js
deleted file mode 100644
index 4284dd3ed..000000000
--- a/ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import ViewToscaModals from './ViewToscaModals';
-import { mount } from 'enzyme';
-
-
-describe('Verify ViewToscaModals', () => {
-	beforeEach(() => {
-		fetch.resetMocks();
-		fetch.mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"index": "1",
-  					"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-	});
-
-	it('Test the tosca model view render method', () => {
-		const component = shallow(<ViewToscaModals/>);
-		component.setState({ toscaNames: {
-			"index": "1",
-			"toscaModelYaml": "MTCA",
-			"toscaModelName": "DCAE_MTCAConfig",
-			"version" : "16",
-			"userId" : "aj928f",
-			"policyType" : "mtca",
-			"lastUpdatedDate" : "05-07-2019 19:09:42"
-		}
-	});
-    expect(component).toMatchSnapshot();
-  });
-
-	it('Test Table icons', () => {
-		const component = mount(<ViewToscaModals/>);
-		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
-
-  });
-
-	it('Test handleYamlContent', () => {
-		const yamlContent = 'MTCA Tosca model details';
-		const component = shallow(<ViewToscaModals/>);
-		component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }});
-    expect(component.state('content')).toEqual(yamlContent);
-  });
-
-	it('Test handleClose', () => {
-		const historyMock = { push: jest.fn() };
-    const handleClose = jest.spyOn(ViewToscaModals.prototype,'handleClose');
-    const component = shallow(<ViewToscaModals history={historyMock} />)
-    component.find('[variant="secondary"]').prop('onClick')();
-    expect(handleClose).toHaveBeenCalledTimes(1);
-    expect(component.state('show')).toEqual(false);
-    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    handleClose.mockClear();
-  });
-});
diff --git a/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap b/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap
deleted file mode 100644
index 55137b928..000000000
--- a/ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap
+++ /dev/null
@@ -1,169 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify ViewToscaModals Test the tosca model view render method 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="xl"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle
-      className="title"
-    >
-      View Tosca Model
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <WithStyles(Component)
-      columns={
-        Array [
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "index",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "render": [Function],
-            "title": "#",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "toscaModelName",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Micro Service Name",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "policyType",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "PolicyType",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "version",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Version",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "userId",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Uploaded By",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "editable": "never",
-            "field": "lastUpdatedDate",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Uploaded Date",
-          },
-        ]
-      }
-      data={
-        Object {
-          "index": "1",
-          "lastUpdatedDate": "05-07-2019 19:09:42",
-          "policyType": "mtca",
-          "toscaModelName": "DCAE_MTCAConfig",
-          "toscaModelYaml": "MTCA",
-          "userId": "aj928f",
-          "version": "16",
-        }
-      }
-      icons={
-        Object {
-          "FirstPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "LastPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "NextPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "PreviousPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "ResetSearch": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Search": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "SortArrow": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-        }
-      }
-      onRowClick={[Function]}
-      options={
-        Object {
-          "headerStyle": Object {
-            "backgroundColor": "#ddd",
-            "border": "1px solid black",
-            "fontSize": "15pt",
-            "text": "bold",
-          },
-          "rowStyle": [Function],
-        }
-      }
-      title="View ToscaModel"
-    />
-    <styled.div>
-      <styled.textarea
-        onChange={[Function]}
-        value="Please select Tosca model to view the details"
-      />
-    </styled.div>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-      variant="secondary"
-    >
-      Close
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 2ce92b39d..bbfa82a13 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -88,7 +88,7 @@ export default class MenuBar extends React.Component {
 
 				<Navbar.Collapse>
 					<StyledNavDropdown title="Template">
-							<NavDropdown.Item as={StyledLink} to="/viewToscaModals">View Tosca Model</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/viewToscaModal">View Tosca Model</NavDropdown.Item>
 					</StyledNavDropdown>
 					<StyledNavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 1e13b3bdc..9082eccd8 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -11,7 +11,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -44,7 +44,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -52,7 +52,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={false}
-      to="/viewToscaModals"
+      to="/viewToscaModal"
     >
       View Tosca Model
     </DropdownItem>
@@ -66,7 +66,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -99,7 +99,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -117,7 +117,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -150,7 +150,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -168,7 +168,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -201,7 +201,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -223,7 +223,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -256,7 +256,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -274,7 +274,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -307,7 +307,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -325,7 +325,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -358,7 +358,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -376,7 +376,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -409,7 +409,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -427,7 +427,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -460,7 +460,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -478,7 +478,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -511,7 +511,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -533,7 +533,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -566,7 +566,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -599,7 +599,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-jKJlTe",
+            "componentId": "sc-dxgOiQ",
             "isStatic": false,
             "rules": Array [
               "
@@ -632,7 +632,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-jKJlTe",
+          "styledComponentId": "sc-dxgOiQ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
-- 
cgit 1.2.3-korg


From 2e9ae128ca601171cb511d410ac9f3996a9b0513 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 15 Nov 2019 16:28:55 +0100
Subject: Fix naming convention

Fix naming convention in UI-react so that it's clearer

Issue-ID: CLAMP-552
Change-Id: I758e0695f5b299514758c35aa699454b0c010974
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |   4 +-
 .../ConfigurationPolicyModal.test.js               |   2 +-
 ui-react/src/components/dialogs/DeployLoop.js      | 127 ---------------------
 ui-react/src/components/dialogs/DeployLoop.test.js | 110 ------------------
 .../src/components/dialogs/Loop/DeployLoopModal.js | 127 +++++++++++++++++++++
 .../dialogs/Loop/DeployLoopModal.test.js           | 110 ++++++++++++++++++
 .../__snapshots__/DeployLoopModal.test.js.snap     |  66 +++++++++++
 .../dialogs/__snapshots__/DeployLoop.test.js.snap  |  66 -----------
 8 files changed, 306 insertions(+), 306 deletions(-)
 delete mode 100644 ui-react/src/components/dialogs/DeployLoop.js
 delete mode 100644 ui-react/src/components/dialogs/DeployLoop.test.js
 create mode 100644 ui-react/src/components/dialogs/Loop/DeployLoopModal.js
 create mode 100644 ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
 delete mode 100644 ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 05f466bc6..bcdc4ffee 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -45,7 +45,7 @@ import LoopService from './api/LoopService';
 import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
-import DeployLoop from './components/dialogs/DeployLoop';
+import DeployLoopModal from './components/dialogs/Loop/DeployLoopModal';
 import Alert from 'react-bootstrap/Alert';
 
 import { Link } from 'react-router-dom';
@@ -261,7 +261,7 @@ export default class LoopUI extends React.Component {
 				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/logout" render={this.logout} />
 				<GlobalClampStyle />
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
index e0aa8c6b0..4fa08e680 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
@@ -26,7 +26,7 @@ import ConfigurationPolicyModal from './ConfigurationPolicyModal';
 import LoopCache from '../../../api/LoopCache';
 
 
-describe('Verify DeployLoop', () => {
+describe('Verify ConfigurationPolicyModal', () => {
     beforeEach(() => {
         fetch.resetMocks();
         fetch.mockImplementation(() => {
diff --git a/ui-react/src/components/dialogs/DeployLoop.js b/ui-react/src/components/dialogs/DeployLoop.js
deleted file mode 100644
index d71af9240..000000000
--- a/ui-react/src/components/dialogs/DeployLoop.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import LoopActionService from '../../api/LoopActionService';
-import LoopService from '../../api/LoopService';
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import Form from 'react-bootstrap/Form';
-import styled from 'styled-components';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-const FormStyled = styled(Form.Group)`
-	padding: .25rem 1.5rem;
-`
-export default class DeployLoop extends React.Component {
-	state = {
-		loopCache: this.props.loopCache,
-		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
-		show: true
-	};
-	constructor(props, context) {
-		super(props, context);
-
-		this.handleSave = this.handleSave.bind(this);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleChange = this.handleChange.bind(this);
-		this.refreshStatus = this.refreshStatus.bind(this);
-		this.renderDeployParam = this.renderDeployParam.bind(this);
-	}
-	componentWillReceiveProps(newProps) {
-		this.setState({
-			loopName: newProps.loopCache.getLoopName(),
-			show: true
-		});
-	}
-	handleClose(){
-		this.props.history.push('/');
-	}
-	handleSave() {
-		const loopName = this.props.loopCache.getLoopName();
-		// save the global propserties
-		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
-			this.setState({ show: false });
-
-			LoopActionService.performAction(loopName, "deploy").then(pars => {
-				this.props.showAlert("Action deploy successfully performed");
-				// refresh status and update loop logs
-				this.refreshStatus(loopName);
-			})
-			.catch(error => {
-				this.props.showAlert("Action deploy failed");
-				// refresh status and update loop logs
-				this.refreshStatus(loopName);
-			});
-		});
-	}
-
-	refreshStatus(loopName) {
-		LoopActionService.refreshStatus(loopName).then(data => {
-			this.props.updateLoopFunction(data);
-			this.props.history.push('/');
-		})
-		.catch(error => {
-			this.props.showAlert("Refresh status failed");
-			this.props.history.push('/');
-		});
-	}
-	handleChange(event) {
-		let deploymentParam = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
-		deploymentParam[event.target.name] = event.target.value;
-
-		this.setState({temporaryPropertiesJson:{dcaeDeployParameters: deploymentParam}});
-	}
-	renderDeployParam() {
-		if (typeof (this.state.temporaryPropertiesJson) === "undefined") {
-			 return "";
-		}
-
-		const deployJson = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
-		var indents = [];
-		Object.keys(deployJson).map((item,key) =>
-		indents.push(<FormStyled>
-				<Form.Label>{item}</Form.Label>
-				<Form.Control type="text" name={item} onChange={this.handleChange} defaultValue={deployJson[item]}></Form.Control>
-			</FormStyled>));
-
-			return indents;
-	}
-
-
-	render() {
-		return (
-					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
-						<Modal.Header closeButton>
-							<Modal.Title>Deployment parameters</Modal.Title>
-						</Modal.Header>
-						{this.renderDeployParam()}
-						<Modal.Footer>
-							<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-							<Button variant="primary" type="submit" onClick={this.handleSave}>Deploy</Button>
-						</Modal.Footer>
-					</ModalStyled>
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/DeployLoop.test.js b/ui-react/src/components/dialogs/DeployLoop.test.js
deleted file mode 100644
index 44bc78379..000000000
--- a/ui-react/src/components/dialogs/DeployLoop.test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import DeployLoop from './DeployLoop';
-import LoopCache from '../../api/LoopCache';
-import LoopActionService from '../../api/LoopActionService';
-import LoopService from '../../api/LoopService';
-
-describe('Verify DeployLoop', () => {
-	const loopCache = new LoopCache({
-		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-		"globalPropertiesJson": {
-			"dcaeDeployParameters": {
-				"location_id": "",
-				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-			}
-		}
-	});
-
-	it('Test the render method', () => {
-		const component = shallow(
-			<DeployLoop loopCache={loopCache}/>
-		)
-
-	expect(component).toMatchSnapshot();
-	});
-	
-	it('Test handleClose', () => {
-		const historyMock = { push: jest.fn() };
-		const handleClose = jest.spyOn(DeployLoop.prototype,'handleClose');
-		const component = shallow(<DeployLoop history={historyMock} loopCache={loopCache}/>)
-
-		component.find('[variant="secondary"]').prop('onClick')();
-
-		expect(handleClose).toHaveBeenCalledTimes(1);
-		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-	});
-
-	it('Test handleSave successful', async () => {
-		const flushPromises = () => new Promise(setImmediate);
-		const historyMock = { push: jest.fn() };
-		const updateLoopFunction = jest.fn();
-		const showAlert = jest.fn();
-		const handleSave = jest.spyOn(DeployLoop.prototype,'handleSave');
-		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				text: () => "OK"
-			});
-		});
-		LoopActionService.performAction = jest.fn().mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {}
-			});
-		});
-		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {}
-			});
-		});
-
-		const component = shallow(<DeployLoop history={historyMock} 
-						loopCache={loopCache} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
-
-		component.find('[variant="primary"]').prop('onClick')();
-		await flushPromises();
-		component.update();
-
-		expect(handleSave).toHaveBeenCalledTimes(1);
-		expect(component.state('show')).toEqual(false);
-		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-		handleSave.mockClear();
-	});
-
-	it('Onchange event', () => {
-		const event = { target: { name: "location_id", value: "testLocation"} };
-		const component = shallow(<DeployLoop loopCache={loopCache}/>);
-		const forms = component.find('StateManager');
-
-		component.find('[name="location_id"]').simulate('change', event);
-		component.update();
-		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
-	});
-});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
new file mode 100644
index 000000000..34304d611
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -0,0 +1,127 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import LoopActionService from '../../../api/LoopActionService';
+import LoopService from '../../../api/LoopService';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import styled from 'styled-components';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const FormStyled = styled(Form.Group)`
+	padding: .25rem 1.5rem;
+`
+export default class DeployLoopModal extends React.Component {
+	state = {
+		loopCache: this.props.loopCache,
+		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
+		show: true
+	};
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleSave = this.handleSave.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleChange = this.handleChange.bind(this);
+		this.refreshStatus = this.refreshStatus.bind(this);
+		this.renderDeployParam = this.renderDeployParam.bind(this);
+	}
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName(),
+			show: true
+		});
+	}
+	handleClose(){
+		this.props.history.push('/');
+	}
+	handleSave() {
+		const loopName = this.props.loopCache.getLoopName();
+		// save the global propserties
+		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
+			this.setState({ show: false });
+
+			LoopActionService.performAction(loopName, "deploy").then(pars => {
+				this.props.showAlert("Action deploy successfully performed");
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			})
+			.catch(error => {
+				this.props.showAlert("Action deploy failed");
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			});
+		});
+	}
+
+	refreshStatus(loopName) {
+		LoopActionService.refreshStatus(loopName).then(data => {
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+		.catch(error => {
+			this.props.showAlert("Refresh status failed");
+			this.props.history.push('/');
+		});
+	}
+	handleChange(event) {
+		let deploymentParam = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		deploymentParam[event.target.name] = event.target.value;
+
+		this.setState({temporaryPropertiesJson:{dcaeDeployParameters: deploymentParam}});
+	}
+	renderDeployParam() {
+		if (typeof (this.state.temporaryPropertiesJson) === "undefined") {
+			 return "";
+		}
+
+		const deployJson = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		var indents = [];
+		Object.keys(deployJson).map((item,key) =>
+		indents.push(<FormStyled>
+				<Form.Label>{item}</Form.Label>
+				<Form.Control type="text" name={item} onChange={this.handleChange} defaultValue={deployJson[item]}></Form.Control>
+			</FormStyled>));
+
+			return indents;
+	}
+
+
+	render() {
+		return (
+					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
+						<Modal.Header closeButton>
+							<Modal.Title>Deployment parameters</Modal.Title>
+						</Modal.Header>
+						{this.renderDeployParam()}
+						<Modal.Footer>
+							<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+							<Button variant="primary" type="submit" onClick={this.handleSave}>Deploy</Button>
+						</Modal.Footer>
+					</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
new file mode 100644
index 000000000..2ebb8c067
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
@@ -0,0 +1,110 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import DeployLoopModal from './DeployLoopModal';
+import LoopCache from '../../../api/LoopCache';
+import LoopActionService from '../../../api/LoopActionService';
+import LoopService from '../../../api/LoopService';
+
+describe('Verify DeployLoopModal', () => {
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+		"globalPropertiesJson": {
+			"dcaeDeployParameters": {
+				"location_id": "",
+				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+			}
+		}
+	});
+
+	it('Test the render method', () => {
+		const component = shallow(
+			<DeployLoopModal loopCache={loopCache}/>
+		)
+
+	expect(component).toMatchSnapshot();
+	});
+	
+	it('Test handleClose', () => {
+		const historyMock = { push: jest.fn() };
+		const handleClose = jest.spyOn(DeployLoopModal.prototype,'handleClose');
+		const component = shallow(<DeployLoopModal history={historyMock} loopCache={loopCache}/>)
+
+		component.find('[variant="secondary"]').prop('onClick')();
+
+		expect(handleClose).toHaveBeenCalledTimes(1);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	});
+
+	it('Test handleSave successful', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const updateLoopFunction = jest.fn();
+		const showAlert = jest.fn();
+		const handleSave = jest.spyOn(DeployLoopModal.prototype,'handleSave');
+		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "OK"
+			});
+		});
+		LoopActionService.performAction = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+
+		const component = shallow(<DeployLoopModal history={historyMock} 
+						loopCache={loopCache} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
+
+		component.find('[variant="primary"]').prop('onClick')();
+		await flushPromises();
+		component.update();
+
+		expect(handleSave).toHaveBeenCalledTimes(1);
+		expect(component.state('show')).toEqual(false);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		handleSave.mockClear();
+	});
+
+	it('Onchange event', () => {
+		const event = { target: { name: "location_id", value: "testLocation"} };
+		const component = shallow(<DeployLoopModal loopCache={loopCache}/>);
+		const forms = component.find('StateManager');
+
+		component.find('[name="location_id"]').simulate('change', event);
+		component.update();
+		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
+	});
+});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
new file mode 100644
index 000000000..bf06965be
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
@@ -0,0 +1,66 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify DeployLoopModal Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Deployment parameters
+    </ModalTitle>
+  </ModalHeader>
+  <Styled(FormGroup)>
+    <FormLabel
+      column={false}
+      srOnly={false}
+    >
+      location_id
+    </FormLabel>
+    <FormControl
+      defaultValue=""
+      name="location_id"
+      onChange={[Function]}
+      type="text"
+    />
+  </Styled(FormGroup)>
+  <Styled(FormGroup)>
+    <FormLabel
+      column={false}
+      srOnly={false}
+    >
+      policy_id
+    </FormLabel>
+    <FormControl
+      defaultValue="TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+      name="policy_id"
+      onChange={[Function]}
+      type="text"
+    />
+  </Styled(FormGroup)>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Deploy
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap
deleted file mode 100644
index 1fd4b1047..000000000
--- a/ui-react/src/components/dialogs/__snapshots__/DeployLoop.test.js.snap
+++ /dev/null
@@ -1,66 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify DeployLoop Test the render method 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="lg"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle>
-      Deployment parameters
-    </ModalTitle>
-  </ModalHeader>
-  <Styled(FormGroup)>
-    <FormLabel
-      column={false}
-      srOnly={false}
-    >
-      location_id
-    </FormLabel>
-    <FormControl
-      defaultValue=""
-      name="location_id"
-      onChange={[Function]}
-      type="text"
-    />
-  </Styled(FormGroup)>
-  <Styled(FormGroup)>
-    <FormLabel
-      column={false}
-      srOnly={false}
-    >
-      policy_id
-    </FormLabel>
-    <FormControl
-      defaultValue="TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-      name="policy_id"
-      onChange={[Function]}
-      type="text"
-    />
-  </Styled(FormGroup)>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="null"
-      variant="secondary"
-    >
-      Cancel
-    </Button>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="submit"
-      variant="primary"
-    >
-      Deploy
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
-- 
cgit 1.2.3-korg


From b13a790d9b783a393effb473c91eed9244d86c61 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 15 Nov 2019 17:26:45 +0100
Subject: Fix naming convention

Second stage, fix naming convention in UI-react so that it's clearer

Issue-ID: CLAMP-552
Change-Id: I1bfd48b55d9e1edf66c0369539718e086a778429
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |   4 +-
 .../components/dialogs/Loop/LoopPropertiesModal.js | 117 +++++++++++++++++++++
 .../dialogs/Loop/LoopPropertiesModal.test.js       | 108 +++++++++++++++++++
 .../__snapshots__/LoopPropertiesModal.test.js.snap |  59 +++++++++++
 ui-react/src/components/dialogs/LoopProperties.js  | 117 ---------------------
 .../src/components/dialogs/LoopProperties.test.js  | 108 -------------------
 .../__snapshots__/LoopProperties.test.js.snap      |  59 -----------
 7 files changed, 286 insertions(+), 286 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
 create mode 100644 ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
 delete mode 100644 ui-react/src/components/dialogs/LoopProperties.js
 delete mode 100644 ui-react/src/components/dialogs/LoopProperties.test.js
 delete mode 100644 ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index bcdc4ffee..e709c71f2 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -39,7 +39,7 @@ import { Route } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
-import LoopProperties from './components/dialogs/LoopProperties';
+import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
 import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
 import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal';
@@ -253,7 +253,7 @@ export default class LoopUI extends React.Component {
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
-				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
 				<Route path="/closeLoop" render={this.closeLoop} />
 				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
new file mode 100644
index 000000000..73946f45d
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import styled from 'styled-components';
+import LoopService from '../../../api/LoopService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+export default class LoopPropertiesModal extends React.Component {
+
+	state = {
+		show: true,
+		loopCache: this.props.loopCache,
+		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties()))
+	};
+
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleClose = this.handleClose.bind(this);
+		this.handleSave = this.handleSave.bind(this);
+		this.handleChange = this.handleChange.bind(this);
+
+		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
+		this.renderAllParameters = this.renderAllParameters.bind(this);
+		this.getDcaeParameters = this.getDcaeParameters.bind(this);
+	}
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopCache: newProps.loopCache,
+			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties()))
+		});
+	}
+
+	handleClose() {
+		this.props.history.push('/');
+	}
+
+	handleSave(event) {
+		LoopService.updateGlobalProperties(this.state.loopCache.getLoopName(), this.state.temporaryPropertiesJson).then(resp => {
+			this.setState({ show: false });
+			this.props.history.push('/');
+			this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+		});
+	}
+
+	handleChange(event) {
+		this.setState({temporaryPropertiesJson:{[event.target.name]: JSON.parse(event.target.value)}});
+	}
+
+	renderAllParameters() {
+		return (<Modal.Body>
+			<Form>
+				{this.renderDcaeParameters()}
+			</Form>
+		</Modal.Body>
+		);
+	}
+
+	getDcaeParameters() {
+		if (typeof (this.state.temporaryPropertiesJson) !== "undefined") {
+			return JSON.stringify(this.state.temporaryPropertiesJson["dcaeDeployParameters"]);
+		} else {
+			return "";
+		}
+
+	}
+
+	renderDcaeParameters() {
+		return (
+			<Form.Group >
+				<Form.Label>Deploy Parameters</Form.Label>
+				<Form.Control as="textarea" rows="3" name="dcaeDeployParameters" onChange={this.handleChange} defaultValue={this.getDcaeParameters()}></Form.Control>
+			</Form.Group>
+		);
+	}
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
+				<Modal.Header closeButton>
+					<Modal.Title>Model Properties</Modal.Title>
+				</Modal.Header>
+					{this.renderAllParameters()}
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+					<Button variant="primary" type="submit" onClick={this.handleSave}>Save Changes</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js
new file mode 100644
index 000000000..5bbefe228
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.test.js
@@ -0,0 +1,108 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import LoopPropertiesModal from './LoopPropertiesModal';
+import LoopCache from '../../../api/LoopCache';
+import LoopService from '../../../api/LoopService';
+
+describe('Verify LoopPropertiesModal', () => {
+	const loopCache = new LoopCache({
+		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+		"globalPropertiesJson": {
+			"dcaeDeployParameters": {
+				"location_id": "",
+				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+			}
+		}
+	});
+
+	it('Test the render method', () => {
+		const component = shallow(
+			<LoopPropertiesModal loopCache={loopCache}/>
+		)
+		component.setState({ show: true,
+			temporaryPropertiesJson: {
+				"dcaeDeployParameters": {
+					"location_id": "",
+					"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+				}
+			}
+		});
+
+	expect(component.state('temporaryPropertiesJson')).toEqual({
+	"dcaeDeployParameters": {
+		"location_id": "",
+		"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"}
+	});
+	expect(component.state('show')).toEqual(true);
+
+	expect(component).toMatchSnapshot();
+	});
+
+	it('Test handleClose', () => {
+		const historyMock = { push: jest.fn() };
+		const handleClose = jest.spyOn(LoopPropertiesModal.prototype,'handleClose');
+		const component = shallow(<LoopPropertiesModal history={historyMock} loopCache={loopCache}/>)
+
+		component.find('[variant="secondary"]').prop('onClick')();
+
+		expect(handleClose).toHaveBeenCalledTimes(1);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	});
+
+	it('Test handleSave successful', async () => {
+		const flushPromises = () => new Promise(setImmediate);
+		const historyMock = { push: jest.fn() };
+		const loadLoopFunction = jest.fn();
+		const handleSave = jest.spyOn(LoopPropertiesModal.prototype,'handleSave');
+		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				text: () => "OK"
+			});
+		});
+
+		const component = shallow(<LoopPropertiesModal history={historyMock} 
+						loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
+
+		component.find('[variant="primary"]').prop('onClick')();
+		await flushPromises();
+		component.update();
+
+		expect(handleSave).toHaveBeenCalledTimes(1);
+		expect(component.state('show')).toEqual(false);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+	});
+
+	it('Onchange event', () => {
+		const event = {target:{name:"dcaeDeployParameters", value:"{\"location_id\": \"testLocation\",\"policy_id\": \"TCA_h2NMX_v1_0_ResourceInstanceName1_tca\"}"}};
+		const component = shallow(<LoopPropertiesModal loopCache={loopCache}/>);
+
+		component.find('FormControl').simulate('change', event);
+		component.update();
+
+		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
+	});
+});
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
new file mode 100644
index 000000000..fe9aee2ab
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
@@ -0,0 +1,59 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify LoopPropertiesModal Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Model Properties
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <Form
+      inline={false}
+    >
+      <FormGroup>
+        <FormLabel
+          column={false}
+          srOnly={false}
+        >
+          Deploy Parameters
+        </FormLabel>
+        <FormControl
+          as="textarea"
+          defaultValue="{\\"location_id\\":\\"\\",\\"policy_id\\":\\"TCA_h2NMX_v1_0_ResourceInstanceName1_tca\\"}"
+          name="dcaeDeployParameters"
+          onChange={[Function]}
+          rows="3"
+        />
+      </FormGroup>
+    </Form>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Save Changes
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
deleted file mode 100644
index 990fe7754..000000000
--- a/ui-react/src/components/dialogs/LoopProperties.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import Form from 'react-bootstrap/Form';
-import styled from 'styled-components';
-import LoopService from '../../api/LoopService';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-export default class LoopProperties extends React.Component {
-
-	state = {
-		show: true,
-		loopCache: this.props.loopCache,
-		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties()))
-	};
-
-	constructor(props, context) {
-		super(props, context);
-
-		this.handleClose = this.handleClose.bind(this);
-		this.handleSave = this.handleSave.bind(this);
-		this.handleChange = this.handleChange.bind(this);
-
-		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
-		this.renderAllParameters = this.renderAllParameters.bind(this);
-		this.getDcaeParameters = this.getDcaeParameters.bind(this);
-	}
-
-	componentWillReceiveProps(newProps) {
-		this.setState({
-			loopCache: newProps.loopCache,
-			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties()))
-		});
-	}
-
-	handleClose() {
-		this.props.history.push('/');
-	}
-
-	handleSave(event) {
-		LoopService.updateGlobalProperties(this.state.loopCache.getLoopName(), this.state.temporaryPropertiesJson).then(resp => {
-			this.setState({ show: false });
-			this.props.history.push('/');
-			this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-		});
-	}
-
-	handleChange(event) {
-		this.setState({temporaryPropertiesJson:{[event.target.name]: JSON.parse(event.target.value)}});
-	}
-
-	renderAllParameters() {
-		return (<Modal.Body>
-			<Form>
-				{this.renderDcaeParameters()}
-			</Form>
-		</Modal.Body>
-		);
-	}
-
-	getDcaeParameters() {
-		if (typeof (this.state.temporaryPropertiesJson) !== "undefined") {
-			return JSON.stringify(this.state.temporaryPropertiesJson["dcaeDeployParameters"]);
-		} else {
-			return "";
-		}
-
-	}
-
-	renderDcaeParameters() {
-		return (
-			<Form.Group >
-				<Form.Label>Deploy Parameters</Form.Label>
-				<Form.Control as="textarea" rows="3" name="dcaeDeployParameters" onChange={this.handleChange} defaultValue={this.getDcaeParameters()}></Form.Control>
-			</Form.Group>
-		);
-	}
-
-	render() {
-		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
-				<Modal.Header closeButton>
-					<Modal.Title>Model Properties</Modal.Title>
-				</Modal.Header>
-					{this.renderAllParameters()}
-				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-					<Button variant="primary" type="submit" onClick={this.handleSave}>Save Changes</Button>
-				</Modal.Footer>
-			</ModalStyled>
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/LoopProperties.test.js b/ui-react/src/components/dialogs/LoopProperties.test.js
deleted file mode 100644
index 9b74fe76a..000000000
--- a/ui-react/src/components/dialogs/LoopProperties.test.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import LoopProperties from './LoopProperties';
-import LoopCache from '../../api/LoopCache';
-import LoopService from '../../api/LoopService';
-
-describe('Verify LoopProperties', () => {
-	const loopCache = new LoopCache({
-		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-		"globalPropertiesJson": {
-			"dcaeDeployParameters": {
-				"location_id": "",
-				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-			}
-		}
-	});
-
-	it('Test the render method', () => {
-		const component = shallow(
-			<LoopProperties loopCache={loopCache}/>
-		)
-		component.setState({ show: true,
-			temporaryPropertiesJson: {
-				"dcaeDeployParameters": {
-					"location_id": "",
-					"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-				}
-			}
-		});
-
-	expect(component.state('temporaryPropertiesJson')).toEqual({
-	"dcaeDeployParameters": {
-		"location_id": "",
-		"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"}
-	});
-	expect(component.state('show')).toEqual(true);
-
-	expect(component).toMatchSnapshot();
-	});
-
-	it('Test handleClose', () => {
-		const historyMock = { push: jest.fn() };
-		const handleClose = jest.spyOn(LoopProperties.prototype,'handleClose');
-		const component = shallow(<LoopProperties history={historyMock} loopCache={loopCache}/>)
-
-		component.find('[variant="secondary"]').prop('onClick')();
-
-		expect(handleClose).toHaveBeenCalledTimes(1);
-		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-	});
-
-	it('Test handleSave successful', async () => {
-		const flushPromises = () => new Promise(setImmediate);
-		const historyMock = { push: jest.fn() };
-		const loadLoopFunction = jest.fn();
-		const handleSave = jest.spyOn(LoopProperties.prototype,'handleSave');
-		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				text: () => "OK"
-			});
-		});
-
-		const component = shallow(<LoopProperties history={historyMock} 
-						loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
-
-		component.find('[variant="primary"]').prop('onClick')();
-		await flushPromises();
-		component.update();
-
-		expect(handleSave).toHaveBeenCalledTimes(1);
-		expect(component.state('show')).toEqual(false);
-		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-	});
-
-	it('Onchange event', () => {
-		const event = {target:{name:"dcaeDeployParameters", value:"{\"location_id\": \"testLocation\",\"policy_id\": \"TCA_h2NMX_v1_0_ResourceInstanceName1_tca\"}"}};
-		const component = shallow(<LoopProperties loopCache={loopCache}/>);
-
-		component.find('FormControl').simulate('change', event);
-		component.update();
-
-		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
-	});
-});
diff --git a/ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap
deleted file mode 100644
index c7e81c392..000000000
--- a/ui-react/src/components/dialogs/__snapshots__/LoopProperties.test.js.snap
+++ /dev/null
@@ -1,59 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify LoopProperties Test the render method 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="lg"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle>
-      Model Properties
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <Form
-      inline={false}
-    >
-      <FormGroup>
-        <FormLabel
-          column={false}
-          srOnly={false}
-        >
-          Deploy Parameters
-        </FormLabel>
-        <FormControl
-          as="textarea"
-          defaultValue="{\\"location_id\\":\\"\\",\\"policy_id\\":\\"TCA_h2NMX_v1_0_ResourceInstanceName1_tca\\"}"
-          name="dcaeDeployParameters"
-          onChange={[Function]}
-          rows="3"
-        />
-      </FormGroup>
-    </Form>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="null"
-      variant="secondary"
-    >
-      Cancel
-    </Button>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="submit"
-      variant="primary"
-    >
-      Save Changes
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
-- 
cgit 1.2.3-korg


From 67c76a46e6a96c4c41fddddb9245234063b5306e Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 15 Nov 2019 17:33:44 +0100
Subject: Fix naming convention

Third stage, fix naming convention in UI-react so that it's clearer

Issue-ID: CLAMP-552
Change-Id: I16bed5be640d87e3458cdbd7a83fdfe1e37a7b98
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |   2 +-
 .../src/components/dialogs/Loop/OpenLoopModal.js   | 111 +++++++++++++++++++++
 .../components/dialogs/Loop/OpenLoopModal.test.js  |  82 +++++++++++++++
 .../Loop/__snapshots__/OpenLoopModal.test.js.snap  |  90 +++++++++++++++++
 .../components/dialogs/OpenLoop/OpenLoopModal.js   | 111 ---------------------
 .../dialogs/OpenLoop/OpenLoopModal.test.js         |  82 ---------------
 .../__snapshots__/OpenLoopModal.test.js.snap       |  90 -----------------
 7 files changed, 284 insertions(+), 284 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/Loop/OpenLoopModal.js
 create mode 100644 ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
 delete mode 100644 ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
 delete mode 100644 ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
 delete mode 100644 ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index e709c71f2..bf1e41988 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -36,7 +36,7 @@ import LoopCache from './api/LoopCache';
 import LoopActionService from './api/LoopActionService';
 
 import { Route } from 'react-router-dom'
-import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
+import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
 import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
new file mode 100644
index 000000000..fbfc727eb
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -0,0 +1,111 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Select from 'react-select';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import FormCheck from 'react-bootstrap/FormCheck'
+import styled from 'styled-components';
+import LoopService from '../../../api/LoopService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const CheckBoxStyled = styled(FormCheck.Input)`
+	margin-left:3rem;
+`
+
+export default class OpenLoopModal extends React.Component {
+	constructor(props, context) {
+		super(props, context);
+
+		this.getLoopNames = this.getLoopNames.bind(this);
+		this.handleOpen = this.handleOpen.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.state = {
+			show: true,
+			chosenLoopName: '',
+			loopNames: []
+		};
+	}
+
+	componentWillMount() {
+		this.getLoopNames();
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	handleDropdownListChange(e) {
+		this.setState({ chosenLoopName: e.value });
+	}
+
+	getLoopNames() {
+		LoopService.getLoopNames().then(loopNames => {
+			const loopOptions = loopNames.map((loopName) => { return { label: loopName, value: loopName } });
+			this.setState({ loopNames: loopOptions })
+		});
+	}
+
+	handleOpen() {
+		console.info("Loop " + this.state.chosenLoopName + " is chosen");
+		this.setState({ show: false });
+		this.props.history.push('/');
+		this.props.loadLoopFunction(this.state.chosenLoopName);
+	}
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Open Model</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Form.Label column sm="2">Model Name</Form.Label>
+						<Col sm="10">
+							<Select onChange={this.handleDropdownListChange} options={this.state.loopNames} />
+						</Col>
+					</Form.Group>
+					<Form.Group controlId="formBasicChecbox">
+						<Form.Check>
+							<FormCheck.Label>Read Only</FormCheck.Label>
+							<CheckBoxStyled type="checkbox" />
+						</Form.Check>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+					<Button variant="primary" type="submit" onClick={this.handleOpen}>Open</Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
new file mode 100644
index 000000000..208c947c3
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import OpenLoopModal from './OpenLoopModal';
+
+describe('Verify OpenLoopModal', () => {
+
+  beforeEach(() => {
+      fetch.resetMocks();
+          fetch.mockResponseOnce(JSON.stringify([
+        "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca",
+        "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3",
+        "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2"
+      ]));
+  })
+
+    it('Test the render method', () => {
+
+    const component = shallow(<OpenLoopModal/>);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('Onchange event', () => {
+    const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'};
+    const component = shallow(<OpenLoopModal/>);
+
+    component.find('StateManager').simulate('change', event);
+    component.update();
+    expect(component.state('chosenLoopName')).toEqual("LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3");
+  });
+
+  it('Test handleClose', () => {
+    const historyMock = { push: jest.fn() }; 
+    const handleClose = jest.spyOn(OpenLoopModal.prototype,'handleClose');
+    const component = shallow(<OpenLoopModal history={historyMock} />)
+
+    component.find('[variant="secondary"]').prop('onClick')();
+
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    
+    handleClose.mockClear();
+  });
+
+    it('Test handleSubmit', () => {
+    const historyMock = { push: jest.fn() };
+    const loadLoopFunction = jest.fn();  
+    const handleOpen = jest.spyOn(OpenLoopModal.prototype,'handleOpen');
+    const component = shallow(<OpenLoopModal history={historyMock} loadLoopFunction={loadLoopFunction}/>)
+
+    component.find('[variant="primary"]').prop('onClick')();
+
+    expect(handleOpen).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+
+    handleOpen.mockClear();
+  });
+
+});
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
new file mode 100644
index 000000000..9e7222415
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
@@ -0,0 +1,90 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify OpenLoopModal Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Open Model
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formPlaintextEmail"
+    >
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+        Model Name
+      </FormLabel>
+      <Col
+        sm="10"
+      >
+        <StateManager
+          defaultInputValue=""
+          defaultMenuIsOpen={false}
+          defaultValue={null}
+          onChange={[Function]}
+          options={Array []}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      controlId="formBasicChecbox"
+    >
+      <FormCheck
+        disabled={false}
+        inline={false}
+        isInvalid={false}
+        isValid={false}
+        title=""
+        type="checkbox"
+      >
+        <FormCheckLabel>
+          Read Only
+        </FormCheckLabel>
+        <Styled(FormCheckInput)
+          type="checkbox"
+        />
+      </FormCheck>
+    </FormGroup>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Open
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
deleted file mode 100644
index fbfc727eb..000000000
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Select from 'react-select';
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import Form from 'react-bootstrap/Form';
-import Row from 'react-bootstrap/Row';
-import Col from 'react-bootstrap/Col';
-import FormCheck from 'react-bootstrap/FormCheck'
-import styled from 'styled-components';
-import LoopService from '../../../api/LoopService';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-const CheckBoxStyled = styled(FormCheck.Input)`
-	margin-left:3rem;
-`
-
-export default class OpenLoopModal extends React.Component {
-	constructor(props, context) {
-		super(props, context);
-
-		this.getLoopNames = this.getLoopNames.bind(this);
-		this.handleOpen = this.handleOpen.bind(this);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
-		this.state = {
-			show: true,
-			chosenLoopName: '',
-			loopNames: []
-		};
-	}
-
-	componentWillMount() {
-		this.getLoopNames();
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-	}
-
-	handleDropdownListChange(e) {
-		this.setState({ chosenLoopName: e.value });
-	}
-
-	getLoopNames() {
-		LoopService.getLoopNames().then(loopNames => {
-			const loopOptions = loopNames.map((loopName) => { return { label: loopName, value: loopName } });
-			this.setState({ loopNames: loopOptions })
-		});
-	}
-
-	handleOpen() {
-		console.info("Loop " + this.state.chosenLoopName + " is chosen");
-		this.setState({ show: false });
-		this.props.history.push('/');
-		this.props.loadLoopFunction(this.state.chosenLoopName);
-	}
-
-	render() {
-		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
-				<Modal.Header closeButton>
-					<Modal.Title>Open Model</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<Form.Group as={Row} controlId="formPlaintextEmail">
-						<Form.Label column sm="2">Model Name</Form.Label>
-						<Col sm="10">
-							<Select onChange={this.handleDropdownListChange} options={this.state.loopNames} />
-						</Col>
-					</Form.Group>
-					<Form.Group controlId="formBasicChecbox">
-						<Form.Check>
-							<FormCheck.Label>Read Only</FormCheck.Label>
-							<CheckBoxStyled type="checkbox" />
-						</Form.Check>
-					</Form.Group>
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-					<Button variant="primary" type="submit" onClick={this.handleOpen}>Open</Button>
-				</Modal.Footer>
-			</ModalStyled>
-
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
deleted file mode 100644
index 208c947c3..000000000
--- a/ui-react/src/components/dialogs/OpenLoop/OpenLoopModal.test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import OpenLoopModal from './OpenLoopModal';
-
-describe('Verify OpenLoopModal', () => {
-
-  beforeEach(() => {
-      fetch.resetMocks();
-          fetch.mockResponseOnce(JSON.stringify([
-        "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca",
-        "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3",
-        "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2"
-      ]));
-  })
-
-    it('Test the render method', () => {
-
-    const component = shallow(<OpenLoopModal/>);
-    expect(component).toMatchSnapshot();
-  });
-
-  it('Onchange event', () => {
-    const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'};
-    const component = shallow(<OpenLoopModal/>);
-
-    component.find('StateManager').simulate('change', event);
-    component.update();
-    expect(component.state('chosenLoopName')).toEqual("LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3");
-  });
-
-  it('Test handleClose', () => {
-    const historyMock = { push: jest.fn() }; 
-    const handleClose = jest.spyOn(OpenLoopModal.prototype,'handleClose');
-    const component = shallow(<OpenLoopModal history={historyMock} />)
-
-    component.find('[variant="secondary"]').prop('onClick')();
-
-    expect(handleClose).toHaveBeenCalledTimes(1);
-    expect(component.state('show')).toEqual(false);
-    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    
-    handleClose.mockClear();
-  });
-
-    it('Test handleSubmit', () => {
-    const historyMock = { push: jest.fn() };
-    const loadLoopFunction = jest.fn();  
-    const handleOpen = jest.spyOn(OpenLoopModal.prototype,'handleOpen');
-    const component = shallow(<OpenLoopModal history={historyMock} loadLoopFunction={loadLoopFunction}/>)
-
-    component.find('[variant="primary"]').prop('onClick')();
-
-    expect(handleOpen).toHaveBeenCalledTimes(1);
-    expect(component.state('show')).toEqual(false);
-    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-
-    handleOpen.mockClear();
-  });
-
-});
diff --git a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
deleted file mode 100644
index 9e7222415..000000000
--- a/ui-react/src/components/dialogs/OpenLoop/__snapshots__/OpenLoopModal.test.js.snap
+++ /dev/null
@@ -1,90 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify OpenLoopModal Test the render method 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="lg"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle>
-      Open Model
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <FormGroup
-      as={
-        Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "noGutters": false,
-          },
-          "render": [Function],
-        }
-      }
-      controlId="formPlaintextEmail"
-    >
-      <FormLabel
-        column={true}
-        sm="2"
-        srOnly={false}
-      >
-        Model Name
-      </FormLabel>
-      <Col
-        sm="10"
-      >
-        <StateManager
-          defaultInputValue=""
-          defaultMenuIsOpen={false}
-          defaultValue={null}
-          onChange={[Function]}
-          options={Array []}
-        />
-      </Col>
-    </FormGroup>
-    <FormGroup
-      controlId="formBasicChecbox"
-    >
-      <FormCheck
-        disabled={false}
-        inline={false}
-        isInvalid={false}
-        isValid={false}
-        title=""
-        type="checkbox"
-      >
-        <FormCheckLabel>
-          Read Only
-        </FormCheckLabel>
-        <Styled(FormCheckInput)
-          type="checkbox"
-        />
-      </FormCheck>
-    </FormGroup>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="null"
-      variant="secondary"
-    >
-      Cancel
-    </Button>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="submit"
-      variant="primary"
-    >
-      Open
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
-- 
cgit 1.2.3-korg


From 4dc849f66bf9c8749ca8d2ef228fceee4d358ca1 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 15 Nov 2019 17:49:42 +0100
Subject: Fix naming convention

Fourth stage, fix naming convention in UI-react so that it's clearer

Issue-ID: CLAMP-552
Change-Id: I5d082aec575bf0d71dd08065b9d2bf1bb869d7ca
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/LoopUI.js                             |   4 +-
 ui-react/src/components/dialogs/UserInfo.js        | 152 ---------------------
 ui-react/src/components/dialogs/UserInfo.test.js   |  86 ------------
 ui-react/src/components/dialogs/UserInfoModal.js   | 152 +++++++++++++++++++++
 .../src/components/dialogs/UserInfoModal.test.js   |  86 ++++++++++++
 .../dialogs/__snapshots__/UserInfo.test.js.snap    | 137 -------------------
 .../__snapshots__/UserInfoModal.test.js.snap       | 137 +++++++++++++++++++
 7 files changed, 377 insertions(+), 377 deletions(-)
 delete mode 100644 ui-react/src/components/dialogs/UserInfo.js
 delete mode 100644 ui-react/src/components/dialogs/UserInfo.test.js
 create mode 100644 ui-react/src/components/dialogs/UserInfoModal.js
 create mode 100644 ui-react/src/components/dialogs/UserInfoModal.test.js
 delete mode 100644 ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap
 create mode 100644 ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index bf1e41988..b8fbe8991 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -40,7 +40,7 @@ import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
 import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
-import UserInfo from './components/dialogs/UserInfo';
+import UserInfoModal from './components/dialogs/UserInfoModal';
 import LoopService from './api/LoopService';
 import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal';
 import PerformAction from './components/dialogs/PerformActions';
@@ -254,7 +254,7 @@ export default class LoopUI extends React.Component {
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
-				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
+				<Route path="/userInfo" render={(routeProps) => (<UserInfoModal {...routeProps} />)} />
 				<Route path="/closeLoop" render={this.closeLoop} />
 				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
diff --git a/ui-react/src/components/dialogs/UserInfo.js b/ui-react/src/components/dialogs/UserInfo.js
deleted file mode 100644
index 7d81b38b3..000000000
--- a/ui-react/src/components/dialogs/UserInfo.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import Form from 'react-bootstrap/Form';
-import Row from 'react-bootstrap/Row';
-import Col from 'react-bootstrap/Col';
-import styled from 'styled-components';
-import UserService from '../../api/UserService';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-
-export default class UserInfo extends React.Component {
-
-	constructor(props, context) {
-		super(props, context);
-
-		this.handleClose = this.handleClose.bind(this);
-		this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this);
-		this.renderReadModelPermission = this.renderReadModelPermission.bind(this);
-		this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this);
-		this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this);
-		this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this);
-		this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this);
-		this.renderUserName = this.renderUserName.bind(this);
-		this.state = {
-			show: true,
-			userInfo: {}
-		};
-	}
-	componentWillMount() {
-		UserService.getUserInfo().then(userInfo => {
-			this.setState({ userInfo: userInfo })
-		});
-	}
-
-	handleClose() {
-			this.props.history.push('/');
-	}
-	renderReadTemplatePermission() {
-		if (this.state.userInfo["permissionReadTemplate"]) {
-			return <Form.Control plaintext readOnly defaultValue="Read Template" />
-		} else  {
-			return;
-		}
-	}
-	renderReadModelPermission() {
-		if (this.state.userInfo["permissionReadCl"]) {
-			return <Form.Control plaintext readOnly defaultValue="Read Model" />
-		} else  {
-			return;
-		}
-	}
-	renderReadToscaPermission() {
-		if (this.state.userInfo["permissionReadTosca"]) {
-			return <Form.Control plaintext readOnly defaultValue="Read Tosca" />
-		} else  {
-			return;
-		}
-	}
-	renderUpdateTemplatePermission() {
-		if (this.state.userInfo["permissionUpdateTemplate"]) {
-			return <Form.Control plaintext readOnly defaultValue="Edit Template" />
-		} else  {
-			return;
-		}
-	}
-	renderUpdateModelPermission() {
-		if (this.state.userInfo["permissionUpdateCl"]) {
-			return <Form.Control plaintext readOnly defaultValue="Edit Model" />
-		} else  {
-			return;
-		}
-	}
-	renderUpdateToscaPermission() {
-		if (this.state.userInfo["permissionUpdateTosca"]) {
-			return <Form.Control plaintext readOnly defaultValue="Edit Tosca" />
-		} else  {
-			return;
-		}
-	}
-	renderUserName() {
-		if (this.state.userInfo["userName"]) {
-			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["userName"]} />
-		} else  {
-			return;
-		}
-	}
-	renderVersion() {
-		if (this.state.userInfo["cldsVersion"]) {
-			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["cldsVersion"]} />
-		} else  {
-			return;
-		}
-	}
-	render() {
-		return (
-			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose}>
-				<Modal.Header closeButton>
-					<Modal.Title>User Info</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<Form.Group as={Row} controlId="userName">
-						<Form.Label column sm="3">Current User:</Form.Label>
-						<Col>{this.renderUserName()}</Col>
-					</Form.Group>
-					<Form.Group as={Row} controlId="cldsVersion">
-						<Form.Label column sm="3">CLDS Version:</Form.Label>
-						<Col>{this.renderVersion()}</Col>
-					</Form.Group>
-					<Form.Group as={Row} controlId="userPermissions">
-						<Form.Label column sm="3">User Permissions:</Form.Label>
-						<Col>
-							{this.renderReadTemplatePermission()}
-							{this.renderReadModelPermission()}
-							{this.renderReadToscaPermission()}
-							{this.renderUpdateTemplatePermission()}
-							{this.renderUpdateModelPermission()}
-							{this.renderUpdateToscaPermission()}
-						</Col>
-					</Form.Group>
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-				</Modal.Footer>
-			</ModalStyled>
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/UserInfo.test.js b/ui-react/src/components/dialogs/UserInfo.test.js
deleted file mode 100644
index beddde148..000000000
--- a/ui-react/src/components/dialogs/UserInfo.test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import UserInfo from './UserInfo';
-
-describe('Verify UserInfo', () => {
-
-	beforeEach(() => {
-		fetch.resetMocks();
-		fetch.mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"userName": "test",
-						"cldsVersion": "1.0.0"
-					});
-			}});
-		});
-	})
-
-	it('Test the render method full permission', () => {
-		const component = shallow(<UserInfo />)
-		component.setState({ userInfo: {
-			"userName": "test",
-			"cldsVersion": "1.0.0",
-			"permissionReadCl": true,
-			"permissionReadTemplate" : true,
-			"permissionReadTosca" : true,
-			"permissionUpdateTemplate" : true,
-			"permissionUpdateCl" : true,
-			"permissionUpdateTosca": true
-		}});
-		expect(component).toMatchSnapshot();
-	});
-
-	it('Test the render method no permission', () => {
-		const component = shallow(<UserInfo />)
-		component.setState({ userInfo: {}
-		});
-
-		expect(component.find('FormControl').length).toEqual(0);
-	});
-
-	it('Test the render method read permission', () => {
-		const component = shallow(<UserInfo />)
-		component.setState({ userInfo: {
-			"userName": "test",
-			"cldsVersion": "1.0.0",
-			"permissionReadCl": true,
-			"permissionReadTemplate" : true,
-			"permissionReadTosca" : true
-		}});
-
-		expect(component.find('FormControl').length).toEqual(5);
-
-		const forms = component.find('FormControl');
-		expect(forms.get(0).props.defaultValue).toEqual("test");
-		expect(forms.get(1).props.defaultValue).toEqual("1.0.0");
-		expect(forms.get(2).props.defaultValue).toEqual("Read Template");
-		expect(forms.get(3).props.defaultValue).toEqual("Read Model");
-		expect(forms.get(4).props.defaultValue).toEqual("Read Tosca");
-	});
-});
diff --git a/ui-react/src/components/dialogs/UserInfoModal.js b/ui-react/src/components/dialogs/UserInfoModal.js
new file mode 100644
index 000000000..1273d87c0
--- /dev/null
+++ b/ui-react/src/components/dialogs/UserInfoModal.js
@@ -0,0 +1,152 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import styled from 'styled-components';
+import UserService from '../../api/UserService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class UserInfoModal extends React.Component {
+
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleClose = this.handleClose.bind(this);
+		this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this);
+		this.renderReadModelPermission = this.renderReadModelPermission.bind(this);
+		this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this);
+		this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this);
+		this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this);
+		this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this);
+		this.renderUserName = this.renderUserName.bind(this);
+		this.state = {
+			show: true,
+			userInfo: {}
+		};
+	}
+	componentWillMount() {
+		UserService.getUserInfo().then(userInfo => {
+			this.setState({ userInfo: userInfo })
+		});
+	}
+
+	handleClose() {
+			this.props.history.push('/');
+	}
+	renderReadTemplatePermission() {
+		if (this.state.userInfo["permissionReadTemplate"]) {
+			return <Form.Control plaintext readOnly defaultValue="Read Template" />
+		} else  {
+			return;
+		}
+	}
+	renderReadModelPermission() {
+		if (this.state.userInfo["permissionReadCl"]) {
+			return <Form.Control plaintext readOnly defaultValue="Read Model" />
+		} else  {
+			return;
+		}
+	}
+	renderReadToscaPermission() {
+		if (this.state.userInfo["permissionReadTosca"]) {
+			return <Form.Control plaintext readOnly defaultValue="Read Tosca" />
+		} else  {
+			return;
+		}
+	}
+	renderUpdateTemplatePermission() {
+		if (this.state.userInfo["permissionUpdateTemplate"]) {
+			return <Form.Control plaintext readOnly defaultValue="Edit Template" />
+		} else  {
+			return;
+		}
+	}
+	renderUpdateModelPermission() {
+		if (this.state.userInfo["permissionUpdateCl"]) {
+			return <Form.Control plaintext readOnly defaultValue="Edit Model" />
+		} else  {
+			return;
+		}
+	}
+	renderUpdateToscaPermission() {
+		if (this.state.userInfo["permissionUpdateTosca"]) {
+			return <Form.Control plaintext readOnly defaultValue="Edit Tosca" />
+		} else  {
+			return;
+		}
+	}
+	renderUserName() {
+		if (this.state.userInfo["userName"]) {
+			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["userName"]} />
+		} else  {
+			return;
+		}
+	}
+	renderVersion() {
+		if (this.state.userInfo["cldsVersion"]) {
+			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["cldsVersion"]} />
+		} else  {
+			return;
+		}
+	}
+	render() {
+		return (
+			<ModalStyled size="lg"  show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>User Info</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="userName">
+						<Form.Label column sm="3">Current User:</Form.Label>
+						<Col>{this.renderUserName()}</Col>
+					</Form.Group>
+					<Form.Group as={Row} controlId="cldsVersion">
+						<Form.Label column sm="3">CLDS Version:</Form.Label>
+						<Col>{this.renderVersion()}</Col>
+					</Form.Group>
+					<Form.Group as={Row} controlId="userPermissions">
+						<Form.Label column sm="3">User Permissions:</Form.Label>
+						<Col>
+							{this.renderReadTemplatePermission()}
+							{this.renderReadModelPermission()}
+							{this.renderReadToscaPermission()}
+							{this.renderUpdateTemplatePermission()}
+							{this.renderUpdateModelPermission()}
+							{this.renderUpdateToscaPermission()}
+						</Col>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/UserInfoModal.test.js b/ui-react/src/components/dialogs/UserInfoModal.test.js
new file mode 100644
index 000000000..b5a2b272e
--- /dev/null
+++ b/ui-react/src/components/dialogs/UserInfoModal.test.js
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import UserInfoModal from './UserInfoModal';
+
+describe('Verify UserInfoModal', () => {
+
+	beforeEach(() => {
+		fetch.resetMocks();
+		fetch.mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"userName": "test",
+						"cldsVersion": "1.0.0"
+					});
+			}});
+		});
+	})
+
+	it('Test the render method full permission', () => {
+		const component = shallow(<UserInfoModal />)
+		component.setState({ userInfo: {
+			"userName": "test",
+			"cldsVersion": "1.0.0",
+			"permissionReadCl": true,
+			"permissionReadTemplate" : true,
+			"permissionReadTosca" : true,
+			"permissionUpdateTemplate" : true,
+			"permissionUpdateCl" : true,
+			"permissionUpdateTosca": true
+		}});
+		expect(component).toMatchSnapshot();
+	});
+
+	it('Test the render method no permission', () => {
+		const component = shallow(<UserInfoModal />)
+		component.setState({ userInfo: {}
+		});
+
+		expect(component.find('FormControl').length).toEqual(0);
+	});
+
+	it('Test the render method read permission', () => {
+		const component = shallow(<UserInfoModal />)
+		component.setState({ userInfo: {
+			"userName": "test",
+			"cldsVersion": "1.0.0",
+			"permissionReadCl": true,
+			"permissionReadTemplate" : true,
+			"permissionReadTosca" : true
+		}});
+
+		expect(component.find('FormControl').length).toEqual(5);
+
+		const forms = component.find('FormControl');
+		expect(forms.get(0).props.defaultValue).toEqual("test");
+		expect(forms.get(1).props.defaultValue).toEqual("1.0.0");
+		expect(forms.get(2).props.defaultValue).toEqual("Read Template");
+		expect(forms.get(3).props.defaultValue).toEqual("Read Model");
+		expect(forms.get(4).props.defaultValue).toEqual("Read Tosca");
+	});
+});
diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap
deleted file mode 100644
index 1ae567a2d..000000000
--- a/ui-react/src/components/dialogs/__snapshots__/UserInfo.test.js.snap
+++ /dev/null
@@ -1,137 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify UserInfo Test the render method full permission 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="lg"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle>
-      User Info
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <FormGroup
-      as={
-        Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "noGutters": false,
-          },
-          "render": [Function],
-        }
-      }
-      controlId="userName"
-    >
-      <FormLabel
-        column={true}
-        sm="3"
-        srOnly={false}
-      >
-        Current User:
-      </FormLabel>
-      <Col>
-        <FormControl
-          defaultValue="test"
-          plaintext={true}
-          readOnly={true}
-        />
-      </Col>
-    </FormGroup>
-    <FormGroup
-      as={
-        Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "noGutters": false,
-          },
-          "render": [Function],
-        }
-      }
-      controlId="cldsVersion"
-    >
-      <FormLabel
-        column={true}
-        sm="3"
-        srOnly={false}
-      >
-        CLDS Version:
-      </FormLabel>
-      <Col>
-        <FormControl
-          defaultValue="1.0.0"
-          plaintext={true}
-          readOnly={true}
-        />
-      </Col>
-    </FormGroup>
-    <FormGroup
-      as={
-        Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "noGutters": false,
-          },
-          "render": [Function],
-        }
-      }
-      controlId="userPermissions"
-    >
-      <FormLabel
-        column={true}
-        sm="3"
-        srOnly={false}
-      >
-        User Permissions:
-      </FormLabel>
-      <Col>
-        <FormControl
-          defaultValue="Read Template"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Read Model"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Read Tosca"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Edit Template"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Edit Model"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Edit Tosca"
-          plaintext={true}
-          readOnly={true}
-        />
-      </Col>
-    </FormGroup>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="null"
-      variant="secondary"
-    >
-      Cancel
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
new file mode 100644
index 000000000..fdb24a430
--- /dev/null
+++ b/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
@@ -0,0 +1,137 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify UserInfoModal Test the render method full permission 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      User Info
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="userName"
+    >
+      <FormLabel
+        column={true}
+        sm="3"
+        srOnly={false}
+      >
+        Current User:
+      </FormLabel>
+      <Col>
+        <FormControl
+          defaultValue="test"
+          plaintext={true}
+          readOnly={true}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="cldsVersion"
+    >
+      <FormLabel
+        column={true}
+        sm="3"
+        srOnly={false}
+      >
+        CLDS Version:
+      </FormLabel>
+      <Col>
+        <FormControl
+          defaultValue="1.0.0"
+          plaintext={true}
+          readOnly={true}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="userPermissions"
+    >
+      <FormLabel
+        column={true}
+        sm="3"
+        srOnly={false}
+      >
+        User Permissions:
+      </FormLabel>
+      <Col>
+        <FormControl
+          defaultValue="Read Template"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Read Model"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Read Tosca"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Edit Template"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Edit Model"
+          plaintext={true}
+          readOnly={true}
+        />
+        <FormControl
+          defaultValue="Edit Tosca"
+          plaintext={true}
+          readOnly={true}
+        />
+      </Col>
+    </FormGroup>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
-- 
cgit 1.2.3-korg


From 289e8e1f1858e970f92b50a1e601521edeefd44f Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Fri, 8 Nov 2019 13:10:36 +0100
Subject: Create Service object

User Service object to store loop service and resource realted info.

Issue-ID: CLAMP-545
Change-Id: I0df6f5d43d7e0575346e02a27bca5c0b5ecdb0a0
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 extra/sql/bulkload/create-tables.sql               |  15 +-
 src/main/java/org/onap/clamp/loop/Loop.java        |  18 +-
 .../org/onap/clamp/loop/LoopCsarInstaller.java     |  18 +-
 .../java/org/onap/clamp/loop/service/Service.java  | 137 ++++
 .../OperationalPolicyRepresentationBuilder.java    |  14 +-
 .../org/onap/clamp/clds/it/CldsServiceItCase.java  |   2 +-
 .../org/onap/clamp/loop/CsarInstallerItCase.java   |   9 +-
 .../org/onap/clamp/loop/LoopServiceTestItCase.java |   4 +-
 .../java/org/onap/clamp/loop/LoopToJsonTest.java   |  28 +-
 src/test/java/org/onap/clamp/loop/ServiceTest.java |  55 ++
 ...OperationalPolicyRepresentationBuilderTest.java |   5 +-
 src/test/resources/tosca/loop.json                 | 704 +++++++++++++++++++++
 src/test/resources/tosca/model-properties.json     |  10 -
 src/test/resources/tosca/resource-details.json     |  96 +++
 src/test/resources/tosca/service-details.json      |  15 +
 ui-react/src/api/LoopCache.js                      |   4 +-
 ui-react/src/api/LoopCache_mokeLoopJsonCache.json  |   2 +-
 ui-react/src/api/example.json                      |   2 +-
 18 files changed, 1092 insertions(+), 46 deletions(-)
 create mode 100644 src/main/java/org/onap/clamp/loop/service/Service.java
 create mode 100644 src/test/java/org/onap/clamp/loop/ServiceTest.java
 create mode 100644 src/test/resources/tosca/loop.json
 create mode 100644 src/test/resources/tosca/resource-details.json
 create mode 100644 src/test/resources/tosca/service-details.json

(limited to 'ui-react/src')

diff --git a/extra/sql/bulkload/create-tables.sql b/extra/sql/bulkload/create-tables.sql
index 0e15d4d3a..dafd80034 100644
--- a/extra/sql/bulkload/create-tables.sql
+++ b/extra/sql/bulkload/create-tables.sql
@@ -23,9 +23,9 @@
         dcae_deployment_status_url varchar(255),
         global_properties_json json,
         last_computed_state varchar(255) not null,
-        model_properties_json json,
         operational_policy_schema json,
         svg_representation MEDIUMTEXT,
+        service_uuid varchar(255),
         primary key (name)
     ) engine=InnoDB;
 
@@ -52,11 +52,24 @@
         primary key (name)
     ) engine=InnoDB;
 
+    create table services (
+       service_uuid varchar(255) not null,
+        name varchar(255) not null,
+        resource_details json,
+        service_details json,
+        primary key (service_uuid)
+    ) engine=InnoDB;
+
     alter table loop_logs 
        add constraint FK1j0cda46aickcaoxqoo34khg2 
        foreign key (loop_id) 
        references loops (name);
 
+    alter table loops 
+       add constraint FK4b9wnqopxogwek014i1shqw7w 
+       foreign key (service_uuid) 
+       references services (service_uuid);
+
     alter table loops_microservicepolicies 
        add constraint FKem7tp1cdlpwe28av7ef91j1yl 
        foreign key (microservicepolicy_id) 
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index 37d597eeb..ef70ba80e 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -48,6 +48,7 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -61,6 +62,7 @@ import org.onap.clamp.loop.components.external.DcaeComponent;
 import org.onap.clamp.loop.components.external.ExternalComponent;
 import org.onap.clamp.loop.components.external.PolicyComponent;
 import org.onap.clamp.loop.log.LoopLog;
+import org.onap.clamp.loop.service.Service;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
 import org.onap.clamp.policy.operational.OperationalPolicyRepresentationBuilder;
@@ -109,9 +111,9 @@ public class Loop implements Serializable {
     private JsonObject globalPropertiesJson;
 
     @Expose
-    @Type(type = "json")
-    @Column(columnDefinition = "json", name = "model_properties_json")
-    private JsonObject modelPropertiesJson;
+    @ManyToOne(fetch = FetchType.EAGER,cascade = CascadeType.ALL)
+    @JoinColumn(name = "service_uuid")
+    private Service modelService;
 
     @Column(columnDefinition = "MEDIUMTEXT", nullable = false, name = "blueprint_yaml")
     private String blueprint;
@@ -266,15 +268,15 @@ public class Loop implements Serializable {
         this.dcaeBlueprintId = dcaeBlueprintId;
     }
 
-    public JsonObject getModelPropertiesJson() {
-        return modelPropertiesJson;
+    public Service getModelService() {
+        return modelService;
     }
 
-    void setModelPropertiesJson(JsonObject modelPropertiesJson) {
-        this.modelPropertiesJson = modelPropertiesJson;
+    void setModelService(Service modelService) {
+        this.modelService = modelService;
         try {
             this.operationalPolicySchema = OperationalPolicyRepresentationBuilder
-                    .generateOperationalPolicySchema(this.getModelPropertiesJson());
+                    .generateOperationalPolicySchema(this.getModelService());
         } catch (JsonSyntaxException | IOException | NullPointerException e) {
             logger.error("Unable to generate the operational policy Schema ... ", e);
             this.operationalPolicySchema = new JsonObject();
diff --git a/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java b/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java
index b8bc1f524..55009bc22 100644
--- a/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java
+++ b/src/main/java/org/onap/clamp/loop/LoopCsarInstaller.java
@@ -46,6 +46,7 @@ import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;
 import org.onap.clamp.clds.sdc.controller.installer.MicroService;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.drawing.SvgFacade;
+import org.onap.clamp.loop.service.Service;
 import org.onap.clamp.policy.Policy;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
@@ -138,7 +139,7 @@ public class LoopCsarInstaller implements CsarInstaller {
         if (microServicesChain.isEmpty()) {
             microServicesChain = blueprintParser.fallbackToOneMicroService(blueprintArtifact.getDcaeBlueprint());
         }
-        newLoop.setModelPropertiesJson(createModelPropertiesJson(csar));
+        newLoop.setModelService(createServiceModel(csar));
         newLoop.setMicroServicePolicies(
                 createMicroServicePolicies(microServicesChain, csar, blueprintArtifact, newLoop));
         newLoop.setOperationalPolicies(createOperationalPolicies(csar, blueprintArtifact, newLoop));
@@ -219,16 +220,17 @@ public class LoopCsarInstaller implements CsarInstaller {
         return resourcesProp;
     }
 
-    private static JsonObject createModelPropertiesJson(CsarHandler csar) {
-        JsonObject modelProperties = new JsonObject();
-        // Add service details
-        modelProperties.add("serviceDetails", JsonUtils.GSON.fromJson(
-                JsonUtils.GSON.toJson(csar.getSdcCsarHelper().getServiceMetadataAllProperties()), JsonObject.class));
+    private Service createServiceModel(CsarHandler csar) {
+        JsonObject serviceDetails = JsonUtils.GSON.fromJson(
+                JsonUtils.GSON.toJson(csar.getSdcCsarHelper().getServiceMetadataAllProperties()), JsonObject.class);
+
         // Add properties details for each type, VfModule, VF, VFC, ....
         JsonObject resourcesProp = createServicePropertiesByType(csar);
         resourcesProp.add("VFModule", createVfModuleProperties(csar));
-        modelProperties.add("resourceDetails", resourcesProp);
-        return modelProperties;
+
+        Service modelService = new Service(serviceDetails, resourcesProp);
+
+        return modelService;
     }
 
     private JsonObject getAllBlueprintParametersInJson(BlueprintArtifact blueprintArtifact, Loop newLoop) {
diff --git a/src/main/java/org/onap/clamp/loop/service/Service.java b/src/main/java/org/onap/clamp/loop/service/Service.java
new file mode 100644
index 000000000..ac1216b9d
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/service/Service.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop.service;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.Expose;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
+import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
+
+
+@Entity
+@Table(name = "services")
+@TypeDefs({ @TypeDef(name = "json", typeClass = StringJsonUserType.class) })
+public class Service implements Serializable {
+
+    /**
+     * The serial version id.
+     */
+    private static final long serialVersionUID = 1331119060272760758L;
+
+    @Transient
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(Service.class);
+
+    @Id
+    @Column(name = "service_uuid", unique = true)
+    private String serviceUuid;
+
+    @Column(nullable = false, name = "name")
+    private String name;
+
+    @Expose
+    @Type(type = "json")
+    @Column(columnDefinition = "json", name = "service_details")
+    private JsonObject serviceDetails;
+
+    @Expose
+    @Type(type = "json")
+    @Column(columnDefinition = "json", name = "resource_details")
+    private JsonObject resourceDetails;
+
+    /**
+     * Public constructor.
+     */
+    public Service() {
+    }
+
+    /**
+     * Constructor.
+     */
+    public Service(JsonObject serviceDetails, JsonObject resourceDetails) {
+        this.name = serviceDetails.get("name").getAsString();
+        this.serviceUuid = serviceDetails.get("UUID").getAsString();
+        this.serviceDetails = serviceDetails;
+        this.resourceDetails = resourceDetails;
+    }
+
+    public String getServiceUuid() {
+        return serviceUuid;
+    }
+
+    public JsonObject getServiceDetails() {
+        return serviceDetails;
+    }
+
+    public JsonObject getResourceDetails() {
+        return resourceDetails;
+    }
+
+    public JsonObject getResourceByType(String type) {
+        return (JsonObject) resourceDetails.get(type);
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((serviceUuid == null) ? 0 : serviceUuid.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        Service other = (Service) obj;
+        if (serviceUuid == null) {
+            if (other.serviceUuid != null) {
+                return false;
+            }
+        } else if (!serviceUuid.equals(other.serviceUuid)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index f6f3f498d..1d0d99080 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -33,6 +33,7 @@ import java.util.Map.Entry;
 
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.loop.service.Service;
 
 public class OperationalPolicyRepresentationBuilder {
 
@@ -47,7 +48,7 @@ public class OperationalPolicyRepresentationBuilder {
      * @throws JsonSyntaxException If the schema template cannot be parsed
      * @throws IOException         In case of issue when opening the schema template
      */
-    public static JsonObject generateOperationalPolicySchema(JsonObject modelJson)
+    public static JsonObject generateOperationalPolicySchema(Service modelJson)
             throws JsonSyntaxException, IOException {
         JsonObject jsonSchema = JsonUtils.GSON.fromJson(
                 ResourceFileUtil.getResourceAsString("clds/json-schema/operational_policies/operational_policy.json"),
@@ -78,9 +79,9 @@ public class OperationalPolicyRepresentationBuilder {
         return property;
     }
 
-    private static JsonArray createVnfSchema(JsonObject modelJson) {
+    private static JsonArray createVnfSchema(Service modelService) {
         JsonArray vnfSchemaArray = new JsonArray();
-        JsonObject modelVnfs = modelJson.get("resourceDetails").getAsJsonObject().get("VF").getAsJsonObject();
+        JsonObject modelVnfs = modelService.getResourceByType("VF");
 
         for (Entry<String, JsonElement> entry : modelVnfs.entrySet()) {
             JsonObject vnfOneOfSchema = new JsonObject();
@@ -96,10 +97,9 @@ public class OperationalPolicyRepresentationBuilder {
         return vnfSchemaArray;
     }
 
-    private static JsonArray createVfModuleSchema(JsonObject modelJson) {
+    private static JsonArray createVfModuleSchema(Service modelService) {
         JsonArray vfModuleOneOfSchemaArray = new JsonArray();
-        JsonObject modelVfModules = modelJson.get("resourceDetails").getAsJsonObject().get("VFModule")
-                .getAsJsonObject();
+        JsonObject modelVfModules = modelService.getResourceByType("VFModule");
 
         for (Entry<String, JsonElement> entry : modelVfModules.entrySet()) {
             JsonObject vfModuleOneOfSchema = new JsonObject();
@@ -137,7 +137,7 @@ public class OperationalPolicyRepresentationBuilder {
         return vfModuleOneOfSchemaArray;
     }
 
-    private static JsonArray createAnyOfArray(JsonObject modelJson) {
+    private static JsonArray createAnyOfArray(Service modelJson) {
         JsonArray targetOneOfStructure = new JsonArray();
         targetOneOfStructure.addAll(createVnfSchema(modelJson));
         targetOneOfStructure.addAll(createVfModuleSchema(modelJson));
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
index 072d57712..40cc0650e 100644
--- a/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
@@ -104,7 +104,6 @@ public class CldsServiceItCase {
 
     @Test
     public void testCldsInfoAuthorized() throws Exception {
-        Authentication authentication;
         List<GrantedAuthority> authList = new LinkedList<GrantedAuthority>();
         authList.add(new SimpleGrantedAuthority("permission-type-cl-manage|dev|*"));
         authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|read"));
@@ -113,6 +112,7 @@ public class CldsServiceItCase {
         authList.add(new SimpleGrantedAuthority("permission-type-template|dev|update"));
         authList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|*"));
         authList.add(new SimpleGrantedAuthority("permission-type-cl-event|dev|*"));
+        Authentication authentication;
         authentication = new UsernamePasswordAuthenticationToken(new User("admin", "", authList), "", authList);
 
         Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index fbf1f2079..e3271c7a6 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -202,10 +202,13 @@ public class CsarInstallerItCase {
         assertThat(loop.getGlobalPropertiesJson().get("dcaeDeployParameters")).isNotNull();
         assertThat(loop.getMicroServicePolicies()).hasSize(1);
         assertThat(loop.getOperationalPolicies()).hasSize(1);
-        assertThat(loop.getModelPropertiesJson().get("serviceDetails")).isNotNull();
-        assertThat(loop.getModelPropertiesJson().get("resourceDetails")).isNotNull();
+        assertThat(loop.getModelService().getServiceUuid()).isEqualTo("63cac700-ab9a-4115-a74f-7eac85e3fce0");
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"),
-                JsonUtils.GSON.toJson(loop.getModelPropertiesJson()), true);
+            JsonUtils.GSON_JPA_MODEL.toJson(loop.getModelService()), true);
+        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/service-details.json"),
+                JsonUtils.GSON_JPA_MODEL.toJson(loop.getModelService().getServiceDetails()), true);
+        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/resource-details.json"),
+                JsonUtils.GSON_JPA_MODEL.toJson(loop.getModelService().getResourceDetails()), true);
         assertThat(((MicroServicePolicy) (loop.getMicroServicePolicies().toArray()[0])).getModelType()).isNotEmpty();
 
         loop = loopsRepo
diff --git a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
index 1fedc9abe..28a92e371 100644
--- a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
@@ -347,8 +347,8 @@ public class LoopServiceTestItCase {
         saveTestLoopToDb();
         assertThat(microServicePolicyService.isExisting("policyName")).isFalse();
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("policyName", "",
-                                                                       "tosca_definitions_version: tosca_simple_yaml_1_0_0", false,
-                                                                       JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+            "tosca_definitions_version: tosca_simple_yaml_1_0_0", false,
+            JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
         loopService.updateMicroservicePolicy(EXAMPLE_LOOP_NAME, microServicePolicy);
         assertThat(microServicePolicyService.isExisting("policyName")).isTrue();
     }
diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
index 3010fe50b..b68bf48a0 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
@@ -29,7 +29,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -41,6 +43,7 @@ import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.clamp.loop.components.external.PolicyComponent;
 import org.onap.clamp.loop.log.LogType;
 import org.onap.clamp.loop.log.LoopLog;
+import org.onap.clamp.loop.service.Service;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -54,7 +57,7 @@ public class LoopToJsonTest {
     }
 
     private Loop getLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
-            String dcaeId, String dcaeUrl, String dcaeBlueprintId) {
+            String dcaeId, String dcaeUrl, String dcaeBlueprintId) throws JsonSyntaxException, IOException {
         Loop loop = new Loop(name, blueprint, svgRepresentation);
         loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
         loop.setLastComputedState(LoopState.DESIGN);
@@ -115,6 +118,29 @@ public class LoopToJsonTest {
                 "loop");
     }
 
+    @Test
+    public void loopServiceTest() throws IOException {
+        Loop loopTest2 = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+                "123456789", "https://dcaetest.org", "UUID-blueprint");
+
+        JsonObject jsonModel = new GsonBuilder().create()
+                .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"), JsonObject.class);
+        Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(),
+                jsonModel.get("resourceDetails").getAsJsonObject());
+        loopTest2.setModelService(service);
+
+        String jsonSerialized = JsonUtils.GSON_JPA_MODEL.toJson(loopTest2);
+        assertThat(jsonSerialized).isNotNull().isNotEmpty();
+        System.out.println(jsonSerialized);
+        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/loop.json"),
+                jsonSerialized, true);
+
+        Loop loopTestDeserialized = JsonUtils.GSON_JPA_MODEL.fromJson(jsonSerialized, Loop.class);
+        assertNotNull(loopTestDeserialized);
+        assertThat(loopTestDeserialized).isEqualToIgnoringGivenFields(loopTest2, "modelService", 
+            "svgRepresentation", "blueprint", "components");
+    }
+
     @Test
     public void createPoliciesPayloadPdpGroupTest() throws IOException {
         Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
diff --git a/src/test/java/org/onap/clamp/loop/ServiceTest.java b/src/test/java/org/onap/clamp/loop/ServiceTest.java
new file mode 100644
index 000000000..45de5385e
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/ServiceTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.gson.JsonObject;
+
+import org.junit.Test;
+import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.loop.service.Service;
+
+public class ServiceTest {
+
+    @Test
+    public void equalMethodTest() {
+        String serviceStr1 = "{\"name\": \"vLoadBalancerMS\", \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\"}";
+        String serviceStr2 = "{\"name\": \"vLoadBalancerMS2\", \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\"}";
+        String serviceStr3 = "{\"name\": \"vLoadBalancerMS\",\"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fc11\"}";
+        String resourceStr = "{\"CP\": {}}";
+
+        Service service1 = new Service(JsonUtils.GSON.fromJson(serviceStr1, JsonObject.class), 
+                JsonUtils.GSON.fromJson(resourceStr, JsonObject.class));
+
+        Service service2 = new Service(JsonUtils.GSON.fromJson(serviceStr2, JsonObject.class), null);
+
+        Service service3 = new Service(JsonUtils.GSON.fromJson(serviceStr3, JsonObject.class), 
+                JsonUtils.GSON.fromJson(resourceStr, JsonObject.class));
+
+        assertThat(service1.equals(service2)).isEqualTo(true);
+        assertThat(service1.equals(service3)).isEqualTo(false);
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
index 904525bea..673ac323d 100644
--- a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
+++ b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
@@ -32,6 +32,7 @@ import java.io.IOException;
 
 import org.junit.Test;
 import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.loop.service.Service;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 public class OperationalPolicyRepresentationBuilderTest {
@@ -40,8 +41,10 @@ public class OperationalPolicyRepresentationBuilderTest {
     public void testOperationalPolicyPayloadConstruction() throws IOException {
         JsonObject jsonModel = new GsonBuilder().create()
                 .fromJson(ResourceFileUtil.getResourceAsString("tosca/model-properties.json"), JsonObject.class);
+        Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(),
+                jsonModel.get("resourceDetails").getAsJsonObject());
 
-        JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(jsonModel);
+        JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(service);
 
         assertThat(jsonSchema).isNotNull();
 
diff --git a/src/test/resources/tosca/loop.json b/src/test/resources/tosca/loop.json
new file mode 100644
index 000000000..557fa6f69
--- /dev/null
+++ b/src/test/resources/tosca/loop.json
@@ -0,0 +1,704 @@
+{
+  "name": "ControlLoopTest",
+  "dcaeDeploymentId": "123456789",
+  "dcaeDeploymentStatusUrl": "https://dcaetest.org",
+  "dcaeBlueprintId": "UUID-blueprint",
+  "operationalPolicySchema": {
+    "schema": {
+      "uniqueItems": "true",
+      "format": "tabs",
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 1,
+      "title": "Operational policies",
+      "items": {
+        "type": "object",
+        "title": "Operational Policy Item",
+        "id": "operational_policy_item",
+        "headerTemplate": "{{self.name}}",
+        "required": [
+          "name",
+          "configurationsJson"
+        ],
+        "properties": {
+          "name": {
+            "type": "string",
+            "title": "Operational policy name",
+            "readOnly": "True"
+          },
+          "configurationsJson": {
+            "type": "object",
+            "title": "Configuration",
+            "required": [
+              "operational_policy",
+              "guard_policies"
+            ],
+            "properties": {
+              "operational_policy": {
+                "type": "object",
+                "title": "Related Parameters",
+                "required": [
+                  "controlLoop",
+                  "policies"
+                ],
+                "properties": {
+                  "controlLoop": {
+                    "type": "object",
+                    "title": "Control Loop details",
+                    "required": [
+                      "timeout",
+                      "abatement",
+                      "trigger_policy",
+                      "controlLoopName"
+                    ],
+                    "properties": {
+                      "timeout": {
+                        "type": "string",
+                        "title": "Overall Time Limit",
+                        "default": "0",
+                        "format": "number"
+                      },
+                      "abatement": {
+                        "type": "string",
+                        "title": "Abatement",
+                        "enum": [
+                          "True",
+                          "False"
+                        ]
+                      },
+                      "trigger_policy": {
+                        "type": "string",
+                        "title": "Policy Decision Entry"
+                      },
+                      "controlLoopName": {
+                        "type": "string",
+                        "title": "Control loop name",
+                        "readOnly": "True"
+                      }
+                    }
+                  },
+                  "policies": {
+                    "uniqueItems": "true",
+                    "id": "policies_array",
+                    "type": "array",
+                    "title": "Policy Decision Tree",
+                    "format": "tabs-top",
+                    "items": {
+                      "title": "Policy Decision",
+                      "type": "object",
+                      "id": "policy_item",
+                      "headerTemplate": "{{self.id}} - {{self.recipe}}",
+                      "format": "categories",
+                      "basicCategoryTitle": "recipe",
+                      "required": [
+                        "id",
+                        "recipe",
+                        "retry",
+                        "timeout",
+                        "actor",
+                        "success",
+                        "failure",
+                        "failure_timeout",
+                        "failure_retries",
+                        "failure_exception",
+                        "failure_guard",
+                        "target"
+                      ],
+                      "properties": {
+                        "id": {
+                          "default": "Policy 1",
+                          "title": "Policy ID",
+                          "type": "string"
+                        },
+                        "recipe": {
+                          "title": "Recipe",
+                          "type": "string",
+                          "enum": [
+                            "Restart",
+                            "Rebuild",
+                            "Migrate",
+                            "Health-Check",
+                            "ModifyConfig",
+                            "VF Module Create",
+                            "VF Module Delete",
+                            "Reroute"
+                          ]
+                        },
+                        "retry": {
+                          "default": "0",
+                          "title": "Number of Retry",
+                          "type": "string",
+                          "format": "number"
+                        },
+                        "timeout": {
+                          "default": "0",
+                          "title": "Timeout",
+                          "type": "string",
+                          "format": "number"
+                        },
+                        "actor": {
+                          "title": "Actor",
+                          "type": "string",
+                          "enum": [
+                            "APPC",
+                            "SO",
+                            "VFC",
+                            "SDNC",
+                            "SDNR"
+                          ]
+                        },
+                        "payload": {
+                          "title": "Payload (YAML)",
+                          "type": "string",
+                          "format": "textarea"
+                        },
+                        "success": {
+                          "default": "final_success",
+                          "title": "When Success",
+                          "type": "string"
+                        },
+                        "failure": {
+                          "default": "final_failure",
+                          "title": "When Failure",
+                          "type": "string"
+                        },
+                        "failure_timeout": {
+                          "default": "final_failure_timeout",
+                          "title": "When Failure Timeout",
+                          "type": "string"
+                        },
+                        "failure_retries": {
+                          "default": "final_failure_retries",
+                          "title": "When Failure Retries",
+                          "type": "string"
+                        },
+                        "failure_exception": {
+                          "default": "final_failure_exception",
+                          "title": "When Failure Exception",
+                          "type": "string"
+                        },
+                        "failure_guard": {
+                          "default": "final_failure_guard",
+                          "title": "When Failure Guard",
+                          "type": "string"
+                        },
+                        "target": {
+                          "type": "object",
+                          "required": [
+                            "type",
+                            "resourceID"
+                          ],
+                          "anyOf": [
+                            {
+                              "title": "User Defined",
+                              "additionalProperties": "True",
+                              "properties": {
+                                "type": {
+                                  "title": "Target type",
+                                  "type": "string",
+                                  "default": "",
+                                  "enum": [
+                                    "VNF",
+                                    "VFMODULE",
+                                    "VM"
+                                  ]
+                                },
+                                "resourceID": {
+                                  "title": "Target type",
+                                  "type": "string",
+                                  "default": ""
+                                }
+                              }
+                            },
+                            {
+                              "title": "VNF-vLoadBalancerMS 0",
+                              "properties": {
+                                "type": {
+                                  "title": "Type",
+                                  "type": "string",
+                                  "default": "VNF",
+                                  "readOnly": "True"
+                                },
+                                "resourceID": {
+                                  "title": "Resource ID",
+                                  "type": "string",
+                                  "default": "vLoadBalancerMS",
+                                  "readOnly": "True"
+                                }
+                              }
+                            },
+                            {
+                              "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
+                              "properties": {
+                                "type": {
+                                  "title": "Type",
+                                  "type": "string",
+                                  "default": "VFMODULE",
+                                  "readOnly": "True"
+                                },
+                                "resourceID": {
+                                  "title": "Resource ID",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..vpkg..module-1",
+                                  "readOnly": "True"
+                                },
+                                "modelInvariantId": {
+                                  "title": "Model Invariant Id (ModelInvariantUUID)",
+                                  "type": "string",
+                                  "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
+                                  "readOnly": "True"
+                                },
+                                "modelVersionId": {
+                                  "title": "Model Version Id (ModelUUID)",
+                                  "type": "string",
+                                  "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+                                  "readOnly": "True"
+                                },
+                                "modelName": {
+                                  "title": "Model Name",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..vpkg..module-1",
+                                  "readOnly": "True"
+                                },
+                                "modelVersion": {
+                                  "title": "Model Version",
+                                  "type": "string",
+                                  "default": "1",
+                                  "readOnly": "True"
+                                },
+                                "modelCustomizationId": {
+                                  "title": "Customization ID",
+                                  "type": "string",
+                                  "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+                                  "readOnly": "True"
+                                }
+                              }
+                            },
+                            {
+                              "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
+                              "properties": {
+                                "type": {
+                                  "title": "Type",
+                                  "type": "string",
+                                  "default": "VFMODULE",
+                                  "readOnly": "True"
+                                },
+                                "resourceID": {
+                                  "title": "Resource ID",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..vdns..module-3",
+                                  "readOnly": "True"
+                                },
+                                "modelInvariantId": {
+                                  "title": "Model Invariant Id (ModelInvariantUUID)",
+                                  "type": "string",
+                                  "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+                                  "readOnly": "True"
+                                },
+                                "modelVersionId": {
+                                  "title": "Model Version Id (ModelUUID)",
+                                  "type": "string",
+                                  "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
+                                  "readOnly": "True"
+                                },
+                                "modelName": {
+                                  "title": "Model Name",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..vdns..module-3",
+                                  "readOnly": "True"
+                                },
+                                "modelVersion": {
+                                  "title": "Model Version",
+                                  "type": "string",
+                                  "default": "1",
+                                  "readOnly": "True"
+                                },
+                                "modelCustomizationId": {
+                                  "title": "Customization ID",
+                                  "type": "string",
+                                  "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+                                  "readOnly": "True"
+                                }
+                              }
+                            },
+                            {
+                              "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
+                              "properties": {
+                                "type": {
+                                  "title": "Type",
+                                  "type": "string",
+                                  "default": "VFMODULE",
+                                  "readOnly": "True"
+                                },
+                                "resourceID": {
+                                  "title": "Resource ID",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..base_template..module-0",
+                                  "readOnly": "True"
+                                },
+                                "modelInvariantId": {
+                                  "title": "Model Invariant Id (ModelInvariantUUID)",
+                                  "type": "string",
+                                  "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+                                  "readOnly": "True"
+                                },
+                                "modelVersionId": {
+                                  "title": "Model Version Id (ModelUUID)",
+                                  "type": "string",
+                                  "default": "63734409-f745-4e4d-a38b-131638a0edce",
+                                  "readOnly": "True"
+                                },
+                                "modelName": {
+                                  "title": "Model Name",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..base_template..module-0",
+                                  "readOnly": "True"
+                                },
+                                "modelVersion": {
+                                  "title": "Model Version",
+                                  "type": "string",
+                                  "default": "1",
+                                  "readOnly": "True"
+                                },
+                                "modelCustomizationId": {
+                                  "title": "Customization ID",
+                                  "type": "string",
+                                  "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+                                  "readOnly": "True"
+                                }
+                              }
+                            },
+                            {
+                              "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
+                              "properties": {
+                                "type": {
+                                  "title": "Type",
+                                  "type": "string",
+                                  "default": "VFMODULE",
+                                  "readOnly": "True"
+                                },
+                                "resourceID": {
+                                  "title": "Resource ID",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..vlb..module-2",
+                                  "readOnly": "True"
+                                },
+                                "modelInvariantId": {
+                                  "title": "Model Invariant Id (ModelInvariantUUID)",
+                                  "type": "string",
+                                  "default": "a772a1f4-0064-412c-833d-4749b15828dd",
+                                  "readOnly": "True"
+                                },
+                                "modelVersionId": {
+                                  "title": "Model Version Id (ModelUUID)",
+                                  "type": "string",
+                                  "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+                                  "readOnly": "True"
+                                },
+                                "modelName": {
+                                  "title": "Model Name",
+                                  "type": "string",
+                                  "default": "Vloadbalancerms..vlb..module-2",
+                                  "readOnly": "True"
+                                },
+                                "modelVersion": {
+                                  "title": "Model Version",
+                                  "type": "string",
+                                  "default": "1",
+                                  "readOnly": "True"
+                                },
+                                "modelCustomizationId": {
+                                  "title": "Customization ID",
+                                  "type": "string",
+                                  "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+                                  "readOnly": "True"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "guard_policies": {
+                "type": "array",
+                "format": "tabs-top",
+                "title": "Associated Guard policies",
+                "items": {
+                  "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
+                  "anyOf": [
+                    {
+                      "title": "Guard MinMax",
+                      "type": "object",
+                      "properties": {
+                        "policy-id": {
+                          "type": "string",
+                          "default": "guard.minmax.new",
+                          "pattern": "^(guard.minmax\\..*)$"
+                        },
+                        "content": {
+                          "properties": {
+                            "actor": {
+                              "type": "string",
+                              "enum": [
+                                "APPC",
+                                "SO",
+                                "VFC",
+                                "SDNC",
+                                "SDNR"
+                              ]
+                            },
+                            "recipe": {
+                              "type": "string",
+                              "enum": [
+                                "Restart",
+                                "Rebuild",
+                                "Migrate",
+                                "Health-Check",
+                                "ModifyConfig",
+                                "VF Module Create",
+                                "VF Module Delete",
+                                "Reroute"
+                              ]
+                            },
+                            "targets": {
+                              "type": "string",
+                              "default": ".*"
+                            },
+                            "clname": {
+                              "type": "string",
+                              "template": "{{loopName}}",
+                              "watch": {
+                                "loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
+                              }
+                            },
+                            "guardActiveStart": {
+                              "type": "string",
+                              "default": "00:00:00Z"
+                            },
+                            "guardActiveEnd": {
+                              "type": "string",
+                              "default": "10:00:00Z"
+                            },
+                            "min": {
+                              "type": "string",
+                              "default": "0"
+                            },
+                            "max": {
+                              "type": "string",
+                              "default": "1"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "title": "Guard Frequency",
+                      "type": "object",
+                      "properties": {
+                        "policy-id": {
+                          "type": "string",
+                          "default": "guard.frequency.new",
+                          "pattern": "^(guard.frequency\\..*)$"
+                        },
+                        "content": {
+                          "properties": {
+                            "actor": {
+                              "type": "string",
+                              "enum": [
+                                "APPC",
+                                "SO",
+                                "VFC",
+                                "SDNC",
+                                "SDNR"
+                              ]
+                            },
+                            "recipe": {
+                              "type": "string",
+                              "enum": [
+                                "Restart",
+                                "Rebuild",
+                                "Migrate",
+                                "Health-Check",
+                                "ModifyConfig",
+                                "VF Module Create",
+                                "VF Module Delete",
+                                "Reroute"
+                              ]
+                            },
+                            "targets": {
+                              "type": "string",
+                              "default": ".*"
+                            },
+                            "clname": {
+                              "type": "string",
+                              "template": "{{loopName}}",
+                              "watch": {
+                                "loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
+                              }
+                            },
+                            "guardActiveStart": {
+                              "type": "string",
+                              "default": "00:00:00Z"
+                            },
+                            "guardActiveEnd": {
+                              "type": "string",
+                              "default": "10:00:00Z"
+                            },
+                            "limit": {
+                              "type": "string"
+                            },
+                            "timeWindow": {
+                              "type": "string"
+                            },
+                            "timeUnits": {
+                              "type": "string",
+                              "enum": [
+                                "minute",
+                                "hour",
+                                "day",
+                                "week",
+                                "month",
+                                "year"
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "globalPropertiesJson": {
+    "testname": "testvalue"
+  },
+  "modelService": {
+    "serviceDetails": {
+      "serviceType": "",
+      "namingPolicy": "",
+      "environmentContext": "General_Revenue-Bearing",
+      "serviceEcompNaming": "true",
+      "serviceRole": "",
+      "name": "vLoadBalancerMS",
+      "description": "vLBMS",
+      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+      "ecompGeneratedNaming": "true",
+      "category": "Network L4+",
+      "type": "Service",
+      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+      "instantiationType": "A-la-carte"
+    },
+    "resourceDetails": {
+      "CP": {},
+      "VL": {},
+      "VF": {
+        "vLoadBalancerMS 0": {
+          "resourceVendor": "Test",
+          "resourceVendorModelNumber": "",
+          "name": "vLoadBalancerMS",
+          "description": "vLBMS",
+          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+          "subcategory": "Load Balancer",
+          "category": "Application L4+",
+          "type": "VF",
+          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+          "version": "1.0",
+          "resourceVendorRelease": "1.0",
+          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+        }
+      },
+      "CR": {},
+      "VFC": {},
+      "PNF": {},
+      "Service": {},
+      "CVFC": {},
+      "Service Proxy": {},
+      "Configuration": {},
+      "AllottedResource": {},
+      "VFModule": {
+        "Vloadbalancerms..vpkg..module-1": {
+          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vpkg",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        },
+        "Vloadbalancerms..vdns..module-3": {
+          "vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vdns..module-3",
+          "vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
+          "vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vdns",
+          "max_vf_module_instances": 50,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        },
+        "Vloadbalancerms..base_template..module-0": {
+          "vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..base_template..module-0",
+          "vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
+          "vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+          "min_vf_module_instances": 1,
+          "vf_module_label": "base_template",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Base",
+          "isBase": true,
+          "initial_count": 1,
+          "volume_group": false
+        },
+        "Vloadbalancerms..vlb..module-2": {
+          "vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
+          "vfModuleModelVersion": "1",
+          "vfModuleModelName": "Vloadbalancerms..vlb..module-2",
+          "vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+          "vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+          "min_vf_module_instances": 0,
+          "vf_module_label": "vlb",
+          "max_vf_module_instances": 1,
+          "vf_module_type": "Expansion",
+          "isBase": false,
+          "initial_count": 0,
+          "volume_group": false
+        }
+      }
+    }
+  },
+  "lastComputedState": "DESIGN",
+  "components": {
+    "POLICY": {
+      "componentState": {
+        "stateName": "UNKNOWN",
+        "description": "The current status is not clear. Need to regresh the status to get the current status."
+      }
+    },
+    "DCAE": {
+      "componentState": {
+        "stateName": "BLUEPRINT_DEPLOYED",
+        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
+      }
+    }
+  },
+  "operationalPolicies": [],
+  "microServicePolicies": [],
+  "loopLogs": []
+}
diff --git a/src/test/resources/tosca/model-properties.json b/src/test/resources/tosca/model-properties.json
index 9e7db8ebc..e41471b16 100644
--- a/src/test/resources/tosca/model-properties.json
+++ b/src/test/resources/tosca/model-properties.json
@@ -16,10 +16,8 @@
 	},
 	"resourceDetails": {
 		"CP": {
-			
 		},
 		"VL": {
-			
 		},
 		"VF": {
 			"vLoadBalancerMS 0": {
@@ -38,28 +36,20 @@
 			}
 		},
 		"CR": {
-			
 		},
 		"VFC": {
-			
 		},
 		"PNF": {
-			
 		},
 		"Service": {
-			
 		},
 		"CVFC": {
-			
 		},
 		"Service Proxy": {
-			
 		},
 		"Configuration": {
-			
 		},
 		"AllottedResource": {
-			
 		},
 		"VFModule": {
 			"Vloadbalancerms..vpkg..module-1": {
diff --git a/src/test/resources/tosca/resource-details.json b/src/test/resources/tosca/resource-details.json
new file mode 100644
index 000000000..7b53f3972
--- /dev/null
+++ b/src/test/resources/tosca/resource-details.json
@@ -0,0 +1,96 @@
+{
+	"CP": {
+	},
+	"VL": {
+	},
+	"VF": {
+		"vLoadBalancerMS 0": {
+			"resourceVendor": "Test",
+			"resourceVendorModelNumber": "",
+			"name": "vLoadBalancerMS",
+			"description": "vLBMS",
+			"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
+			"subcategory": "Load Balancer",
+			"category": "Application L4+",
+			"type": "VF",
+			"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
+			"version": "1.0",
+			"resourceVendorRelease": "1.0",
+			"customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
+		}
+	},
+	"CR": {
+	},
+	"VFC": {
+	},
+	"PNF": {
+	},
+	"Service": {
+	},
+	"CVFC": {
+	},
+	"Service Proxy": {
+	},
+	"Configuration": {
+	},
+	"AllottedResource": {
+	},
+	"VFModule": {
+		"Vloadbalancerms..vpkg..module-1": {
+			"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
+			"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+			"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+			"min_vf_module_instances": 0,
+			"vf_module_label": "vpkg",
+			"max_vf_module_instances": 1,
+			"vf_module_type": "Expansion",
+			"isBase": false,
+			"initial_count": 0,
+			"volume_group": false
+		},
+		"Vloadbalancerms..vdns..module-3": {
+			"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
+			"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
+			"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+			"min_vf_module_instances": 0,
+			"vf_module_label": "vdns",
+			"max_vf_module_instances": 50,
+			"vf_module_type": "Expansion",
+			"isBase": false,
+			"initial_count": 0,
+			"volume_group": false
+		},
+		"Vloadbalancerms..base_template..module-0": {
+			"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
+			"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
+			"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+			"min_vf_module_instances": 1,
+			"vf_module_label": "base_template",
+			"max_vf_module_instances": 1,
+			"vf_module_type": "Base",
+			"isBase": true,
+			"initial_count": 1,
+			"volume_group": false
+		},
+		"Vloadbalancerms..vlb..module-2": {
+			"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
+			"vfModuleModelVersion": "1",
+			"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
+			"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+			"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+			"min_vf_module_instances": 0,
+			"vf_module_label": "vlb",
+			"max_vf_module_instances": 1,
+			"vf_module_type": "Expansion",
+			"isBase": false,
+			"initial_count": 0,
+			"volume_group": false
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/tosca/service-details.json b/src/test/resources/tosca/service-details.json
new file mode 100644
index 000000000..f41eec107
--- /dev/null
+++ b/src/test/resources/tosca/service-details.json
@@ -0,0 +1,15 @@
+{
+	"serviceType": "",
+	"namingPolicy": "",
+	"environmentContext": "General_Revenue-Bearing",
+	"serviceEcompNaming": "true",
+	"serviceRole": "",
+	"name": "vLoadBalancerMS",
+	"description": "vLBMS",
+	"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
+	"ecompGeneratedNaming": "true",
+	"category": "Network L4+",
+	"type": "Service",
+	"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
+	"instantiationType": "A-la-carte"
+}
\ No newline at end of file
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index dd8c5b520..95eb9310e 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -99,11 +99,11 @@ export default class LoopCache {
 	}
 
 	getResourceDetailsVfProperty() {
-		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VF"];
+		return this.loopJsonCache["modelService"]["resourceDetails"]["VF"];
 	}
 
 	getResourceDetailsVfModuleProperty() {
-		return this.loopJsonCache["modelPropertiesJson"]["resourceDetails"]["VFModule"];
+		return this.loopJsonCache["modelService"]["resourceDetails"]["VFModule"];
 	}
 
 	getLoopLogsArray() {
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index 184eaf7cd..c84b5b691 100644
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -8,7 +8,7 @@
       "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
     }
   },
-  "modelPropertiesJson": {
+  "modelService": {
     "serviceDetails": {
       "serviceType": "",
       "namingPolicy": "",
diff --git a/ui-react/src/api/example.json b/ui-react/src/api/example.json
index 108cf78e2..7b9a95a23 100644
--- a/ui-react/src/api/example.json
+++ b/ui-react/src/api/example.json
@@ -8,7 +8,7 @@
       "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
     }
   },
-  "modelPropertiesJson": {
+  "modelService": {
     "serviceDetails": {
       "serviceType": "",
       "namingPolicy": "",
-- 
cgit 1.2.3-korg


From 684057e69bea57d0bd954a84a10581a81d546006 Mon Sep 17 00:00:00 2001
From: drveerendra <vrajasekharaiah@att.com>
Date: Mon, 11 Nov 2019 19:37:39 -0500
Subject: Adding View BP template Menu

Adding View Blue Print templates option under Template menu. Adding few
more test cases for ViewTosca Modals to cover the api calls.

Issue-ID: CLAMP-544
Change-Id: Ibf881f46fd03e9149a88ccc211a996d99fd74748
Signed-off-by: drveerendra <vrajasekharaiah@att.com>
---
 ui-react/src/LoopUI.js                             |   6 +-
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   6 +-
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   8 +-
 ui-react/src/api/TemplateMenuService.js            |  25 ++-
 .../ViewBlueprintMicroServiceTemplatesModal.js     | 154 ++++++++++++++++
 ...ViewBlueprintMicroServiceTemplatesModal.test.js | 193 ++++++++++++++++++++
 .../dialogs/Tosca/ViewToscaPolicyModal.js          | 154 ++++++++++++++++
 .../dialogs/Tosca/ViewToscaPolicyModal.test.js     | 195 +++++++++++++++++++++
 ...lueprintMicroServiceTemplatesModal.test.js.snap | 163 +++++++++++++++++
 .../ViewToscaPolicyModal.test.js.snap              | 163 +++++++++++++++++
 .../dialogs/ViewToscaModal/ViewToscaModal.js       | 147 ----------------
 .../dialogs/ViewToscaModal/ViewToscaModal.test.js  |  89 ----------
 .../__snapshots__/ViewToscaModal.test.js.snap      | 169 ------------------
 ui-react/src/components/menu/MenuBar.js            |   3 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        | 103 ++++++++---
 ui-react/src/theme/globalStyle.js                  |   7 +-
 16 files changed, 1143 insertions(+), 442 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap
 create mode 100644 ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
 delete mode 100644 ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js
 delete mode 100644 ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js
 delete mode 100644 ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 05f466bc6..f767da9a6 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -42,7 +42,8 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C
 import LoopProperties from './components/dialogs/LoopProperties';
 import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
-import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal';
+import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal';
+import ViewBlueprintMicroServiceTemplatesModal from './components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoop from './components/dialogs/DeployLoop';
@@ -248,7 +249,8 @@ export default class LoopUI extends React.Component {
 	render() {
 		return (
 				<StyledMainDiv id="main_div">
-				<Route path="/viewToscaModal" render={(routeProps) => (<ViewToscaModal {...routeProps} />)} />
+				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
+				<Route path="/viewBlueprintMicroServiceTemplatesModal" render={(routeProps) => (<ViewBlueprintMicroServiceTemplatesModal {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index ab4ea4999..22f549754 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -5,7 +5,11 @@ exports[`Verify LoopUI Test the render method 1`] = `
   id="main_div"
 >
   <Route
-    path="/viewToscaModal"
+    path="/viewToscaPolicyModal"
+    render={[Function]}
+  />
+  <Route
+    path="/viewBlueprintMicroServiceTemplatesModal"
     render={[Function]}
   />
   <Route
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 7a4d94570..7bb8f81ca 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -21,6 +21,8 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       "menuFontColor": "black",
       "menuHighlightedBackgroundColor": "#337ab7",
       "menuHighlightedFontColor": "white",
+      "toscaTextareaBackgroundColor": "#E8E8E8",
+      "toscaTextareaFontSize": "13px",
     }
   }
 >
@@ -28,7 +30,11 @@ exports[`Verify OnapClamp Test the render method 1`] = `
     id="main_div"
   >
     <Route
-      path="/viewToscaModal"
+      path="/viewToscaPolicyModal"
+      render={[Function]}
+    />
+    <Route
+      path="/viewBlueprintMicroServiceTemplatesModal"
       render={[Function]}
     />
     <Route
diff --git a/ui-react/src/api/TemplateMenuService.js b/ui-react/src/api/TemplateMenuService.js
index 5d3f29a80..dfa9c578e 100644
--- a/ui-react/src/api/TemplateMenuService.js
+++ b/ui-react/src/api/TemplateMenuService.js
@@ -21,19 +21,36 @@
  */
 
 export default class TemplateMenuService {
-  static getToscaModels() {
+  static getToscaPolicyModels() {
     return fetch('restservices/clds/v2/loop/tosca/models', { method: 'GET', credentials: 'same-origin' })
       .then(function (response) {
-        console.debug("getToscaModels response received: ", response.status);
+        console.debug("getToscaPolicyModels response received: ", response.status);
         if (response.ok) {
           return response.json();
         } else {
-          console.error("getToscaModels query failed");
+          console.error("getToscaPolicyModels query failed");
           return {};
         }
       })
       .catch(function (error) {
-        console.error("getToscaModels error received", error);
+        console.error("getToscaPolicyModels error received", error);
+        return {};
+      });
+  }
+
+  static getBlueprintMicroServiceTemplates() {
+    return fetch('restservices/clds/v2/loop/templates', { method: 'GET', credentials: 'same-origin', })
+      .then(function (response) {
+        console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
+        if (response.ok) {
+          return response.json();
+        } else {
+          console.error("getBlueprintMicroServiceTemplates query failed");
+          return {};
+        }
+      })
+      .catch(function (error) {
+        console.error("getBlueprintMicroServiceTemplates error received", error);
         return {};
       });
   }
diff --git a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js
new file mode 100644
index 000000000..adacbc8c6
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js
@@ -0,0 +1,154 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import TemplateMenuService from '../../../api/TemplateMenuService';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+import MaterialTable from "material-table";
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const TextModal = styled.textarea`
+margin-top: 20px;
+white-space:pre;
+background-color: ${props => props.theme.toscaTextareaBackgroundColor};;
+text-align: justify;
+font-size: ${props => props.theme.toscaTextareaFontSize};;
+width: 100%;
+height: 300px;
+`
+const cellStyle = { border: '1px solid black' };
+const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ViewBlueprintMicroServiceTemplatesModal extends React.Component {
+  state = {
+    show: true,
+		content: 'Please select Blue print template to view the details',
+		selectedRow: -1,
+		bpTemplNames: [],
+		bpTemplColumns: [
+			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Template Name", field: "templateName",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Policy Model", field: "templatePolicy[0].policyModelId",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Template ID", field: "templateId",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Uploaded By", field: "updatedBy",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Uploaded Date", field: "timestamp", editable: 'never',
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			}
+		],
+		tableIcons: {
+			FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+			LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+			NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+			PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+			ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+			Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+			SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
+		}
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getBlueprintMicroServiceTemplates = this.getBlueprintMicroServiceTemplates.bind(this);
+		this.handleYamlContent = this.handleYamlContent.bind(this);
+	}
+
+	componentWillMount() {
+		this.getBlueprintMicroServiceTemplates();
+	}
+
+	getBlueprintMicroServiceTemplates() {
+		TemplateMenuService.getBlueprintMicroServiceTemplates().then(bpTemplNames => {
+		this.setState({ bpTemplNames: bpTemplNames })
+		});
+	}
+
+	handleYamlContent = event => {
+		this.setState({
+			content: event.target.value
+		});
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/')
+	}
+
+	render() {
+    return (
+      <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+        <Modal.Header closeButton>
+				</Modal.Header>
+				<Modal.Body>
+          <MaterialTable
+            title={"View Blueprint MicroService Templates"}
+            data={this.state.bpTemplNames}
+					  columns={this.state.bpTemplColumns}
+					  icons={this.state.tableIcons}
+					  onRowClick={(event, rowData) => {this.setState({content: rowData.templateYaml, selectedRow: rowData.tableData.id})}}
+					  options={{
+					  headerStyle:rowHeaderStyle,
+					  rowStyle: rowData => ({
+					  backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
+            })
+          }}
+          />
+          <div>
+            <TextModal value={this.state.content} onChange={this.handleYamlContent} />
+          </div>
+        </Modal.Body>
+        <Modal.Footer>
+          <Button variant="secondary" onClick={this.handleClose}>Close</Button>
+        </Modal.Footer>
+      </ModalStyled>
+      );
+    }
+  }
diff --git a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js
new file mode 100644
index 000000000..4a8d9c3ff
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js
@@ -0,0 +1,193 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import ViewBlueprintMicroServiceTemplatesModal from './ViewBlueprintMicroServiceTemplatesModal';
+import { mount } from 'enzyme';
+
+describe('Verify ViewBlueprintMicroServiceTemplatesModal', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+		}
+	);
+
+	it('Test API Successful', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"content": "MTCA version 1",
+						"templateName": "MTCA",
+						"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+						"updatedBy":"tester",
+						"templateId":"aaaa_bbbb_cccc",
+						"timestamp":"2019-09-06 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
+	});
+  	
+	it('Test API Exception', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: false,
+				status: 500,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"content": "MTCA version 1",
+						"templateName": "MTCA",
+						"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+						"updatedBy":"tester",
+						"templateId":"aaaa_bbbb_cccc",
+						"timestamp":"2019-09-06 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
+	});
+
+	it('Test API Rejection', () => {
+		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
+		setTimeout( () => myMockFunc().catch(e => {
+			console.log(e);
+		}),
+		100
+		);
+		new Promise(resolve => setTimeout(resolve, 200));
+		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
+		expect(myMockFunc.mock.calls.length).toBe(1);
+	});
+
+	it('Test the tosca model view render method', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"content": "MTCA version 1",
+						"templateName": "MTCA",
+						"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+						"updatedBy":"tester",
+						"templateId":"aaaa_bbbb_cccc",
+						"timestamp":"2019-09-06 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
+		component.setState({ bpTemplNames: {
+			"index": "1",
+			"content": "MTCA version 1",
+			"templateName": "MTCA",
+			"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+			"updatedBy":"tester",
+			"templateId":"aaaa_bbbb_cccc",
+			"timestamp":"2019-09-06 19:09:42"
+		  }
+		});
+		expect(component).toMatchSnapshot();
+	});
+
+	it('Test Table icons', () => {
+			fetch.mockImplementationOnce(() => {
+				return Promise.resolve({
+					ok: true,
+					status: 200,
+					json: () => {
+						return Promise.resolve({
+							"index": "1",
+							"content": "MTCA version 1",
+							"templateName": "MTCA",
+							"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+							"updatedBy":"tester",
+							"templateId":"aaaa_bbbb_cccc",
+							"timestamp":"2019-09-06 19:09:42"
+						});
+					}
+				});
+			});
+			const component = mount(<ViewBlueprintMicroServiceTemplatesModal/>);
+			expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+		});
+
+		it('Test handleYamlContent', () => {
+			fetch.mockImplementationOnce(() => {
+				return Promise.resolve({
+					ok: true,
+					status: 200,
+					json: () => {
+						return Promise.resolve({
+							"index": "1",
+							"content": "MTCA version 1",
+							"templateName": "MTCA",
+							"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+							"updatedBy":"tester",
+							"templateId":"aaaa_bbbb_cccc",
+							"timestamp":"2019-09-06 19:09:42"
+						});
+					}
+				});
+			});
+			const yamlContent = 'MTCA Tosca model details';
+			const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
+			component.find('[value="Please select Blue print template to view the details"]').prop('onChange')({ target: { value: yamlContent }});
+			expect(component.state('content')).toEqual(yamlContent);
+		});
+		
+		it('Test handleClose', () => {
+			fetch.mockImplementationOnce(() => {
+				return Promise.resolve({
+					ok: true,
+					status: 200,
+					json: () => {
+						return Promise.resolve({
+							"index": "1",
+							"content": "MTCA version 1",
+							"templateName": "MTCA",
+							"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
+							"updatedBy":"tester",
+							"templateId":"aaaa_bbbb_cccc",
+							"timestamp":"2019-09-06 19:09:42"
+						});
+					}
+				});
+			});
+			const historyMock = { push: jest.fn() };
+			const handleClose = jest.spyOn(ViewBlueprintMicroServiceTemplatesModal.prototype,'handleClose');
+			const component = shallow(<ViewBlueprintMicroServiceTemplatesModal history={historyMock} />)
+			component.find('[variant="secondary"]').prop('onClick')();
+			expect(handleClose).toHaveBeenCalledTimes(1);
+			expect(component.state('show')).toEqual(false);
+			expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+			handleClose.mockClear();
+		});
+	});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
new file mode 100644
index 000000000..6a93d4d98
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
@@ -0,0 +1,154 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import MaterialTable from "material-table";
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import TemplateMenuService from '../../../api/TemplateMenuService';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const TextModal = styled.textarea`
+	margin-top: 20px;
+	white-space:pre;
+	background-color: ${props => props.theme.toscaTextareaBackgroundColor};
+	text-align: justify;
+	font-size: ${props => props.theme.toscaTextareaFontSize};
+	width: 100%;
+	height: 300px;
+`
+const cellStyle = { border: '1px solid black' };
+const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ViewToscalPolicyModal extends React.Component {
+
+	state = {
+		show: true,
+		content: 'Please select Tosca model to view the details',
+		selectedRow: -1,
+		toscaNames: [],
+		toscaColumns: [
+			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Micro Service Name", field: "toscaModelName",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "PolicyType", field: "policyType",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Version", field: "toscaModelRevisions[0].version",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Uploaded By", field: "userId",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never',
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			}
+		],
+		tableIcons: {
+		    FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+		    LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+		    NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+		    PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+		    ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+		    Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+		    SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
+		}
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getPolicyToscaModels = this.getToscaPolicyModels.bind(this);
+		this.handleYamlContent = this.handleYamlContent.bind(this);
+	}
+
+	componentWillMount() {
+		this.getToscaPolicyModels();
+	}
+
+	getToscaPolicyModels() {
+	    TemplateMenuService.getToscaPolicyModels().then(toscaNames => {
+			this.setState({ toscaNames: toscaNames });
+		});
+	}
+
+	handleYamlContent(event) {
+		this.setState({ content: event.target.value });
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	render() {
+		return (
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+				</Modal.Header>
+				<Modal.Body>
+					<MaterialTable
+					title={"View Tosca Policy Models"}
+					data={this.state.toscaNames}
+					columns={this.state.toscaColumns}
+					icons={this.state.tableIcons}
+					onRowClick={(event, rowData) => {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}}
+					options={{
+						headerStyle: rowHeaderStyle,
+						rowStyle: rowData => ({
+							backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
+						})
+					}}
+					/>
+					<div>
+						<TextModal value={this.state.content} onChange={this.handleYamlContent}/>
+					</div>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" onClick={this.handleClose}>Close</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
new file mode 100644
index 000000000..1445e8863
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
@@ -0,0 +1,195 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import ViewToscaPolicyModal from './ViewToscaPolicyModal';
+import { mount } from 'enzyme';
+
+
+describe('Verify ViewToscaPolicyModal', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+	});
+
+	it('Test API Successful', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewToscaPolicyModal/>);
+	});
+
+  it('Test API Exception', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: false,
+				status: 500,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewToscaPolicyModal/>);
+	});
+
+	it('Test API Rejection', () => {
+		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
+		setTimeout(
+    () =>
+      myMockFunc().catch(e => {
+        console.log(e);
+      }),
+    100
+  );
+	new Promise(resolve => setTimeout(resolve, 200));
+	const component = shallow(<ViewToscaPolicyModal/>);
+	expect(myMockFunc.mock.calls.length).toBe(1);
+	});
+
+
+	it('Test the tosca model view render method', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewToscaPolicyModal/>);
+		component.setState({ toscaNames: {
+			"index": "1",
+			"toscaModelYaml": "MTCA",
+			"toscaModelName": "DCAE_MTCAConfig",
+			"version" : "16",
+			"userId" : "aj928f",
+			"policyType" : "mtca",
+			"lastUpdatedDate" : "05-07-2019 19:09:42"
+		}
+	});
+  expect(component).toMatchSnapshot();
+  });
+
+	it('Test Table icons', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = mount(<ViewToscaPolicyModal/>);
+		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+  });
+
+	it('Test handleYamlContent', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const yamlContent = 'MTCA Tosca model details';
+		const component = shallow(<ViewToscaPolicyModal/>);
+		component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }});
+    expect(component.state('content')).toEqual(yamlContent);
+  });
+
+	it('Test handleClose', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"toscaModelYaml":"MTCA",
+						"toscaModelName":"DCAE_MTCAConfig",
+						"version":"16",
+						"userId":"aj928f",
+						"policyType":"mtca",
+						"lastUpdatedDate":"05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const historyMock = { push: jest.fn() };
+		const handleClose = jest.spyOn(ViewToscaPolicyModal.prototype,'handleClose');
+		const component = shallow(<ViewToscaPolicyModal history={historyMock} />)
+		component.find('[variant="secondary"]').prop('onClick')();
+		expect(handleClose).toHaveBeenCalledTimes(1);
+		expect(component.state('show')).toEqual(false);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		handleClose.mockClear();
+	});
+});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap
new file mode 100644
index 000000000..7dd4ee0d9
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap
@@ -0,0 +1,163 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify ViewBlueprintMicroServiceTemplatesModal Test the tosca model view render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  />
+  <ModalBody>
+    <WithStyles(Component)
+      columns={
+        Array [
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "index",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "render": [Function],
+            "title": "#",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "templateName",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Template Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "templatePolicy[0].policyModelId",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Policy Model",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "templateId",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Template ID",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "updatedBy",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded By",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "timestamp",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded Date",
+          },
+        ]
+      }
+      data={
+        Object {
+          "content": "MTCA version 1",
+          "index": "1",
+          "templateId": "aaaa_bbbb_cccc",
+          "templateName": "MTCA",
+          "templatePolicy.policyModelId": "onap.policies.monitoring.docker.mtca.app",
+          "timestamp": "2019-09-06 19:09:42",
+          "updatedBy": "tester",
+        }
+      }
+      icons={
+        Object {
+          "FirstPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "LastPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "NextPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "PreviousPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ResetSearch": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Search": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "SortArrow": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+        }
+      }
+      onRowClick={[Function]}
+      options={
+        Object {
+          "headerStyle": Object {
+            "backgroundColor": "#ddd",
+            "border": "1px solid black",
+            "fontSize": "15pt",
+            "text": "bold",
+          },
+          "rowStyle": [Function],
+        }
+      }
+      title="View Blueprint MicroService Templates"
+    />
+    <div>
+      <styled.textarea
+        onChange={[Function]}
+        value="Please select Blue print template to view the details"
+      />
+    </div>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+      variant="secondary"
+    >
+      Close
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
new file mode 100644
index 000000000..e7294c080
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
@@ -0,0 +1,163 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  />
+  <ModalBody>
+    <WithStyles(Component)
+      columns={
+        Array [
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "index",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "render": [Function],
+            "title": "#",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "toscaModelName",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Micro Service Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "policyType",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "PolicyType",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "toscaModelRevisions[0].version",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Version",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "userId",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded By",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "lastUpdatedDate",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Uploaded Date",
+          },
+        ]
+      }
+      data={
+        Object {
+          "index": "1",
+          "lastUpdatedDate": "05-07-2019 19:09:42",
+          "policyType": "mtca",
+          "toscaModelName": "DCAE_MTCAConfig",
+          "toscaModelYaml": "MTCA",
+          "userId": "aj928f",
+          "version": "16",
+        }
+      }
+      icons={
+        Object {
+          "FirstPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "LastPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "NextPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "PreviousPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ResetSearch": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Search": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "SortArrow": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+        }
+      }
+      onRowClick={[Function]}
+      options={
+        Object {
+          "headerStyle": Object {
+            "backgroundColor": "#ddd",
+            "border": "1px solid black",
+            "fontSize": "15pt",
+            "text": "bold",
+          },
+          "rowStyle": [Function],
+        }
+      }
+      title="View Tosca Policy Models"
+    />
+    <div>
+      <styled.textarea
+        onChange={[Function]}
+        value="Please select Tosca model to view the details"
+      />
+    </div>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+      variant="secondary"
+    >
+      Close
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js b/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js
deleted file mode 100644
index fbfb4a78c..000000000
--- a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React, { forwardRef } from 'react'
-import MaterialTable from "material-table";
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateMenuService';
-import ArrowUpward from '@material-ui/icons/ArrowUpward';
-import ChevronLeft from '@material-ui/icons/ChevronLeft';
-import ChevronRight from '@material-ui/icons/ChevronRight';
-import Clear from '@material-ui/icons/Clear';
-import FirstPage from '@material-ui/icons/FirstPage';
-import LastPage from '@material-ui/icons/LastPage';
-import Search from '@material-ui/icons/Search';
-
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-
-const vtmCellStyle = { border: '1px solid black' };
-const vtmHeaderStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
-const vtmRowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
-
-export default class ViewToscalModal extends React.Component {
-
-	state = {
-		show: true,
-		content: 'Please select Tosca model to view the details',
-		selectedRow: -1,
-		toscaNames: [],
-		toscaColumns: [
-			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Micro Service Name", field: "toscaModelName",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "PolicyType", field: "policyType",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Version", field: "version",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Uploaded By", field: "userId",
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			},
-			{ title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never',
-				cellStyle: vtmCellStyle,
-				headerStyle: vtmHeaderStyle
-			}
-		],
-		tableIcons: {
-		    FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
-		    LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
-		    NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-		    PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
-		    ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-		    Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
-		    SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
-		}
-	};
-
-	constructor(props, context) {
-		super(props, context);
-		this.handleClose = this.handleClose.bind(this);
-		this.getToscaModels = this.getToscaModels.bind(this);
-		this.handleYamlContent = this.handleYamlContent.bind(this);
-	}
-
-	componentWillMount() {
-		this.getToscaModels();
-	}
-
-	getToscaModels() {
-	    TemplateMenuService.getToscaModels().then(toscaNames => {
-			this.setState({ toscaNames: toscaNames });
-		});
-	}
-
-	handleYamlContent(event) {
-		this.setState({ content: event.target.value });
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-	}
-
-	render() {
-		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
-				<Modal.Header closeButton>
-					<Modal.Title className="title">View Tosca Model</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<MaterialTable
-					title={"View ToscaModel"}
-					data={this.state.toscaNames}
-					columns={this.state.toscaColumns}
-					icons={this.state.tableIcons}
-					onRowClick={(event, rowData) => {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}}
-					options={{
-						headerStyle: vtmRowHeaderStyle,
-						rowStyle: rowData => ({
-							backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
-						})
-					}}
-					/>
-					<div>
-						<textarea value={this.state.content} onChange={this.handleYamlContent}/>
-					</div>
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" onClick={this.handleClose}>Close</Button>
-				</Modal.Footer>
-			</ModalStyled>
-		);
-	}
-}
diff --git a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js b/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js
deleted file mode 100644
index 4dbe37615..000000000
--- a/ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import ViewToscaModal from './ViewToscaModal';
-import { mount } from 'enzyme';
-
-
-describe('Verify ViewToscaModal', () => {
-	beforeEach(() => {
-		fetch.resetMocks();
-		fetch.mockImplementation(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"index": "1",
-  					"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
-	});
-
-	it('Test the tosca model view render method', () => {
-		const component = shallow(<ViewToscaModal/>);
-		component.setState({ toscaNames: {
-			"index": "1",
-			"toscaModelYaml": "MTCA",
-			"toscaModelName": "DCAE_MTCAConfig",
-			"version" : "16",
-			"userId" : "aj928f",
-			"policyType" : "mtca",
-			"lastUpdatedDate" : "05-07-2019 19:09:42"
-		}
-	});
-    expect(component).toMatchSnapshot();
-  });
-
-	it('Test Table icons', () => {
-		const component = mount(<ViewToscaModal/>);
-		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
-
-  });
-
-	it('Test handleYamlContent', () => {
-		const yamlContent = 'MTCA Tosca model details';
-		const component = shallow(<ViewToscaModal/>);
-		component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }});
-    expect(component.state('content')).toEqual(yamlContent);
-  });
-
-	it('Test handleClose', () => {
-		const historyMock = { push: jest.fn() };
-    const handleClose = jest.spyOn(ViewToscaModal.prototype,'handleClose');
-    const component = shallow(<ViewToscaModal history={historyMock} />)
-    component.find('[variant="secondary"]').prop('onClick')();
-    expect(handleClose).toHaveBeenCalledTimes(1);
-    expect(component.state('show')).toEqual(false);
-    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    handleClose.mockClear();
-  });
-});
diff --git a/ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap b/ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap
deleted file mode 100644
index 3523adad3..000000000
--- a/ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap
+++ /dev/null
@@ -1,169 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify ViewToscaModal Test the tosca model view render method 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="xl"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle
-      className="title"
-    >
-      View Tosca Model
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <WithStyles(Component)
-      columns={
-        Array [
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "index",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "render": [Function],
-            "title": "#",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "toscaModelName",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Micro Service Name",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "policyType",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "PolicyType",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "version",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Version",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "userId",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Uploaded By",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "editable": "never",
-            "field": "lastUpdatedDate",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Uploaded Date",
-          },
-        ]
-      }
-      data={
-        Object {
-          "index": "1",
-          "lastUpdatedDate": "05-07-2019 19:09:42",
-          "policyType": "mtca",
-          "toscaModelName": "DCAE_MTCAConfig",
-          "toscaModelYaml": "MTCA",
-          "userId": "aj928f",
-          "version": "16",
-        }
-      }
-      icons={
-        Object {
-          "FirstPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "LastPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "NextPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "PreviousPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "ResetSearch": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Search": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "SortArrow": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-        }
-      }
-      onRowClick={[Function]}
-      options={
-        Object {
-          "headerStyle": Object {
-            "backgroundColor": "#ddd",
-            "border": "1px solid black",
-            "fontSize": "15pt",
-            "text": "bold",
-          },
-          "rowStyle": [Function],
-        }
-      }
-      title="View ToscaModel"
-    />
-    <div>
-      <textarea
-        onChange={[Function]}
-        value="Please select Tosca model to view the details"
-      />
-    </div>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-      variant="secondary"
-    >
-      Close
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index bbfa82a13..e211b0eaf 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -88,7 +88,8 @@ export default class MenuBar extends React.Component {
 
 				<Navbar.Collapse>
 					<StyledNavDropdown title="Template">
-							<NavDropdown.Item as={StyledLink} to="/viewToscaModal">View Tosca Model</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Policy Models</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/viewBlueprintMicroServiceTemplatesModal">View Blueprint MicroService Templates</NavDropdown.Item>
 					</StyledNavDropdown>
 					<StyledNavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 9082eccd8..1670124cc 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -11,7 +11,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -44,7 +44,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -52,9 +52,60 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={false}
-      to="/viewToscaModal"
+      to="/viewToscaPolicyModal"
     >
-      View Tosca Model
+      View Tosca Policy Models
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-eNQAEJ",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-eNQAEJ",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/viewBlueprintMicroServiceTemplatesModal"
+    >
+      View Blueprint MicroService Templates
     </DropdownItem>
   </Styled(NavDropdown)>
   <Styled(NavDropdown)
@@ -66,7 +117,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -99,7 +150,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -117,7 +168,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -150,7 +201,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -168,7 +219,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -201,7 +252,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -223,7 +274,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -256,7 +307,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -274,7 +325,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -307,7 +358,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -325,7 +376,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -358,7 +409,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -376,7 +427,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -409,7 +460,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -427,7 +478,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -460,7 +511,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -478,7 +529,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -511,7 +562,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -533,7 +584,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -566,7 +617,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -599,7 +650,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-dxgOiQ",
+            "componentId": "sc-eNQAEJ",
             "isStatic": false,
             "rules": Array [
               "
@@ -632,7 +683,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-dxgOiQ",
+          "styledComponentId": "sc-eNQAEJ",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index bb41bc192..3656f9e98 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -86,9 +86,12 @@ export const DefaultClampTheme = {
 	loopViewerFontColor: 'yellow',
 	loopViewerHeaderBackgroundColor: '#337ab7',
 	loopViewerHeaderFontColor: 'white',
-	
+
 	menuBackgroundColor: 'white',
 	menuFontColor: 'black',
 	menuHighlightedBackgroundColor: '#337ab7',
-	menuHighlightedFontColor: 'white'
+	menuHighlightedFontColor: 'white',
+
+	toscaTextareaBackgroundColor: '#E8E8E8',
+	toscaTextareaFontSize: '13px'
 };
-- 
cgit 1.2.3-korg


From 9047defa7549ebd9a84cef3e10bbfd90f068097b Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Fri, 13 Dec 2019 11:50:24 +0100
Subject: Update deploymentParameters

Update deploymentParameters to allow a map of <msName, deploymentParams>
instead of a single deploymentParam

Issue-ID: CLAMP-569, CLAMP-570
Change-Id: I6abc4fe193157644bd6abe1c893a1416cadec988
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../clamp/clds/model/dcae/DcaeInventoryCache.java  |   5 +
 .../java/org/onap/clamp/loop/CsarInstaller.java    |  36 +-----
 .../onap/clamp/loop/deploy/DeployParameters.java   | 127 +++++++++++++++++++++
 .../clamp/loop/deploy/DeployParametersTest.java    |  86 ++++++++++++++
 .../sdc/expected-result/deployment-parameters.json |  43 +++++++
 .../src/components/dialogs/Loop/DeployLoopModal.js |  35 ++++--
 .../dialogs/Loop/DeployLoopModal.test.js           |   9 +-
 .../__snapshots__/DeployLoopModal.test.js.snap     |  68 ++++++-----
 8 files changed, 336 insertions(+), 73 deletions(-)
 create mode 100644 src/main/java/org/onap/clamp/loop/deploy/DeployParameters.java
 create mode 100644 src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java
 create mode 100644 src/test/resources/example/sdc/expected-result/deployment-parameters.json

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java b/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java
index b383c18bf..558102c5d 100644
--- a/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java
+++ b/src/main/java/org/onap/clamp/clds/model/dcae/DcaeInventoryCache.java
@@ -38,6 +38,11 @@ public class DcaeInventoryCache {
 
     private Map<String, Set<DcaeInventoryResponse>> blueprintsMap = new ConcurrentHashMap<>();
 
+    /**
+     * Add Dcae inventory response.
+     * 
+     * @param inventoryResponse the Dcae inventory response
+     */
     public void addDcaeInventoryResponse(DcaeInventoryResponse inventoryResponse) {
         Set<DcaeInventoryResponse> responsesSet = blueprintsMap.get(inventoryResponse.getAsdcServiceId());
         if (responsesSet == null) {
diff --git a/src/main/java/org/onap/clamp/loop/CsarInstaller.java b/src/main/java/org/onap/clamp/loop/CsarInstaller.java
index 3f69e116c..371f88e8b 100644
--- a/src/main/java/org/onap/clamp/loop/CsarInstaller.java
+++ b/src/main/java/org/onap/clamp/loop/CsarInstaller.java
@@ -45,6 +45,7 @@ import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
 import org.onap.clamp.clds.sdc.controller.installer.MicroService;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.drawing.SvgFacade;
+import org.onap.clamp.loop.deploy.DeployParameters;
 import org.onap.clamp.loop.service.Service;
 import org.onap.clamp.loop.service.ServiceRepository;
 import org.onap.clamp.policy.Policy;
@@ -240,9 +241,7 @@ public class CsarInstaller {
     }
 
     private JsonObject createGlobalPropertiesJson(BlueprintArtifact blueprintArtifact, Loop newLoop) {
-        JsonObject globalProperties = new JsonObject();
-        globalProperties.add("dcaeDeployParameters", getAllBlueprintParametersInJson(blueprintArtifact, newLoop));
-        return globalProperties;
+        return new DeployParameters(blueprintArtifact, newLoop).getDeploymentParametersinJson();
     }
 
     private static JsonObject createVfModuleProperties(CsarHandler csar) {
@@ -280,24 +279,6 @@ public class CsarInstaller {
         return resourcesProp;
     }
 
-    private JsonObject getAllBlueprintParametersInJson(BlueprintArtifact blueprintArtifact, Loop newLoop) {
-        JsonObject node = new JsonObject();
-        Yaml yaml = new Yaml();
-        Map<String, Object> inputsNodes = ((Map<String, Object>) ((Map<String, Object>) yaml
-                .load(blueprintArtifact.getDcaeBlueprint())).get("inputs"));
-        inputsNodes.entrySet().stream().filter(e -> !e.getKey().contains("policy_id")).forEach(elem -> {
-            Object defaultValue = ((Map<String, Object>) elem.getValue()).get("default");
-            if (defaultValue != null) {
-                addPropertyToNode(node, elem.getKey(), defaultValue);
-            } else {
-                node.addProperty(elem.getKey(), "");
-            }
-        });
-        // For Dublin only one micro service is expected
-        node.addProperty("policy_id", ((MicroServicePolicy) newLoop.getMicroServicePolicies().toArray()[0]).getName());
-        return node;
-    }
-
     /**
      * ll get the latest version of the artifact (version can be specified to DCAE
      * call).
@@ -311,17 +292,4 @@ public class CsarInstaller {
                 blueprintArtifact.getResourceAttached().getResourceInvariantUUID());
     }
 
-    private void addPropertyToNode(JsonObject node, String key, Object value) {
-        if (value instanceof String) {
-            node.addProperty(key, (String) value);
-        } else if (value instanceof Number) {
-            node.addProperty(key, (Number) value);
-        } else if (value instanceof Boolean) {
-            node.addProperty(key, (Boolean) value);
-        } else if (value instanceof Character) {
-            node.addProperty(key, (Character) value);
-        } else {
-            node.addProperty(key, JsonUtils.GSON.toJson(value));
-        }
-    }
 }
diff --git a/src/main/java/org/onap/clamp/loop/deploy/DeployParameters.java b/src/main/java/org/onap/clamp/loop/deploy/DeployParameters.java
new file mode 100644
index 000000000..c994af7c0
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/deploy/DeployParameters.java
@@ -0,0 +1,127 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop.deploy;
+
+import com.google.gson.JsonObject;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+
+import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.loop.Loop;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.yaml.snakeyaml.Yaml;
+
+public class DeployParameters  {
+
+    private LinkedHashMap<String, JsonObject> deploymentParamMap = new LinkedHashMap<String, JsonObject>();
+
+    /**
+     * Constructor.
+     * 
+     * @param blueprintArtifactList A list of blueprint artifacts
+     * @param loop The loop object
+     */
+    public DeployParameters(LinkedHashSet<BlueprintArtifact> blueprintArtifactList, Loop loop) {
+        this.init(blueprintArtifactList, loop);
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param blueprintArtifact One blueprint artifact
+     * @param loop The loop object
+     */
+    public DeployParameters(BlueprintArtifact blueprintArtifact, Loop loop) {
+        LinkedHashSet<BlueprintArtifact> blueprintArtifactList = new LinkedHashSet<BlueprintArtifact>();
+        blueprintArtifactList.add(blueprintArtifact);
+        this.init(blueprintArtifactList, loop);
+    }
+
+    private void init(LinkedHashSet<BlueprintArtifact> blueprintArtifactList, Loop loop) {
+        String microServiceName = ((MicroServicePolicy) loop.getMicroServicePolicies().toArray()[0]).getName();
+        // Add index to the microservice name from the 2nd blueprint artifact for now.
+        // Update the microservice names, when able to link the microserivce <-> blueprint in the future
+        int index = 0;
+        for (BlueprintArtifact blueprintArtifact: blueprintArtifactList) {
+            if (index > 0) {
+                deploymentParamMap.put(microServiceName + index, 
+                        generateDeployParameter(blueprintArtifact, microServiceName));
+            } else {
+                deploymentParamMap.put(microServiceName, generateDeployParameter(blueprintArtifact, microServiceName));
+            }
+            index++;
+        }
+    }
+
+    private JsonObject generateDeployParameter(BlueprintArtifact blueprintArtifact, String microServiceName) {
+        JsonObject deployJsonBody = new JsonObject();
+        Yaml yaml = new Yaml();
+        Map<String, Object> inputsNodes = ((Map<String, Object>) ((Map<String, Object>) yaml
+            .load(blueprintArtifact.getDcaeBlueprint())).get("inputs"));
+        inputsNodes.entrySet().stream().filter(e -> !e.getKey().contains("policy_id")).forEach(elem -> {
+            Object defaultValue = ((Map<String, Object>) elem.getValue()).get("default");
+            if (defaultValue != null) {
+                addPropertyToNode(deployJsonBody, elem.getKey(), defaultValue);
+            } else {
+                deployJsonBody.addProperty(elem.getKey(), "");
+            }
+        });
+        // For Dublin only one micro service is expected
+        deployJsonBody.addProperty("policy_id", microServiceName);
+        return deployJsonBody;
+    }
+
+    private void addPropertyToNode(JsonObject node, String key, Object value) {
+        if (value instanceof String) {
+            node.addProperty(key, (String) value);
+        } else if (value instanceof Number) {
+            node.addProperty(key, (Number) value);
+        } else if (value instanceof Boolean) {
+            node.addProperty(key, (Boolean) value);
+        } else if (value instanceof Character) {
+            node.addProperty(key, (Character) value);
+        } else {
+            node.addProperty(key, JsonUtils.GSON.toJson(value));
+        }
+    }
+
+    /**
+     * Convert the object in Json.
+     *
+     * @return The deploymentParameters in Json
+     */
+    public JsonObject getDeploymentParametersinJson() {
+        JsonObject globalProperties = new JsonObject();
+        JsonObject deployParamJson = new JsonObject();
+        for (Map.Entry<String, JsonObject> mapElement: deploymentParamMap.entrySet()) {
+            deployParamJson.add(mapElement.getKey(), mapElement.getValue());
+        }
+        globalProperties.add("dcaeDeployParameters", deployParamJson);
+        return globalProperties;
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java b/src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java
new file mode 100644
index 000000000..8834ef667
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Modifications copyright (c) 2019 Nokia
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop.deploy;
+
+import com.google.gson.JsonObject;
+
+import java.io.IOException;
+import java.util.LinkedHashSet;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
+import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.loop.Loop;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+
+public class DeployParametersTest {
+
+    private BlueprintArtifact buildFakeBuildprintArtifact(String blueprintFilePath) throws IOException {
+        BlueprintArtifact blueprintArtifact = Mockito.mock(BlueprintArtifact.class);
+        Mockito.when(blueprintArtifact.getDcaeBlueprint())
+                .thenReturn(ResourceFileUtil.getResourceAsString(blueprintFilePath));
+        return blueprintArtifact;
+    }
+
+    private LinkedHashSet<BlueprintArtifact> buildFakeCsarHandler() throws IOException, SdcToscaParserException {
+
+        LinkedHashSet<BlueprintArtifact> blueprintSet = new LinkedHashSet<BlueprintArtifact>();
+
+        BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact("example/sdc/blueprint-dcae/tca.yaml");
+
+        blueprintSet.add(blueprintArtifact);
+        // Create fake blueprint artifact 2 on resource2
+        blueprintArtifact = buildFakeBuildprintArtifact("example/sdc/blueprint-dcae/tca_2.yaml");
+        blueprintSet.add(blueprintArtifact);
+
+        // Create fake blueprint artifact 3 on resource 1 so that it's possible to
+        // test multiple CL deployment per Service/vnf
+        blueprintArtifact = buildFakeBuildprintArtifact("example/sdc/blueprint-dcae/tca_3.yaml");
+        blueprintSet.add(blueprintArtifact);
+        return blueprintSet;
+    }
+
+    @Test
+    public void getDeploymentParametersinJsonTest() throws IOException, SdcToscaParserException {
+        Loop loop = Mockito.mock(Loop.class);
+        MicroServicePolicy umService = Mockito.mock(MicroServicePolicy.class);
+        LinkedHashSet<MicroServicePolicy> umServiceSet = new LinkedHashSet<MicroServicePolicy>();
+        Mockito.when(umService.getName()).thenReturn("testName");
+        umServiceSet.add(umService);
+        Mockito.when(loop.getMicroServicePolicies()).thenReturn(umServiceSet);
+
+        DeployParameters deployParams = new DeployParameters(buildFakeCsarHandler(), loop);
+        JsonObject paramJson = deployParams.getDeploymentParametersinJson();
+
+        Assert.assertEquals(JsonUtils.GSON_JPA_MODEL.toJson(paramJson), 
+            ResourceFileUtil.getResourceAsString("example/sdc/expected-result/deployment-parameters.json"));
+    }
+}
diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters.json b/src/test/resources/example/sdc/expected-result/deployment-parameters.json
new file mode 100644
index 000000000..2e10ac37e
--- /dev/null
+++ b/src/test/resources/example/sdc/expected-result/deployment-parameters.json
@@ -0,0 +1,43 @@
+{
+  "dcaeDeployParameters": {
+    "testName": {
+      "location_id": "",
+      "service_id": "",
+      "policy_id": "testName"
+    },
+    "testName1": {
+      "aaiEnrichmentHost": "aai.onap.svc.cluster.local",
+      "aaiEnrichmentPort": "8443",
+      "enableAAIEnrichment": true,
+      "dmaap_host": "message-router.onap",
+      "dmaap_port": "3904",
+      "enableRedisCaching": false,
+      "redisHosts": "dcae-redis.onap.svc.cluster.local:6379",
+      "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1",
+      "consul_host": "consul-server.onap",
+      "consul_port": "8500",
+      "cbs_host": "config-binding-servicel",
+      "cbs_port": "10000",
+      "external_port": "32012",
+      "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+      "policy_id": "testName"
+    },
+    "testName2": {
+      "aaiEnrichmentHost": "aai.onap.svc.cluster.local",
+      "aaiEnrichmentPort": "8443",
+      "enableAAIEnrichment": true,
+      "dmaap_host": "message-router.onap.svc.cluster.local",
+      "dmaap_port": "3904",
+      "enableRedisCaching": false,
+      "redisHosts": "dcae-redis.onap.svc.cluster.local:6379",
+      "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest",
+      "consul_host": "consul-server.onap.svc.cluster.local",
+      "consul_port": "8500",
+      "cbs_host": "config-binding-service.dcae.svc.cluster.local",
+      "cbs_port": "10000",
+      "external_port": "32012",
+      "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+      "policy_id": "testName"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 34304d611..9c9a16feb 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -26,6 +26,8 @@ import LoopService from '../../../api/LoopService';
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import Form from 'react-bootstrap/Form';
+import Tabs from 'react-bootstrap/Tabs';
+import Tab from 'react-bootstrap/Tab';
 import styled from 'styled-components';
 
 const ModalStyled = styled(Modal)`
@@ -55,6 +57,14 @@ export default class DeployLoopModal extends React.Component {
 			show: true
 		});
 	}
+	componentDidMount() {
+		const deployJsonList = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		Object.keys(deployJsonList)
+			.filter((obj) => Object.keys(deployJsonList).indexOf(obj) === 0)
+			.map(obj =>
+				this.setState({key: obj})
+		);
+	}
 	handleClose(){
 		this.props.history.push('/');
 	}
@@ -89,34 +99,43 @@ export default class DeployLoopModal extends React.Component {
 	}
 	handleChange(event) {
 		let deploymentParam = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
-		deploymentParam[event.target.name] = event.target.value;
+		deploymentParam[this.state.key][event.target.name] = event.target.value;
 
 		this.setState({temporaryPropertiesJson:{dcaeDeployParameters: deploymentParam}});
 	}
-	renderDeployParam() {
+	renderDeployParamTabs() {
 		if (typeof (this.state.temporaryPropertiesJson) === "undefined") {
 			 return "";
 		}
 
-		const deployJson = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		const deployJsonList = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		var indents = [];
+		Object.keys(deployJsonList).map((item,key) =>
+			indents.push(<Tab eventKey={item} title={item}>
+				{this.renderDeployParam(deployJsonList[item])}
+				</Tab>)
+		);
+		return indents;
+	}
+
+	renderDeployParam(deployJson) {
 		var indents = [];
 		Object.keys(deployJson).map((item,key) =>
 		indents.push(<FormStyled>
 				<Form.Label>{item}</Form.Label>
 				<Form.Control type="text" name={item} onChange={this.handleChange} defaultValue={deployJson[item]}></Form.Control>
 			</FormStyled>));
-
-			return indents;
+		return indents;
 	}
-
-
 	render() {
 		return (
 					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
 						<Modal.Header closeButton>
 							<Modal.Title>Deployment parameters</Modal.Title>
 						</Modal.Header>
-						{this.renderDeployParam()}
+						<Tabs id="controlled-tab-example" activeKey={this.state.key} onSelect={key => this.setState({ key })}>
+						{this.renderDeployParamTabs()}
+						</Tabs>
 						<Modal.Footer>
 							<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
 							<Button variant="primary" type="submit" onClick={this.handleSave}>Deploy</Button>
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
index 2ebb8c067..5f1dcd5fc 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
@@ -32,8 +32,10 @@ describe('Verify DeployLoopModal', () => {
 		"name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
 		"globalPropertiesJson": {
 			"dcaeDeployParameters": {
-				"location_id": "",
-				"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+				"testMs": {
+					"location_id": "",
+					"policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+				}
 			}
 		}
 	});
@@ -101,10 +103,9 @@ describe('Verify DeployLoopModal', () => {
 	it('Onchange event', () => {
 		const event = { target: { name: "location_id", value: "testLocation"} };
 		const component = shallow(<DeployLoopModal loopCache={loopCache}/>);
-		const forms = component.find('StateManager');
 
 		component.find('[name="location_id"]').simulate('change', event);
 		component.update();
-		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.location_id).toEqual("testLocation");
+		expect(component.state('temporaryPropertiesJson').dcaeDeployParameters.testMs.location_id).toEqual("testLocation");
 	});
 });
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
index bf06965be..0f86aa340 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
@@ -14,34 +14,48 @@ exports[`Verify DeployLoopModal Test the render method 1`] = `
       Deployment parameters
     </ModalTitle>
   </ModalHeader>
-  <Styled(FormGroup)>
-    <FormLabel
-      column={false}
-      srOnly={false}
-    >
-      location_id
-    </FormLabel>
-    <FormControl
-      defaultValue=""
-      name="location_id"
-      onChange={[Function]}
-      type="text"
-    />
-  </Styled(FormGroup)>
-  <Styled(FormGroup)>
-    <FormLabel
-      column={false}
-      srOnly={false}
+  <Tabs
+    activeKey="testMs"
+    id="controlled-tab-example"
+    mountOnEnter={false}
+    onSelect={[Function]}
+    unmountOnExit={false}
+    variant="tabs"
+  >
+    <Tab
+      eventKey="testMs"
+      title="testMs"
     >
-      policy_id
-    </FormLabel>
-    <FormControl
-      defaultValue="TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-      name="policy_id"
-      onChange={[Function]}
-      type="text"
-    />
-  </Styled(FormGroup)>
+      <Styled(FormGroup)>
+        <FormLabel
+          column={false}
+          srOnly={false}
+        >
+          location_id
+        </FormLabel>
+        <FormControl
+          defaultValue=""
+          name="location_id"
+          onChange={[Function]}
+          type="text"
+        />
+      </Styled(FormGroup)>
+      <Styled(FormGroup)>
+        <FormLabel
+          column={false}
+          srOnly={false}
+        >
+          policy_id
+        </FormLabel>
+        <FormControl
+          defaultValue="TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+          name="policy_id"
+          onChange={[Function]}
+          type="text"
+        />
+      </Styled(FormGroup)>
+    </Tab>
+  </Tabs>
   <ModalFooter>
     <Button
       active={false}
-- 
cgit 1.2.3-korg


From c488fed6bb0d06acad9aefda54e77c5c687eb941 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Thu, 19 Dec 2019 11:58:45 +0100
Subject: Update op policy UI

Change the React UI accordingly so that we read OperationalPolicy Object


Issue-ID: CLAMP-583
Change-Id: Ifd14a7eb115dc75acb35f1e7591ee383066a45f1
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/api/LoopCache.js                      |  8 ++++++-
 ui-react/src/api/LoopCache.test.js                 | 25 +++++++++++++++++++++-
 ui-react/src/api/LoopCache_mokeLoopJsonCache.json  |  3 +++
 .../OperationalPolicy/OperationalPolicyModal.js    |  2 +-
 .../OperationalPolicyModal.test.js                 |  6 +++---
 5 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 95eb9310e..c73ed62b5 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -53,13 +53,19 @@ export default class LoopCache {
 	}
 	
 	getOperationalPolicyJsonSchema() {
-		return this.loopJsonCache["operationalPolicySchema"];
+		return this.loopJsonCache["operationalPolicies"]["0"]["jsonRepresentation"];
 	}
 
 	getOperationalPolicies() {
 		return this.loopJsonCache["operationalPolicies"];
 	}
 
+	getOperationalPoliciesNoJsonSchema() {
+		var operationalPolicies = JSON.parse(JSON.stringify(this.loopJsonCache["operationalPolicies"]));
+		delete operationalPolicies[0]["jsonRepresentation"];
+		return operationalPolicies;
+	}
+
 	getGlobalProperties() {
 		return this.loopJsonCache["globalPropertiesJson"];
 	}
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index f67bc0aa0..471fa4d71 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -49,13 +49,36 @@ describe('Verify LoopCache functions', () => {
           "operational_policy": {
             "controlLoop": {},
             "policies": []
+          }
+        },
+       "jsonRepresentation": {
+        "schema": {}
+      }
+      }];
+      expect(loopCache.getOperationalPolicies()).toStrictEqual(opPolicy);
+    });
 
+    it('getOperationalPoliciesNoJsonSchema', () => {
+      const opPolicy = [{
+        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+        "configurationsJson": {
+          "guard_policies": {},
+          "operational_policy": {
+            "controlLoop": {},
+            "policies": []
           }
         }
       }];
-      expect(loopCache.getOperationalPolicies()).toStrictEqual(opPolicy);
+      expect(loopCache.getOperationalPoliciesNoJsonSchema()).toStrictEqual(opPolicy);
     });
 
+    it('getOperationalPolicyJsonSchema', () => {
+      const jsonSchema = {
+          "schema": {}
+      };
+
+      expect(loopCache.getOperationalPolicyJsonSchema()).toStrictEqual(jsonSchema);
+    });
     it('getGlobalProperties', () => {
       const globelProp = {
         "dcaeDeployParameters": {
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index c84b5b691..087ab5d45 100644
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -93,6 +93,9 @@
           "controlLoop": {},
           "policies": []
         }
+      },
+      "jsonRepresentation": {
+        "schema": {}
       }
     }
   ],
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 5c5f0241a..c7363f6e5 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -114,7 +114,7 @@ export default class OperationalPolicyModal extends React.Component {
 			console.error("NO Operational policy schema found");
 			return;
 		}
-		var operationalPoliciesData = this.state.loopCache.getOperationalPolicies();
+		var operationalPoliciesData = this.state.loopCache.getOperationalPoliciesNoJsonSchema();
 
 		this.setState({
 				jsonEditor: new JSONEditor(document.getElementById("editor"),
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
index 9c7da3108..522a3f681 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
@@ -46,9 +46,9 @@ describe('Verify OperationalPolicyModal', () => {
                         "controlLoop": {},
                         "policies": []
                     }
-                }
-             }],
-            "operationalPolicySchema": {"schema": {}}
+                },
+                "jsonRepresentation" : {"schema": {}}
+             }]
     });
     const historyMock = { push: jest.fn() };
     const flushPromises = () => new Promise(setImmediate);
-- 
cgit 1.2.3-korg


From 2f5b2cdb2a7650d6bd41d1b20ec0813cad7989ed Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 6 Jan 2020 16:13:46 +0100
Subject: Add button to refresh op policy UI

Add the button on Operational Policy UI to refresh the json
representation.


Issue-ID: CLAMP-584
Change-Id: I3ae6ca0207bf9ca84f1e1dc6b3aed42b90298d8e
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js                             |  2 +-
 ui-react/src/api/LoopService.js                    | 23 ++++++++++++++++++
 .../OperationalPolicy/OperationalPolicyModal.js    | 28 ++++++++++++++++++++--
 .../OperationalPolicyModal.test.js                 | 15 +++++++++++-
 4 files changed, 64 insertions(+), 4 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 58fbce635..eb4ff6a50 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -252,7 +252,7 @@ export default class LoopUI extends React.Component {
 				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
 				<Route path="/viewBlueprintMicroServiceTemplatesModal" render={(routeProps) => (<ViewBlueprintMicroServiceTemplatesModal {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index e2e234821..ead2cf80c 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -152,4 +152,27 @@ export default class LoopService {
 				return "";
 			});
 	}
+
+	static refreshOpPolicyJson(loopName) {
+		return fetch('/restservices/clds/v2/loop/refreshOpPolicyJsonSchema/' + loopName, {
+			method: 'PUT',
+			headers: {
+				"Content-Type": "application/json"
+			},
+			credentials: 'same-origin'
+		})
+			.then(function (response) {
+				console.debug("Refresh Operational Policy Json Schema response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("Refresh Operational Policy Json Schema query failed");
+					return {};
+				}
+			})
+			.catch(function (error) {
+				console.error("Refresh Operational Policy Json Schema error received", error);
+				return {};
+			});
+	}
 }
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index c7363f6e5..dc7c0a489 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -25,6 +25,7 @@ import React from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
+import LoopCache from '../../../api/LoopCache';
 import LoopService from '../../../api/LoopService';
 import JSONEditor from '@json-editor/json-editor';
 
@@ -45,6 +46,7 @@ export default class OperationalPolicyModal extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
 		this.renderJsonEditor = this.renderJsonEditor.bind(this);
+		this.handleRefresh = this.handleRefresh.bind(this);
 		this.setDefaultJsonEditorOptions();
 	}
 
@@ -122,6 +124,25 @@ export default class OperationalPolicyModal extends React.Component {
 			})
 	}
 
+	handleRefresh() {
+		LoopService.refreshOpPolicyJson(this.state.loopCache.getLoopName()).then(data => {
+			var newLoopCache =  new LoopCache(data);
+			var schema_json = newLoopCache.getOperationalPolicyJsonSchema();
+			var operationalPoliciesData = newLoopCache.getOperationalPoliciesNoJsonSchema();
+			document.getElementById("editor").innerHTML = "";
+			this.setState({
+				loopCache: newLoopCache,
+				jsonEditor: new JSONEditor(document.getElementById("editor"),
+					{ schema: schema_json.schema, startval: operationalPoliciesData })
+			})
+			this.props.updateLoopFunction(data);
+			
+		})
+		.catch(error => {
+			console.error("Error while refreshing the Operational Policy Json Representation");
+		});
+	}
+
 	render() {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
@@ -135,10 +156,13 @@ export default class OperationalPolicyModal extends React.Component {
 				<Modal.Footer>
 					<Button variant="secondary" onClick={this.handleClose}>
 						Close
-	            </Button>
+					</Button>
+					<Button variant="secondary" onClick={this.handleRefresh}>
+						Refresh
+					</Button>
 					<Button variant="primary" onClick={this.handleSave}>
 						Save Changes
-	            </Button>
+					</Button>
 				</Modal.Footer>
 			</ModalStyled>
 
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
index 522a3f681..c10c6ff0a 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
@@ -57,7 +57,7 @@ describe('Verify OperationalPolicyModal', () => {
       const handleClose = jest.spyOn(OperationalPolicyModal.prototype,'handleClose');
       const component = mount(<OperationalPolicyModal history={historyMock} loopCache={loopCache}/>)
 
-      component.find('[variant="secondary"]').prop('onClick')();
+      component.find('[variant="secondary"]').get(0).props.onClick();
 
       expect(handleClose).toHaveBeenCalledTimes(1);
       expect(component.state('show')).toEqual(false);
@@ -78,4 +78,17 @@ describe('Verify OperationalPolicyModal', () => {
         expect(component.state('show')).toEqual(false);
         expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     });
+
+    it('Test handleRefresh', async () => {
+        const updateLoopFunction = jest.fn();
+        const handleRefresh = jest.spyOn(OperationalPolicyModal.prototype,'handleRefresh');
+        const component = mount(<OperationalPolicyModal loopCache={loopCache} updateLoopFunction={updateLoopFunction} />)
+
+        component.find('[variant="secondary"]').get(1).props.onClick();
+        await flushPromises();
+        component.update();
+
+        expect(handleRefresh).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(true);
+    });
 });
\ No newline at end of file
-- 
cgit 1.2.3-korg


From 8c2ce6065ddd8405ef3faa99969453e080b63f55 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 13 Jan 2020 10:27:54 +0100
Subject: Update based on comment

Initialize the state attribute in the constructor.

Issue-ID: CLAMP-569
Change-Id: Iabd739ce2c828d6e50720bfb2f29c365b8736bfa
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../src/components/dialogs/Loop/DeployLoopModal.js | 36 +++++++++++++---------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 9c9a16feb..6468e9f9e 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -37,11 +37,9 @@ const FormStyled = styled(Form.Group)`
 	padding: .25rem 1.5rem;
 `
 export default class DeployLoopModal extends React.Component {
-	state = {
-		loopCache: this.props.loopCache,
-		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
-		show: true
-	};
+
+
+		
 	constructor(props, context) {
 		super(props, context);
 
@@ -50,6 +48,24 @@ export default class DeployLoopModal extends React.Component {
 		this.handleChange = this.handleChange.bind(this);
 		this.refreshStatus = this.refreshStatus.bind(this);
 		this.renderDeployParam = this.renderDeployParam.bind(this);
+
+		const propertiesJson = JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties()));
+		this.state = {
+			loopCache: this.props.loopCache,
+			temporaryPropertiesJson: propertiesJson,
+			show: true,
+			key: this.getInitialKeyValue(propertiesJson)
+		};
+	}
+	getInitialKeyValue(temporaryPropertiesJson) {
+		const deployJsonList = temporaryPropertiesJson["dcaeDeployParameters"];
+		let initialKey;
+		Object.keys(deployJsonList)
+			.filter((obj) => Object.keys(deployJsonList).indexOf(obj) === 0)
+			.map(obj =>
+				initialKey = obj
+		);
+		return initialKey;
 	}
 	componentWillReceiveProps(newProps) {
 		this.setState({
@@ -57,14 +73,7 @@ export default class DeployLoopModal extends React.Component {
 			show: true
 		});
 	}
-	componentDidMount() {
-		const deployJsonList = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
-		Object.keys(deployJsonList)
-			.filter((obj) => Object.keys(deployJsonList).indexOf(obj) === 0)
-			.map(obj =>
-				this.setState({key: obj})
-		);
-	}
+
 	handleClose(){
 		this.props.history.push('/');
 	}
@@ -117,7 +126,6 @@ export default class DeployLoopModal extends React.Component {
 		);
 		return indents;
 	}
-
 	renderDeployParam(deployJson) {
 		var indents = [];
 		Object.keys(deployJson).map((item,key) =>
-- 
cgit 1.2.3-korg


From 01e5fde3fa45638f3ad884ca76ad861d8781868a Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Mon, 27 Jan 2020 18:57:39 -0500
Subject: Changes for populating ReactJS component library

Modification of Maven pom.xml to segregate creation of component library
away from the basic CLAMP UI. New directory ui-react-lib is introduced
and populated with just a few files to support the library creation.
Introduction of OnapConstants.js provides single focus for defining
constants shared across multiple components, resolving circular
dependency between LoopUI.js and MenuBar.js around defaultLoopName.
Modified LoopSvg.js to import withRoute from react-router-dom instead
of react-router, which was causing problems in usage of completed
component library.

Issue-ID: CLAMP-586
Change-Id: I3054d5388b8aa7417fe7566c34279390d24fb80a
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 pom.xml                                            | 72 +++++++++++++++++++---
 ui-react-lib/libIndex.js                           | 45 ++++++++++++++
 ui-react-lib/package.json                          | 51 +++++++++++++++
 ui-react-lib/rollup.config.js                      | 48 +++++++++++++++
 ui-react/src/LoopUI.js                             |  7 +--
 ui-react/src/LoopUI.test.js                        |  3 +-
 ui-react/src/components/loop_viewer/svg/LoopSvg.js |  2 +-
 ui-react/src/components/menu/MenuBar.js            |  4 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        | 52 ++++++++--------
 ui-react/src/utils/OnapConstants.js                | 30 +++++++++
 10 files changed, 270 insertions(+), 44 deletions(-)
 create mode 100755 ui-react-lib/libIndex.js
 create mode 100755 ui-react-lib/package.json
 create mode 100755 ui-react-lib/rollup.config.js
 create mode 100644 ui-react/src/utils/OnapConstants.js

(limited to 'ui-react/src')

diff --git a/pom.xml b/pom.xml
index a7498ed26..bb22596fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 	<description>
 	       This is the MAVEN project that builds everything for ONAP CLAMP.
 	       Docker engine is normally requires to perfom all possible tasks (including integration tests)
-	       
+
            It can build:
            - The ONAP CLAMP JAR that contains CLAMP back-end code.
            - The DOCKER images for:
@@ -53,7 +53,7 @@
             - The CLAMP backend, JAVA unit testing
             - The CLAMP backend, JAVA integration tests (with Spring + docker mariadb database + docker policy/dcae emulator written in python)
             - The CLAMP frontend, Javascrip tests (NodeJS(NPM) + JEST + Enzyme fro React)
-           
+
            The test coverage for dev's can be found after a "clean install" build in:
             - Clamp backend: target/jacoco-dev.exec (unit tests + integration tests merged)
                 or separately target/coverage-reports/jacoco.exec and target/coverage-reports/jacoco-it.exec
@@ -104,6 +104,7 @@
 		<python.http.proxy.param />
 		<tomcat.version>9.0.27</tomcat.version>
 		<ui.react.src>ui-react</ui.react.src>
+		<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
 		<npm.publish.url>https://nexus3.onap.org/repository/npm.release/</npm.publish.url>
 	</properties>
 
@@ -589,7 +590,7 @@
 			</testResource>
 		</testResources>
 		<resources>
-			<!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise 
+			<!-- For AAF folder maven should not try to filter Keystores/Truststores ... Otherwise
 				they will be broken and unreadable -->
 			<resource>
 				<directory>src/main/resources</directory>
@@ -607,6 +608,9 @@
 			</resource>
 			<resource>
 				<directory>${ui.react.src}</directory>
+				<excludes>
+					<exclude>node_modules</exclude>
+				</excludes>
 				<includes>
 					<include>src/**</include>
 					<include>public/**</include>
@@ -616,6 +620,30 @@
 				<filtering>true</filtering>
 				<targetPath>${project.build.directory}/${ui.react.src}</targetPath>
 			</resource>
+			<resource>
+				<directory>${ui.react.src}</directory>
+				<includes>
+					<include>src/**</include>
+				</includes>
+				<excludes>
+					<exclude>**/__snapshots__/**</exclude>
+					<exclude>**/**.test.js</exclude>
+				</excludes>
+				<filtering>true</filtering>
+				<targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
+			</resource>
+			<resource>
+				<directory>${ui.react.lib.src}</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>node_modules/**</exclude>
+					<exclude>package-lock.json</exclude>
+				</excludes>
+				<filtering>true</filtering>
+				<targetPath>${project.build.directory}/${ui.react.lib.src}</targetPath>
+			</resource>
 		</resources>
 
 		<plugins>
@@ -652,7 +680,7 @@
 				</executions>
 
 			</plugin>
-			<!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate 
+			<!-- Read the swagger.json file and the definition from SwaggerConfig.java; generate
 				a list of .adoc files containing the APIs info in more structured way -->
 			<plugin>
 				<groupId>io.github.swagger2markup</groupId>
@@ -687,7 +715,7 @@
 				</executions>
 			</plugin>
 
-			<!-- Run the generated asciidoc through Asciidoctor to generate other documentation 
+			<!-- Run the generated asciidoc through Asciidoctor to generate other documentation
 				types, such as PDFs or HTML5 -->
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
@@ -975,7 +1003,7 @@
 									<tag>${project.docker.latesttagtimestamp.version}</tag>
 									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
-								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by 
+								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by
 									default -->
 								<dockerFile>backend/Dockerfile</dockerFile>
 								<assembly>
@@ -997,7 +1025,7 @@
 									<tag>${project.docker.latesttagtimestamp.version}</tag>
 									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
-								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by 
+								<!-- A relative path is looked up in ${project.basedir}/src/main/docker by
 									default -->
 								<dockerFile>frontend/Dockerfile</dockerFile>
 								<assembly>
@@ -1153,7 +1181,6 @@
 				<version>1.8.0</version>
 				<configuration>
 					<installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
-					<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
 				</configuration>
 				<executions>
 					<execution>
@@ -1163,8 +1190,8 @@
 						</goals>
 						<phase>generate-sources</phase>
 						<configuration>
-						<nodeVersion>v12.13.0</nodeVersion>
-						<npmVersion>6.13.0</npmVersion>
+							<nodeVersion>v12.13.0</nodeVersion>
+							<npmVersion>6.13.0</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -1174,6 +1201,7 @@
 						</goals>
 						<phase>compile</phase>
 						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
 							<arguments>install</arguments>
 						</configuration>
 					</execution>
@@ -1185,6 +1213,29 @@
 						<phase>test</phase>
 						<configuration>
 							<arguments>run-script test:coverage</arguments>
+							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_install_lib</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>deploy</phase>
+						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+							<arguments>install</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>npm_build_lib</id>
+						<goals>
+							<goal>npm</goal>
+						</goals>
+						<phase>deploy</phase>
+						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
+							<arguments>run build</arguments>
 						</configuration>
 					</execution>
 					<execution>
@@ -1194,6 +1245,7 @@
 						</goals>
 						<phase>deploy</phase>
 						<configuration>
+							<workingDirectory>${project.build.directory}/${ui.react.lib.src}</workingDirectory>
 							<arguments>publish</arguments>
 						</configuration>
 					</execution>
diff --git a/ui-react-lib/libIndex.js b/ui-react-lib/libIndex.js
new file mode 100755
index 000000000..89bf831d9
--- /dev/null
+++ b/ui-react-lib/libIndex.js
@@ -0,0 +1,45 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export { default as ConfigurationPolicyModal } from './src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
+export { default as DeployLoopModal } from './src/components/dialogs/Loop/DeployLoopModal';
+export { default as LoopActionService } from './src/api/LoopActionService';
+export { default as LoopCache }  from './src/api/LoopCache';
+export { default as LoopComponentConverter } from './src/components/loop_viewer/svg/LoopComponentConverter';
+export { default as LoopLogs } from './src/components/loop_viewer/logs/LoopLogs';
+export { default as LoopPropertiesModal } from './src/components/dialogs/Loop/LoopPropertiesModal';
+export { default as LoopService } from './src/api/LoopService';
+export { default as LoopStatus } from './src/components/loop_viewer/status/LoopStatus';
+export { default as LoopSvg } from './src/components/loop_viewer/svg/LoopSvg';
+export { default as LoopUI } from './src/LoopUI';
+export { default as MenuBar } from './src/components/menu/MenuBar';
+export { default as NotFound } from './src/NotFound';
+export { default as OpenLoopModal } from './src/components/dialogs/Loop/OpenLoopModal';
+export { default as OperationalPolicyModal } from './src/components/dialogs/OperationalPolicy/OperationalPolicyModal';
+export { default as PerformActions } from './src/components/dialogs/PerformActions';
+export { default as RefreshStatus } from './src/components/dialogs/RefreshStatus';
+export { default as TemplateMenuService } from './src/api/TemplateMenuService';
+export { default as UserInfoModal } from './src/components/dialogs/UserInfoModal';
+export { default as UserService } from './src/api/UserService';
+export { default as ViewBlueprintMicroServiceTemplatesModal } from './src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal';
+export { default as ViewToscaPolicyModal } from './src/components/dialogs/Tosca/ViewToscaPolicyModal';
diff --git a/ui-react-lib/package.json b/ui-react-lib/package.json
new file mode 100755
index 000000000..3698484d7
--- /dev/null
+++ b/ui-react-lib/package.json
@@ -0,0 +1,51 @@
+{
+	"name": "onap-clamp-ui-lib",
+	"version": "${project.version}",
+	"description": "ONAP CLAMP UI Reactjs Component Library",
+	"author": "ONAP Clamp Team",
+	"license": "Apache-2.0",
+	"main": "dist/index.js",
+	"module": "dist/esindex.js",
+	"scripts": {
+		"build": "rollup -c"
+	},
+	"files": [
+		"dist"
+	],
+	"peerDependencies": {
+		"@json-editor/json-editor": "1.4.0-beta.0",
+		"@material-ui/core": "4.6.0",
+		"@material-ui/icons": "4.5.1",
+		"bootstrap-css-only": "4.3.1",
+		"material-table": "1.53.0",
+		"react": "16.9.0",
+		"react-bootstrap": "1.0.0-beta.14",
+		"react-dom": "16.9.0",
+		"react-router-dom": "5.0.1",
+		"react-scripts": "3.1.1",
+		"react-select": "3.0.8",
+		"rollup": "^1.29.1",
+		"styled-components": "4.3.2"
+	},
+	"devDependencies": {
+		"@babel/cli": "7.7.5",
+		"@babel/core": "7.7.5",
+		"@babel/helper-plugin-utils": "7.0.0",
+		"@babel/plugin-external-helpers": "^7.7.4",
+		"@babel/plugin-proposal-class-properties": "7.5.5",
+		"@babel/plugin-transform-runtime": "7.7.6",
+		"@babel/preset-env": "7.5.5",
+		"@babel/preset-react": "7.0.0",
+		"rollup": "1.29.1",
+		"@rollup/plugin-commonjs": "^11.0.1",
+		"@rollup/plugin-image": "2.0.0",
+		"@rollup/plugin-node-resolve": "7.0.0",
+		"@rollup/plugin-replace": "2.2.1",
+		"@rollup/plugin-url": "4.0.0",
+		"@svgr/rollup": "5.1.0",
+		"babel-plugin-external-helpers": "6.22.0",
+		"rollup-plugin-babel": "4.3.3",
+		"rollup-plugin-peer-deps-external": "2.2.0",
+		"rollup-plugin-postcss": "2.0.3"
+	}
+}
diff --git a/ui-react-lib/rollup.config.js b/ui-react-lib/rollup.config.js
new file mode 100755
index 000000000..c671779c0
--- /dev/null
+++ b/ui-react-lib/rollup.config.js
@@ -0,0 +1,48 @@
+import babel from 'rollup-plugin-babel'
+import commonjs from '@rollup/plugin-commonjs'
+import postcss from 'rollup-plugin-postcss'
+import resolve from '@rollup/plugin-node-resolve'
+import external from 'rollup-plugin-peer-deps-external'
+import img from '@rollup/plugin-image'
+
+import pkg from './package.json'
+
+export default {
+	input: './libIndex.js',
+	output: [
+		{
+			file: pkg.main,
+			format: 'cjs',
+			sourcemap: true
+		},
+		{
+			file: pkg.module,
+			format: 'es',
+			sourcemap: true
+		}
+	],
+	plugins: [
+		img(),
+		external(),
+		postcss({
+			modules: true
+		}),
+		babel({
+			exclude: 'node_modules/**',
+			presets: [
+	
+				"@babel/preset-env", {},
+				"@babel/preset-react", {}
+			],
+			plugins: [
+					[
+						"@babel/plugin-proposal-class-properties",
+						{
+							"loose": true
+						}
+					]
+			]
+		}),
+		resolve({ preferBuiltins: true, mainFields: ['browser'] })
+	]
+}
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index eb4ff6a50..9eea0be95 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -27,6 +27,7 @@ import MenuBar from './components/menu/MenuBar';
 import Navbar from 'react-bootstrap/Navbar';
 import logo from './logo.png';
 import { GlobalClampStyle } from './theme/globalStyle.js';
+import OnapConstants from './utils/OnapConstants';
 
 import LoopSvg from './components/loop_viewer/svg/LoopSvg';
 import LoopLogs from './components/loop_viewer/logs/LoopLogs';
@@ -99,11 +100,9 @@ const LoopViewBodyDivStyled = styled.div`
 
 export default class LoopUI extends React.Component {
 
-	static defaultLoopName="Empty (NO loop loaded yet)";
-
 	state = {
 		userName: null,
-		loopName: LoopUI.defaultLoopName,
+		loopName: OnapConstants.defaultLoopName,
 		loopCache: new LoopCache({}),
 		showAlert: false
 	};
@@ -242,7 +241,7 @@ export default class LoopUI extends React.Component {
 	}
 
 	closeLoop() {
-		this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
+		this.setState({ loopCache: new LoopCache({}), loopName: OnapConstants.defaultLoopName });
 		this.props.history.push('/');
 	}
 
diff --git a/ui-react/src/LoopUI.test.js b/ui-react/src/LoopUI.test.js
index e28096bd4..d1b76aa9a 100644
--- a/ui-react/src/LoopUI.test.js
+++ b/ui-react/src/LoopUI.test.js
@@ -23,6 +23,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import LoopUI from './LoopUI';
+import OnapConstants from './utils/OnapConstants';
 
 import LoopCache from './api/LoopCache';
 import LoopActionService from './api/LoopActionService';
@@ -77,7 +78,7 @@ describe('Verify LoopUI', () => {
 		const instance = component.instance();
 		instance.closeLoop();
 			
-		expect(component.state('loopName')).toEqual("Empty (NO loop loaded yet)");
+		expect(component.state('loopName')).toEqual(OnapConstants.defaultLoopName);
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
 	})
 
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 06cfd238f..4bbf608df 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -23,7 +23,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import LoopCache from '../../../api/LoopCache';
-import { withRouter } from "react-router";
+import { withRouter } from "react-router-dom";
 import LoopService from '../../../api/LoopService';
 import LoopComponentConverter from './LoopComponentConverter';
 
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index e211b0eaf..41a105488 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -24,7 +24,7 @@ import React from 'react';
 import Nav from 'react-bootstrap/Nav';
 import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
-import LoopUI from '../../LoopUI';
+import OnapConstants from '../../utils/OnapConstants';
 import 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom';
@@ -76,7 +76,7 @@ export default class MenuBar extends React.Component {
 	};
 
 	componentWillReceiveProps(newProps) {
-		if (newProps.loopName !== LoopUI.defaultLoopName) {
+		if (newProps.loopName !== OnapConstants.defaultLoopName) {
 			this.setState({ disabled: false });
 		} else {
 			this.setState({ disabled: true });
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 1670124cc..c17214aad 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -11,7 +11,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -44,7 +44,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -62,7 +62,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -95,7 +95,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -117,7 +117,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -150,7 +150,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -168,7 +168,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -201,7 +201,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -219,7 +219,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -252,7 +252,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -274,7 +274,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -307,7 +307,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -325,7 +325,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -358,7 +358,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -376,7 +376,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -409,7 +409,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -427,7 +427,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -460,7 +460,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -478,7 +478,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -511,7 +511,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -529,7 +529,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -562,7 +562,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -584,7 +584,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -617,7 +617,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
@@ -650,7 +650,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "$$typeof": Symbol(react.forward_ref),
           "attrs": Array [],
           "componentStyle": ComponentStyle {
-            "componentId": "sc-eNQAEJ",
+            "componentId": "sc-bdVaJa",
             "isStatic": false,
             "rules": Array [
               "
@@ -683,7 +683,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "displayName": "Styled(Link)",
           "foldedComponentIds": Array [],
           "render": [Function],
-          "styledComponentId": "sc-eNQAEJ",
+          "styledComponentId": "sc-bdVaJa",
           "target": [Function],
           "toString": [Function],
           "warnTooManyClasses": [Function],
diff --git a/ui-react/src/utils/OnapConstants.js b/ui-react/src/utils/OnapConstants.js
new file mode 100644
index 000000000..22460c3d1
--- /dev/null
+++ b/ui-react/src/utils/OnapConstants.js
@@ -0,0 +1,30 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+// Maintain a list of ONAP CLAMP UI "constants" that can be used by any componenet within CLAMP
+
+const OnapConstants = {
+	defaultLoopName: "Empty (NO loop loaded yet)"
+};
+
+export default OnapConstants;
-- 
cgit 1.2.3-korg


From 3a83e2a2ff88ef49535973df8dc77dc8015170da Mon Sep 17 00:00:00 2001
From: ash74268 <ashwin.shyam.sharma@att.com>
Date: Fri, 31 Jan 2020 15:40:15 +0000
Subject: Changes include Metadata support, Upload tosca policy model and Loop
 Template

CLAMP Metadata support to parse policy_model_type, acronym and clamp_possible_values from the Tosca Policy Model
UI and Backend changes to support Loop Template
Backend APIs for Dictionary referenced in the Tosca Policy Model.
Upload Tosca Model UI changes to allow user to upload policy models.
DB Schema changes for the Loop Element Model and updated schema for the Dictionary
Added Jest test cases and snapshots
checkstyle issues fix and Junits

Issue-ID: CLAMP-580

Signed-off-by: ash74268 <ashwin.shyam.sharma@att.com>
Change-Id: I57521bc1c3afaf4ca5a2acf4c59823df05fd4cd6
Signed-off-by: ash74268 <ashwin.shyam.sharma@att.com>
---
 extra/sql/bulkload/create-tables.sql               |  31 +-
 .../clamp/clds/tosca/ToscaSchemaConstants.java     |   5 +
 .../clamp/clds/tosca/ToscaYamlToJsonConvertor.java | 565 ++++++++----
 .../onap/clamp/loop/template/LoopElementModel.java |  72 +-
 .../org/onap/clamp/loop/template/LoopTemplate.java | 116 ++-
 .../template/LoopTemplateLoopElementModelId.java   |  14 +-
 .../clamp/loop/template/LoopTemplatesService.java  | 111 +++
 .../org/onap/clamp/loop/template/LoopType.java     |  42 +
 .../clamp/loop/template/LoopTypeConvertor.java     |  52 ++
 .../org/onap/clamp/loop/template/PolicyModel.java  |  32 +-
 .../clamp/loop/template/PolicyModelsService.java   |  60 +-
 src/main/java/org/onap/clamp/tosca/Dictionary.java |  86 +-
 .../org/onap/clamp/tosca/DictionaryElement.java    | 121 +--
 .../clamp/tosca/DictionaryElementsRepository.java  |   2 +-
 .../org/onap/clamp/tosca/DictionaryRepository.java |   4 +-
 .../org/onap/clamp/tosca/DictionaryService.java    | 142 +++
 .../org/onap/clamp/util/SemanticVersioning.java    |  31 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     | 634 +++++++++----
 .../tosca/DictionaryRepositoriesTestItCase.java    |  15 +-
 .../clds/tosca/ToscaYamlToJsonConvertorTest.java   |  91 --
 .../tosca/ToscaYamlToJsonConvertorTestItCase.java  | 188 ++++
 .../clamp/loop/LoopTemplatesServiceItCase.java     | 145 +++
 .../onap/clamp/tosca/DictionaryServiceItCase.java  | 247 ++++++
 .../onap/clamp/util/SemanticVersioningTest.java    |  28 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     | 984 +++++++++++++++++++++
 .../tosca_metadata_clamp_possible_values.yaml      | 184 ++++
 ...metadata_clamp_possible_values_json_schema.json | 235 +++++
 ui-react/src/LoopUI.js                             |   2 +
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   4 +
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   4 +
 ui-react/src/api/TemplateMenuService.js            |  52 +-
 .../dialogs/Tosca/UploadToscaPolicyModal.js        | 138 +++
 .../dialogs/Tosca/UploadToscaPolicyModal.test.js   |  87 ++
 .../dialogs/Tosca/ViewToscaPolicyModal.js          |  37 +-
 .../dialogs/Tosca/ViewToscaPolicyModal.test.js     |  87 +-
 .../UploadToscaPolicyModal.test.js.snap            | 111 +++
 .../ViewToscaPolicyModal.test.js.snap              |  26 +-
 ui-react/src/components/menu/MenuBar.js            |   3 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        |  51 ++
 39 files changed, 4133 insertions(+), 706 deletions(-)
 create mode 100644 src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
 create mode 100644 src/main/java/org/onap/clamp/loop/template/LoopType.java
 create mode 100644 src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java
 create mode 100644 src/main/java/org/onap/clamp/tosca/DictionaryService.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
 create mode 100644 src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
 create mode 100644 src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
 create mode 100644 src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java
 create mode 100644 src/test/resources/clds/camel/rest/clamp-api-v2.xml
 create mode 100644 src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml
 create mode 100644 src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json
 create mode 100644 ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/extra/sql/bulkload/create-tables.sql b/extra/sql/bulkload/create-tables.sql
index 4edb46916..50c8d42ca 100644
--- a/extra/sql/bulkload/create-tables.sql
+++ b/extra/sql/bulkload/create-tables.sql
@@ -11,17 +11,22 @@
     ) engine=InnoDB;
 
     create table dictionary_elements (
-       name varchar(255) not null,
+       short_name varchar(255) not null,
         created_by varchar(255),
         created_timestamp datetime(6) not null,
         updated_by varchar(255),
         updated_timestamp datetime(6) not null,
-        description varchar(255),
-        short_name varchar(255) not null,
-        subdictionary_id varchar(255) not null,
+        description varchar(255) not null,
+        name varchar(255) not null,
+        subdictionary_name varchar(255),
         type varchar(255) not null,
-        dictionary_id varchar(255),
-        primary key (name)
+        primary key (short_name)
+    ) engine=InnoDB;
+
+    create table dictionary_to_dictionaryelements (
+       dictionary_name varchar(255) not null,
+        dictionary_element_short_name varchar(255) not null,
+        primary key (dictionary_name, dictionary_element_short_name)
     ) engine=InnoDB;
 
     create table hibernate_sequence (
@@ -39,6 +44,7 @@
         blueprint_yaml MEDIUMTEXT,
         dcae_blueprint_id varchar(255),
         loop_element_type varchar(255) not null,
+        short_name varchar(255),
         primary key (name)
     ) engine=InnoDB;
 
@@ -58,6 +64,7 @@
         created_timestamp datetime(6) not null,
         updated_by varchar(255),
         updated_timestamp datetime(6) not null,
+        allowed_loop_type varchar(255),
         blueprint_yaml MEDIUMTEXT,
         dcae_blueprint_id varchar(255),
         maximum_instances_allowed integer,
@@ -161,12 +168,14 @@
         primary key (service_uuid)
     ) engine=InnoDB;
 
-    alter table dictionary_elements 
-       add constraint UK_qxkrvsrhp26m60apfvxphpl3d unique (short_name);
+    alter table dictionary_to_dictionaryelements 
+       add constraint FK68hjjinnm8nte2owstd0xwp23 
+       foreign key (dictionary_element_short_name) 
+       references dictionary_elements (short_name);
 
-    alter table dictionary_elements 
-       add constraint FKn87bpgpm9i56w7uko585rbkgn 
-       foreign key (dictionary_id) 
+    alter table dictionary_to_dictionaryelements 
+       add constraint FKtqfxg46gsxwlm2gkl6ne3cxfe 
+       foreign key (dictionary_name) 
        references dictionary (name);
 
     alter table loop_logs 
diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java b/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java
index 595b1805e..9601649c9 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/ToscaSchemaConstants.java
@@ -42,6 +42,11 @@ public class ToscaSchemaConstants {
     public static final String PROPERTIES = "properties";
     public static final String REQUIRED = "required";
     public static final String ENTRY_SCHEMA = "entry_schema";
+    
+    public static final String METADATA = "metadata";
+    public static final String METADATA_POLICY_MODEL_TYPE = "policy_model_type";
+    public static final String METADATA_ACRONYM = "acronym";
+    public static final String METADATA_CLAMP_POSSIBLE_VALUES = "clamp_possible_values";
 
     // Constraints
     public static final String CONSTRAINTS = "constraints";
diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java b/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
index 232db48c4..666ca6702 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
@@ -23,15 +23,25 @@
 
 package org.onap.clamp.clds.tosca;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.tosca.DictionaryElement;
+import org.onap.clamp.tosca.DictionaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
 /**
@@ -39,8 +49,15 @@ import org.yaml.snakeyaml.Yaml;
  * Editor.
  *
  */
+@Component
 public class ToscaYamlToJsonConvertor {
 
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    @Autowired
+    private ClampProperties refProp;
+
     private int simpleTypeOrder = 1000;
     private int complexTypeOrder = 10000;
     private int complexSimpleTypeOrder = 1;
@@ -58,12 +75,57 @@ public class ToscaYamlToJsonConvertor {
         return complexTypeOrder + complexSimpleTypeOrder;
     }
 
+    /**
+     * Parses Tosca YAML string and Converts to JsonObject.
+     *
+     * @param yamlString YAML string
+     * @return JsonObject
+     */
+    public JsonObject validateAndConvertToJson(String yamlString) {
+
+        Yaml yaml = new Yaml();
+        LinkedHashMap<String, Object> loadedYaml = yaml.load(yamlString);
+        if (loadedYaml == null) {
+            return null;
+        }
+
+        JSONObject jsonObject = new JSONObject(loadedYaml);
+        return new Gson().fromJson(jsonObject.toString(), JsonObject.class);
+    }
+
+    /**
+     * return the values by looking up the key in the Toscsa JSON object.
+     *
+     * @param obj Tosca Json Object
+     * @param key the parameter key to look up
+     * @return the value for the provided key
+     */
+    public String getValueFromMetadata(JsonObject obj, String key) {
+        JsonElement jsonElement = obj.get(ToscaSchemaConstants.NODE_TYPES);
+        if (jsonElement.isJsonObject()) {
+            Iterator<Entry<String, JsonElement>> itr =
+                jsonElement.getAsJsonObject().entrySet().iterator();
+            while (itr.hasNext()) {
+                Entry<String, JsonElement> entry = itr.next();
+                if (entry.getValue() != null && entry.getValue().isJsonObject()
+                    && entry.getValue().getAsJsonObject().has(ToscaSchemaConstants.METADATA)) {
+                    JsonObject metadatas = entry.getValue().getAsJsonObject()
+                        .get(ToscaSchemaConstants.METADATA).getAsJsonObject();
+                    if (metadatas.has(key)) {
+                        return metadatas.get(key).getAsString();
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Parses Tosca YAML string.
      *
-     * @param yamlString     YAML string
+     * @param yamlString YAML string
      * @param modelTypeToUse The model type that must be used to obtain the Json
-     *                       Schema
+     *        Schema
      * @return JSON string
      */
     public String parseToscaYaml(String yamlString, String modelTypeToUse) {
@@ -78,7 +140,8 @@ public class ToscaYamlToJsonConvertor {
         JSONObject jsonParentObject = new JSONObject();
         JSONObject jsonTempObject = new JSONObject();
         parseNodeAndDataType(loadedYaml, nodeTypes, dataNodes);
-        populateJsonEditorObject(loadedYaml, nodeTypes, dataNodes, jsonParentObject, jsonTempObject, modelTypeToUse);
+        populateJsonEditorObject(loadedYaml, nodeTypes, dataNodes, jsonParentObject, jsonTempObject,
+            modelTypeToUse);
         if (jsonTempObject.length() > 0) {
             jsonParentObject = jsonTempObject;
         }
@@ -89,13 +152,17 @@ public class ToscaYamlToJsonConvertor {
 
     // Parse node_type and data_type
     @SuppressWarnings("unchecked")
-    private void parseNodeAndDataType(LinkedHashMap<String, Object> map, LinkedHashMap<String, Object> nodeTypes,
-            LinkedHashMap<String, Object> dataNodes) {
+    private void parseNodeAndDataType(LinkedHashMap<String, Object> map,
+        LinkedHashMap<String, Object> nodeTypes, LinkedHashMap<String, Object> dataNodes) {
         map.entrySet().stream().forEach(n -> {
-            if (n.getKey().contains(ToscaSchemaConstants.NODE_TYPES) && n.getValue() instanceof Map) {
-                parseNodeAndDataType((LinkedHashMap<String, Object>) n.getValue(), nodeTypes, dataNodes);
-            } else if (n.getKey().contains(ToscaSchemaConstants.DATA_TYPES) && n.getValue() instanceof Map) {
-                parseNodeAndDataType((LinkedHashMap<String, Object>) n.getValue(), nodeTypes, dataNodes);
+            if (n.getKey().contains(ToscaSchemaConstants.NODE_TYPES)
+                && n.getValue() instanceof Map) {
+                parseNodeAndDataType((LinkedHashMap<String, Object>) n.getValue(), nodeTypes,
+                    dataNodes);
+            } else if (n.getKey().contains(ToscaSchemaConstants.DATA_TYPES)
+                && n.getValue() instanceof Map) {
+                parseNodeAndDataType((LinkedHashMap<String, Object>) n.getValue(), nodeTypes,
+                    dataNodes);
             } else if (n.getKey().contains(ToscaSchemaConstants.POLICY_NODE)) {
                 nodeTypes.put(n.getKey(), n.getValue());
             } else if (n.getKey().contains(ToscaSchemaConstants.POLICY_DATA)) {
@@ -105,83 +172,97 @@ public class ToscaYamlToJsonConvertor {
     }
 
     @SuppressWarnings("unchecked")
-    private void populateJsonEditorObject(LinkedHashMap<String, Object> map, LinkedHashMap<String, Object> nodeTypes,
-            LinkedHashMap<String, Object> dataNodes, JSONObject jsonParentObject, JSONObject jsonTempObject,
-            String modelTypeToUse) {
+    private void populateJsonEditorObject(LinkedHashMap<String, Object> map,
+        LinkedHashMap<String, Object> nodeTypes, LinkedHashMap<String, Object> dataNodes,
+        JSONObject jsonParentObject, JSONObject jsonTempObject, String modelTypeToUse) {
 
         Map<String, JSONObject> jsonEntrySchema = new HashMap<>();
         jsonParentObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_OBJECT);
         if (nodeTypes.get(modelTypeToUse) instanceof Map) {
-            ((LinkedHashMap<String, Object>) nodeTypes.get(modelTypeToUse)).entrySet().forEach(ntElement -> {
-                if (ntElement.getKey().equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
-                    JSONArray rootNodeArray = new JSONArray();
-                    if (ntElement.getValue() instanceof Map) {
-                        ((LinkedHashMap<String, Object>) ntElement.getValue()).entrySet()
+            ((LinkedHashMap<String, Object>) nodeTypes.get(modelTypeToUse)).entrySet()
+                .forEach(ntElement -> {
+                    if (ntElement.getKey().equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
+                        JSONArray rootNodeArray = new JSONArray();
+                        if (ntElement.getValue() instanceof Map) {
+                            ((LinkedHashMap<String, Object>) ntElement.getValue()).entrySet()
                                 .forEach((ntPropertiesElement) -> {
                                     boolean isListNode = false;
-                                    parseDescription((LinkedHashMap<String, Object>) ntPropertiesElement.getValue(),
-                                            jsonParentObject);
-                                    LinkedHashMap<String, Object> parentPropertiesMap = (LinkedHashMap<String, Object>) ntPropertiesElement
+                                    parseDescription(
+                                        (LinkedHashMap<String, Object>) ntPropertiesElement
+                                            .getValue(),
+                                        jsonParentObject);
+                                    LinkedHashMap<String, Object> parentPropertiesMap =
+                                        (LinkedHashMap<String, Object>) ntPropertiesElement
                                             .getValue();
                                     if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
-                                            && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
-                                                    .contains(ToscaSchemaConstants.TYPE_MAP)
-                                            && parentPropertiesMap.containsKey(ToscaSchemaConstants.ENTRY_SCHEMA)) {
-                                        parentPropertiesMap = (LinkedHashMap<String, Object>) parentPropertiesMap
+                                        && ((String) parentPropertiesMap
+                                            .get(ToscaSchemaConstants.TYPE))
+                                                .contains(ToscaSchemaConstants.TYPE_MAP)
+                                        && parentPropertiesMap
+                                            .containsKey(ToscaSchemaConstants.ENTRY_SCHEMA)) {
+                                        parentPropertiesMap =
+                                            (LinkedHashMap<String, Object>) parentPropertiesMap
                                                 .get(ToscaSchemaConstants.ENTRY_SCHEMA);
                                         isListNode = true;
                                     }
                                     if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
-                                            && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
-                                                    .contains(ToscaSchemaConstants.POLICY_DATA)) {
-                                        ((LinkedHashMap<String, Object>) dataNodes
-                                                .get(parentPropertiesMap.get(ToscaSchemaConstants.TYPE))).entrySet()
-                                                        .stream().forEach(pmap -> {
-                                                            if (pmap.getKey().equalsIgnoreCase(
-                                                                    ToscaSchemaConstants.PROPERTIES)) {
-                                                                parseToscaProperties(ToscaSchemaConstants.POLICY_NODE,
-                                                                        (LinkedHashMap<String, Object>) pmap.getValue(),
-                                                                        jsonParentObject, rootNodeArray,
-                                                                        jsonEntrySchema, dataNodes,
-                                                                        incrementSimpleTypeOrder());
-                                                            }
-                                                        });
+                                        && ((String) parentPropertiesMap
+                                            .get(ToscaSchemaConstants.TYPE))
+                                                .contains(ToscaSchemaConstants.POLICY_DATA)) {
+                                        ((LinkedHashMap<String, Object>) dataNodes.get(
+                                            parentPropertiesMap.get(ToscaSchemaConstants.TYPE)))
+                                                .entrySet().stream().forEach(pmap -> {
+                                                    if (pmap.getKey().equalsIgnoreCase(
+                                                        ToscaSchemaConstants.PROPERTIES)) {
+                                                        parseToscaProperties(
+                                                            ToscaSchemaConstants.POLICY_NODE,
+                                                            (LinkedHashMap<String, Object>) pmap
+                                                                .getValue(),
+                                                            jsonParentObject, rootNodeArray,
+                                                            jsonEntrySchema, dataNodes,
+                                                            incrementSimpleTypeOrder());
+                                                    }
+                                                });
                                     }
                                     if (isListNode) {
                                         jsonTempObject.put(JsonEditorSchemaConstants.TYPE,
-                                                JsonEditorSchemaConstants.TYPE_ARRAY);
-                                        parseDescription((LinkedHashMap<String, Object>) ntPropertiesElement.getValue(),
-                                                jsonTempObject);
-                                        jsonTempObject.put(JsonEditorSchemaConstants.ITEMS, jsonParentObject);
+                                            JsonEditorSchemaConstants.TYPE_ARRAY);
+                                        parseDescription(
+                                            (LinkedHashMap<String, Object>) ntPropertiesElement
+                                                .getValue(),
+                                            jsonTempObject);
+                                        jsonTempObject.put(JsonEditorSchemaConstants.ITEMS,
+                                            jsonParentObject);
                                         jsonTempObject.put(JsonEditorSchemaConstants.FORMAT,
-                                                JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT_TABS_TOP);
+                                            JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT_TABS_TOP);
                                         jsonTempObject.put(JsonEditorSchemaConstants.UNIQUE_ITEMS,
-                                                JsonEditorSchemaConstants.TRUE);
+                                            JsonEditorSchemaConstants.TRUE);
                                     }
                                 });
+                        }
                     }
-                }
-            });
+                });
         }
     }
 
     @SuppressWarnings("unchecked")
     private void parseToscaProperties(String parentKey, LinkedHashMap<String, Object> propertiesMap,
-            JSONObject jsonDataNode, JSONArray array, Map<String, JSONObject> jsonEntrySchema,
-            LinkedHashMap<String, Object> dataNodes, final int order) {
+        JSONObject jsonDataNode, JSONArray array, Map<String, JSONObject> jsonEntrySchema,
+        LinkedHashMap<String, Object> dataNodes, final int order) {
         JSONObject jsonPropertyNode = new JSONObject();
         propertiesMap.entrySet().stream().forEach(p -> {
             // Populate JSON Array for "required" key
 
             if (p.getValue() instanceof Map) {
-                LinkedHashMap<String, Object> nodeMap = (LinkedHashMap<String, Object>) p.getValue();
+                LinkedHashMap<String, Object> nodeMap =
+                    (LinkedHashMap<String, Object>) p.getValue();
                 if (nodeMap.containsKey(ToscaSchemaConstants.REQUIRED)
-                        && ((boolean) nodeMap.get(ToscaSchemaConstants.REQUIRED))) {
+                    && ((boolean) nodeMap.get(ToscaSchemaConstants.REQUIRED))) {
                     array.put(p.getKey());
                 }
                 // if(nodeMap.containsKey(ToscaSchemaConstants.CONSTRAINTS))
-                parseToscaChildNodeMap(p.getKey(), nodeMap, jsonPropertyNode, jsonEntrySchema, dataNodes, array,
-                        incrementSimpleTypeOrder());
+                parseToscaChildNodeMap(p.getKey(), nodeMap, jsonPropertyNode, jsonEntrySchema,
+                    dataNodes, array, incrementSimpleTypeOrder());
             }
         });
         jsonDataNode.put(JsonEditorSchemaConstants.REQUIRED, array);
@@ -189,42 +270,48 @@ public class ToscaYamlToJsonConvertor {
     }
 
     @SuppressWarnings("unchecked")
-    private void parseToscaPropertiesForType(String parentKey, LinkedHashMap<String, Object> propertiesMap,
-            JSONObject jsonDataNode, JSONArray array, Map<String, JSONObject> jsonEntrySchema,
-            LinkedHashMap<String, Object> dataNodes, boolean isType, int order) {
+    private void parseToscaPropertiesForType(String parentKey,
+        LinkedHashMap<String, Object> propertiesMap, JSONObject jsonDataNode, JSONArray array,
+        Map<String, JSONObject> jsonEntrySchema, LinkedHashMap<String, Object> dataNodes,
+        boolean isType, int order) {
         JSONObject jsonPropertyNode = new JSONObject();
 
         propertiesMap.entrySet().stream().forEach(p -> {
             // array.put(p.getKey());
             boolean overWriteArray = false;
             if (p.getValue() instanceof Map) {
-                LinkedHashMap<String, Object> nodeMap = (LinkedHashMap<String, Object>) p.getValue();
+                LinkedHashMap<String, Object> nodeMap =
+                    (LinkedHashMap<String, Object>) p.getValue();
                 if (!(parentKey.contains(ToscaSchemaConstants.ENTRY_SCHEMA)
-                        || parentKey.contains(ToscaSchemaConstants.POLICY_NODE))
-                        && nodeMap.containsKey(ToscaSchemaConstants.TYPE)
-                        && (((String) nodeMap.get(ToscaSchemaConstants.TYPE))
-                                .contains(ToscaSchemaConstants.POLICY_DATA))) {
+                    || parentKey.contains(ToscaSchemaConstants.POLICY_NODE))
+                    && nodeMap.containsKey(ToscaSchemaConstants.TYPE)
+                    && (((String) nodeMap.get(ToscaSchemaConstants.TYPE))
+                        .contains(ToscaSchemaConstants.POLICY_DATA))) {
                     overWriteArray = true;
                 }
                 if (nodeMap.containsKey(ToscaSchemaConstants.REQUIRED)
-                        && ((boolean) nodeMap.get(ToscaSchemaConstants.REQUIRED))) {
+                    && ((boolean) nodeMap.get(ToscaSchemaConstants.REQUIRED))) {
                     array.put(p.getKey());
                 }
-                parseToscaChildNodeMap(p.getKey(), nodeMap, jsonPropertyNode, jsonEntrySchema, dataNodes, array, order);
+                parseToscaChildNodeMap(p.getKey(), nodeMap, jsonPropertyNode, jsonEntrySchema,
+                    dataNodes, array, order);
             }
         });
         jsonDataNode.put(JsonEditorSchemaConstants.REQUIRED, array);
         jsonDataNode.put(JsonEditorSchemaConstants.PROPERTIES, jsonPropertyNode);
     }
 
-    private void parseToscaChildNodeMap(String childObjectKey, LinkedHashMap<String, Object> childNodeMap,
-            JSONObject jsonPropertyNode, Map<String, JSONObject> jsonEntrySchema,
-            LinkedHashMap<String, Object> dataNodes, JSONArray array, int order) {
+    private void parseToscaChildNodeMap(String childObjectKey,
+        LinkedHashMap<String, Object> childNodeMap, JSONObject jsonPropertyNode,
+        Map<String, JSONObject> jsonEntrySchema, LinkedHashMap<String, Object> dataNodes,
+        JSONArray array, int order) {
         JSONObject childObject = new JSONObject();
         // JSONArray childArray = new JSONArray();
         parseDescription(childNodeMap, childObject);
-        parseTypes(childObjectKey, childNodeMap, childObject, jsonEntrySchema, dataNodes, array, order);
+        parseTypes(childObjectKey, childNodeMap, childObject, jsonEntrySchema, dataNodes, array,
+            order);
         parseConstraints(childNodeMap, childObject);
+        parseMetadataPossibleValues(childNodeMap, childObject);
         parseEntrySchema(childNodeMap, childObject, jsonPropertyNode, jsonEntrySchema, dataNodes);
 
         jsonPropertyNode.put(childObjectKey, childObject);
@@ -232,15 +319,17 @@ public class ToscaYamlToJsonConvertor {
 
     }
 
-    private void parseEntrySchema(LinkedHashMap<String, Object> childNodeMap, JSONObject childObject,
-            JSONObject jsonPropertyNode, Map<String, JSONObject> jsonEntrySchema,
-            LinkedHashMap<String, Object> dataNodes) {
+    private void parseEntrySchema(LinkedHashMap<String, Object> childNodeMap,
+        JSONObject childObject, JSONObject jsonPropertyNode,
+        Map<String, JSONObject> jsonEntrySchema, LinkedHashMap<String, Object> dataNodes) {
         if (childNodeMap.get(ToscaSchemaConstants.ENTRY_SCHEMA) != null) {
             if (childNodeMap.get(ToscaSchemaConstants.ENTRY_SCHEMA) instanceof Map) {
-                LinkedHashMap<String, Object> entrySchemaMap = (LinkedHashMap<String, Object>) childNodeMap
+                LinkedHashMap<String, Object> entrySchemaMap =
+                    (LinkedHashMap<String, Object>) childNodeMap
                         .get(ToscaSchemaConstants.ENTRY_SCHEMA);
                 entrySchemaMap.entrySet().stream().forEach(entry -> {
-                    if (entry.getKey().equalsIgnoreCase(ToscaSchemaConstants.TYPE) && entry.getValue() != null) {
+                    if (entry.getKey().equalsIgnoreCase(ToscaSchemaConstants.TYPE)
+                        && entry.getValue() != null) {
                         String entrySchemaType = (String) entry.getValue();
                         if (entrySchemaType.contains(ToscaSchemaConstants.POLICY_DATA)) {
                             JSONArray array = new JSONArray();
@@ -248,44 +337,51 @@ public class ToscaYamlToJsonConvertor {
                                 // Already traversed
                                 JSONObject entrySchemaObject = jsonEntrySchema.get(entrySchemaType);
                                 attachEntrySchemaJsonObject(childObject, entrySchemaObject,
-                                        JsonEditorSchemaConstants.TYPE_OBJECT);
+                                    JsonEditorSchemaConstants.TYPE_OBJECT);
                             } else if (dataNodes.containsKey(entrySchemaType)) {
 
                                 JSONObject entrySchemaObject = new JSONObject();
                                 // Need to traverse
-                                ((LinkedHashMap<String, Object>) dataNodes.get(entrySchemaType)).entrySet().stream()
-                                        .forEach(pmap -> {
-                                            if (pmap.getKey().equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
-                                                parseToscaProperties(ToscaSchemaConstants.ENTRY_SCHEMA,
-                                                        (LinkedHashMap<String, Object>) pmap.getValue(),
-                                                        entrySchemaObject, array, jsonEntrySchema, dataNodes,
-                                                        incrementComplexTypeOrder());
-                                                jsonEntrySchema.put(entrySchemaType, entrySchemaObject);
-                                                dataNodes.remove(entrySchemaType);
-                                                attachEntrySchemaJsonObject(childObject, entrySchemaObject,
-                                                        JsonEditorSchemaConstants.TYPE_OBJECT);
-                                            }
+                                ((LinkedHashMap<String, Object>) dataNodes.get(entrySchemaType))
+                                    .entrySet().stream().forEach(pmap -> {
+                                        if (pmap.getKey()
+                                            .equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
+                                            parseToscaProperties(ToscaSchemaConstants.ENTRY_SCHEMA,
+                                                (LinkedHashMap<String, Object>) pmap.getValue(),
+                                                entrySchemaObject, array, jsonEntrySchema,
+                                                dataNodes, incrementComplexTypeOrder());
+                                            jsonEntrySchema.put(entrySchemaType, entrySchemaObject);
+                                            dataNodes.remove(entrySchemaType);
+                                            attachEntrySchemaJsonObject(childObject,
+                                                entrySchemaObject,
+                                                JsonEditorSchemaConstants.TYPE_OBJECT);
+                                        }
 
-                                        });
+                                    });
                             }
-                        } else if (entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)
-                                || entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_INTEGER)
-                                || entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_FLOAT)) {
+                        } else if (entrySchemaType
+                            .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)
+                            || entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_INTEGER)
+                            || entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_FLOAT)) {
                             JSONObject entrySchemaObject = new JSONObject();
                             parseConstraints(entrySchemaMap, entrySchemaObject);
+                            parseMetadataPossibleValues(entrySchemaMap, entrySchemaObject);
                             String jsontype = JsonEditorSchemaConstants.TYPE_STRING;
                             if (entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_INTEGER)
-                                    || entrySchemaType.equalsIgnoreCase(ToscaSchemaConstants.TYPE_FLOAT)) {
+                                || entrySchemaType
+                                    .equalsIgnoreCase(ToscaSchemaConstants.TYPE_FLOAT)) {
                                 jsontype = JsonEditorSchemaConstants.TYPE_INTEGER;
                             }
                             if (childNodeMap.get(ToscaSchemaConstants.TYPE) != null) {
                                 // Only known value of type is String for now
                                 if (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String) {
-                                    String typeValue = (String) childNodeMap.get(ToscaSchemaConstants.TYPE);
-                                    if (typeValue.equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
+                                    String typeValue =
+                                        (String) childNodeMap.get(ToscaSchemaConstants.TYPE);
+                                    if (typeValue
+                                        .equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
                                         // Custom key for JSON Editor and UI rendering
                                         childObject.put(JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT,
-                                                JsonEditorSchemaConstants.FORMAT_SELECT);
+                                            JsonEditorSchemaConstants.FORMAT_SELECT);
                                         // childObject.put(JsonEditorSchemaConstants.UNIQUE_ITEMS,
                                         // JsonEditorSchemaConstants.TRUE);
                                     }
@@ -299,7 +395,8 @@ public class ToscaYamlToJsonConvertor {
         }
     }
 
-    private void attachEntrySchemaJsonObject(JSONObject childObject, JSONObject entrySchemaObject, String dataType) {
+    private void attachEntrySchemaJsonObject(JSONObject childObject, JSONObject entrySchemaObject,
+        String dataType) {
 
         entrySchemaObject.put(JsonEditorSchemaConstants.TYPE, dataType);
         childObject.put(JsonEditorSchemaConstants.ITEMS, entrySchemaObject);
@@ -320,33 +417,40 @@ public class ToscaYamlToJsonConvertor {
      * toscaKey.length()); }
      */
 
-    private void parseDescription(LinkedHashMap<String, Object> childNodeMap, JSONObject childObject) {
+    private void parseDescription(LinkedHashMap<String, Object> childNodeMap,
+        JSONObject childObject) {
         if (childNodeMap.get(ToscaSchemaConstants.DESCRIPTION) != null) {
-            childObject.put(JsonEditorSchemaConstants.TITLE, childNodeMap.get(ToscaSchemaConstants.DESCRIPTION));
+            childObject.put(JsonEditorSchemaConstants.TITLE,
+                childNodeMap.get(ToscaSchemaConstants.DESCRIPTION));
         }
     }
 
-    private void parseTypes(String childObjectKey, LinkedHashMap<String, Object> childNodeMap, JSONObject childObject,
-            Map<String, JSONObject> jsonEntrySchema, LinkedHashMap<String, Object> dataNodes, JSONArray array,
-            int order) {
+    private void parseTypes(String childObjectKey, LinkedHashMap<String, Object> childNodeMap,
+        JSONObject childObject, Map<String, JSONObject> jsonEntrySchema,
+        LinkedHashMap<String, Object> dataNodes, JSONArray array, int order) {
         if (childNodeMap.get(ToscaSchemaConstants.TYPE) != null) {
             // Only known value of type is String for now
             if (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String) {
                 childObject.put(JsonEditorSchemaConstants.PROPERTY_ORDER, order);
                 String typeValue = (String) childNodeMap.get(ToscaSchemaConstants.TYPE);
                 if (typeValue.equalsIgnoreCase(ToscaSchemaConstants.TYPE_INTEGER)) {
-                    childObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_INTEGER);
+                    childObject.put(JsonEditorSchemaConstants.TYPE,
+                        JsonEditorSchemaConstants.TYPE_INTEGER);
 
                 } else if (typeValue.equalsIgnoreCase(ToscaSchemaConstants.TYPE_FLOAT)) {
-                    childObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_INTEGER);
+                    childObject.put(JsonEditorSchemaConstants.TYPE,
+                        JsonEditorSchemaConstants.TYPE_INTEGER);
                 } else if (typeValue.equalsIgnoreCase(ToscaSchemaConstants.TYPE_LIST)) {
-                    childObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_ARRAY);
+                    childObject.put(JsonEditorSchemaConstants.TYPE,
+                        JsonEditorSchemaConstants.TYPE_ARRAY);
                     // Custom key for JSON Editor and UI rendering
                     childObject.put(JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT,
-                            JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT_TABS_TOP);
-                    childObject.put(JsonEditorSchemaConstants.UNIQUE_ITEMS, JsonEditorSchemaConstants.TRUE);
+                        JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT_TABS_TOP);
+                    childObject.put(JsonEditorSchemaConstants.UNIQUE_ITEMS,
+                        JsonEditorSchemaConstants.TRUE);
                 } else if (typeValue.equalsIgnoreCase(ToscaSchemaConstants.TYPE_MAP)) {
-                    childObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_OBJECT);
+                    childObject.put(JsonEditorSchemaConstants.TYPE,
+                        JsonEditorSchemaConstants.TYPE_OBJECT);
                 } else if (typeValue.contains(ToscaSchemaConstants.POLICY_DATA)) {
                     JSONArray childArray = new JSONArray();
 
@@ -358,101 +462,129 @@ public class ToscaYamlToJsonConvertor {
                         JSONObject entrySchemaObject = new JSONObject();
                         // Need to traverse
                         JSONArray jsonArray = new JSONArray();
-                        ((LinkedHashMap<String, Object>) dataNodes.get(typeValue)).entrySet().stream().forEach(pmap -> {
-                            if (pmap.getKey().equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
-                                parseToscaPropertiesForType(childObjectKey,
-                                        (LinkedHashMap<String, Object>) pmap.getValue(), entrySchemaObject, childArray,
-                                        jsonEntrySchema, dataNodes, true, incrementComplexSimpleTypeOrder());
-                                jsonEntrySchema.put(typeValue, entrySchemaObject);
-                                dataNodes.remove(typeValue);
-                                attachTypeJsonObject(childObject, entrySchemaObject);
-                            }
-                        });
+                        ((LinkedHashMap<String, Object>) dataNodes.get(typeValue)).entrySet()
+                            .stream().forEach(pmap -> {
+                                if (pmap.getKey()
+                                    .equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
+                                    parseToscaPropertiesForType(childObjectKey,
+                                        (LinkedHashMap<String, Object>) pmap.getValue(),
+                                        entrySchemaObject, childArray, jsonEntrySchema, dataNodes,
+                                        true, incrementComplexSimpleTypeOrder());
+                                    jsonEntrySchema.put(typeValue, entrySchemaObject);
+                                    dataNodes.remove(typeValue);
+                                    attachTypeJsonObject(childObject, entrySchemaObject);
+                                }
+                            });
                     }
                 } else {
-                    childObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_STRING);
+                    childObject.put(JsonEditorSchemaConstants.TYPE,
+                        JsonEditorSchemaConstants.TYPE_STRING);
                 }
             }
             if (childNodeMap.get(ToscaSchemaConstants.DEFAULT) != null) {
-                childObject.put(JsonEditorSchemaConstants.DEFAULT, childNodeMap.get(ToscaSchemaConstants.DEFAULT));
+                childObject.put(JsonEditorSchemaConstants.DEFAULT,
+                    childNodeMap.get(ToscaSchemaConstants.DEFAULT));
             }
         }
     }
 
-    private void parseConstraints(LinkedHashMap<String, Object> childNodeMap, JSONObject childObject) {
+    private void parseConstraints(LinkedHashMap<String, Object> childNodeMap,
+        JSONObject childObject) {
         if (childNodeMap.containsKey(ToscaSchemaConstants.CONSTRAINTS)
-                && childNodeMap.get(ToscaSchemaConstants.CONSTRAINTS) != null) {
-            List<LinkedHashMap<String, Object>> constraintsList = (List<LinkedHashMap<String, Object>>) childNodeMap
+            && childNodeMap.get(ToscaSchemaConstants.CONSTRAINTS) != null) {
+            List<LinkedHashMap<String, Object>> constraintsList =
+                (List<LinkedHashMap<String, Object>>) childNodeMap
                     .get(ToscaSchemaConstants.CONSTRAINTS);
             constraintsList.stream().forEach(c -> {
                 if (c instanceof Map) {
                     c.entrySet().stream().forEach(constraint -> {
                         if (constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.MIN_LENGTH)
-                                || constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.GREATER_OR_EQUAL)) {
-                            // For String min_lenghth is minimum length whereas for number, it will be
+                            || constraint.getKey()
+                                .equalsIgnoreCase(ToscaSchemaConstants.GREATER_OR_EQUAL)) {
+                            // For String min_lenghth is minimum length whereas for number, it will
+                            // be
                             // minimum or greater than to the defined value
                             if (childNodeMap.containsKey(ToscaSchemaConstants.TYPE)
-                                    && (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String)
-                                    && ((String) childNodeMap.get(ToscaSchemaConstants.TYPE))
-                                            .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
-                                childObject.put(JsonEditorSchemaConstants.MIN_LENGTH, constraint.getValue());
+                                && (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String)
+                                && ((String) childNodeMap.get(ToscaSchemaConstants.TYPE))
+                                    .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
+                                childObject.put(JsonEditorSchemaConstants.MIN_LENGTH,
+                                    constraint.getValue());
                             } else {
-                                childObject.put(JsonEditorSchemaConstants.MINIMUM, constraint.getValue());
+                                childObject.put(JsonEditorSchemaConstants.MINIMUM,
+                                    constraint.getValue());
                             }
-                        } else if (constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.MAX_LENGTH)
-                                || constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.LESS_OR_EQUAL)) {
-                            // For String max_lenghth is maximum length whereas for number, it will be
+                        } else if (constraint.getKey()
+                            .equalsIgnoreCase(ToscaSchemaConstants.MAX_LENGTH)
+                            || constraint.getKey()
+                                .equalsIgnoreCase(ToscaSchemaConstants.LESS_OR_EQUAL)) {
+                            // For String max_lenghth is maximum length whereas for number, it will
+                            // be
                             // maximum or less than the defined value
                             if (childNodeMap.containsKey(ToscaSchemaConstants.TYPE)
-                                    && (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String)
-                                    && ((String) childNodeMap.get(ToscaSchemaConstants.TYPE))
-                                            .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
-                                childObject.put(JsonEditorSchemaConstants.MAX_LENGTH, constraint.getValue());
+                                && (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String)
+                                && ((String) childNodeMap.get(ToscaSchemaConstants.TYPE))
+                                    .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
+                                childObject.put(JsonEditorSchemaConstants.MAX_LENGTH,
+                                    constraint.getValue());
                             } else {
-                                childObject.put(JsonEditorSchemaConstants.MAXIMUM, constraint.getValue());
+                                childObject.put(JsonEditorSchemaConstants.MAXIMUM,
+                                    constraint.getValue());
                             }
-                        } else if (constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.LESS_THAN)) {
-                            childObject.put(JsonEditorSchemaConstants.EXCLUSIVE_MAXIMUM, constraint.getValue());
-                        } else if (constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.GREATER_THAN)) {
-                            childObject.put(JsonEditorSchemaConstants.EXCLUSIVE_MINIMUM, constraint.getValue());
-                        } else if (constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.IN_RANGE)) {
+                        } else if (constraint.getKey()
+                            .equalsIgnoreCase(ToscaSchemaConstants.LESS_THAN)) {
+                            childObject.put(JsonEditorSchemaConstants.EXCLUSIVE_MAXIMUM,
+                                constraint.getValue());
+                        } else if (constraint.getKey()
+                            .equalsIgnoreCase(ToscaSchemaConstants.GREATER_THAN)) {
+                            childObject.put(JsonEditorSchemaConstants.EXCLUSIVE_MINIMUM,
+                                constraint.getValue());
+                        } else if (constraint.getKey()
+                            .equalsIgnoreCase(ToscaSchemaConstants.IN_RANGE)) {
                             if (constraint.getValue() instanceof ArrayList<?>) {
                                 if (childNodeMap.containsKey(ToscaSchemaConstants.TYPE)
-                                        && (childNodeMap.get(ToscaSchemaConstants.TYPE) instanceof String)
-                                        && ((String) childNodeMap.get(ToscaSchemaConstants.TYPE))
-                                                .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
+                                    && (childNodeMap
+                                        .get(ToscaSchemaConstants.TYPE) instanceof String)
+                                    && ((String) childNodeMap.get(ToscaSchemaConstants.TYPE))
+                                        .equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
                                     childObject.put(JsonEditorSchemaConstants.MIN_LENGTH,
-                                            ((ArrayList) constraint.getValue()).get(0));
+                                        ((ArrayList) constraint.getValue()).get(0));
                                     childObject.put(JsonEditorSchemaConstants.MAX_LENGTH,
-                                            ((ArrayList) constraint.getValue()).get(1));
+                                        ((ArrayList) constraint.getValue()).get(1));
                                 } else {
                                     childObject.put(JsonEditorSchemaConstants.MINIMUM,
-                                            ((ArrayList) constraint.getValue()).get(0));
+                                        ((ArrayList) constraint.getValue()).get(0));
                                     childObject.put(JsonEditorSchemaConstants.MAXIMUM,
-                                            ((ArrayList) constraint.getValue()).get(1));
+                                        ((ArrayList) constraint.getValue()).get(1));
                                 }
 
                             }
-                        } else if (constraint.getKey().equalsIgnoreCase(ToscaSchemaConstants.VALID_VALUES)) {
+                        } else if (constraint.getKey()
+                            .equalsIgnoreCase(ToscaSchemaConstants.VALID_VALUES)) {
                             JSONArray validValuesArray = new JSONArray();
 
                             if (constraint.getValue() instanceof ArrayList<?>) {
-                                boolean processDictionary = ((ArrayList<?>) constraint.getValue()).stream()
-                                        .anyMatch(value -> (value instanceof String
-                                                && ((String) value).contains(ToscaSchemaConstants.DICTIONARY)));
+                                boolean processDictionary =
+                                    ((ArrayList<?>) constraint.getValue()).stream().anyMatch(
+                                        value -> (value instanceof String && ((String) value)
+                                            .contains(ToscaSchemaConstants.DICTIONARY)));
                                 if (!processDictionary) {
-                                    ((ArrayList<?>) constraint.getValue()).stream().forEach(value -> {
-                                        validValuesArray.put(value);
-                                    });
-                                    childObject.put(JsonEditorSchemaConstants.ENUM, validValuesArray);
+                                    ((ArrayList<?>) constraint.getValue()).stream()
+                                        .forEach(value -> {
+                                            validValuesArray.put(value);
+                                        });
+                                    childObject.put(JsonEditorSchemaConstants.ENUM,
+                                        validValuesArray);
                                 } else {
-                                    ((ArrayList<?>) constraint.getValue()).stream().forEach(value -> {
-                                        if ((value instanceof String
-                                                && ((String) value).contains(ToscaSchemaConstants.DICTIONARY))) {
-                                            processDictionaryElements(childObject, (String) value);
-                                        }
+                                    ((ArrayList<?>) constraint.getValue()).stream()
+                                        .forEach(value -> {
+                                            if ((value instanceof String && ((String) value)
+                                                .contains(ToscaSchemaConstants.DICTIONARY))) {
+                                                processDictionaryElements(childObject,
+                                                    (String) value);
+                                            }
 
-                                    });
+                                        });
 
                                 }
                             }
@@ -464,8 +596,117 @@ public class ToscaYamlToJsonConvertor {
         }
     }
 
+    private void parseMetadataPossibleValues(LinkedHashMap<String, Object> childNodeMap,
+        JSONObject childObject) {
+        if (childNodeMap.containsKey(ToscaSchemaConstants.METADATA)
+            && childNodeMap.get(ToscaSchemaConstants.METADATA) != null) {
+            LinkedHashMap<String, Object> metadataMap =
+                (LinkedHashMap<String, Object>) childNodeMap.get(ToscaSchemaConstants.METADATA);
+            if (metadataMap instanceof Map) {
+                metadataMap.entrySet().stream().forEach(constraint -> {
+                    if (constraint.getKey()
+                        .equalsIgnoreCase(ToscaSchemaConstants.METADATA_CLAMP_POSSIBLE_VALUES)) {
+                        JSONArray validValuesArray = new JSONArray();
+
+                        if (constraint.getValue() instanceof ArrayList<?>) {
+                            boolean processDictionary = ((ArrayList<?>) constraint.getValue())
+                                .stream().anyMatch(value -> (value instanceof String
+                                    && ((String) value).contains(ToscaSchemaConstants.DICTIONARY)));
+                            if (processDictionary) {
+                                ((ArrayList<?>) constraint.getValue()).stream().forEach(value -> {
+                                    if ((value instanceof String && ((String) value)
+                                        .contains(ToscaSchemaConstants.DICTIONARY))) {
+                                        processDictionaryElements(childObject, (String) value);
+                                    }
+
+                                });
+
+                            }
+                        }
+
+                    }
+                });
+            }
+        }
+    }
+
     private void processDictionaryElements(JSONObject childObject, String dictionaryReference) {
+        if (dictionaryReference.contains("#")) {
+            String[] dictionaryKeyArray = dictionaryReference
+                .substring(dictionaryReference.indexOf(ToscaSchemaConstants.DICTIONARY) + 11,
+                    dictionaryReference.length())
+                .split("#");
+            // We support only one # as of now.
+            List<DictionaryElement> cldsDictionaryElements = null;
+            List<DictionaryElement> subDictionaryElements = null;
+            if (dictionaryKeyArray != null && dictionaryKeyArray.length == 2) {
+                cldsDictionaryElements = dictionaryService.getDictionary(dictionaryKeyArray[0])
+                    .getDictionaryElements().stream().collect(Collectors.toList());
+                subDictionaryElements = dictionaryService.getDictionary(dictionaryKeyArray[1])
+                    .getDictionaryElements().stream().collect(Collectors.toList());
+
+                if (cldsDictionaryElements != null) {
+                    List<String> subCldsDictionaryNames = subDictionaryElements.stream()
+                        .map(DictionaryElement::getShortName).collect(Collectors.toList());
+                    JSONArray jsonArray = new JSONArray();
+
+                    Optional.ofNullable(cldsDictionaryElements).get().stream().forEach(c -> {
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put(JsonEditorSchemaConstants.TYPE, getJsonType(c.getType()));
+                        if (c.getType() != null
+                            && c.getType().equalsIgnoreCase(ToscaSchemaConstants.TYPE_STRING)) {
+                            jsonObject.put(JsonEditorSchemaConstants.MIN_LENGTH, 1);
 
+                        }
+                        jsonObject.put(JsonEditorSchemaConstants.ID, c.getName());
+                        jsonObject.put(JsonEditorSchemaConstants.LABEL, c.getShortName());
+                        jsonObject.put(JsonEditorSchemaConstants.OPERATORS, subCldsDictionaryNames);
+                        jsonArray.put(jsonObject);
+                    });;
+                    JSONObject filterObject = new JSONObject();
+                    filterObject.put(JsonEditorSchemaConstants.FILTERS, jsonArray);
+
+                    childObject.put(JsonEditorSchemaConstants.TYPE,
+                        JsonEditorSchemaConstants.TYPE_QBLDR);
+                    // TO invoke validation on such parameters
+                    childObject.put(JsonEditorSchemaConstants.MIN_LENGTH, 1);
+                    childObject.put(JsonEditorSchemaConstants.QSSCHEMA, filterObject);
+
+                }
+            }
+        } else {
+            String dictionaryKey = dictionaryReference.substring(
+                dictionaryReference.indexOf(ToscaSchemaConstants.DICTIONARY) + 11,
+                dictionaryReference.length());
+            if (dictionaryKey != null) {
+                List<DictionaryElement> cldsDictionaryElements =
+                    dictionaryService.getDictionary(dictionaryKey).getDictionaryElements().stream()
+                        .collect(Collectors.toList());
+                if (cldsDictionaryElements != null) {
+                    List<String> cldsDictionaryNames = new ArrayList<>();
+                    List<String> cldsDictionaryFullNames = new ArrayList<>();
+                    cldsDictionaryElements.stream().forEach(c -> {
+                        // Json type will be translated before Policy creation
+                        if (c.getType() != null && !c.getType().equalsIgnoreCase("json")) {
+                            cldsDictionaryFullNames.add(c.getName());
+                        }
+                        cldsDictionaryNames.add(c.getShortName());
+                    });
+
+                    if (!cldsDictionaryFullNames.isEmpty()) {
+                        childObject.put(JsonEditorSchemaConstants.ENUM, cldsDictionaryFullNames);
+                        // Add Enum titles for generated translated values during JSON instance
+                        // generation
+                        JSONObject enumTitles = new JSONObject();
+                        enumTitles.put(JsonEditorSchemaConstants.ENUM_TITLES, cldsDictionaryNames);
+                        childObject.put(JsonEditorSchemaConstants.OPTIONS, enumTitles);
+                    } else {
+                        childObject.put(JsonEditorSchemaConstants.ENUM, cldsDictionaryNames);
+                    }
+
+                }
+            }
+        }
     }
 
     private String getJsonType(String toscaType) {
@@ -480,4 +721,4 @@ public class ToscaYamlToJsonConvertor {
         return jsonType;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
index 0a0831bb7..e6ba98151 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
@@ -24,13 +24,11 @@
 package org.onap.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -41,7 +39,6 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-
 import org.hibernate.annotations.SortNatural;
 import org.onap.clamp.loop.common.AuditEntity;
 
@@ -79,16 +76,27 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     @Column(nullable = false, name = "loop_element_type")
     private String loopElementType;
 
+    /**
+     * This variable is used to display the micro-service name in the SVG.
+     */
+    @Expose
+    @Column(name = "short_name")
+    private String shortName;
+
     /**
      * This variable is used to store the type mentioned in the micro-service
      * blueprint.
      */
     @Expose
-    @ManyToMany(fetch = FetchType.EAGER, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH })
-    @JoinTable(name = "loopelementmodels_to_policymodels",
-            joinColumns = @JoinColumn(name = "loop_element_name", referencedColumnName = "name"),
-            inverseJoinColumns = { @JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
-                @JoinColumn(name = "policy_model_version", referencedColumnName = "version") })
+    @ManyToMany(
+        fetch = FetchType.EAGER,
+        cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
+    @JoinTable(
+        name = "loopelementmodels_to_policymodels",
+        joinColumns = @JoinColumn(name = "loop_element_name", referencedColumnName = "name"),
+        inverseJoinColumns = {
+            @JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
+            @JoinColumn(name = "policy_model_version", referencedColumnName = "version")})
     @SortNatural
     private SortedSet<PolicyModel> policyModels = new TreeSet<>();
 
@@ -97,7 +105,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * policyModels getter.
-     * 
+     *
      * @return the policyModel
      */
     public SortedSet<PolicyModel> getPolicyModels() {
@@ -106,7 +114,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * Method to add a new policyModel to the list.
-     * 
+     *
      * @param policyModel The policy model
      */
     public void addPolicyModel(PolicyModel policyModel) {
@@ -116,7 +124,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * name getter.
-     * 
+     *
      * @return the name
      */
     public String getName() {
@@ -125,7 +133,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * name setter.
-     * 
+     *
      * @param name the name to set
      */
     public void setName(String name) {
@@ -134,7 +142,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * blueprint getter.
-     * 
+     *
      * @return the blueprint
      */
     public String getBlueprint() {
@@ -143,7 +151,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * blueprint setter.
-     * 
+     *
      * @param blueprint the blueprint to set
      */
     public void setBlueprint(String blueprint) {
@@ -151,10 +159,8 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     }
 
     /**
-     * loopElementType getter.
-     * 
      * dcaeBlueprintId getter.
-     * 
+     *
      * @return the dcaeBlueprintId
      */
     public String getDcaeBlueprintId() {
@@ -163,7 +169,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * dcaeBlueprintId setter.
-     * 
+     *
      * @param dcaeBlueprintId the dcaeBlueprintId to set
      */
     public void setDcaeBlueprintId(String dcaeBlueprintId) {
@@ -171,6 +177,8 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     }
 
     /**
+     * loopElementType getter.
+     *
      * @return the loopElementType
      */
     public String getLoopElementType() {
@@ -179,16 +187,32 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * loopElementType setter.
-     * 
+     *
      * @param loopElementType the loopElementType to set
      */
     public void setLoopElementType(String loopElementType) {
         this.loopElementType = loopElementType;
     }
 
+    /**
+     * shortName getter.
+     *
+     * @return the shortName
+     */
+    public String getShortName() {
+        return shortName;
+    }
+
+    /**
+     * @param shortName the shortName to set.
+     */
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
     /**
      * usedByLoopTemplates getter.
-     * 
+     *
      * @return the usedByLoopTemplates
      */
     public Set<LoopTemplateLoopElementModel> getUsedByLoopTemplates() {
@@ -203,11 +227,11 @@ public class LoopElementModel extends AuditEntity implements Serializable {
 
     /**
      * Constructor.
-     * 
-     * @param name            The name id
+     *
+     * @param name The name id
      * @param loopElementType The type of loop element
-     * @param blueprint       The blueprint defined for dcae that contains the
-     *                        policy type to use
+     * @param blueprint The blueprint defined for dcae that contains the
+     *        policy type to use
      */
     public LoopElementModel(String name, String loopElementType, String blueprint) {
         this.name = name;
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java b/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java
index 3e90c1e5b..54096cb8f 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopTemplate.java
@@ -24,14 +24,13 @@
 package org.onap.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
+import javax.persistence.Convert;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
@@ -39,7 +38,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-
 import org.hibernate.annotations.SortNatural;
 import org.onap.clamp.loop.common.AuditEntity;
 import org.onap.clamp.loop.service.Service;
@@ -74,12 +72,18 @@ public class LoopTemplate extends AuditEntity implements Serializable {
     private String svgRepresentation;
 
     @Expose
-    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "loopTemplate", orphanRemoval = true)
+    @OneToMany(
+        cascade = CascadeType.ALL,
+        fetch = FetchType.EAGER,
+        mappedBy = "loopTemplate",
+        orphanRemoval = true)
     @SortNatural
     private SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed = new TreeSet<>();
 
     @Expose
-    @ManyToOne(fetch = FetchType.EAGER, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH })
+    @ManyToOne(
+        fetch = FetchType.EAGER,
+        cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
     @JoinColumn(name = "service_uuid")
     private Service modelService;
 
@@ -91,9 +95,17 @@ public class LoopTemplate extends AuditEntity implements Serializable {
     @Column(name = "unique_blueprint", columnDefinition = "boolean default false")
     private boolean uniqueBlueprint;
 
+    /**
+     * Type of Loop allowed to be created.
+     */
+    @Expose
+    @Column(name = "allowed_loop_type")
+    @Convert(converter = LoopTypeConvertor.class)
+    private LoopType allowedLoopType = LoopType.CLOSED;
+
     /**
      * name getter.
-     * 
+     *
      * @return the name
      */
     public String getName() {
@@ -102,7 +114,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * name setter.
-     * 
+     *
      * @param name the name to set
      */
     public void setName(String name) {
@@ -111,7 +123,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * blueprint getter.
-     * 
+     *
      * @return the blueprint
      */
     public String getBlueprint() {
@@ -120,7 +132,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * dcaeBlueprintId getter.
-     * 
+     *
      * @return the dcaeBlueprintId
      */
     public String getDcaeBlueprintId() {
@@ -129,7 +141,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * dcaeBlueprintId setter.
-     * 
+     *
      * @param dcaeBlueprintId the dcaeBlueprintId to set
      */
     public void setDcaeBlueprintId(String dcaeBlueprintId) {
@@ -138,7 +150,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * blueprint setter.
-     * 
+     *
      * @param blueprint the blueprint to set
      */
     public void setBlueprint(String blueprint) {
@@ -152,7 +164,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * svgRepresentation getter.
-     * 
+     *
      * @return the svgRepresentation
      */
     public String getSvgRepresentation() {
@@ -161,7 +173,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * svgRepresentation setter.
-     * 
+     *
      * @param svgRepresentation the svgRepresentation to set
      */
     public void setSvgRepresentation(String svgRepresentation) {
@@ -170,7 +182,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * loopElementModelsUsed getter.
-     * 
+     *
      * @return the loopElementModelsUsed
      */
     public SortedSet<LoopTemplateLoopElementModel> getLoopElementModelsUsed() {
@@ -179,7 +191,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * maximumInstancesAllowed getter.
-     * 
+     *
      * @return the maximumInstancesAllowed
      */
     public Integer getMaximumInstancesAllowed() {
@@ -188,17 +200,35 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * maximumInstancesAllowed setter.
-     * 
+     *
      * @param maximumInstancesAllowed the maximumInstancesAllowed to set
      */
     public void setMaximumInstancesAllowed(Integer maximumInstancesAllowed) {
         this.maximumInstancesAllowed = maximumInstancesAllowed;
     }
 
+    /**
+     * allowedLoopType getter.
+     *
+     * @return the allowedLoopType Type of Loop allowed to be created
+     */
+    public LoopType getAllowedLoopType() {
+        return allowedLoopType;
+    }
+
+    /**
+     * allowedLoopType setter.
+     *
+     * @param allowedLoopType the allowedLoopType to set
+     */
+    public void setAllowedLoopType(LoopType allowedLoopType) {
+        this.allowedLoopType = allowedLoopType;
+    }
+
     /**
      * Add list of loopElements to the current template, each loopElementModel is
      * added at the end of the list so the flowOrder is computed automatically.
-     * 
+     *
      * @param loopElementModels The loopElementModel set to add
      */
     public void addLoopElementModels(Set<LoopElementModel> loopElementModels) {
@@ -210,12 +240,12 @@ public class LoopTemplate extends AuditEntity implements Serializable {
     /**
      * Add a loopElement to the current template, the loopElementModel is added at
      * the end of the list so the flowOrder is computed automatically.
-     * 
+     *
      * @param loopElementModel The loopElementModel to add
      */
     public void addLoopElementModel(LoopElementModel loopElementModel) {
-        LoopTemplateLoopElementModel jointEntry = new LoopTemplateLoopElementModel(this, loopElementModel,
-                this.loopElementModelsUsed.size());
+        LoopTemplateLoopElementModel jointEntry = new LoopTemplateLoopElementModel(this,
+            loopElementModel, this.loopElementModelsUsed.size());
         this.loopElementModelsUsed.add(jointEntry);
         loopElementModel.getUsedByLoopTemplates().add(jointEntry);
     }
@@ -223,20 +253,20 @@ public class LoopTemplate extends AuditEntity implements Serializable {
     /**
      * Add a loopElement model to the current template, the flow order must be
      * specified manually.
-     * 
+     *
      * @param loopElementModel The loopElementModel to add
-     * @param listPosition     The position in the flow
+     * @param listPosition The position in the flow
      */
     public void addLoopElementModel(LoopElementModel loopElementModel, Integer listPosition) {
-        LoopTemplateLoopElementModel jointEntry = new LoopTemplateLoopElementModel(this, loopElementModel,
-                listPosition);
+        LoopTemplateLoopElementModel jointEntry =
+            new LoopTemplateLoopElementModel(this, loopElementModel, listPosition);
         this.loopElementModelsUsed.add(jointEntry);
         loopElementModel.getUsedByLoopTemplates().add(jointEntry);
     }
 
     /**
      * modelService getter.
-     * 
+     *
      * @return the modelService
      */
     public Service getModelService() {
@@ -245,7 +275,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * modelService setter.
-     * 
+     *
      * @param modelService the modelService to set
      */
     public void setModelService(Service modelService) {
@@ -254,7 +284,7 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * uniqueBlueprint getter.
-     * 
+     *
      * @return the uniqueBlueprint
      */
     public boolean getUniqueBlueprint() {
@@ -270,17 +300,17 @@ public class LoopTemplate extends AuditEntity implements Serializable {
 
     /**
      * Constructor.
-     * 
-     * @param name                The loop template name id
-     * @param blueprint           The blueprint containing all microservices (legacy
-     *                            case)
-     * @param svgRepresentation   The svg representation of that loop template
+     *
+     * @param name The loop template name id
+     * @param blueprint The blueprint containing all microservices (legacy
+     *        case)
+     * @param svgRepresentation The svg representation of that loop template
      * @param maxInstancesAllowed The maximum number of instances that can be
-     *                            created from that template
-     * @param service             The service associated to that loop template
+     *        created from that template
+     * @param service The service associated to that loop template
      */
-    public LoopTemplate(String name, String blueprint, String svgRepresentation, Integer maxInstancesAllowed,
-            Service service) {
+    public LoopTemplate(String name, String blueprint, String svgRepresentation,
+        Integer maxInstancesAllowed, Service service) {
         this.name = name;
         this.setBlueprint(blueprint);
         this.svgRepresentation = svgRepresentation;
@@ -322,17 +352,17 @@ public class LoopTemplate extends AuditEntity implements Serializable {
     /**
      * Generate the loop template name.
      *
-     * @param serviceName       The service name
-     * @param serviceVersion    The service version
-     * @param resourceName      The resource name
+     * @param serviceName The service name
+     * @param serviceVersion The service version
+     * @param resourceName The resource name
      * @param blueprintFileName The blueprint file name
      * @return The generated loop template name
      */
-    public static String generateLoopTemplateName(String serviceName, String serviceVersion, String resourceName,
-            String blueprintFileName) {
+    public static String generateLoopTemplateName(String serviceName, String serviceVersion,
+        String resourceName, String blueprintFileName) {
         StringBuilder buffer = new StringBuilder("LOOP_TEMPLATE_").append(serviceName).append("_v")
-                .append(serviceVersion).append("_").append(resourceName).append("_")
-                .append(blueprintFileName.replaceAll(".yaml", ""));
+            .append(serviceVersion).append("_").append(resourceName).append("_")
+            .append(blueprintFileName.replaceAll(".yaml", ""));
         return buffer.toString().replace('.', '_').replaceAll(" ", "");
     }
 }
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java b/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java
index 3e2f8ad42..cac5f088a 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopTemplateLoopElementModelId.java
@@ -24,9 +24,7 @@
 package org.onap.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
-
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
@@ -55,8 +53,8 @@ public class LoopTemplateLoopElementModelId implements Serializable {
 
     /**
      * Constructor.
-     * 
-     * @param loopTemplateName      The loop template name id
+     *
+     * @param loopTemplateName The loop template name id
      * @param microServiceModelName THe micro Service name id
      */
     public LoopTemplateLoopElementModelId(String loopTemplateName, String microServiceModelName) {
@@ -66,7 +64,7 @@ public class LoopTemplateLoopElementModelId implements Serializable {
 
     /**
      * loopTemplateName getter.
-     * 
+     *
      * @return the loopTemplateName
      */
     public String getLoopTemplateName() {
@@ -75,7 +73,7 @@ public class LoopTemplateLoopElementModelId implements Serializable {
 
     /**
      * loopTemplateName setter.
-     * 
+     *
      * @param loopTemplateName the loopTemplateName to set
      */
     public void setLoopTemplateName(String loopTemplateName) {
@@ -84,7 +82,7 @@ public class LoopTemplateLoopElementModelId implements Serializable {
 
     /**
      * microServiceModelName getter.
-     * 
+     *
      * @return the microServiceModelName
      */
     public String getLoopElementModelName() {
@@ -93,7 +91,7 @@ public class LoopTemplateLoopElementModelId implements Serializable {
 
     /**
      * loopElementModelName setter.
-     * 
+     *
      * @param loopElementModelName the loopElementModelName to set
      */
     public void setLoopElementModelName(String loopElementModelName) {
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java b/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
new file mode 100644
index 000000000..279d602c8
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
@@ -0,0 +1,111 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop.template;
+
+import java.util.List;
+import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
+import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
+import org.onap.clamp.clds.sdc.controller.installer.BlueprintParser;
+import org.onap.clamp.clds.sdc.controller.installer.ChainGenerator;
+import org.onap.clamp.clds.util.drawing.SvgFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LoopTemplatesService {
+
+    private final LoopTemplatesRepository loopTemplatesRepository;
+
+    @Autowired
+    ChainGenerator chainGenerator;
+
+    @Autowired
+    private SvgFacade svgFacade;
+
+    /**
+     * Constructor.
+     */
+    @Autowired
+    public LoopTemplatesService(LoopTemplatesRepository loopTemplatesRepository) {
+        this.loopTemplatesRepository = loopTemplatesRepository;
+
+    }
+
+    public LoopTemplate saveOrUpdateLoopTemplate(LoopTemplate loopTemplate) {
+        return loopTemplatesRepository.save(loopTemplate);
+    }
+
+    /**
+     * Saves or updates loop template Object.
+     *
+     * @param templateName the loop template name
+     * @param loopTemplate the loop template object
+     * @return the loop template
+     * @throws BlueprintParserException In case of issues with the blueprint
+     *         parsing
+     */
+    public LoopTemplate saveOrUpdateLoopTemplateByName(String templateName,
+        LoopTemplate loopTemplate) throws BlueprintParserException {
+
+        if (getLoopTemplate(templateName) != null) {
+            loopTemplate.setName(getLoopTemplate(templateName).getName());
+        }
+        return saveOrUpdateLoopTemplate(createTemplateFromBlueprint(templateName, loopTemplate));
+    }
+
+    public List<String> getLoopTemplateNames() {
+        return loopTemplatesRepository.getAllLoopTemplateNames();
+    }
+
+    public List<LoopTemplate> getAllLoopTemplates() {
+        return loopTemplatesRepository.findAll();
+    }
+
+    public LoopTemplate getLoopTemplate(String name) {
+        return loopTemplatesRepository.findById(name).orElse(null);
+    }
+
+    public void deleteLoopTemplate(String name) {
+        loopTemplatesRepository.deleteById(name);
+    }
+
+    private LoopTemplate createTemplateFromBlueprint(String templateName, LoopTemplate loopTemplate)
+        throws BlueprintParserException {
+
+        String blueprintYaml = loopTemplate.getBlueprint();
+        List<BlueprintMicroService> microServicesChain =
+            chainGenerator.getChainOfMicroServices(BlueprintParser.getMicroServices(blueprintYaml));
+        if (microServicesChain.isEmpty()) {
+            microServicesChain = BlueprintParser.fallbackToOneMicroService();
+        }
+        loopTemplate.setSvgRepresentation(svgFacade.getSvgImage(microServicesChain));
+        loopTemplate.setName(templateName);
+
+        LoopTemplate existingTemplate = getLoopTemplate(templateName);
+        if (existingTemplate != null) {
+            loopTemplate.setName(existingTemplate.getName());
+        }
+        return loopTemplate;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopType.java b/src/main/java/org/onap/clamp/loop/template/LoopType.java
new file mode 100644
index 000000000..ccbc62a83
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/template/LoopType.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop.template;
+
+/**
+ * Enums for AllowedLoopType in LoopTemplate enity.
+ *
+ */
+public enum LoopType {
+    OPEN("OPEN"), CLOSED("CLOSED"), HYBRID("HYBRID");
+
+    private String value;
+
+    private LoopType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java b/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java
new file mode 100644
index 000000000..0b05613cb
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/template/LoopTypeConvertor.java
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop.template;
+
+import java.util.stream.Stream;
+import javax.persistence.AttributeConverter;
+
+/**
+ * Attribute Converter to allow using LoopType Enum values in DB and Java classes.
+ *
+ */
+public class LoopTypeConvertor implements AttributeConverter<LoopType, String> {
+
+    @Override
+    public String convertToDatabaseColumn(LoopType loopType) {
+        if (loopType == null) {
+            return null;
+        }
+        return loopType.getValue();
+    }
+
+    @Override
+    public LoopType convertToEntityAttribute(String value) {
+        if (value == null) {
+            return null;
+        }
+
+        return Stream.of(LoopType.values()).filter(c -> c.getValue().equals(value)).findFirst()
+            .orElseThrow(IllegalArgumentException::new);
+    }
+}
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
index 52f662bb4..d06cb8cff 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
@@ -24,11 +24,9 @@
 package org.onap.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -36,7 +34,6 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-
 import org.onap.clamp.loop.common.AuditEntity;
 import org.onap.clamp.util.SemanticVersioning;
 
@@ -83,7 +80,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * usedByElementModels getter.
-     * 
+     *
      * @return the usedByElementModels
      */
     public Set<LoopElementModel> getUsedByElementModels() {
@@ -92,7 +89,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * policyModelTosca getter.
-     * 
+     *
      * @return the policyModelTosca
      */
     public String getPolicyModelTosca() {
@@ -101,7 +98,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * policyModelTosca setter.
-     * 
+     *
      * @param policyModelTosca the policyModelTosca to set
      */
     public void setPolicyModelTosca(String policyModelTosca) {
@@ -110,7 +107,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * policyModelType getter.
-     * 
+     *
      * @return the modelType
      */
     public String getPolicyModelType() {
@@ -119,7 +116,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * policyModelType setter.
-     * 
+     *
      * @param modelType the modelType to set
      */
     public void setPolicyModelType(String modelType) {
@@ -128,7 +125,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * version getter.
-     * 
+     *
      * @return the version
      */
     public String getVersion() {
@@ -137,7 +134,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * version setter.
-     * 
+     *
      * @param version the version to set
      */
     public void setVersion(String version) {
@@ -147,7 +144,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * policyAcronym getter.
-     * 
+     *
      * @return the policyAcronym value
      */
     public String getPolicyAcronym() {
@@ -156,7 +153,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * policyAcronym setter.
-     * 
+     *
      * @param policyAcronym The policyAcronym to set
      */
     public void setPolicyAcronym(String policyAcronym) {
@@ -171,13 +168,14 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * Constructor.
-     * 
-     * @param policyType       The policyType (referenced in the blueprint
+     *
+     * @param policyType The policyType (referenced in the blueprint
      * @param policyModelTosca The policy tosca model in yaml
-     * @param version          the version like 1.0.0
-     * @param policyAcronym    Subtype for policy if it exists (could be used by UI)
+     * @param version the version like 1.0.0
+     * @param policyAcronym Subtype for policy if it exists (could be used by UI)
      */
-    public PolicyModel(String policyType, String policyModelTosca, String version, String policyAcronym) {
+    public PolicyModel(String policyType, String policyModelTosca, String version,
+        String policyAcronym) {
         this.policyModelType = policyType;
         this.policyModelTosca = policyModelTosca;
         this.version = version;
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
index 8e22852a9..0a09dd8d7 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,24 +23,62 @@
 
 package org.onap.clamp.loop.template;
 
+import com.google.gson.JsonObject;
 import java.util.List;
-
+import org.onap.clamp.clds.tosca.ToscaSchemaConstants;
+import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
+import org.onap.clamp.util.SemanticVersioning;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PolicyModelsService {
     private final PolicyModelsRepository policyModelsRepository;
+    private ToscaYamlToJsonConvertor toscaYamlToJsonConvertor;
 
     @Autowired
-    public PolicyModelsService(PolicyModelsRepository policyModelrepo) {
+    public PolicyModelsService(PolicyModelsRepository policyModelrepo,
+        ToscaYamlToJsonConvertor convertor) {
         policyModelsRepository = policyModelrepo;
+        toscaYamlToJsonConvertor = convertor;
     }
 
     public PolicyModel saveOrUpdatePolicyModel(PolicyModel policyModel) {
         return policyModelsRepository.save(policyModel);
     }
 
+    /**
+     * Creates or updates the Tosca Policy Model.
+     *
+     * @param policyModelType
+     *        The policyModeltype in Tosca yaml
+     * @param policyModel
+     *        The Policymodel object
+     * @return The Policy Model
+     */
+    public PolicyModel saveOrUpdateByPolicyModelType(String policyModelType,
+        String policyModelTosca) {
+        JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
+
+        String policyModelTypeName = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+            ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
+        String acronym = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+            ToscaSchemaConstants.METADATA_ACRONYM);
+        PolicyModel model = getPolicyModelByType(
+            policyModelTypeName != null ? policyModelTypeName : policyModelType);
+
+        if (model == null) {
+            model = new PolicyModel(policyModelTypeName, policyModelTosca,
+                SemanticVersioning.incrementMajorVersion(null), acronym);
+        } else {
+            model.setVersion(SemanticVersioning
+                .incrementMajorVersion(model.getVersion() != null ? model.getVersion() : null));
+            model.setPolicyModelType(policyModelTypeName);
+            model.setPolicyAcronym(acronym);
+        }
+        return saveOrUpdatePolicyModel(model);
+    }
+
     public List<String> getAllPolicyModelTypes() {
         return policyModelsRepository.getAllPolicyModelType();
     }
@@ -56,4 +94,20 @@ public class PolicyModelsService {
     public Iterable<PolicyModel> getAllPolicyModelsByType(String type) {
         return policyModelsRepository.findByPolicyModelType(type);
     }
+
+    public PolicyModel getPolicyModelByType(String type) {
+        List<PolicyModel> list = policyModelsRepository.findByPolicyModelType(type);
+        return list.stream().sorted().findFirst().orElse(null);
+    }
+
+    /**
+     * Retrieves the Tosca model Yaml string.
+     *
+     * @param type The PolicyModelType
+     * @return The Tosca model Yaml string
+     */
+    public String getPolicyModelTosca(String type) {
+        PolicyModel policyModel = getPolicyModelByType(type);
+        return policyModel != null ? policyModel.getPolicyModelTosca() : null;
+    }
 }
diff --git a/src/main/java/org/onap/clamp/tosca/Dictionary.java b/src/main/java/org/onap/clamp/tosca/Dictionary.java
index 7b4e513a2..44b5b6f68 100644
--- a/src/main/java/org/onap/clamp/tosca/Dictionary.java
+++ b/src/main/java/org/onap/clamp/tosca/Dictionary.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,19 +24,18 @@
 package org.onap.clamp.tosca;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
+import java.util.HashSet;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-
 import org.onap.clamp.loop.common.AuditEntity;
 
 /**
@@ -59,19 +58,27 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     @Expose
     @Column(name = "dictionary_second_level")
-    private int secondLevelDictionary;
+    private int secondLevelDictionary = 0;
 
     @Expose
     @Column(name = "dictionary_type")
     private String subDictionaryType;
 
     @Expose
-    @OneToMany(mappedBy = "dictionary", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    private List<DictionaryElement> dictionaryElements = new ArrayList<>();
+    @ManyToMany(
+        fetch = FetchType.EAGER,
+        cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
+    @JoinTable(
+        name = "dictionary_to_dictionaryelements",
+        joinColumns = @JoinColumn(name = "dictionary_name", referencedColumnName = "name"),
+        inverseJoinColumns = {@JoinColumn(
+            name = "dictionary_element_short_name",
+            referencedColumnName = "short_name")})
+    private Set<DictionaryElement> dictionaryElements = new HashSet<>();
 
     /**
      * name getter.
-     * 
+     *
      * @return the name
      */
     public String getName() {
@@ -80,7 +87,7 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     /**
      * name setter.
-     * 
+     *
      * @param name the name to set
      */
     public void setName(String name) {
@@ -89,7 +96,7 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     /**
      * secondLevelDictionary getter.
-     * 
+     *
      * @return the secondLevelDictionary
      */
     public int getSecondLevelDictionary() {
@@ -98,7 +105,7 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     /**
      * secondLevelDictionary setter.
-     * 
+     *
      * @param secondLevelDictionary the secondLevelDictionary to set
      */
     public void setSecondLevelDictionary(int secondLevelDictionary) {
@@ -107,7 +114,7 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     /**
      * subDictionaryType getter.
-     * 
+     *
      * @return the subDictionaryType
      */
     public String getSubDictionaryType() {
@@ -116,7 +123,7 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     /**
      * subDictionaryType setter.
-     * 
+     *
      * @param subDictionaryType the subDictionaryType to set
      */
     public void setSubDictionaryType(String subDictionaryType) {
@@ -125,20 +132,51 @@ public class Dictionary extends AuditEntity implements Serializable {
 
     /**
      * dictionaryElements getter.
-     * 
-     * @return the dictionaryElements
+     *
+     * @return the dictionaryElements List of dictionary element
      */
-    public List<DictionaryElement> getDictionaryElements() {
+    public Set<DictionaryElement> getDictionaryElements() {
         return dictionaryElements;
     }
 
     /**
-     * dictionaryElements setter.
-     * 
-     * @param dictionaryElements the dictionaryElements to set
+     * Method to add a new dictionaryElement to the list.
+     *
+     * @param dictionaryElement The dictionary element
+     */
+    public void addDictionaryElements(DictionaryElement dictionaryElement) {
+        dictionaryElements.add(dictionaryElement);
+        dictionaryElement.getUsedByDictionaries().add(this);
+    }
+
+    /**
+     * Method to delete a dictionaryElement from the list.
+     *
+     * @param dictionaryElement The dictionary element
      */
-    public void setDictionaryElements(List<DictionaryElement> dictionaryElements) {
-        this.dictionaryElements = dictionaryElements;
+    public void removeDictionaryElement(DictionaryElement dictionaryElement) {
+        dictionaryElements.remove(dictionaryElement);
+        dictionaryElement.getUsedByDictionaries().remove(this);
+    }
+
+    /**
+     * Default Constructor.
+     */
+    public Dictionary() {
+
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param name The Dictionary name
+     * @param secondLevelDictionary defines if dictionary is a secondary level
+     * @param subDictionaryType defines the type of secondary level dictionary
+     */
+    public Dictionary(String name, int secondLevelDictionary, String subDictionaryType) {
+        this.name = name;
+        this.secondLevelDictionary = secondLevelDictionary;
+        this.subDictionaryType = subDictionaryType;
     }
 
     @Override
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryElement.java b/src/main/java/org/onap/clamp/tosca/DictionaryElement.java
index e81885f3e..43a3106f5 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryElement.java
+++ b/src/main/java/org/onap/clamp/tosca/DictionaryElement.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,17 +24,15 @@
 package org.onap.clamp.tosca;
 
 import com.google.gson.annotations.Expose;
-
 import java.io.Serializable;
-
-import javax.persistence.CascadeType;
+import java.util.HashSet;
+import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-
 import org.onap.clamp.loop.common.AuditEntity;
 
 /**
@@ -51,32 +49,31 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     @Id
     @Expose
-    @Column(nullable = false, name = "name", unique = true)
-    private String name;
+    @Column(nullable = false, name = "short_name")
+    private String shortName;
 
     @Expose
-    @Column(nullable = false, name = "short_name", unique = true)
-    private String shortName;
+    @Column(nullable = false, name = "name")
+    private String name;
 
     @Expose
-    @Column(name = "description")
+    @Column(nullable = false, name = "description")
     private String description;
 
     @Expose
     @Column(nullable = false, name = "type")
     private String type;
 
-    @Column(name = "subdictionary_id", nullable = false)
     @Expose
+    @Column(nullable = true, name = "subdictionary_name")
     private String subDictionary;
 
-    @ManyToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "dictionary_id")
-    private Dictionary dictionary;
+    @ManyToMany(mappedBy = "dictionaryElements", fetch = FetchType.EAGER)
+    private Set<Dictionary> usedByDictionaries = new HashSet<>();
 
     /**
      * name getter.
-     * 
+     *
      * @return the name
      */
     public String getName() {
@@ -85,7 +82,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * name setter.
-     * 
+     *
      * @param name the name to set
      */
     public void setName(String name) {
@@ -94,7 +91,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * shortName getter.
-     * 
+     *
      * @return the shortName
      */
     public String getShortName() {
@@ -103,7 +100,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * shortName setter.
-     * 
+     *
      * @param shortName the shortName to set
      */
     public void setShortName(String shortName) {
@@ -112,7 +109,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * description getter.
-     * 
+     *
      * @return the description
      */
     public String getDescription() {
@@ -121,7 +118,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * description setter.
-     * 
+     *
      * @param description the description to set
      */
     public void setDescription(String description) {
@@ -130,7 +127,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * type getter.
-     * 
+     *
      * @return the type
      */
     public String getType() {
@@ -139,7 +136,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * type setter.
-     * 
+     *
      * @param type the type to set
      */
     public void setType(String type) {
@@ -148,7 +145,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * subDictionary getter.
-     * 
+     *
      * @return the subDictionary
      */
     public String getSubDictionary() {
@@ -157,7 +154,7 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * subDictionary setter.
-     * 
+     *
      * @param subDictionary the subDictionary to set
      */
     public void setSubDictionary(String subDictionary) {
@@ -165,21 +162,21 @@ public class DictionaryElement extends AuditEntity implements Serializable {
     }
 
     /**
-     * dictionary getter.
-     * 
-     * @return the dictionary
+     * usedByDictionaries getter.
+     *
+     * @return the usedByDictionaries
      */
-    public Dictionary getDictionary() {
-        return dictionary;
+    public Set<Dictionary> getUsedByDictionaries() {
+        return usedByDictionaries;
     }
 
     /**
-     * dictionary setter.
-     * 
-     * @param dictionary the dictionary to set
+     * usedByDictionaries setter.
+     *
+     * @param usedByDictionaries the usedByDictionaries to set
      */
-    public void setDictionary(Dictionary dictionary) {
-        this.dictionary = dictionary;
+    public void setUsedByDictionaries(Set<Dictionary> usedByDictionaries) {
+        this.usedByDictionaries = usedByDictionaries;
     }
 
     /**
@@ -190,30 +187,46 @@ public class DictionaryElement extends AuditEntity implements Serializable {
 
     /**
      * Constructor.
-     * 
-     * @param name          The Dictionary element name
-     * @param shortName     The short name
-     * @param description   The description
-     * @param type          The type of element
+     *
+     * @param name The Dictionary element name
+     * @param shortName The short name
+     * @param description The description
+     * @param type The type of element
      * @param subDictionary The sub type
-     * @param dictionary    The parent dictionary
      */
-    public DictionaryElement(String name, String shortName, String description, String type, String subDictionary,
-            Dictionary dictionary) {
+    public DictionaryElement(String name, String shortName, String description, String type,
+        String subDictionary) {
         this.name = name;
         this.shortName = shortName;
         this.description = description;
         this.type = type;
         this.subDictionary = subDictionary;
-        this.dictionary = dictionary;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param name The Dictionary element name
+     * @param shortName The short name
+     * @param description The description
+     * @param type The type of element
+     * @param subDictionary The sub type
+     */
+    public DictionaryElement(String name, String shortName, String description, String type,
+        String subDictionary, Set<Dictionary> usedByDictionaries) {
+        this.name = name;
+        this.shortName = shortName;
+        this.description = description;
+        this.type = type;
+        this.subDictionary = subDictionary;
+        this.usedByDictionaries = usedByDictionaries;
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((dictionary == null) ? 0 : dictionary.hashCode());
-        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((shortName == null) ? 0 : shortName.hashCode());
         return result;
     }
 
@@ -229,21 +242,13 @@ public class DictionaryElement extends AuditEntity implements Serializable {
             return false;
         }
         DictionaryElement other = (DictionaryElement) obj;
-        if (dictionary == null) {
-            if (other.dictionary != null) {
+        if (shortName == null) {
+            if (other.shortName != null) {
                 return false;
             }
-        } else if (!dictionary.equals(other.dictionary)) {
-            return false;
-        }
-        if (name == null) {
-            if (other.name != null) {
-                return false;
-            }
-        } else if (!name.equals(other.name)) {
+        } else if (!shortName.equals(other.shortName)) {
             return false;
         }
         return true;
     }
-
 }
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java b/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java
index 96cb2e35e..43f6f1d40 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java
+++ b/src/main/java/org/onap/clamp/tosca/DictionaryElementsRepository.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java b/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java
index 2a087b6d9..ae8430d93 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java
+++ b/src/main/java/org/onap/clamp/tosca/DictionaryRepository.java
@@ -24,7 +24,6 @@
 package org.onap.clamp.tosca;
 
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -35,4 +34,7 @@ public interface DictionaryRepository extends JpaRepository<Dictionary, String>
     @Query("SELECT dict.name FROM Dictionary as dict")
     List<String> getAllDictionaryNames();
 
+    @Query("SELECT dict.name FROM Dictionary as dict where dict.secondLevelDictionary = 1")
+    List<String> getAllSecondaryLevelDictionaryNames();
+
 }
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryService.java b/src/main/java/org/onap/clamp/tosca/DictionaryService.java
new file mode 100644
index 000000000..21ca1f7f7
--- /dev/null
+++ b/src/main/java/org/onap/clamp/tosca/DictionaryService.java
@@ -0,0 +1,142 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.tosca;
+
+import com.google.common.collect.Sets;
+import java.util.List;
+import java.util.Set;
+import javax.persistence.EntityNotFoundException;
+import org.onap.clamp.clds.service.SecureServiceBase;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DictionaryService extends SecureServiceBase {
+
+    private final DictionaryRepository dictionaryRepository;
+    private final DictionaryElementsRepository dictionaryElementsRepository;
+
+    /**
+     * Constructor.
+     */
+    @Autowired
+    public DictionaryService(DictionaryRepository dictionaryRepository,
+        DictionaryElementsRepository dictionaryElementsRepository) {
+        this.dictionaryRepository = dictionaryRepository;
+        this.dictionaryElementsRepository = dictionaryElementsRepository;
+
+    }
+
+    public Dictionary saveOrUpdateDictionary(Dictionary dictionary) {
+        return dictionaryRepository.save(dictionary);
+    }
+
+    /**
+     * Creates or Updates Dictionary Element.
+     *
+     * @param dictionaryName The Dictionary name
+     * @param dictionary The Dictionary object with dictionary elements
+     * @return updated Dictionary object with all dictionary elements
+     */
+    public Dictionary saveOrUpdateDictionaryElement(String dictionaryName, Dictionary dictionary) {
+        Dictionary dict = getDictionary(dictionaryName);
+
+        Set<DictionaryElement> newDictionaryElements = dictionary.getDictionaryElements();
+
+        for (DictionaryElement dictionaryElement : newDictionaryElements) {
+            if (dict.getDictionaryElements().contains(dictionaryElement)) {
+                // Update the Dictionary Element
+                getAndUpdateDictionaryElement(dict, dictionaryElement);
+            } else {
+                // Create the Dictionary Element
+                dict.addDictionaryElements(getAndUpdateDictionaryElement(dict, dictionaryElement));
+                dictionaryRepository.save(dict);
+            }
+        }
+
+        // Fetch again to get Dictionary with most recent updates.
+        return dictionaryRepository.findById(dictionaryName).orElseThrow(
+            () -> new EntityNotFoundException("Couldn't find Dictionary named: " + dictionaryName));
+
+    }
+
+    private DictionaryElement getAndUpdateDictionaryElement(Dictionary dictionary,
+        DictionaryElement element) {
+        return dictionaryElementsRepository
+            .save(dictionaryElementsRepository.findById(element.getShortName())
+                .map(p -> updateDictionaryElement(p, element, dictionary))
+                .orElse(new DictionaryElement(element.getName(), element.getShortName(),
+                    element.getDescription(), element.getType(), element.getSubDictionary(),
+                    Sets.newHashSet(dictionary))));
+    }
+
+    public void deleteDictionary(Dictionary dictionary) {
+        dictionaryRepository.delete(dictionary);
+    }
+
+    public void deleteDictionary(String dictionaryName) {
+        dictionaryRepository.deleteById(dictionaryName);
+    }
+
+    public List<Dictionary> getAllDictionaries() {
+        return dictionaryRepository.findAll();
+    }
+
+    public List<String> getAllSecondaryLevelDictionaryNames() {
+        return dictionaryRepository.getAllSecondaryLevelDictionaryNames();
+    }
+
+    public Dictionary getDictionary(String dictionaryName) {
+        return dictionaryRepository.findById(dictionaryName).orElseThrow(
+            () -> new EntityNotFoundException("Couldn't find Dictionary named: " + dictionaryName));
+    }
+
+    /**
+     * Deletes a dictionary element from Dictionary by shortName.
+     *
+     * @param dictionaryName The dictionary name
+     * @param dictionaryElementShortName the dictionary Element Short name
+     */
+    public void deleteDictionaryElement(String dictionaryName, String dictionaryElementShortName) {
+        if (dictionaryRepository.existsById(dictionaryName)) {
+            DictionaryElement element =
+                dictionaryElementsRepository.findById(dictionaryElementShortName).orElse(null);
+            if (element != null) {
+                Dictionary dict = getDictionary(dictionaryName);
+                dict.removeDictionaryElement(element);
+                dictionaryRepository.save(dict);
+            }
+        }
+    }
+
+    private DictionaryElement updateDictionaryElement(DictionaryElement oldDictionaryElement,
+        DictionaryElement newDictionaryElement, Dictionary dictionary) {
+        oldDictionaryElement.setName(newDictionaryElement.getName());
+        oldDictionaryElement.setDescription(newDictionaryElement.getDescription());
+        oldDictionaryElement.setType(newDictionaryElement.getType());
+        oldDictionaryElement.setSubDictionary(newDictionaryElement.getSubDictionary());
+        oldDictionaryElement.getUsedByDictionaries().add(dictionary);
+        return oldDictionaryElement;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/util/SemanticVersioning.java b/src/main/java/org/onap/clamp/util/SemanticVersioning.java
index bf1529c2c..102284494 100644
--- a/src/main/java/org/onap/clamp/util/SemanticVersioning.java
+++ b/src/main/java/org/onap/clamp/util/SemanticVersioning.java
@@ -33,12 +33,13 @@ public class SemanticVersioning {
     public static final int BEFORE = -1;
     public static final int EQUAL = 0;
     public static final int AFTER = 1;
+    public static final String DEFAULT_VERSION = "1.0.0";
 
     /**
      * The compare method that compare arg0 to arg1.
-     * 
-     * @param arg0 A version in string for semantice versioning (a.b.c.d...)
-     * @param arg1 A version in string for semantice versioning (a.b.c.d...)
+     *
+     * @param arg0 A version in string for semantic versioning (a.b.c.d...)
+     * @param arg1 A version in string for semantic versioning (a.b.c.d...)
      * @return objects (arg0, arg1) given as parameters. It returns the value: 0: if
      *         (arg0==arg1) -1: if (arg0 < arg1) 1: if (arg0 > arg1)
      */
@@ -58,11 +59,13 @@ public class SemanticVersioning {
 
         int smalestStringLength = Math.min(arg0Array.length, arg1Array.length);
 
-        for (int currentVersionIndex = 0; currentVersionIndex < smalestStringLength; ++currentVersionIndex) {
-            if (Integer.parseInt(arg0Array[currentVersionIndex]) < Integer.parseInt(arg1Array[currentVersionIndex])) {
+        for (int currentVersionIndex =
+            0; currentVersionIndex < smalestStringLength; ++currentVersionIndex) {
+            if (Integer.parseInt(arg0Array[currentVersionIndex]) < Integer
+                .parseInt(arg1Array[currentVersionIndex])) {
                 return BEFORE;
             } else if (Integer.parseInt(arg0Array[currentVersionIndex]) > Integer
-                    .parseInt(arg1Array[currentVersionIndex])) {
+                .parseInt(arg1Array[currentVersionIndex])) {
                 return AFTER;
             }
             // equals, so do not return anything, continue
@@ -73,4 +76,18 @@ public class SemanticVersioning {
             return Integer.compare(arg0Array.length, arg1Array.length);
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * Method to increment a version from its current version.
+     *
+     * @param currentVersion The current Version
+     * @return the increment version string
+     */
+    public static String incrementMajorVersion(String currentVersion) {
+        if (currentVersion == null || currentVersion.isEmpty()) {
+            return DEFAULT_VERSION;
+        }
+        String[] versionArray = currentVersion.split("\\.");
+        return String.valueOf(Integer.parseInt(versionArray[0]) + 1)+".0.0";
+    }
+}
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index a0a3eb104..f2db72cb8 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -1,8 +1,6 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
 	<rest>
-		<get
-			uri="/v2/loop/getAllNames"
-			outType="java.lang.String[]"
+		<get uri="/v2/loop/getAllNames" outType="java.lang.String[]"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*" />
@@ -26,14 +24,10 @@
 				</doTry>
 			</route>
 		</get>
-		<get
-			uri="/v2/loop/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
+		<get uri="/v2/loop/{loopName}" outType="org.onap.clamp.loop.Loop"
 			produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
@@ -54,14 +48,10 @@
 				</doTry>
 			</route>
 		</get>
-		<get
-			uri="/v2/loop/svgRepresentation/{loopName}"
-			outType="java.lang.String"
-			produces="application/xml">
+		<get uri="/v2/loop/svgRepresentation/{loopName}"
+			outType="java.lang.String" produces="application/xml">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get SVG Representation')" />
@@ -83,16 +73,11 @@
 			</route>
 		</get>
 
-		<post
-			uri="/v2/loop/updateGlobalProperties/{loopName}"
-			type="com.google.gson.JsonObject"
-			consumes="application/json"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<post uri="/v2/loop/updateGlobalProperties/{loopName}"
+			type="com.google.gson.JsonObject" consumes="application/json"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
@@ -119,16 +104,11 @@
 				</doTry>
 			</route>
 		</post>
-		<post
-			uri="/v2/loop/updateOperationalPolicies/{loopName}"
-			type="com.google.gson.JsonArray"
-			consumes="application/json"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<post uri="/v2/loop/updateOperationalPolicies/{loopName}"
+			type="com.google.gson.JsonArray" consumes="application/json"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
@@ -155,16 +135,13 @@
 				</doTry>
 			</route>
 		</post>
-		<post
-			uri="/v2/loop/updateMicroservicePolicy/{loopName}"
+		<post uri="/v2/loop/updateMicroservicePolicy/{loopName}"
 			type="org.onap.clamp.policy.microservice.MicroServicePolicy"
 			consumes="application/json"
 			outType="org.onap.clamp.policy.microservice.MicroServicePolicy"
 			produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
@@ -192,17 +169,12 @@
 				</doTry>
 			</route>
 		</post>
-		<put
-			uri="/v2/loop/deploy/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/deploy/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DCAE DEPLOY request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
@@ -214,8 +186,7 @@
 
 					<to uri="direct:deploy-loop" />
 
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -228,8 +199,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="DEPLOY request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -237,17 +207,12 @@
 				</doTry>
 			</route>
 		</put>
-		<put
-			uri="/v2/loop/refreshOpPolicyJsonSchema/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/refreshOpPolicyJsonSchema/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="Refresh Operational Policy UI for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH OP Policy UI request')" />
@@ -256,8 +221,7 @@
 					<to uri="direct:load-loop" />
 					<to
 						uri="bean:org.onap.clamp.loop.LoopController?method=refreshOpPolicyJsonRepresentation(${header.loopName})" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="REFRESH request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -270,8 +234,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="REFRESH request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -279,17 +242,12 @@
 				</doTry>
 			</route>
 		</put>
-		<put
-			uri="/v2/loop/undeploy/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/undeploy/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DCAE UNDEPLOY request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
@@ -300,8 +258,7 @@
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
 					<to uri="direct:undeploy-loop" />
 
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="UNDEPLOY request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -314,8 +271,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="UNDEPLOY request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -323,17 +279,12 @@
 				</doTry>
 			</route>
 		</put>
-		<put
-			uri="/v2/loop/stop/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/stop/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="STOP request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
@@ -344,8 +295,7 @@
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="STOP request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -358,8 +308,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="STOP request failed for loop: $${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -367,17 +316,12 @@
 				</doTry>
 			</route>
 		</put>
-		<put
-			uri="/v2/loop/restart/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/restart/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="RESTART request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
@@ -389,8 +333,7 @@
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
 
 					<to uri="direct:add-all-to-active-pdp-group" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="RESTART request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -403,8 +346,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="RESTART request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','INFO',${exchangeProperty[loopObject]})" />
@@ -412,17 +354,12 @@
 				</doTry>
 			</route>
 		</put>
-		<put
-			uri="/v2/loop/submit/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<put uri="/v2/loop/submit/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="POLICY SUBMIT request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
@@ -435,8 +372,7 @@
 						<simple resultType="java.lang.Boolean">false</simple>
 					</setProperty>
 					<to uri="direct:remove-all-policy-from-active-pdp-group" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="Processing all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
@@ -444,8 +380,7 @@
 						<setProperty propertyName="microServicePolicy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
+						<log loggingLevel="INFO"
 							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
 						<setProperty propertyName="raiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
@@ -453,8 +388,7 @@
 						<to uri="direct:delete-micro-service-policy" />
 						<to uri="direct:create-micro-service-policy" />
 					</split>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
@@ -462,8 +396,7 @@
 						<setProperty propertyName="operationalPolicy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
+						<log loggingLevel="INFO"
 							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
 						<setProperty propertyName="raiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
@@ -472,8 +405,7 @@
 						<to uri="direct:delete-operational-policy" />
 						<to uri="direct:create-operational-policy" />
 
-						<log
-							loggingLevel="INFO"
+						<log loggingLevel="INFO"
 							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 						<split>
 							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
@@ -481,8 +413,7 @@
 							<setProperty propertyName="guardPolicy">
 								<simple>${body}</simple>
 							</setProperty>
-							<log
-								loggingLevel="INFO"
+							<log loggingLevel="INFO"
 								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
 
 							<setProperty propertyName="raiseHttpExceptionFlag">
@@ -499,8 +430,7 @@
 
 					<to uri="direct:add-all-to-active-pdp-group" />
 
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="SUBMIT request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -513,8 +443,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="SUBMIT request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -524,12 +453,9 @@
 		</put>
 		<put uri="/v2/loop/delete/{loopName}">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DELETE request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
@@ -546,14 +472,12 @@
 						<setProperty propertyName="microServicePolicy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
+						<log loggingLevel="INFO"
 							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
 						<to uri="direct:delete-micro-service-policy" />
 					</split>
 
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
@@ -561,12 +485,10 @@
 						<setProperty propertyName="operationalPolicy">
 							<simple>${body}</simple>
 						</setProperty>
-						<log
-							loggingLevel="INFO"
+						<log loggingLevel="INFO"
 							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
 						<to uri="direct:delete-operational-policy" />
-						<log
-							loggingLevel="INFO"
+						<log loggingLevel="INFO"
 							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 						<split>
 							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
@@ -574,16 +496,14 @@
 							<setProperty propertyName="guardPolicy">
 								<simple>${body}</simple>
 							</setProperty>
-							<log
-								loggingLevel="INFO"
+							<log loggingLevel="INFO"
 								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
 							<to uri="direct:delete-guard-policy" />
 						</split>
 					</split>
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopService?method=deleteLoop(${header.loopName})" />
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="DELETE request successfully executed for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request successfully executed','INFO',${exchangeProperty[loopObject]})" />
@@ -596,8 +516,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="DELETE request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -605,17 +524,12 @@
 				</doTry>
 			</route>
 		</put>
-		<get
-			uri="/v2/loop/getstatus/{loopName}"
-			outType="org.onap.clamp.loop.Loop"
-			produces="application/json">
+		<get uri="/v2/loop/getstatus/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders
-					pattern="*"
-					excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName" />
 				<doTry>
-					<log
-						loggingLevel="INFO"
+					<log loggingLevel="INFO"
 						message="GET STATUS request for loop: ${header.loopName}" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
@@ -641,8 +555,7 @@
 						</handled>
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
-						<log
-							loggingLevel="ERROR"
+						<log loggingLevel="ERROR"
 							message="Get Status request failed for loop: ${header.loopName}" />
 						<to
 							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Get Status request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
@@ -655,5 +568,408 @@
 				</doTry>
 			</route>
 		</get>
+
+		<get uri="/v2/dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+
+		<get uri="/v2/dictionary/secondary/names"
+			outType="java.lang.String[]" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/dictionary/{dictionaryName}"
+			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="dictionaryName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<put uri="/v2/dictionary" type="org.onap.clamp.tosca.Dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
+			produces="application/json">
+			<route>
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="DictionaryObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+		<put uri="/v2/dictionary/{name}"
+			type="org.onap.clamp.tosca.Dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="name" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="DictionaryObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+		<delete uri="/v2/dictionary/{name}" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="name" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</delete>
+
+		<delete uri="/v2/dictionary/{name}/elements/{shortName}"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="name|shortName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</delete>
+
+		<get uri="/v2/policyToscaModels"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/policyToscaModels/{policyModelType}"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/policyToscaModels/yaml/{policyModelType}"
+			outType="java.lang.String" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+
+		<put uri="/v2/policyToscaModels/{policyModelType}"
+			type="java.lang.String"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			consumes="plain/text" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="PolicyModelObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=saveOrUpdateByPolicyModelType(${header.policyModelType},${exchangeProperty[PolicyModelObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>404</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+
+		<get uri="/v2/templates"
+			outType="org.onap.clamp.loop.template.LoopTemplate"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/templates/{templateName}"
+			outType="org.onap.clamp.loop.template.LoopTemplate"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="templateName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/templates/names" outType="java.lang.String[]"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
 	</rest>
 </rests>
diff --git a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
index 2274fcf63..5208f7ffd 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
@@ -25,9 +25,7 @@ package org.onap.clamp.clds.tosca;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.LinkedList;
 import java.util.List;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
@@ -55,16 +53,12 @@ public class DictionaryRepositoriesTestItCase {
         dictionaryTest1.setSubDictionaryType("testType");
 
         DictionaryElement element1 = new DictionaryElement();
-        element1.setDictionary(dictionaryTest1);
         element1.setName("element1");
         element1.setShortName("shortName1");
-        element1.setSubDictionary("subDictionary1");
         element1.setType("type1");
         element1.setDescription("description1");
 
-        LinkedList<DictionaryElement> elementList1 = new LinkedList<DictionaryElement>();
-        elementList1.add(element1);
-        dictionaryTest1.setDictionaryElements(elementList1);
+        dictionaryTest1.addDictionaryElements(element1);
 
         Dictionary dictionaryTest2 = new Dictionary();
         dictionaryTest2.setName("testDictionary2");
@@ -72,16 +66,13 @@ public class DictionaryRepositoriesTestItCase {
         dictionaryTest2.setSubDictionaryType("testType");
 
         DictionaryElement element2 = new DictionaryElement();
-        element2.setDictionary(dictionaryTest2);
         element2.setName("element2");
         element2.setShortName("shortName2");
-        element2.setSubDictionary("subDictionary2");
+        element2.setSubDictionary("testDictionary1");
         element2.setType("type2");
         element2.setDescription("description2");
 
-        LinkedList<DictionaryElement> elementList2 = new LinkedList<DictionaryElement>();
-        elementList2.add(element2);
-        dictionaryTest2.setDictionaryElements(elementList2);
+        dictionaryTest2.addDictionaryElements(element2);
 
         dictionaryRepository.save(dictionaryTest1);
         List<String> res1 = dictionaryRepository.getAllDictionaryNames();
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
deleted file mode 100644
index a9e279de4..000000000
--- a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * Modifications Copyright (C) 2019 Huawei Technologies Co., Ltd.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class ToscaYamlToJsonConvertorTest {
-
-    /**
-     * This Test validates TOSCA yaml to JSON Schema conversion based on JSON Editor
-     * Schema.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    public final void testParseToscaYaml() throws IOException {
-        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml");
-        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
-
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml,
-                "onap.policies.monitoring.cdap.tca.hi.lo.app");
-        assertNotNull(parsedJsonSchema);
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json.json"),
-                parsedJsonSchema, true);
-    }
-
-    /**
-     * This Test validates TOSCA yaml with constraints to JSON Schema conversion
-     * based on JSON Editor Schema.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    public final void testParseToscaYamlWithConstraints() throws IOException {
-        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca-with-constraints.yaml");
-        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
-
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
-        assertNotNull(parsedJsonSchema);
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-constraints.json"),
-                parsedJsonSchema, true);
-    }
-
-    /**
-     * This Test validates TOSCA yaml with different datatypes to JSON Schema
-     * conversion based on JSON Editor Schema.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    public final void testParseToscaYamlWithTypes() throws IOException {
-        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca-with-datatypes.yaml");
-        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
-
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
-        assertNotNull(parsedJsonSchema);
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-datatypes.json"),
-                parsedJsonSchema, true);
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
new file mode 100644
index 000000000..f426c7625
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
@@ -0,0 +1,188 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * Modifications Copyright (C) 2019 Huawei Technologies Co., Ltd.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca;
+
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import javax.transaction.Transactional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.Application;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.tosca.Dictionary;
+import org.onap.clamp.tosca.DictionaryElement;
+import org.onap.clamp.tosca.DictionaryService;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class ToscaYamlToJsonConvertorTestItCase {
+
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    @Autowired
+    private ToscaYamlToJsonConvertor toscaYamlToJsonConvertor;
+
+    /**
+     * This Test validates TOSCA yaml to JSON Schema conversion based on JSON Editor
+     * Schema.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    public final void testParseToscaYaml() throws IOException {
+        String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml");
+        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
+
+        String parsedJsonSchema =
+            convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.cdap.tca.hi.lo.app");
+        assertNotNull(parsedJsonSchema);
+        JSONAssert.assertEquals(
+            ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json.json"),
+            parsedJsonSchema, true);
+    }
+
+    /**
+     * This Test validates TOSCA yaml with constraints to JSON Schema conversion
+     * based on JSON Editor Schema.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    public final void testParseToscaYamlWithConstraints() throws IOException {
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca-with-constraints.yaml");
+        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
+
+        String parsedJsonSchema =
+            convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
+        assertNotNull(parsedJsonSchema);
+        JSONAssert.assertEquals(
+            ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-constraints.json"),
+            parsedJsonSchema, true);
+    }
+
+    /**
+     * This Test validates TOSCA yaml with different datatypes to JSON Schema
+     * conversion based on JSON Editor Schema.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    public final void testParseToscaYamlWithTypes() throws IOException {
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca-with-datatypes.yaml");
+        ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
+
+        String parsedJsonSchema =
+            convertor.parseToscaYaml(toscaModelYaml, "onap.policies.monitoring.example.app");
+        assertNotNull(parsedJsonSchema);
+        JSONAssert.assertEquals(
+            ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-datatypes.json"),
+            parsedJsonSchema, true);
+    }
+
+    /**
+     * This Test validates Tosca yaml with metadata tag that contains policy_model_type and acronym
+     * parameters which defines the Tosca Policy name and its short name.
+     *
+     * @throws IOException In case of issue when opening the tosca yaml file and
+     *         converted json file
+     */
+    @Test
+    @Transactional
+    public final void testMetadataClampPossibleValues() throws IOException {
+
+        // Set up dictionary elements
+        Dictionary dictionaryTest = new Dictionary();
+        dictionaryTest.setName("Context");
+        dictionaryTest.setSecondLevelDictionary(0);
+
+        DictionaryElement element = new DictionaryElement();
+        element.setName("PROD");
+        element.setShortName("PROD");
+        element.setType("string");
+        element.setDescription("Production");
+        dictionaryTest.addDictionaryElements(element);
+
+        dictionaryService.saveOrUpdateDictionary(dictionaryTest);
+
+        Dictionary dictionaryTest1 = new Dictionary();
+        dictionaryTest1.setName("EventDictionary");
+        dictionaryTest1.setSecondLevelDictionary(0);
+
+        DictionaryElement element1 = new DictionaryElement();
+        element1.setName("alarmCondition");
+        element1.setShortName("alarmCondition");
+        element1.setType("string");
+        element1.setDescription("Alarm Condition");
+        dictionaryTest1.addDictionaryElements(element1);
+
+        dictionaryService.saveOrUpdateDictionary(dictionaryTest1);
+
+        Dictionary dictionaryTest2 = new Dictionary();
+        dictionaryTest2.setName("Operators");
+        dictionaryTest2.setSecondLevelDictionary(0);
+
+        DictionaryElement element2 = new DictionaryElement();
+        element2.setName("equals");
+        element2.setShortName("equals");
+        element2.setType("string");
+        element2.setDescription("equals");
+        dictionaryTest2.addDictionaryElements(element2);
+        dictionaryService.saveOrUpdateDictionary(dictionaryTest2);
+
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca_metadata_clamp_possible_values.yaml");
+
+        JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(toscaModelYaml);
+        assertNotNull(jsonObject);
+        String policyModelType = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+            ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
+        String acronym = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+            ToscaSchemaConstants.METADATA_ACRONYM);
+        String parsedJsonSchema =
+            toscaYamlToJsonConvertor.parseToscaYaml(toscaModelYaml, policyModelType);
+
+        assertNotNull(parsedJsonSchema);
+        assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", policyModelType);
+        assertEquals("tca", acronym);
+        JSONAssert.assertEquals(
+            ResourceFileUtil
+                .getResourceAsString("tosca/tosca_metadata_clamp_possible_values_json_schema.json"),
+            parsedJsonSchema, true);
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
new file mode 100644
index 000000000..3a36a5d82
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
@@ -0,0 +1,145 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+import java.util.SortedSet;
+import javax.transaction.Transactional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.Application;
+import org.onap.clamp.loop.template.LoopElementModel;
+import org.onap.clamp.loop.template.LoopTemplate;
+import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;
+import org.onap.clamp.loop.template.LoopTemplatesService;
+import org.onap.clamp.loop.template.LoopType;
+import org.onap.clamp.loop.template.PolicyModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class LoopTemplatesServiceItCase {
+
+    @Autowired
+    LoopTemplatesService loopTemplatesService;
+
+    private static final String POLICY_MODEL_TYPE_1 = "org.onap.test";
+    private static final String VERSION = "1.0.0";
+
+    private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType,
+        String createdBy, PolicyModel policyModel) {
+        LoopElementModel model = new LoopElementModel(name, loopElementType, yaml);
+        model.setBlueprint("");
+        model.setDcaeBlueprintId("");
+        model.addPolicyModel(policyModel);
+        return model;
+    }
+
+    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,
+        String policyAcronym, String createdBy) {
+        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
+    }
+
+    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,
+        String createdBy, Integer maxInstancesAllowed) {
+        LoopTemplate template =
+            new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);
+        template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService",
+            createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));
+        template.setAllowedLoopType(LoopType.OPEN);
+        return template;
+    }
+
+    @Test
+    @Transactional
+    public void shouldSaveOrUpdateLoopTemplate() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);
+        LoopTemplate actualLoopTemplate =
+            loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+
+        assertNotNull(actualLoopTemplate);
+        assertThat(loopTemplate.getName()).isEqualTo("TemplateName");
+        assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN);
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnAllLoopemplates() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        List<LoopTemplate> loopTemplateList = loopTemplatesService.getAllLoopTemplates();
+
+        assertNotNull(loopTemplateList);
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnLoopemplateNames() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        List<String> loopTemplateNames = loopTemplatesService.getLoopTemplateNames();
+
+        assertNotNull(loopTemplateNames);
+        assertEquals("TemplateName", loopTemplateNames.get(0));
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnLoopemplate() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");
+
+        assertNotNull(actualLoopTemplate);
+        assertThat(loopTemplate).isEqualTo(actualLoopTemplate);
+        assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName());
+        assertThat(loopTemplate.getMaximumInstancesAllowed())
+            .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());
+        SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =
+            loopTemplate.getLoopElementModelsUsed();
+        LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();
+        assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName())
+            .isEqualTo("microService1");
+        assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())
+            .isEqualTo("TemplateName");
+    }
+
+    @Test
+    @Transactional
+    public void shouldDeleteLoopemplate() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        loopTemplatesService.deleteLoopTemplate("TemplateName");
+        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");
+        assertNull(actualLoopTemplate);
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java b/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java
new file mode 100644
index 000000000..55d347ceb
--- /dev/null
+++ b/src/test/java/org/onap/clamp/tosca/DictionaryServiceItCase.java
@@ -0,0 +1,247 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.tosca;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import javax.persistence.EntityNotFoundException;
+import javax.transaction.Transactional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.Application;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class DictionaryServiceItCase {
+
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    @Autowired
+    private DictionaryElementsRepository dictionaryElementsRepository;
+
+    private DictionaryElement getDictionaryElement(String shortName, String name,
+        String description, String type, String subDictionaryName) {
+
+        return new DictionaryElement(name, shortName, description, type, subDictionaryName);
+
+    }
+
+    private Dictionary getSimpleDictionaryExample() {
+
+        Dictionary dictionary = new Dictionary("Dictionary1", 0, null);
+
+        dictionary.addDictionaryElements(getDictionaryElement("DE1", "DictionaryElement1",
+            "DictionaryElement1", "string", null));
+
+        dictionary.addDictionaryElements(getDictionaryElement("DE2", "DictionaryElement2",
+            "DictionaryElement2", "number", null));
+
+        return dictionary;
+    }
+
+    private Dictionary getSecondaryDictionaryExample() {
+
+        Dictionary dictionary = new Dictionary("SecondaryDict", 1, "string");
+
+        dictionary.addDictionaryElements(getDictionaryElement("SDE1", "SecondaryDictElement1",
+            "SecondaryDictElement1", "string", null));
+
+        dictionary.addDictionaryElements(getDictionaryElement("SDE2", "SecondaryDictElement2",
+            "SecondaryDictElement2", "string", null));
+
+        return dictionary;
+    }
+
+    /**
+     * Test to validate that Dictionary is created.
+     */
+    @Test
+    @Transactional
+    public void shouldCreateDictionary() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary actualDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
+        assertNotNull(actualDictionary);
+        assertThat(actualDictionary).isEqualTo(dictionary);
+        assertThat(actualDictionary.getName()).isEqualTo(dictionary.getName());
+
+        assertThat(actualDictionary.getDictionaryElements()).contains(
+            dictionaryElementsRepository.findById("DE1").get(),
+            dictionaryElementsRepository.findById("DE2").get());
+    }
+
+    /**
+     * Test to validate a DictionaryElement is created for a Dictionary.
+     */
+    @Test
+    @Transactional
+    public void shouldCreateorUpdateDictionaryElement() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary actualDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
+        DictionaryElement dictionaryElement =
+            getDictionaryElement("DictionaryElement3", "DE3", "DictionaryElement3", "date", null);
+        actualDictionary.addDictionaryElements(dictionaryElement);
+        Dictionary updatedDictionary = dictionaryService
+            .saveOrUpdateDictionaryElement(actualDictionary.getName(), actualDictionary);
+        assertNotNull(updatedDictionary);
+        assertTrue(updatedDictionary.getDictionaryElements().contains(dictionaryElement));
+        assertThat(updatedDictionary.getName()).isEqualTo(actualDictionary.getName());
+        // update the dictionary element.
+        dictionaryElement.setDescription("DictionaryElement3 New Description");
+        Dictionary dictionary3 = new Dictionary("Dictionary1", 0, null);
+        dictionary3.addDictionaryElements(dictionaryElement);
+        Dictionary updatedDictionary2 =
+            dictionaryService.saveOrUpdateDictionaryElement(dictionary3.getName(), dictionary3);
+
+        assertNotNull(updatedDictionary2);
+        assertTrue(updatedDictionary2.getDictionaryElements().contains(dictionaryElement));
+        updatedDictionary2.getDictionaryElements().forEach(element -> {
+            if (element.equals(dictionaryElement)) {
+                assertTrue(element.getDescription().equals(dictionaryElement.getDescription()));
+            }
+        });
+
+    }
+
+    /**
+     * Test to validate that All Dictionaries are retrieved.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnAllDictionaries() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary secondaryDictionary = getSecondaryDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+        dictionaryService.saveOrUpdateDictionary(secondaryDictionary);
+
+        List<Dictionary> list = dictionaryService.getAllDictionaries();
+        assertNotNull(list);
+        assertThat(list).contains(dictionary, secondaryDictionary);
+    }
+
+    /**
+     * Test to validate one Dictionary is returned.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnOneDictionary() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+
+        Dictionary returnedDictionary = dictionaryService.getDictionary("Dictionary1");
+        assertNotNull(returnedDictionary);
+        assertThat(returnedDictionary).isEqualTo(dictionary);
+        assertThat(returnedDictionary.getDictionaryElements())
+            .isEqualTo(dictionary.getDictionaryElements());
+    }
+
+    /**
+     * Test to validate one Dictionary is returned.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnEntityNotFoundException() {
+        try {
+            dictionaryService.getDictionary("Test");
+        } catch (Exception e) {
+            assertThat(e).isInstanceOf(EntityNotFoundException.class);
+            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Test"));
+        }
+    }
+
+    /**
+     * Test to validate Dictionary is deleted.
+     */
+    @Test
+    @Transactional
+    public void shouldDeleteDictionaryByObject() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        Dictionary returnedDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
+
+        dictionaryService.deleteDictionary(returnedDictionary);
+        try {
+            dictionaryService.getDictionary("Dictionary1");
+        } catch (EntityNotFoundException e) {
+            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Dictionary1"));
+        }
+    }
+
+    /**
+     * Test to validate Dictionary is deleted by Name.
+     */
+    @Test
+    @Transactional
+    public void shouldDeleteDictionaryByName() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+        dictionaryService.deleteDictionary(dictionary.getName());
+        try {
+            dictionaryService.getDictionary("Dictionary1");
+        } catch (EntityNotFoundException e) {
+            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Dictionary1"));
+        }
+    }
+
+    /**
+     * Test to validate DictionaryElements is deleted by Name.
+     */
+    @Test
+    @Transactional
+    public void shouldDeleteDictionaryElementsByName() {
+        Dictionary dictionary = getSimpleDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+        DictionaryElement dictionaryElement =
+            dictionaryElementsRepository.findById("DE1").orElse(null);
+        assertNotNull(dictionaryElement);
+        dictionaryService.deleteDictionaryElement("Dictionary1", "DE1");
+        dictionary = dictionaryService.getDictionary("Dictionary1");
+        DictionaryElement deletedDictionaryElement =
+            dictionaryElementsRepository.findById("DE1").orElse(null);
+        assertThat(deletedDictionaryElement).isNotIn(dictionary.getDictionaryElements());
+    }
+
+    /**
+     * Test to validate all secondary level dictionary names are returned.
+     */
+    @Test
+    @Transactional
+    public void shouldReturnAllSecondaryLevelDictionaryNames() {
+        Dictionary dictionary = getSecondaryDictionaryExample();
+        dictionaryService.saveOrUpdateDictionary(dictionary);
+
+        Dictionary dictionary2 = new Dictionary("SecondaryDict2", 1, "string");
+        dictionaryService.saveOrUpdateDictionary(dictionary2);
+        List<String> secondaryDictionaryNames =
+            dictionaryService.getAllSecondaryLevelDictionaryNames();
+
+        assertNotNull(secondaryDictionaryNames);
+        assertThat(secondaryDictionaryNames).contains(dictionary.getName(), dictionary2.getName());
+    }
+}
diff --git a/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java b/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
index 1fb5922fd..e018f0952 100644
--- a/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
+++ b/src/test/java/org/onap/clamp/util/SemanticVersioningTest.java
@@ -6,27 +6,27 @@
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. 
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 
 package org.onap.clamp.util;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class SemanticVersioningTest {
 
     @Test
@@ -68,4 +68,12 @@ public class SemanticVersioningTest {
         assertThat(SemanticVersioning.compare(null, "1.0")).isEqualTo(-1);
         assertThat(SemanticVersioning.compare("1.0", null)).isEqualTo(1);
     }
+
+    @Test
+    public void incrementVersionTest() {
+        assertThat(SemanticVersioning.incrementMajorVersion("1.0")).isEqualTo("2.0.0");
+        assertThat(SemanticVersioning.incrementMajorVersion("1.0.0")).isEqualTo("2.0.0");
+        assertThat(SemanticVersioning.incrementMajorVersion("1")).isEqualTo("2.0.0");
+        assertThat(SemanticVersioning.incrementMajorVersion("1.2.3")).isEqualTo("2.0.0");
+    }
 }
diff --git a/src/test/resources/clds/camel/rest/clamp-api-v2.xml b/src/test/resources/clds/camel/rest/clamp-api-v2.xml
new file mode 100644
index 000000000..b0a8d2fd7
--- /dev/null
+++ b/src/test/resources/clds/camel/rest/clamp-api-v2.xml
@@ -0,0 +1,984 @@
+<rests xmlns="http://camel.apache.org/schema/spring">
+	<rest>
+		<get uri="/v2/loop/getAllNames" outType="java.lang.String[]"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoopNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/loop/{loopName}" outType="org.onap.clamp.loop.Loop"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Loop')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getLoop(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/loop/svgRepresentation/{loopName}"
+			outType="java.lang.String" produces="application/xml">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get SVG Representation')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=getSvgRepresentation(${header.loopName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+
+		<post uri="/v2/loop/updateGlobalProperties/{loopName}"
+			type="com.google.gson.JsonObject" consumes="application/json"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<setHeader headerName="GlobalPropertiesJson">
+						<simple>${body}</simple>
+					</setHeader>
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=updateGlobalPropertiesJson(${header.loopName},${header.GlobalPropertiesJson})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Global Properties UPDATED','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</post>
+		<post uri="/v2/loop/updateOperationalPolicies/{loopName}"
+			type="com.google.gson.JsonArray" consumes="application/json"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<setHeader headerName="OperationalPoliciesArray">
+						<simple>${body}</simple>
+					</setHeader>
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational and Guard policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</post>
+		<post uri="/v2/loop/updateMicroservicePolicy/{loopName}"
+			type="org.onap.clamp.policy.microservice.MicroServicePolicy"
+			consumes="application/json"
+			outType="org.onap.clamp.policy.microservice.MicroServicePolicy"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<setProperty propertyName="MicroServicePolicyObject">
+						<simple>${body}</simple>
+					</setProperty>
+
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=updateMicroservicePolicy(${header.loopName},${exchangeProperty[MicroServicePolicyObject]})" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Micro Service policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</post>
+		<put uri="/v2/loop/deploy/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="DCAE DEPLOY request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})" />
+
+					<to uri="direct:deploy-loop" />
+
+					<log loggingLevel="INFO"
+						message="DEPLOY request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="DEPLOY request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put
+			uri="/v2/loop/refreshOpPolicyJsonSchema/{loopName}"
+			outType="org.onap.clamp.loop.Loop"
+			produces="application/json">
+			<route>
+				<removeHeaders
+					pattern="*"
+					excludePattern="loopName" />
+				<doTry>
+					<log
+						loggingLevel="INFO"
+						message="Refresh Operational Policy UI for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH OP Policy UI request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.LoopController?method=refreshOpPolicyJsonRepresentation(${header.loopName})" />
+					<log
+						loggingLevel="INFO"
+						message="REFRESH request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log
+							loggingLevel="ERROR"
+							message="REFRESH request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put
+			uri="/v2/loop/undeploy/{loopName}"
+			outType="org.onap.clamp.loop.Loop"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="DCAE UNDEPLOY request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DCAE UNDEPLOY request','INFO',${exchangeProperty[loopObject]})" />
+					<to uri="direct:undeploy-loop" />
+
+					<log loggingLevel="INFO"
+						message="UNDEPLOY request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="UNDEPLOY request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put uri="/v2/loop/stop/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="STOP request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'STOP request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request','INFO',${exchangeProperty[loopObject]})" />
+
+					<to uri="direct:remove-all-policy-from-active-pdp-group" />
+					<log loggingLevel="INFO"
+						message="STOP request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="STOP request failed for loop: $${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put uri="/v2/loop/restart/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="RESTART request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request','INFO',${exchangeProperty[loopObject]})" />
+
+					<to uri="direct:add-all-to-active-pdp-group" />
+					<log loggingLevel="INFO"
+						message="RESTART request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="RESTART request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','INFO',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put uri="/v2/loop/submit/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="POLICY SUBMIT request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'POLICY SUBMIT request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">false</simple>
+					</setProperty>
+					<to uri="direct:remove-all-policy-from-active-pdp-group" />
+					<log loggingLevel="INFO"
+						message="Processing all MICRO-SERVICES policies defined in loop ${exchangeProperty[loopObject].getName()}" />
+					<split>
+						<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
+						</simple>
+						<setProperty propertyName="microServicePolicy">
+							<simple>${body}</simple>
+						</setProperty>
+						<log loggingLevel="INFO"
+							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
+						<setProperty propertyName="raiseHttpExceptionFlag">
+							<simple resultType="java.lang.Boolean">false</simple>
+						</setProperty>
+						<to uri="direct:delete-micro-service-policy" />
+						<to uri="direct:create-micro-service-policy" />
+					</split>
+					<log loggingLevel="INFO"
+						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
+					<split>
+						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
+						</simple>
+						<setProperty propertyName="operationalPolicy">
+							<simple>${body}</simple>
+						</setProperty>
+						<log loggingLevel="INFO"
+							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
+						<setProperty propertyName="raiseHttpExceptionFlag">
+							<simple resultType="java.lang.Boolean">false</simple>
+						</setProperty>
+
+						<to uri="direct:delete-operational-policy" />
+						<to uri="direct:create-operational-policy" />
+
+						<log loggingLevel="INFO"
+							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
+						<split>
+							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
+							</simple>
+							<setProperty propertyName="guardPolicy">
+								<simple>${body}</simple>
+							</setProperty>
+							<log loggingLevel="INFO"
+								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
+
+							<setProperty propertyName="raiseHttpExceptionFlag">
+								<simple resultType="java.lang.Boolean">false</simple>
+							</setProperty>
+							<to uri="direct:delete-guard-policy" />
+							<to uri="direct:create-guard-policy" />
+						</split>
+					</split>
+
+					<delay>
+						<constant>3000</constant>
+					</delay>
+
+					<to uri="direct:add-all-to-active-pdp-group" />
+
+					<log loggingLevel="INFO"
+						message="SUBMIT request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="SUBMIT request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put uri="/v2/loop/delete/{loopName}">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="DELETE request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*,'DELETE request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request','INFO',${exchangeProperty[loopObject]})" />
+					<to uri="direct:undeploy-loop" />
+					<to uri="direct:remove-all-policy-from-active-pdp-group" />
+					<split>
+						<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
+						</simple>
+						<setProperty propertyName="microServicePolicy">
+							<simple>${body}</simple>
+						</setProperty>
+						<log loggingLevel="INFO"
+							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
+						<to uri="direct:delete-micro-service-policy" />
+					</split>
+
+					<log loggingLevel="INFO"
+						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
+					<split>
+						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
+						</simple>
+						<setProperty propertyName="operationalPolicy">
+							<simple>${body}</simple>
+						</setProperty>
+						<log loggingLevel="INFO"
+							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
+						<to uri="direct:delete-operational-policy" />
+						<log loggingLevel="INFO"
+							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
+						<split>
+							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
+							</simple>
+							<setProperty propertyName="guardPolicy">
+								<simple>${body}</simple>
+							</setProperty>
+							<log loggingLevel="INFO"
+								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
+							<to uri="direct:delete-guard-policy" />
+						</split>
+					</split>
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopService?method=deleteLoop(${header.loopName})" />
+					<log loggingLevel="INFO"
+						message="DELETE request successfully executed for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="DELETE request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<get uri="/v2/loop/getstatus/{loopName}"
+			outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						message="GET STATUS request for loop: ${header.loopName}" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET STATUS request')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
+					<to uri="direct:load-loop" />
+					<to
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('GET STATUS request','INFO',${exchangeProperty[loopObject]})" />
+					<doTry>
+						<to uri="direct:update-policy-status-for-loop" />
+						<to uri="direct:update-dcae-status-for-loop" />
+						<to uri="direct:update-loop-state" />
+
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Get Status request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					</doTry>
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							message="Get Status request failed for loop: ${header.loopName}" />
+						<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Get Status request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+					<doFinally>
+						<setBody>
+							<simple>${exchangeProperty[loopObject]}</simple>
+						</setBody>
+					</doFinally>
+				</doTry>
+			</route>
+		</get>
+
+		<get uri="/v2/dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionaries')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllDictionaries()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+
+		<get uri="/v2/dictionary/secondary/names"
+			outType="java.lang.String[]" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Secondary Dictionary Level Names')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getAllSecondaryLevelDictionaryNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/dictionary/{dictionaryName}"
+			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="dictionaryName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Dictionary Elements for a Dictionary Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=getDictionary(${header.dictionaryName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<put uri="/v2/dictionary" type="org.onap.clamp.tosca.Dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
+			produces="application/json">
+			<route>
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="DictionaryObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionary(${exchangeProperty[DictionaryObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+		<put uri="/v2/dictionary/{name}"
+			type="org.onap.clamp.tosca.Dictionary"
+			outType="org.onap.clamp.tosca.Dictionary" consumes="application/json"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="name" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="DictionaryObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=saveOrUpdateDictionaryElement(${header.name}, ${exchangeProperty[DictionaryObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+		<delete uri="/v2/dictionary/{name}" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="name" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionary(${header.name})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</delete>
+
+		<delete uri="/v2/dictionary/{name}/elements/{shortName}"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="name|shortName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Delete Dictionary Element')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<to
+						uri="bean:org.onap.clamp.tosca.DictionaryService?method=deleteDictionaryElement(${header.name}, ${header.shortName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</delete>
+
+		<get uri="/v2/policyToscaModels"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Tosca Policy Models')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getAllPolicyModels()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/policyToscaModels/{policyModelType}"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/policyToscaModels/yaml/{policyModelType}"
+			outType="java.lang.String" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+
+		<put uri="/v2/policyToscaModels/{policyModelType}"
+			type="java.lang.String"
+			outType="org.onap.clamp.loop.template.PolicyModel"
+			consumes="plain/text" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="policyModelType" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="PolicyModelObject">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=saveOrUpdateByPolicyModelType(${header.policyModelType},${exchangeProperty[PolicyModelObject]})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>404</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+
+
+		<get uri="/v2/templates"
+			outType="org.onap.clamp.loop.template.LoopTemplate"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Templates')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getAllLoopTemplates()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/templates/{templateName}"
+			outType="org.onap.clamp.loop.template.LoopTemplate"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+					excludePattern="templateName" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET a Template by NAME')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplate(${header.templateName})" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+		<get uri="/v2/templates/names" outType="java.lang.String[]"
+			produces="application/json">
+			<route>
+				<removeHeaders pattern="*" />
+				<doTry>
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET ALL Loop Template Names')" />
+					<to
+						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+						uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getLoopTemplateNames()" />
+					<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
+	</rest>
+</rests>
diff --git a/src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml b/src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml
new file mode 100644
index 000000000..4d3c3dff2
--- /dev/null
+++ b/src/test/resources/tosca/tosca_metadata_clamp_possible_values.yaml
@@ -0,0 +1,184 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+policy_types:
+    onap.policies.Monitoring:
+        derived_from: tosca.policies.Root
+        description: a base policy type for all policies that governs monitoring provisioning
+    onap.policies.monitoring.cdap.tca.hi.lo.app:
+        derived_from: onap.policies.Monitoring
+        version: 1.0.0
+        properties:
+            tca_policy:
+                type: map
+                description: TCA Policy JSON
+                entry_schema:
+                    type: onap.datatypes.monitoring.tca_policy
+        metadata:
+            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
+            acronym: tca
+            
+data_types:
+    onap.datatypes.monitoring.metricsPerEventName:
+        derived_from: tosca.datatypes.Root
+        properties:
+            controlLoopSchemaType:
+                type: string
+                required: true
+                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
+                constraints:
+                  - valid_values:
+                      - VM
+                      - VNF
+            eventName:
+                type: string
+                required: true
+                description: Event name to which thresholds need to be applied
+            policyName:
+                type: string
+                required: true
+                description: TCA Policy Scope Name
+            policyScope:
+                type: string
+                required: true
+                description: TCA Policy Scope
+            policyVersion:
+                type: string
+                required: true
+                description: TCA Policy Scope Version
+            thresholds:
+                type: list
+                required: true
+                description: Thresholds associated with eventName
+                entry_schema:
+                    type: onap.datatypes.monitoring.thresholds
+            context:
+                type: string
+                required: true
+                description: TCA Policy Dummy Context
+                metadata:
+                    clamp_possible_values: ["Dictionary:Context"]
+
+            signature:
+                type: onap.datatypes.monitoring.Dummy_Signature
+                description: Signature
+                required: true
+        
+    onap.datatypes.monitoring.Dummy_Signature:
+        derived_from: tosca.datatypes.Root
+        properties:
+            filter_clause:
+                type: string
+                description: Filter Clause
+                required: true
+                metadata:
+                    clamp_possible_values: ["Dictionary:EventDictionary#Operators"]
+            
+    onap.datatypes.monitoring.tca_policy:
+        derived_from: tosca.datatypes.Root
+        properties:
+            domain:
+                type: string
+                required: true
+                description: Domain name to which TCA needs to be applied
+                default: measurementsForVfScaling
+                constraints:
+                  - equal: measurementsForVfScaling
+            metricsPerEventName:
+                type: list
+                required: true
+                description: Contains eventName and threshold details that need to be applied to given eventName
+                entry_schema:
+                    type: onap.datatypes.monitoring.metricsPerEventName
+    onap.datatypes.monitoring.thresholds:
+        derived_from: tosca.datatypes.Root
+        properties:
+            closedLoopControlName:
+                type: string
+                required: true
+                description: Closed Loop Control Name associated with the threshold
+            closedLoopEventStatus:
+                type: string
+                required: true
+                description: Closed Loop Event Status of the threshold
+                constraints:
+                  - valid_values:
+                      - ONSET
+                      - ABATED
+            direction:
+                type: string
+                required: true
+                description: Direction of the threshold
+                constraints:
+                  - valid_values:
+                      - LESS
+                      - LESS_OR_EQUAL
+                      - GREATER
+                      - GREATER_OR_EQUAL
+                      - EQUAL
+            fieldPath:
+                type: string
+                required: true
+                description: Json field Path as per CEF message which needs to be analyzed for TCA
+                constraints:
+                  - valid_values:
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
+                      - $.event.measurementsForVfScalingFields.meanRequestLatency
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
+                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
+            severity:
+                type: string
+                required: true
+                description: Threshold Event Severity
+                constraints:
+                  - valid_values:
+                      - CRITICAL
+                      - MAJOR
+                      - MINOR
+                      - WARNING
+                      - NORMAL
+            thresholdValue:
+                type: integer
+                required: true
+                description: Threshold value for the field Path inside CEF message
+            version:
+                type: string
+                required: true
+                description: Version number associated with the threshold
diff --git a/src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json b/src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json
new file mode 100644
index 000000000..af8c1f961
--- /dev/null
+++ b/src/test/resources/tosca/tosca_metadata_clamp_possible_values_json_schema.json
@@ -0,0 +1,235 @@
+{
+   "schema":{
+      "uniqueItems":"true",
+      "format":"tabs-top",
+      "type":"array",
+      "title":"TCA Policy JSON",
+      "items":{
+         "type":"object",
+         "title":"TCA Policy JSON",
+         "required":[
+            "domain",
+            "metricsPerEventName"
+         ],
+         "properties":{
+            "domain":{
+               "propertyOrder":1001,
+               "default":"measurementsForVfScaling",
+               "title":"Domain name to which TCA needs to be applied",
+               "type":"string"
+            },
+            "metricsPerEventName":{
+               "propertyOrder":1002,
+               "uniqueItems":"true",
+               "format":"tabs-top",
+               "title":"Contains eventName and threshold details that need to be applied to given eventName",
+               "type":"array",
+               "items":{
+                  "type":"object",
+                  "required":[
+                     "controlLoopSchemaType",
+                     "eventName",
+                     "policyName",
+                     "policyScope",
+                     "policyVersion",
+                     "thresholds",
+                     "context",
+                     "signature"
+                  ],
+                  "properties":{
+                     "policyVersion":{
+                        "propertyOrder":1007,
+                        "title":"TCA Policy Scope Version",
+                        "type":"string"
+                     },
+                     "thresholds":{
+                        "propertyOrder":1008,
+                        "uniqueItems":"true",
+                        "format":"tabs-top",
+                        "title":"Thresholds associated with eventName",
+                        "type":"array",
+                        "items":{
+                           "type":"object",
+                           "required":[
+                              "closedLoopControlName",
+                              "closedLoopEventStatus",
+                              "direction",
+                              "fieldPath",
+                              "severity",
+                              "thresholdValue",
+                              "version"
+                           ],
+                           "properties":{
+                              "severity":{
+                                 "propertyOrder":1013,
+                                 "title":"Threshold Event Severity",
+                                 "type":"string",
+                                 "enum":[
+                                    "CRITICAL",
+                                    "MAJOR",
+                                    "MINOR",
+                                    "WARNING",
+                                    "NORMAL"
+                                 ]
+                              },
+                              "fieldPath":{
+                                 "propertyOrder":1012,
+                                 "title":"Json field Path as per CEF message which needs to be analyzed for TCA",
+                                 "type":"string",
+                                 "enum":[
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                                    "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                                    "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+                                 ]
+                              },
+                              "thresholdValue":{
+                                 "propertyOrder":1014,
+                                 "title":"Threshold value for the field Path inside CEF message",
+                                 "type":"integer"
+                              },
+                              "closedLoopEventStatus":{
+                                 "propertyOrder":1010,
+                                 "title":"Closed Loop Event Status of the threshold",
+                                 "type":"string",
+                                 "enum":[
+                                    "ONSET",
+                                    "ABATED"
+                                 ]
+                              },
+                              "closedLoopControlName":{
+                                 "propertyOrder":1009,
+                                 "title":"Closed Loop Control Name associated with the threshold",
+                                 "type":"string"
+                              },
+                              "version":{
+                                 "propertyOrder":1015,
+                                 "title":"Version number associated with the threshold",
+                                 "type":"string"
+                              },
+                              "direction":{
+                                 "propertyOrder":1011,
+                                 "title":"Direction of the threshold",
+                                 "type":"string",
+                                 "enum":[
+                                    "LESS",
+                                    "LESS_OR_EQUAL",
+                                    "GREATER",
+                                    "GREATER_OR_EQUAL",
+                                    "EQUAL"
+                                 ]
+                              }
+                           }
+                        }
+                     },
+                     "policyName":{
+                        "propertyOrder":1005,
+                        "title":"TCA Policy Scope Name",
+                        "type":"string"
+                     },
+                     "signature":{
+                        "propertyOrder":1017,
+                        "title":"Signature",
+                        "required":[
+                           "filter_clause"
+                        ],
+                        "properties":{
+                           "filter_clause":{
+                              "propertyOrder":30002,
+                              "qschema":{
+                                 "filters":[
+                                    {
+                                       "operators":[
+                                          "equals"
+                                       ],
+                                       "minLength":1,
+                                       "id":"alarmCondition",
+                                       "label":"alarmCondition",
+                                       "type":"string"
+                                    }
+                                 ]
+                              },
+                              "minLength":1,
+                              "title":"Filter Clause",
+                              "type":"qbldr"
+                           }
+                        }
+                     },
+                     "controlLoopSchemaType":{
+                        "propertyOrder":1003,
+                        "title":"Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+                        "type":"string",
+                        "enum":[
+                           "VM",
+                           "VNF"
+                        ]
+                     },
+                     "policyScope":{
+                        "propertyOrder":1006,
+                        "title":"TCA Policy Scope",
+                        "type":"string"
+                     },
+                     "context":{
+                        "propertyOrder":1016,
+                        "options":{
+                           "enum_titles":[
+                              "PROD"
+                           ]
+                        },
+                        "title":"TCA Policy Dummy Context",
+                        "type":"string",
+                        "enum":[
+                           "PROD"
+                        ]
+                     },
+                     "eventName":{
+                        "propertyOrder":1004,
+                        "title":"Event name to which thresholds need to be applied",
+                        "type":"string"
+                     }
+                  }
+               }
+            }
+         }
+      }
+   }
+}
\ No newline at end of file
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 9eea0be95..19b0814db 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -43,6 +43,7 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C
 import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
 import UserInfoModal from './components/dialogs/UserInfoModal';
 import LoopService from './api/LoopService';
+import UploadToscaPolicyModal from './components/dialogs/Tosca/UploadToscaPolicyModal';
 import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal';
 import ViewBlueprintMicroServiceTemplatesModal from './components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal';
 import PerformAction from './components/dialogs/PerformActions';
@@ -248,6 +249,7 @@ export default class LoopUI extends React.Component {
 	render() {
 		return (
 				<StyledMainDiv id="main_div">
+				<Route path="/uploadToscaPolicyModal" render={(routeProps) => (<UploadToscaPolicyModal {...routeProps} />)} />
 				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
 				<Route path="/viewBlueprintMicroServiceTemplatesModal" render={(routeProps) => (<ViewBlueprintMicroServiceTemplatesModal {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 22f549754..5f7611bbc 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -4,6 +4,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
 <styled.div
   id="main_div"
 >
+  <Route
+    path="/uploadToscaPolicyModal"
+    render={[Function]}
+  />
   <Route
     path="/viewToscaPolicyModal"
     render={[Function]}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 7bb8f81ca..5961cd2fc 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -29,6 +29,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
   <styled.div
     id="main_div"
   >
+    <Route
+      path="/uploadToscaPolicyModal"
+      render={[Function]}
+    />
     <Route
       path="/viewToscaPolicyModal"
       render={[Function]}
diff --git a/ui-react/src/api/TemplateMenuService.js b/ui-react/src/api/TemplateMenuService.js
index dfa9c578e..0dabebdd1 100644
--- a/ui-react/src/api/TemplateMenuService.js
+++ b/ui-react/src/api/TemplateMenuService.js
@@ -22,7 +22,7 @@
 
 export default class TemplateMenuService {
   static getToscaPolicyModels() {
-    return fetch('restservices/clds/v2/loop/tosca/models', { method: 'GET', credentials: 'same-origin' })
+    return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
       .then(function (response) {
         console.debug("getToscaPolicyModels response received: ", response.status);
         if (response.ok) {
@@ -38,8 +38,56 @@ export default class TemplateMenuService {
       });
   }
 
+	static getToscaPolicyModelYaml(policyModelType) {
+		return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType, {
+			method: 'GET',
+			credentials: 'same-origin'
+		})
+			.then(function (response) {
+				console.debug("getToscaPolicyModelYaml response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("getToscaPolicyModelYaml query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("getToscaPolicyModelYaml error received", error);
+				return "";
+			});
+	}
+
+  static uploadToscaPolicyModal(policyModelType, jsonData) {
+    return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, {
+        method: 'PUT',
+        credentials: 'same-origin',
+        headers: {
+          "Content-Type": "a",
+        },
+        body: JSON.stringify(jsonData)
+      })
+      .then(function(response) {
+        console.debug("uploadToscaPolicyModal response received: ", response.status);
+        if (response.ok) {
+          var message = {
+            status: response.status,
+            message: 'Tosca Policy Model successfully uploaded'
+          };
+          return message;
+        } else {
+          console.error("uploadToscaPolicyModal failed");
+          return response.text();
+        }
+      })
+      .catch(function(error) {
+        console.error("uploadToscaPolicyModal error received", error);
+        return "";
+      });
+  }
+
   static getBlueprintMicroServiceTemplates() {
-    return fetch('restservices/clds/v2/loop/templates', { method: 'GET', credentials: 'same-origin', })
+    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
       .then(function (response) {
         console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
         if (response.ok) {
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
new file mode 100644
index 000000000..76beca711
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
@@ -0,0 +1,138 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import styled from 'styled-components';
+import Alert from 'react-bootstrap/Alert';
+import TemplateMenuService from '../../../api/TemplateMenuService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+export default class UploadToscaPolicyModal extends React.Component {
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleUploadToscaPolicyModel = this.handleUploadToscaPolicyModel.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handlePolicyModelType = this.handlePolicyModelType.bind(this);
+		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
+		this.state = {
+				show: true,
+				selectedFile: '',
+				policyModelType: '',
+				policyModelTosca: [],
+				apiResponseStatus: '',
+				apiResponseMessage: '',
+				upldBtnClicked: false
+			};
+		}
+
+		fileSelectedHandler = (event) => {
+				if (event.target.files && event.target.files[0]) {
+					const scope = this;
+  				let reader = new FileReader();
+					this.setState({policyModelType: '', policyModelTosca: '' });
+					reader.onload = function(e) {
+					 	var lines = reader.result.split('\n');
+					 	for (var line = 0; line < lines.length; line++) {
+							if(lines[line].trim().slice(0, 24) === 'onap.policies.monitoring') {
+								var microsvc = lines[line].trim().slice(0, -1);
+								scope.setState({ policyModelType: microsvc, policyModelTosca:  reader.result});
+							}
+					  }
+					};
+					console.log("Filename is", event.target.files[0]);
+					reader.readAsText(event.target.files[0]);
+				}
+				this.setState({selectedFile: event.target.files[0]});
+		};
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	handleUploadToscaPolicyModel(e) {
+    e.preventDefault();
+		console.log("Policy Model Type is", this.state.policyModelType);
+		if(this.state.policyModelType && this.state.policyModelTosca) {
+ 		TemplateMenuService.uploadToscaPolicyModal(this.state.policyModelType, this.state.policyModelTosca).then(resp => {
+			if(resp.status === 200) {
+			this.setState({apiResponseStatus: resp.status, apiResponseMessage: resp.message, upldBtnClicked: true});
+		} else {
+			this.setState({apiResponseStatus: 500, apiResponseMessage: resp, upldBtnClicked: true});
+		}
+	});
+	} else {
+		this.setState({apiResponse: 500, apiResponseMessage: 'Parameters are missing', upldBtnClicked: true});
+	}
+}
+
+	handlePolicyModelType = event => {
+    this.setState({
+      policyModelType: event.target.value
+    })
+  }
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Upload Tosca Modal</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Col sm="10">
+						<input style={{display: 'none'}} type="file" name="file" accept=".yaml" onChange={this.fileSelectedHandler}
+							ref={fileInput => this.fileInput = fileInput}/>
+						<button onClick={() => this.fileInput.click()}>Pick Tosca File</button>
+							<Alert variant="secondary">
+								<p>{this.state.selectedFile.name}</p>
+							</Alert>
+							<Form.Label column sm="2">Micro Service Name:</Form.Label>
+							<input type="text" style={{width: '50%'}}
+								value={this.state.policyModelType}
+								onChange={this.handlePolicyModelType}
+							/>
+						</Col>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					{!this.state.apiResponseStatus?<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>:""}
+				  {!this.state.apiResponseStatus?<Button disabled={!this.state.selectedFile.name || this.state.upldBtnClicked} variant="primary" type="submit" onClick={this.handleUploadToscaPolicyModel.bind(this)}>Upload</Button>:""}
+					{this.state.apiResponseStatus?<Alert variant={this.state.apiResponseStatus === 200?"success":"danger"}>
+							<p>{this.state.apiResponseMessage}</p>
+								<Button onClick={this.handleClose} variant={this.state.apiResponseStatus === 200?"outline-success":"danger"}>
+									Exit
+								</Button>
+						</Alert>:""}
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js
new file mode 100644
index 000000000..dac8ac920
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js
@@ -0,0 +1,87 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import UploadToscaPolicyModal from './UploadToscaPolicyModal';
+
+
+describe('Test Upload Tosca Policy Model', () => {
+
+      it('Test handleMicroServiceName', () => {
+
+      const component = shallow(<UploadToscaPolicyModal />);
+
+        const inputValue = 'TCA'
+
+        const button = component.find('input').at(1);
+
+        button.simulate('change', { target: { value: inputValue }});
+
+        expect(component.state('policyModelType')).toEqual(inputValue);
+
+        expect(component).toMatchSnapshot();
+
+    });
+
+    it('Test handleUploadToscaPolicyModel for Tosca Model', () => {
+
+      const component = shallow(<UploadToscaPolicyModal />);
+
+      const fakeEvent = { preventDefault: () => console.log('preventDefault') };
+
+      component.setState({
+    	policyModelType: "TCA",
+        upldBtnClicked: false,
+        policyModelTosca: "TCAToscaModelYaml",
+        selectedFile: { name: "tca.yaml"}
+      });
+
+      const Button = component.find('Button').at(1);
+
+      Button.simulate('click', fakeEvent);
+
+      expect(component.state('policyModelTosca')).toEqual('TCAToscaModelYaml');
+
+    });
+
+    it('Test handleClose', () => {
+
+      const historyMock = { push: jest.fn() };
+
+      const handleClose = jest.spyOn(UploadToscaPolicyModal.prototype,'handleClose');
+
+      const component = shallow(<UploadToscaPolicyModal history={historyMock} />)
+
+      component.find('[variant="secondary"]').at(1).prop('onClick')();
+
+      expect(handleClose).toHaveBeenCalledTimes(1);
+
+      expect(component.state('show')).toEqual(false);
+
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+
+      handleClose.mockClear();
+
+    });
+
+});
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
index 6a93d4d98..5b66a25c0 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,29 +58,29 @@ export default class ViewToscalPolicyModal extends React.Component {
 		show: true,
 		content: 'Please select Tosca model to view the details',
 		selectedRow: -1,
-		toscaNames: [],
+		toscaPolicyModelNames: [],
 		toscaColumns: [
 			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
-			{ title: "Micro Service Name", field: "toscaModelName",
+			{ title: "Policy Model Type", field: "policyModelType",
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
-			{ title: "PolicyType", field: "policyType",
+			{ title: "Policy Acronym", field: "policyAcronym",
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
-			{ title: "Version", field: "toscaModelRevisions[0].version",
+			{ title: "Version", field: "version",
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
-			{ title: "Uploaded By", field: "userId",
+			{ title: "Uploaded By", field: "updatedBy",
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
-			{ title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never',
+			{ title: "Uploaded Date", field: "updatedDate", editable: 'never',
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			}
@@ -101,6 +101,7 @@ export default class ViewToscalPolicyModal extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.getPolicyToscaModels = this.getToscaPolicyModels.bind(this);
 		this.handleYamlContent = this.handleYamlContent.bind(this);
+		this.getToscaPolicyModelYaml = this.getToscaPolicyModelYaml.bind(this);
 	}
 
 	componentWillMount() {
@@ -108,11 +109,25 @@ export default class ViewToscalPolicyModal extends React.Component {
 	}
 
 	getToscaPolicyModels() {
-	    TemplateMenuService.getToscaPolicyModels().then(toscaNames => {
-			this.setState({ toscaNames: toscaNames });
+	    TemplateMenuService.getToscaPolicyModels().then(toscaPolicyModelNames => {
+			this.setState({ toscaPolicyModelNames: toscaPolicyModelNames });
 		});
 	}
 
+	getToscaPolicyModelYaml(policyModelType) {
+		if (typeof policyModelType !== "undefined") {
+			TemplateMenuService.getToscaPolicyModelYaml(policyModelType).then(toscaYaml => {
+				if (toscaYaml.length !== 0) {
+					this.setState({content: toscaYaml})
+				} else {
+					this.setState({ content: 'Please select Tosca model to view the details' })
+				}
+			});
+		} else {
+			this.setState({ content: 'Please select Tosca model to view the details' })
+		}
+	}
+
 	handleYamlContent(event) {
 		this.setState({ content: event.target.value });
 	}
@@ -130,10 +145,10 @@ export default class ViewToscalPolicyModal extends React.Component {
 				<Modal.Body>
 					<MaterialTable
 					title={"View Tosca Policy Models"}
-					data={this.state.toscaNames}
+					data={this.state.toscaPolicyModelNames}
 					columns={this.state.toscaColumns}
 					icons={this.state.tableIcons}
-					onRowClick={(event, rowData) => {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}}
+					onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType);this.setState({selectedRow: rowData.tableData.id})}}
 					options={{
 						headerStyle: rowHeaderStyle,
 						rowStyle: rowData => ({
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
index 1445e8863..952e88867 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,12 +39,12 @@ describe('Verify ViewToscaPolicyModal', () => {
 				json: () => {
 					return Promise.resolve({
 						"index": "1",
-						"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
+						"policyModelTosca":"TCA",
+						"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+						"version":"1.0.0",
+						"policyAcronym": "TCA",
+						"updatedDate": "2020-01-31T20:49:48.658795600Z",
+						"updatedBy": "admin"
 					});
 				}
 			});
@@ -60,11 +60,12 @@ describe('Verify ViewToscaPolicyModal', () => {
 				json: () => {
 					return Promise.resolve({
 						"index": "1",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
+						"policyModelTosca":"TCA",
+						"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+						"version":"1.0.0",
+						"policyAcronym": "TCA",
+						"updatedDate": "2020-01-31T20:49:48.658795600Z",
+						"updatedBy": "admin"
 					});
 				}
 			});
@@ -95,12 +96,12 @@ describe('Verify ViewToscaPolicyModal', () => {
 				json: () => {
 					return Promise.resolve({
 						"index": "1",
-						"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
+						"policyModelTosca":"TCA",
+						"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+						"version":"1.0.0",
+						"policyAcronym": "TCA",
+						"updatedDate": "2020-01-31T20:49:48.658795600Z",
+						"updatedBy": "admin"
 					});
 				}
 			});
@@ -108,12 +109,12 @@ describe('Verify ViewToscaPolicyModal', () => {
 		const component = shallow(<ViewToscaPolicyModal/>);
 		component.setState({ toscaNames: {
 			"index": "1",
-			"toscaModelYaml": "MTCA",
-			"toscaModelName": "DCAE_MTCAConfig",
-			"version" : "16",
-			"userId" : "aj928f",
-			"policyType" : "mtca",
-			"lastUpdatedDate" : "05-07-2019 19:09:42"
+			"policyModelTosca":"TCA",
+			"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+			"version":"1.0.0",
+			"policyAcronym": "TCA",
+			"updatedDate": "2020-01-31T20:49:48.658795600Z",
+			"updatedBy": "admin"
 		}
 	});
   expect(component).toMatchSnapshot();
@@ -127,12 +128,12 @@ describe('Verify ViewToscaPolicyModal', () => {
 				json: () => {
 					return Promise.resolve({
 						"index": "1",
-						"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
+						"policyModelTosca":"TCA",
+						"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+						"version":"1.0.0",
+						"policyAcronym": "TCA",
+						"updatedDate": "2020-01-31T20:49:48.658795600Z",
+						"updatedBy": "admin"
 					});
 				}
 			});
@@ -149,17 +150,17 @@ describe('Verify ViewToscaPolicyModal', () => {
 				json: () => {
 					return Promise.resolve({
 						"index": "1",
-						"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
+						"policyModelTosca":"TCA",
+						"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+						"version":"1.0.0",
+						"policyAcronym":"TCA",
+						"updatedDate": "2020-01-31T20:49:48.658795600Z",
+						"updatedBy": "admin"
 					});
 				}
 			});
 		});
-		const yamlContent = 'MTCA Tosca model details';
+		const yamlContent = 'TCA Tosca model details';
 		const component = shallow(<ViewToscaPolicyModal/>);
 		component.find('[value="Please select Tosca model to view the details"]').prop('onChange')({ target: { value: yamlContent }});
     expect(component.state('content')).toEqual(yamlContent);
@@ -173,12 +174,12 @@ describe('Verify ViewToscaPolicyModal', () => {
 				json: () => {
 					return Promise.resolve({
 						"index": "1",
-						"toscaModelYaml":"MTCA",
-						"toscaModelName":"DCAE_MTCAConfig",
-						"version":"16",
-						"userId":"aj928f",
-						"policyType":"mtca",
-						"lastUpdatedDate":"05-07-2019 19:09:42"
+						"policyModelTosca":"TCA",
+						"policyModelType":"onap.policies.monitoring.cdap.tca.hi.lo.app",
+						"version":"1.0.0",
+						"policyAcronym": "TCA",
+						"updatedDate": "2020-01-31T20:49:48.658795600Z",
+						"updatedBy": "admin"
 					});
 				}
 			});
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
new file mode 100644
index 000000000..1b5cd82a8
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
@@ -0,0 +1,111 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="lg"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Upload Tosca Modal
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formPlaintextEmail"
+    >
+      <Col
+        sm="10"
+      >
+        <input
+          accept=".yaml"
+          name="file"
+          onChange={[Function]}
+          style={
+            Object {
+              "display": "none",
+            }
+          }
+          type="file"
+        />
+        <button
+          onClick={[Function]}
+        >
+          Pick Tosca File
+        </button>
+        <Alert
+          closeLabel="Close alert"
+          show={true}
+          transition={
+            Object {
+              "$$typeof": Symbol(react.forward_ref),
+              "defaultProps": Object {
+                "appear": false,
+                "in": false,
+                "mountOnEnter": false,
+                "timeout": 300,
+                "unmountOnExit": false,
+              },
+              "displayName": "Fade",
+              "render": [Function],
+            }
+          }
+          variant="secondary"
+        >
+          <p />
+        </Alert>
+        <FormLabel
+          column={true}
+          sm="2"
+          srOnly={false}
+        >
+          Micro Service Name:
+        </FormLabel>
+        <input
+          onChange={[Function]}
+          style={
+            Object {
+              "width": "50%",
+            }
+          }
+          type="text"
+          value="TCA"
+        />
+      </Col>
+    </FormGroup>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={true}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Upload
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
index e7294c080..fc5eef024 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
@@ -30,29 +30,29 @@ exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`]
             "cellStyle": Object {
               "border": "1px solid black",
             },
-            "field": "toscaModelName",
+            "field": "policyModelType",
             "headerStyle": Object {
               "backgroundColor": "#ddd",
               "border": "2px solid black",
             },
-            "title": "Micro Service Name",
+            "title": "Policy Model Type",
           },
           Object {
             "cellStyle": Object {
               "border": "1px solid black",
             },
-            "field": "policyType",
+            "field": "policyAcronym",
             "headerStyle": Object {
               "backgroundColor": "#ddd",
               "border": "2px solid black",
             },
-            "title": "PolicyType",
+            "title": "Policy Acronym",
           },
           Object {
             "cellStyle": Object {
               "border": "1px solid black",
             },
-            "field": "toscaModelRevisions[0].version",
+            "field": "version",
             "headerStyle": Object {
               "backgroundColor": "#ddd",
               "border": "2px solid black",
@@ -63,7 +63,7 @@ exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`]
             "cellStyle": Object {
               "border": "1px solid black",
             },
-            "field": "userId",
+            "field": "updatedBy",
             "headerStyle": Object {
               "backgroundColor": "#ddd",
               "border": "2px solid black",
@@ -75,7 +75,7 @@ exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`]
               "border": "1px solid black",
             },
             "editable": "never",
-            "field": "lastUpdatedDate",
+            "field": "updatedDate",
             "headerStyle": Object {
               "backgroundColor": "#ddd",
               "border": "2px solid black",
@@ -84,17 +84,7 @@ exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`]
           },
         ]
       }
-      data={
-        Object {
-          "index": "1",
-          "lastUpdatedDate": "05-07-2019 19:09:42",
-          "policyType": "mtca",
-          "toscaModelName": "DCAE_MTCAConfig",
-          "toscaModelYaml": "MTCA",
-          "userId": "aj928f",
-          "version": "16",
-        }
-      }
+      data={Array []}
       icons={
         Object {
           "FirstPage": Object {
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 41a105488..6fae008ef 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -88,7 +88,8 @@ export default class MenuBar extends React.Component {
 
 				<Navbar.Collapse>
 					<StyledNavDropdown title="Template">
-							<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Policy Models</NavDropdown.Item>
+					<NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Policy Model</NavDropdown.Item>
+					<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Policy Models</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/viewBlueprintMicroServiceTemplatesModal">View Blueprint MicroService Templates</NavDropdown.Item>
 					</StyledNavDropdown>
 					<StyledNavDropdown title="Closed Loop">
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index c17214aad..7ed386ff2 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -38,6 +38,57 @@ exports[`Verify MenuBar Test the render method 1`] = `
               [Function],
               ";
 	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-bdVaJa",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/uploadToscaPolicyModal"
+    >
+      Upload Tosca Policy Model
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-bdVaJa",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
 ",
             ],
           },
-- 
cgit 1.2.3-korg


From 3b7f669088d5867056578b275bf4314af3a439c6 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 17 Feb 2020 06:03:31 -0800
Subject: Fix the loop template view

Fix the loop template view modal as the rest api has been changed + the database model as well
Issue-ID: CLAMP-589

Change-Id: I57521bc1c3afaf4ca5a2acf4c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 docs/swagger/swagger.json                          |   819 +-
 docs/swagger/swagger.pdf                           | 46469 +++++++++++++------
 extra/sql/dump/test-data.sql                       |    37 +-
 src/main/resources/META-INF/resources/swagger.html |  1831 +-
 ui-react/src/LoopUI.js                             |     4 +-
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |     2 +-
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |     2 +-
 .../ViewBlueprintMicroServiceTemplatesModal.js     |   154 -
 ...ViewBlueprintMicroServiceTemplatesModal.test.js |   193 -
 .../dialogs/Tosca/ViewLoopTemplatesModal.js        |   151 +
 .../dialogs/Tosca/ViewLoopTemplatesModal.test.js   |   186 +
 ...lueprintMicroServiceTemplatesModal.test.js.snap |   163 -
 .../ViewLoopTemplatesModal.test.js.snap            |   162 +
 ui-react/src/components/menu/MenuBar.js            |     2 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        |     4 +-
 15 files changed, 33860 insertions(+), 16319 deletions(-)
 delete mode 100644 ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js
 delete mode 100644 ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
 create mode 100644 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
 delete mode 100644 ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap
 create mode 100644 ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 32113ccbd..5206784f2 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,16 +1,159 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "4.2.0-SNAPSHOT",
+    "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:33953",
+  "host" : "localhost:33699",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
-    "/v2/loop/{loopName}" : {
+    "/v2/dictionary" : {
       "get" : {
+        "operationId" : "route18",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Dictionary"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route18"
+      },
+      "put" : {
         "operationId" : "route20",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/Dictionary"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Dictionary"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route20"
+      }
+    },
+    "/v2/dictionary/{dictionaryName}" : {
+      "get" : {
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "dictionaryName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Dictionary"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      }
+    },
+    "/v2/dictionary/{name}" : {
+      "put" : {
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/Dictionary"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Dictionary"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      },
+      "delete" : {
+        "operationId" : "route22",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : { }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route22"
+      }
+    },
+    "/v2/dictionary/{name}/elements/{shortName}" : {
+      "delete" : {
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "shortName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : { }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      }
+    },
+    "/v2/dictionary/secondary/names" : {
+      "get" : {
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      }
+    },
+    "/v2/loop/{loopName}" : {
+      "get" : {
+        "operationId" : "route3",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -26,13 +169,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route3"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route30",
+        "operationId" : "route14",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -42,13 +185,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route14"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route25",
+        "operationId" : "route8",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -64,13 +207,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route8"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route19",
+        "operationId" : "route2",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -83,13 +226,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route19"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route2"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route31",
+        "operationId" : "route15",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -105,13 +248,35 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route31"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route15"
+      }
+    },
+    "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : {
+      "put" : {
+        "operationId" : "route9",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "loopName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/Loop"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route9"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route28",
+        "operationId" : "route12",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -127,13 +292,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route28"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route12"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route27",
+        "operationId" : "route11",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -149,13 +314,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route27"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route11"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route29",
+        "operationId" : "route13",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -171,13 +336,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route13"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route21",
+        "operationId" : "route4",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -193,13 +358,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route21"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route4"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route26",
+        "operationId" : "route10",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -215,13 +380,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route10"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route22",
+        "operationId" : "route5",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -245,13 +410,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route5"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route24",
+        "operationId" : "route7",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -275,13 +440,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route24"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route7"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route23",
+        "operationId" : "route6",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -305,13 +470,154 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route23"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route6"
+      }
+    },
+    "/v2/policyToscaModels" : {
+      "get" : {
+        "operationId" : "route25",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route25"
+      }
+    },
+    "/v2/policyToscaModels/{policyModelType}" : {
+      "get" : {
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "policyModelType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      },
+      "put" : {
+        "operationId" : "route26",
+        "consumes" : [ "plain/text" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "policyModelType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/PolicyModel"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route26"
+      }
+    },
+    "/v2/policyToscaModels/yaml/{policyModelType}" : {
+      "get" : {
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "policyModelType",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "type" : "string"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      }
+    },
+    "/v2/templates" : {
+      "get" : {
+        "operationId" : "route29",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/LoopTemplate"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route29"
+      }
+    },
+    "/v2/templates/{templateName}" : {
+      "get" : {
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "templateName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "$ref" : "#/definitions/LoopTemplate"
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
+      }
+    },
+    "/v2/templates/names" : {
+      "get" : {
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Output type",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          }
+        },
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : null
       }
     },
     "/v1/clds/cldsInfo" : {
       "get" : {
-        "operationId" : "route32",
+        "operationId" : "route30",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -321,13 +627,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route32"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route30"
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route33",
+        "operationId" : "route31",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -337,24 +643,24 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route33"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route31"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route34",
+        "operationId" : "route32",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route34"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route32"
       }
     }
   },
   "definitions" : {
-    "Loop" : {
+    "Dictionary" : {
       "type" : "object",
       "properties" : {
         "createdDate" : {
@@ -374,68 +680,68 @@
         "name" : {
           "type" : "string"
         },
-        "dcaeDeploymentId" : {
-          "type" : "string"
+        "secondLevelDictionary" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "dcaeDeploymentStatusUrl" : {
+        "subDictionaryType" : {
           "type" : "string"
         },
-        "dcaeBlueprintId" : {
-          "type" : "string"
+        "dictionaryElements" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/DictionaryElement"
+          }
+        }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.tosca.Dictionary"
+      }
+    },
+    "DictionaryElement" : {
+      "type" : "object",
+      "properties" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "svgRepresentation" : {
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
           "type" : "string"
         },
-        "globalPropertiesJson" : {
-          "$ref" : "#/definitions/JsonObject"
+        "createdBy" : {
+          "type" : "string"
         },
-        "modelService" : {
-          "$ref" : "#/definitions/Service"
+        "shortName" : {
+          "type" : "string"
         },
-        "blueprint" : {
+        "name" : {
           "type" : "string"
         },
-        "lastComputedState" : {
-          "type" : "string",
-          "enum" : [ "DESIGN", "SUBMITTED", "DEPLOYED", "RUNNING", "STOPPED", "IN_ERROR", "WAITING" ]
+        "description" : {
+          "type" : "string"
         },
-        "components" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "$ref" : "#/definitions/ExternalComponent"
-          }
+        "type" : {
+          "type" : "string"
         },
-        "operationalPolicies" : {
-          "type" : "array",
-          "uniqueItems" : true,
-          "items" : {
-            "$ref" : "#/definitions/OperationalPolicy"
-          }
+        "subDictionary" : {
+          "type" : "string"
         },
-        "microServicePolicies" : {
+        "usedByDictionaries" : {
           "type" : "array",
           "uniqueItems" : true,
           "items" : {
-            "$ref" : "#/definitions/MicroServicePolicy"
+            "$ref" : "#/definitions/Dictionary"
           }
-        },
-        "loopLogs" : {
-          "type" : "array",
-          "uniqueItems" : true,
-          "items" : {
-            "$ref" : "#/definitions/LoopLog"
-          }
-        },
-        "loopTemplate" : {
-          "$ref" : "#/definitions/LoopTemplate"
         }
-      },
-      "x-className" : {
-        "type" : "string",
-        "format" : "org.onap.clamp.loop.Loop"
       }
     },
-    "MicroServiceModel" : {
+    "Loop" : {
       "type" : "object",
       "properties" : {
         "createdDate" : {
@@ -455,22 +761,59 @@
         "name" : {
           "type" : "string"
         },
-        "policyType" : {
+        "dcaeDeploymentId" : {
           "type" : "string"
         },
-        "blueprint" : {
+        "dcaeDeploymentStatusUrl" : {
           "type" : "string"
         },
-        "policyModel" : {
-          "$ref" : "#/definitions/PolicyModel"
+        "svgRepresentation" : {
+          "type" : "string"
+        },
+        "globalPropertiesJson" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "modelService" : {
+          "$ref" : "#/definitions/Service"
+        },
+        "lastComputedState" : {
+          "type" : "string",
+          "enum" : [ "DESIGN", "SUBMITTED", "DEPLOYED", "RUNNING", "STOPPED", "IN_ERROR", "WAITING" ]
+        },
+        "components" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ExternalComponent"
+          }
+        },
+        "operationalPolicies" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/OperationalPolicy"
+          }
+        },
+        "microServicePolicies" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/MicroServicePolicy"
+          }
         },
-        "usedByLoopTemplates" : {
+        "loopLogs" : {
           "type" : "array",
           "uniqueItems" : true,
           "items" : {
-            "$ref" : "#/definitions/TemplateMicroServiceModel"
+            "$ref" : "#/definitions/LoopLog"
           }
+        },
+        "loopTemplate" : {
+          "$ref" : "#/definitions/LoopTemplate"
         }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.loop.Loop"
       }
     },
     "JsonPrimitive" : {
@@ -479,15 +822,25 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "boolean" : {
-          "type" : "boolean"
-        },
         "number" : {
           "type" : "boolean"
         },
         "asString" : {
           "type" : "string"
         },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "boolean" : {
+          "type" : "boolean"
+        },
+        "string" : {
+          "type" : "boolean"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -517,31 +870,21 @@
         "asBigDecimal" : {
           "type" : "number"
         },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "string" : {
-          "type" : "boolean"
-        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
         "jsonObject" : {
           "type" : "boolean"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
@@ -570,6 +913,18 @@
         "createdBy" : {
           "type" : "string"
         },
+        "jsonRepresentation" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "configurationsJson" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "loopElementModel" : {
+          "$ref" : "#/definitions/LoopElementModel"
+        },
+        "pdpGroup" : {
+          "type" : "string"
+        },
         "name" : {
           "type" : "string"
         },
@@ -582,18 +937,12 @@
         "deviceTypeScope" : {
           "type" : "string"
         },
-        "properties" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "shared" : {
           "type" : "boolean"
         },
         "policyTosca" : {
           "type" : "string"
         },
-        "jsonRepresentation" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "usedByLoops" : {
           "type" : "array",
           "uniqueItems" : true,
@@ -601,8 +950,14 @@
             "$ref" : "#/definitions/Loop"
           }
         },
-        "microServiceModel" : {
-          "$ref" : "#/definitions/MicroServiceModel"
+        "dcaeDeploymentId" : {
+          "type" : "string"
+        },
+        "dcaeDeploymentStatusUrl" : {
+          "type" : "string"
+        },
+        "dcaeBlueprintId" : {
+          "type" : "string"
         }
       },
       "x-className" : {
@@ -619,19 +974,26 @@
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asString" : {
           "type" : "string"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "jsonArray" : {
+        "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonObject" : {
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
@@ -671,13 +1033,6 @@
         },
         "asBigDecimal" : {
           "type" : "number"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
         }
       },
       "x-className" : {
@@ -714,9 +1069,17 @@
         "policyAcronym" : {
           "type" : "string"
         },
-        "policyVariant" : {
-          "type" : "string"
+        "usedByElementModels" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/LoopElementModel"
+          }
         }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.loop.template.PolicyModel"
       }
     },
     "Service" : {
@@ -725,6 +1088,12 @@
         "serviceUuid" : {
           "type" : "string"
         },
+        "name" : {
+          "type" : "string"
+        },
+        "version" : {
+          "type" : "string"
+        },
         "serviceDetails" : {
           "$ref" : "#/definitions/JsonObject"
         },
@@ -733,23 +1102,58 @@
         }
       }
     },
+    "LoopTemplateLoopElementModel" : {
+      "type" : "object",
+      "properties" : {
+        "loopTemplate" : {
+          "$ref" : "#/definitions/LoopTemplate"
+        },
+        "loopElementModel" : {
+          "$ref" : "#/definitions/LoopElementModel"
+        },
+        "flowOrder" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
     "OperationalPolicy" : {
       "type" : "object",
       "properties" : {
-        "name" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
+          "type" : "string"
+        },
+        "createdBy" : {
           "type" : "string"
         },
+        "jsonRepresentation" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
         "configurationsJson" : {
           "$ref" : "#/definitions/JsonObject"
         },
+        "loopElementModel" : {
+          "$ref" : "#/definitions/LoopElementModel"
+        },
+        "pdpGroup" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
         "loop" : {
           "$ref" : "#/definitions/Loop"
         },
         "policyModel" : {
           "$ref" : "#/definitions/PolicyModel"
-        },
-        "jsonRepresentation" : {
-          "$ref" : "#/definitions/JsonObject"
         }
       }
     },
@@ -762,19 +1166,26 @@
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asString" : {
           "type" : "string"
         },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "jsonArray" : {
+        "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonObject" : {
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
@@ -814,13 +1225,6 @@
         },
         "asBigDecimal" : {
           "type" : "number"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
         }
       }
     },
@@ -833,6 +1237,13 @@
         "asString" : {
           "type" : "string"
         },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
@@ -862,28 +1273,21 @@
         "asBigDecimal" : {
           "type" : "number"
         },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
         "jsonObject" : {
           "type" : "boolean"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
@@ -925,21 +1329,6 @@
         }
       }
     },
-    "TemplateMicroServiceModel" : {
-      "type" : "object",
-      "properties" : {
-        "loopTemplate" : {
-          "$ref" : "#/definitions/LoopTemplate"
-        },
-        "microServiceModel" : {
-          "$ref" : "#/definitions/MicroServiceModel"
-        },
-        "flowOrder" : {
-          "type" : "integer",
-          "format" : "int32"
-        }
-      }
-    },
     "Number" : {
       "type" : "object"
     },
@@ -974,17 +1363,20 @@
         "name" : {
           "type" : "string"
         },
+        "dcaeBlueprintId" : {
+          "type" : "string"
+        },
         "blueprint" : {
           "type" : "string"
         },
         "svgRepresentation" : {
           "type" : "string"
         },
-        "microServiceModelUsed" : {
+        "loopElementModelsUsed" : {
           "type" : "array",
           "uniqueItems" : true,
           "items" : {
-            "$ref" : "#/definitions/TemplateMicroServiceModel"
+            "$ref" : "#/definitions/LoopTemplateLoopElementModel"
           }
         },
         "modelService" : {
@@ -993,7 +1385,18 @@
         "maximumInstancesAllowed" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "uniqueBlueprint" : {
+          "type" : "boolean"
+        },
+        "allowedLoopType" : {
+          "type" : "string",
+          "enum" : [ "OPEN", "CLOSED", "HYBRID" ]
         }
+      },
+      "x-className" : {
+        "type" : "string",
+        "format" : "org.onap.clamp.loop.template.LoopTemplate"
       }
     },
     "ExternalComponentState" : {
@@ -1011,6 +1414,54 @@
         }
       }
     },
+    "LoopElementModel" : {
+      "type" : "object",
+      "properties" : {
+        "createdDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedDate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "updatedBy" : {
+          "type" : "string"
+        },
+        "createdBy" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "dcaeBlueprintId" : {
+          "type" : "string"
+        },
+        "blueprint" : {
+          "type" : "string"
+        },
+        "loopElementType" : {
+          "type" : "string"
+        },
+        "shortName" : {
+          "type" : "string"
+        },
+        "policyModels" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/PolicyModel"
+          }
+        },
+        "usedByLoopTemplates" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "$ref" : "#/definitions/LoopTemplateLoopElementModel"
+          }
+        }
+      }
+    },
     "CldsInfo" : {
       "type" : "object",
       "properties" : {
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 8a34cb5e7..baa8dcbb9 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,16 +4,16 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200116114123+01'00')
-/ModDate (D:20200116114123+01'00')
+/CreationDate (D:20200217012904-08'00')
+/ModDate (D:20200217012904-08'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
-/Names 18 0 R
-/Outlines 383 0 R
-/PageLabels 471 0 R
+/Names 20 0 R
+/Outlines 604 0 R
+/PageLabels 752 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 793.0]
 /ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
 endobj
 3 0 obj
 << /Type /Pages
-/Count 24
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 25 0 R 41 0 R 55 0 R 69 0 R 82 0 R 96 0 R 109 0 R 123 0 R 130 0 R 136 0 R 143 0 R 151 0 R 158 0 R 166 0 R 171 0 R 180 0 R 187 0 R 195 0 R 205 0 R]
+/Count 34
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 59 0 R 73 0 R 85 0 R 98 0 R 111 0 R 126 0 R 137 0 R 153 0 R 166 0 R 181 0 R 192 0 R 206 0 R 214 0 R 220 0 R 224 0 R 232 0 R 240 0 R 247 0 R 255 0 R 261 0 R 267 0 R 276 0 R 283 0 R 290 0 R 296 0 R 308 0 R]
 >>
 endobj
 4 0 obj
@@ -80,15 +80,15 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 473 0 R
+/FontDescriptor 754 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 475 0 R
-/ToUnicode 474 0 R
+/Widths 756 0 R
+/ToUnicode 755 0 R
 >>
 endobj
 9 0 obj
-<< /Length 31165
+<< /Length 31201
 >>
 stream
 q
@@ -631,7 +631,7 @@ ET
 BT
 60.24000000000001 458.52599999999967 Td
 /F1.0 10.5 Tf
-<322e342e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
+<322e342e20474554202f76322f64696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -640,9 +640,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-241.20524999999992 458.52599999999967 Td
+177.0712499999999 458.52599999999967 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -671,7 +671,7 @@ ET
 BT
 72.24000000000001 440.04599999999965 Td
 /F1.0 10.5 Tf
-[<322e342e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e342e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -680,9 +680,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 440.04599999999965 Td
+155.69324999999992 440.04599999999965 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -711,7 +711,7 @@ ET
 BT
 72.24000000000001 421.56599999999963 Td
 /F1.0 10.5 Tf
-<322e342e322e20526573706f6e736573> Tj
+<322e342e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -720,9 +720,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 421.56599999999963 Td
+150.34874999999994 421.56599999999963 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -751,7 +751,7 @@ ET
 BT
 60.24000000000001 403.0859999999996 Td
 /F1.0 10.5 Tf
-[<322e352e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+<322e352e20505554202f76322f64696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -760,9 +760,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-246.54974999999996 403.0859999999996 Td
+177.0712499999999 403.0859999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -871,7 +871,7 @@ ET
 BT
 72.24000000000001 347.64599999999956 Td
 /F1.0 10.5 Tf
-<322e352e332e2050726f6475636573> Tj
+<322e352e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -880,9 +880,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 347.64599999999956 Td
+155.69324999999992 347.64599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -909,9 +909,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 329.16599999999954 Td
+72.24000000000001 329.16599999999954 Td
 /F1.0 10.5 Tf
-<322e362e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
+<322e352e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -920,9 +920,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-214.48274999999995 329.16599999999954 Td
+150.34874999999994 329.16599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -949,9 +949,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 310.6859999999995 Td
+60.24000000000001 310.6859999999995 Td
 /F1.0 10.5 Tf
-<322e362e312e20526573706f6e736573> Tj
+<322e362e20474554202f76322f64696374696f6e6172792f7365636f6e646172792f6e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -960,9 +960,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 310.6859999999995 Td
+267.92774999999995 310.6859999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -991,7 +991,7 @@ ET
 BT
 72.24000000000001 292.2059999999995 Td
 /F1.0 10.5 Tf
-<322e362e322e2050726f6475636573> Tj
+<322e362e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1000,9 +1000,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 292.2059999999995 Td
+155.69324999999992 292.2059999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1029,9 +1029,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 273.7259999999995 Td
+72.24000000000001 273.7259999999995 Td
 /F1.0 10.5 Tf
-<322e372e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
+<322e362e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1040,9 +1040,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-257.2387499999999 273.7259999999995 Td
+150.34874999999994 273.7259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1069,9 +1069,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 255.24599999999947 Td
+60.24000000000001 255.24599999999947 Td
 /F1.0 10.5 Tf
-[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e372e20474554202f76322f64696374696f6e6172792f7b64696374696f6e6172794e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1080,9 +1080,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 255.24599999999947 Td
+267.92774999999995 255.24599999999947 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1111,7 +1111,7 @@ ET
 BT
 72.24000000000001 236.76599999999948 Td
 /F1.0 10.5 Tf
-<322e372e322e20526573706f6e736573> Tj
+[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1120,9 +1120,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 236.76599999999948 Td
+161.0377499999999 236.76599999999948 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1151,7 +1151,7 @@ ET
 BT
 72.24000000000001 218.2859999999995 Td
 /F1.0 10.5 Tf
-<322e372e332e2050726f6475636573> Tj
+<322e372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1160,9 +1160,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 218.2859999999995 Td
+155.69324999999992 218.2859999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1189,9 +1189,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 199.8059999999995 Td
+72.24000000000001 199.8059999999995 Td
 /F1.0 10.5 Tf
-<322e382e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
+<322e372e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1200,9 +1200,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-246.54974999999996 199.8059999999995 Td
+150.34874999999994 199.8059999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1229,9 +1229,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 181.3259999999995 Td
+60.24000000000001 181.3259999999995 Td
 /F1.0 10.5 Tf
-[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e382e20505554202f76322f64696374696f6e6172792f7b6e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1240,9 +1240,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 181.3259999999995 Td
+214.48274999999995 181.3259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1271,7 +1271,7 @@ ET
 BT
 72.24000000000001 162.84599999999952 Td
 /F1.0 10.5 Tf
-<322e382e322e20526573706f6e736573> Tj
+[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1280,9 +1280,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 162.84599999999952 Td
+161.0377499999999 162.84599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1311,7 +1311,7 @@ ET
 BT
 72.24000000000001 144.36599999999953 Td
 /F1.0 10.5 Tf
-<322e382e332e2050726f6475636573> Tj
+<322e382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1320,9 +1320,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 144.36599999999953 Td
+155.69324999999992 144.36599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1349,9 +1349,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 125.88599999999954 Td
+72.24000000000001 125.88599999999954 Td
 /F1.0 10.5 Tf
-<322e392e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
+<322e382e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1360,9 +1360,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-235.86074999999994 125.88599999999954 Td
+155.69324999999992 125.88599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1391,7 +1391,7 @@ ET
 BT
 72.24000000000001 107.40599999999955 Td
 /F1.0 10.5 Tf
-[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e382e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1400,9 +1400,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 107.40599999999955 Td
+150.34874999999994 107.40599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1420,7 +1420,7 @@ ET
 BT
 557.8905 107.40599999999955 Td
 /F1.0 10.5 Tf
-<34> Tj
+<35> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1429,9 +1429,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 88.92599999999956 Td
+60.24000000000001 88.92599999999956 Td
 /F1.0 10.5 Tf
-<322e392e322e20526573706f6e736573> Tj
+<322e392e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1440,9 +1440,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 88.92599999999956 Td
+235.86074999999994 88.92599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1471,7 +1471,7 @@ ET
 BT
 72.24000000000001 70.44599999999957 Td
 /F1.0 10.5 Tf
-<322e392e332e2050726f6475636573> Tj
+[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1480,9 +1480,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 70.44599999999957 Td
+161.0377499999999 70.44599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1509,9 +1509,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 51.965999999999575 Td
+72.24000000000001 51.965999999999575 Td
 /F1.0 10.5 Tf
-<322e31302e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
+<322e392e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1520,9 +1520,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-251.89424999999994 51.965999999999575 Td
+155.69324999999992 51.965999999999575 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1555,15 +1555,15 @@ endobj
 /MediaBox [0 0 612.0 792.0]
 /Contents 9 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
+/Font << /F2.0 22 0 R
 /F1.0 8 0 R
 >>
 >>
-/Annots [212 0 R 213 0 R 214 0 R 215 0 R 216 0 R 217 0 R 218 0 R 219 0 R 220 0 R 221 0 R 222 0 R 223 0 R 224 0 R 225 0 R 226 0 R 227 0 R 228 0 R 229 0 R 230 0 R 231 0 R 232 0 R 233 0 R 234 0 R 235 0 R 236 0 R 237 0 R 238 0 R 239 0 R 240 0 R 241 0 R 242 0 R 243 0 R 244 0 R 245 0 R 246 0 R 247 0 R 248 0 R 249 0 R 250 0 R 251 0 R 252 0 R 253 0 R 254 0 R 255 0 R 256 0 R 257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 279 0 R 280 0 R 281 0 R 282 0 R 283 0 R]
+/Annots [313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R]
 >>
 endobj
 11 0 obj
-<< /Length 32531
+<< /Length 32386
 >>
 stream
 q
@@ -1575,7 +1575,7 @@ q
 BT
 72.24000000000001 744.786 Td
 /F1.0 10.5 Tf
-[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e392e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1584,9 +1584,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 744.786 Td
+150.34874999999994 744.786 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1613,9 +1613,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 726.3059999999999 Td
+60.24000000000001 726.3059999999999 Td
 /F1.0 10.5 Tf
-<322e31302e322e20526573706f6e736573> Tj
+<322e31302e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d2f656c656d656e74732f7b73686f72744e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1624,16 +1624,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 726.3059999999999 Td
+358.78425 726.3059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.5307499999999 726.3059999999999 Td
+556.53075 726.3059999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1655,7 +1655,7 @@ ET
 BT
 72.24000000000001 707.8259999999999 Td
 /F1.0 10.5 Tf
-<322e31302e332e2050726f6475636573> Tj
+[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1664,9 +1664,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 707.8259999999999 Td
+166.38224999999994 707.8259999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1693,9 +1693,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 689.3459999999999 Td
+72.24000000000001 689.3459999999999 Td
 /F1.0 10.5 Tf
-<322e31312e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
+<322e31302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1704,16 +1704,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-310.68375000000003 689.3459999999999 Td
+161.0377499999999 689.3459999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 689.3459999999999 Td
+556.5307499999999 689.3459999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1735,7 +1735,7 @@ ET
 BT
 72.24000000000001 670.8659999999999 Td
 /F1.0 10.5 Tf
-[<322e31312e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31302e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1744,9 +1744,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 670.8659999999999 Td
+155.69324999999992 670.8659999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1773,9 +1773,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 652.3859999999999 Td
+60.24000000000001 652.3859999999999 Td
 /F1.0 10.5 Tf
-<322e31312e322e20526573706f6e736573> Tj
+<322e31312e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1784,9 +1784,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 652.3859999999999 Td
+246.54974999999996 652.3859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1815,7 +1815,7 @@ ET
 BT
 72.24000000000001 633.9059999999998 Td
 /F1.0 10.5 Tf
-<322e31312e332e2050726f6475636573> Tj
+[<322e31312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1824,9 +1824,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 633.9059999999998 Td
+166.38224999999994 633.9059999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1853,9 +1853,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 615.4259999999998 Td
+72.24000000000001 615.4259999999998 Td
 /F1.0 10.5 Tf
-[<322e31322e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+<322e31312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1864,9 +1864,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-267.92774999999995 615.4259999999998 Td
+161.0377499999999 615.4259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1893,9 +1893,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 596.9459999999998 Td
+60.24000000000001 596.9459999999998 Td
 /F1.0 10.5 Tf
-[<322e31322e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e31322e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1904,9 +1904,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 596.9459999999998 Td
+251.89424999999994 596.9459999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1935,7 +1935,7 @@ ET
 BT
 72.24000000000001 578.4659999999998 Td
 /F1.0 10.5 Tf
-<322e31322e322e20526573706f6e736573> Tj
+[<322e31322e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1944,9 +1944,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 578.4659999999998 Td
+166.38224999999994 578.4659999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1975,7 +1975,7 @@ ET
 BT
 72.24000000000001 559.9859999999999 Td
 /F1.0 10.5 Tf
-<322e31322e332e2050726f6475636573> Tj
+<322e31322e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1984,9 +1984,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 559.9859999999999 Td
+161.0377499999999 559.9859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2013,9 +2013,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 541.5059999999999 Td
+72.24000000000001 541.5059999999999 Td
 /F1.0 10.5 Tf
-[<322e31332e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
+<322e31322e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2024,16 +2024,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-342.75075000000004 541.5059999999999 Td
+155.69324999999992 541.5059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 541.5059999999999 Td
+556.5307499999999 541.5059999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2053,9 +2053,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 523.0259999999998 Td
+60.24000000000001 523.0259999999998 Td
 /F1.0 10.5 Tf
-[<322e31332e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31332e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2064,9 +2064,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 523.0259999999998 Td
+219.82724999999994 523.0259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2095,7 +2095,7 @@ ET
 BT
 72.24000000000001 504.54599999999976 Td
 /F1.0 10.5 Tf
-<322e31332e322e20526573706f6e736573> Tj
+<322e31332e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2135,7 +2135,7 @@ ET
 BT
 72.24000000000001 486.06599999999975 Td
 /F1.0 10.5 Tf
-<322e31332e332e20436f6e73756d6573> Tj
+<322e31332e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2144,9 +2144,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 486.06599999999975 Td
+155.69324999999992 486.06599999999975 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2173,9 +2173,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 467.58599999999973 Td
+60.24000000000001 467.58599999999973 Td
 /F1.0 10.5 Tf
-<322e31332e342e2050726f6475636573> Tj
+<322e31342e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2184,9 +2184,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 467.58599999999973 Td
+262.58324999999996 467.58599999999973 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2213,9 +2213,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 449.1059999999997 Td
+72.24000000000001 449.1059999999997 Td
 /F1.0 10.5 Tf
-[<322e31342e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d>] TJ
+[<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2224,16 +2224,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-353.43975 449.1059999999997 Td
+166.38224999999994 449.1059999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 449.1059999999997 Td
+556.5307499999999 449.1059999999997 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2255,7 +2255,7 @@ ET
 BT
 72.24000000000001 430.6259999999997 Td
 /F1.0 10.5 Tf
-[<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31342e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2264,9 +2264,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 430.6259999999997 Td
+161.0377499999999 430.6259999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2295,7 +2295,7 @@ ET
 BT
 72.24000000000001 412.1459999999997 Td
 /F1.0 10.5 Tf
-<322e31342e322e20526573706f6e736573> Tj
+<322e31342e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2304,9 +2304,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 412.1459999999997 Td
+155.69324999999992 412.1459999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2333,9 +2333,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 393.66599999999966 Td
+60.24000000000001 393.66599999999966 Td
 /F1.0 10.5 Tf
-<322e31342e332e20436f6e73756d6573> Tj
+<322e31352e20505554202f76322f6c6f6f702f726566726573684f70506f6c6963794a736f6e536368656d612f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2344,16 +2344,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 393.66599999999966 Td
+358.78425 393.66599999999966 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.5307499999999 393.66599999999966 Td
+556.53075 393.66599999999966 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2375,7 +2375,7 @@ ET
 BT
 72.24000000000001 375.18599999999964 Td
 /F1.0 10.5 Tf
-<322e31342e342e2050726f6475636573> Tj
+[<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2384,9 +2384,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 375.18599999999964 Td
+166.38224999999994 375.18599999999964 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2413,9 +2413,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 356.7059999999996 Td
+72.24000000000001 356.7059999999996 Td
 /F1.0 10.5 Tf
-[<322e31352e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
+<322e31352e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2424,16 +2424,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-358.78425 356.7059999999996 Td
+161.0377499999999 356.7059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 356.7059999999996 Td
+556.5307499999999 356.7059999999996 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2455,7 +2455,7 @@ ET
 BT
 72.24000000000001 338.2259999999996 Td
 /F1.0 10.5 Tf
-[<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31352e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2464,9 +2464,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 338.2259999999996 Td
+155.69324999999992 338.2259999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2484,7 +2484,7 @@ ET
 BT
 557.8905 338.2259999999996 Td
 /F1.0 10.5 Tf
-<38> Tj
+<37> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2493,9 +2493,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 319.7459999999996 Td
+60.24000000000001 319.7459999999996 Td
 /F1.0 10.5 Tf
-<322e31352e322e20526573706f6e736573> Tj
+<322e31362e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2504,9 +2504,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 319.7459999999996 Td
+251.89424999999994 319.7459999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2535,7 +2535,7 @@ ET
 BT
 72.24000000000001 301.26599999999956 Td
 /F1.0 10.5 Tf
-<322e31352e332e20436f6e73756d6573> Tj
+[<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2544,9 +2544,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 301.26599999999956 Td
+166.38224999999994 301.26599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2575,7 +2575,7 @@ ET
 BT
 72.24000000000001 282.78599999999955 Td
 /F1.0 10.5 Tf
-<322e31352e342e2050726f6475636573> Tj
+<322e31362e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2584,9 +2584,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 282.78599999999955 Td
+161.0377499999999 282.78599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2613,9 +2613,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 264.30599999999953 Td
+72.24000000000001 264.30599999999953 Td
 /F1.0 10.5 Tf
-<322e31362e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
+<322e31362e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2624,9 +2624,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-214.48274999999995 264.30599999999953 Td
+155.69324999999992 264.30599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2653,9 +2653,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 245.8259999999995 Td
+60.24000000000001 245.8259999999995 Td
 /F1.0 10.5 Tf
-[<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31372e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2664,9 +2664,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 245.8259999999995 Td
+241.20524999999992 245.8259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2695,7 +2695,7 @@ ET
 BT
 72.24000000000001 227.34599999999952 Td
 /F1.0 10.5 Tf
-<322e31362e322e20526573706f6e736573> Tj
+[<322e31372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2704,9 +2704,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 227.34599999999952 Td
+166.38224999999994 227.34599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2735,7 +2735,7 @@ ET
 BT
 72.24000000000001 208.86599999999953 Td
 /F1.0 10.5 Tf
-<322e31362e332e2050726f6475636573> Tj
+<322e31372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2744,9 +2744,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 208.86599999999953 Td
+161.0377499999999 208.86599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2773,9 +2773,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 190.38599999999954 Td
+72.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-<332e20446566696e6974696f6e73> Tj
+<322e31372e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2784,9 +2784,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-118.28174999999993 190.38599999999954 Td
+155.69324999999992 190.38599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2804,7 +2804,7 @@ ET
 BT
 557.8905 190.38599999999954 Td
 /F1.0 10.5 Tf
-<39> Tj
+<38> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2815,7 +2815,7 @@ ET
 BT
 60.24000000000001 171.90599999999955 Td
 /F1.0 10.5 Tf
-<332e312e20436c64734865616c7468436865636b> Tj
+<322e31382e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2824,9 +2824,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 171.90599999999955 Td
+251.89424999999994 171.90599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2844,7 +2844,7 @@ ET
 BT
 557.8905 171.90599999999955 Td
 /F1.0 10.5 Tf
-<39> Tj
+<38> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2853,9 +2853,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 153.42599999999956 Td
+72.24000000000001 153.42599999999956 Td
 /F1.0 10.5 Tf
-<332e322e20436c6473496e666f> Tj
+[<322e31382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2864,9 +2864,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-123.62624999999991 153.42599999999956 Td
+166.38224999999994 153.42599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2884,7 +2884,7 @@ ET
 BT
 557.8905 153.42599999999956 Td
 /F1.0 10.5 Tf
-<39> Tj
+<38> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2893,9 +2893,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 134.94599999999957 Td
+72.24000000000001 134.94599999999957 Td
 /F1.0 10.5 Tf
-<332e332e2045787465726e616c436f6d706f6e656e74> Tj
+<322e31382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2904,9 +2904,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-182.41574999999995 134.94599999999957 Td
+161.0377499999999 134.94599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2933,9 +2933,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 116.46599999999958 Td
+72.24000000000001 116.46599999999958 Td
 /F1.0 10.5 Tf
-<332e342e2045787465726e616c436f6d706f6e656e745374617465> Tj
+<322e31382e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2944,16 +2944,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-208.61325 116.46599999999958 Td
+155.69324999999992 116.46599999999958 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-550.66125 116.46599999999958 Td
+556.5307499999999 116.46599999999958 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2962,9 +2962,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 116.46599999999958 Td
+557.8905 116.46599999999958 Td
 /F1.0 10.5 Tf
-<3130> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2975,7 +2975,7 @@ ET
 BT
 60.24000000000001 97.98599999999959 Td
 /F1.0 10.5 Tf
-[<332e352e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<322e31392e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2984,16 +2984,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 97.98599999999959 Td
+310.68375000000003 97.98599999999959 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-550.66125 97.98599999999959 Td
+556.53075 97.98599999999959 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3002,9 +3002,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 97.98599999999959 Td
+557.8905 97.98599999999959 Td
 /F1.0 10.5 Tf
-<3130> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3013,9 +3013,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 79.5059999999996 Td
+72.24000000000001 79.5059999999996 Td
 /F1.0 10.5 Tf
-<332e362e204a736f6e4e756c6c> Tj
+[<322e31392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3024,16 +3024,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-128.44574999999998 79.5059999999996 Td
+166.38224999999994 79.5059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-550.66125 79.5059999999996 Td
+556.5307499999999 79.5059999999996 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3042,9 +3042,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 79.5059999999996 Td
+557.8905 79.5059999999996 Td
 /F1.0 10.5 Tf
-<3131> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3053,9 +3053,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 61.02599999999961 Td
+72.24000000000001 61.02599999999961 Td
 /F1.0 10.5 Tf
-<332e372e204a736f6e4f626a656374> Tj
+<322e31392e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3064,16 +3064,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 61.02599999999961 Td
+161.0377499999999 61.02599999999961 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-550.66125 61.02599999999961 Td
+556.5307499999999 61.02599999999961 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3082,9 +3082,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 61.02599999999961 Td
+557.8905 61.02599999999961 Td
 /F1.0 10.5 Tf
-<3132> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3102,11 +3102,11 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 289 0 R 290 0 R 291 0 R 292 0 R 293 0 R 294 0 R 295 0 R 296 0 R 297 0 R 298 0 R 299 0 R 300 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R]
+/Annots [385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R]
 >>
 endobj
 13 0 obj
-<< /Length 9378
+<< /Length 32065
 >>
 stream
 q
@@ -3116,9 +3116,9 @@ q
 0.200 0.200 0.200 SCN
 
 BT
-60.24 744.786 Td
+72.24000000000001 744.786 Td
 /F1.0 10.5 Tf
-<332e382e204a736f6e5072696d6974697665> Tj
+<322e31392e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3127,7 +3127,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-149.82374999999996 744.786 Td
+155.69324999999992 744.786 Td
 /F1.0 10.5 Tf
 <2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
@@ -3136,7 +3136,7 @@ ET
 0.000 0.000 0.000 scn
 
 BT
-550.66125 744.786 Td
+556.5307499999999 744.786 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3145,9 +3145,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 744.786 Td
+557.8905 744.786 Td
 /F1.0 10.5 Tf
-<3134> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3158,7 +3158,7 @@ ET
 BT
 60.24000000000001 726.3059999999999 Td
 /F1.0 10.5 Tf
-<332e392e204c6f6f70> Tj
+[<322e32302e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3167,16 +3167,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-107.06774999999999 726.3059999999999 Td
+267.92774999999995 726.3059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-550.66125 726.3059999999999 Td
+556.5307499999999 726.3059999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3185,9 +3185,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 726.3059999999999 Td
+557.8905 726.3059999999999 Td
 /F1.0 10.5 Tf
-<3135> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3196,9 +3196,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 707.8259999999999 Td
+72.24000000000001 707.8259999999999 Td
 /F1.0 10.5 Tf
-<332e31302e204c6f6f704c6f67> Tj
+[<322e32302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3207,16 +3207,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 707.8259999999999 Td
+166.38224999999994 707.8259999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-550.66125 707.8259999999999 Td
+556.5307499999999 707.8259999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3225,9 +3225,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-552.021 707.8259999999999 Td
+557.8905 707.8259999999999 Td
 /F1.0 10.5 Tf
-<3136> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3236,9 +3236,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 689.3459999999999 Td
+72.24000000000001 689.3459999999999 Td
 /F1.0 10.5 Tf
-[<332e31312e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
+<322e32302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3267,7 +3267,7 @@ ET
 BT
 552.021 689.3459999999999 Td
 /F1.0 10.5 Tf
-<3137> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3276,9 +3276,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 670.8659999999999 Td
+72.24000000000001 670.8659999999999 Td
 /F1.0 10.5 Tf
-<332e31322e204d6963726f536572766963654d6f64656c> Tj
+<322e32302e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3287,9 +3287,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-187.23524999999995 670.8659999999999 Td
+155.16824999999994 670.8659999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3307,7 +3307,7 @@ ET
 BT
 552.021 670.8659999999999 Td
 /F1.0 10.5 Tf
-<3137> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3318,7 +3318,7 @@ ET
 BT
 60.24000000000001 652.3859999999999 Td
 /F1.0 10.5 Tf
-<332e31332e204d6963726f53657276696365506f6c696379> Tj
+[<322e32312e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3327,9 +3327,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-187.23524999999995 652.3859999999999 Td
+342.22574999999995 652.3859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3347,7 +3347,7 @@ ET
 BT
 552.021 652.3859999999999 Td
 /F1.0 10.5 Tf
-<3138> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3356,9 +3356,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 633.9059999999998 Td
+72.24000000000001 633.9059999999998 Td
 /F1.0 10.5 Tf
-<332e31342e204e756d626572> Tj
+[<322e32312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3367,9 +3367,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-128.44574999999998 633.9059999999998 Td
+165.85724999999996 633.9059999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3387,7 +3387,7 @@ ET
 BT
 552.021 633.9059999999998 Td
 /F1.0 10.5 Tf
-<3139> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3396,9 +3396,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 615.4259999999998 Td
+72.24000000000001 615.4259999999998 Td
 /F1.0 10.5 Tf
-[<332e31352e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+<322e32312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3407,9 +3407,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-176.54625 615.4259999999998 Td
+160.51274999999998 615.4259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3427,7 +3427,7 @@ ET
 BT
 552.021 615.4259999999998 Td
 /F1.0 10.5 Tf
-<3139> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3436,9 +3436,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 596.9459999999998 Td
+72.24000000000001 596.9459999999998 Td
 /F1.0 10.5 Tf
-<332e31362e20506f6c6963794d6f64656c> Tj
+<322e32312e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3447,9 +3447,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-149.82374999999996 596.9459999999998 Td
+160.51274999999998 596.9459999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3467,7 +3467,7 @@ ET
 BT
 552.021 596.9459999999998 Td
 /F1.0 10.5 Tf
-<3139> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3476,9 +3476,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 578.4659999999998 Td
+72.24000000000001 578.4659999999998 Td
 /F1.0 10.5 Tf
-<332e31372e2053657276696365> Tj
+<322e32312e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3487,9 +3487,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-123.10125 578.4659999999998 Td
+155.16824999999994 578.4659999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3507,7 +3507,7 @@ ET
 BT
 552.021 578.4659999999998 Td
 /F1.0 10.5 Tf
-<3230> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3518,7 +3518,7 @@ ET
 BT
 60.24000000000001 559.9859999999999 Td
 /F1.0 10.5 Tf
-[<332e31382e2054> 29.78515625 <656d706c6174654d6963726f536572766963654d6f64656c>] TJ
+[<322e32322e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3527,9 +3527,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-235.33574999999996 559.9859999999999 Td
+352.91474999999997 559.9859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3547,41 +3547,18 @@ ET
 BT
 552.021 559.9859999999999 Td
 /F1.0 10.5 Tf
-<3230> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-
-endstream
-endobj
-14 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 13 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 8 0 R
->>
->>
-/Annots [360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R]
->>
-endobj
-15 0 obj
-<< /Length 2379
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 730.304 Td
-/F2.0 22 Tf
-<4368617074657220312e204f76657276696577> Tj
+72.24000000000001 541.5059999999999 Td
+/F1.0 10.5 Tf
+[<322e32322e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3590,20 +3567,27 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 688.656 Td
-/F2.0 18 Tf
-[<312e312e2056> 60.05859375 <657273696f6e20696e666f726d6174696f6e>] TJ
+165.85724999999996 541.5059999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 541.5059999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 660.036 Td
-/F3.0 10.5 Tf
-[<56> 60.05859375 <657273696f6e>] TJ
+552.021 541.5059999999999 Td
+/F1.0 10.5 Tf
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3612,9 +3596,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-85.136384765625 660.036 Td
+72.24000000000001 523.0259999999998 Td
 /F1.0 10.5 Tf
-[<203a20342e322e302d534e415053484f> 20.01953125 <54>] TJ
+<322e32322e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3623,20 +3607,27 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 620.796 Td
-/F2.0 18 Tf
-<312e322e2055524920736368656d65> Tj
+160.51274999999998 523.0259999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 523.0259999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 592.176 Td
-/F3.0 10.5 Tf
-<486f7374> Tj
+552.021 523.0259999999998 Td
+/F1.0 10.5 Tf
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3645,9 +3636,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-71.30850000000001 592.176 Td
+72.24000000000001 504.54599999999976 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3333393533> Tj
+<322e32322e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3656,18 +3647,27 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 576.3960000000001 Td
+160.51274999999998 504.54599999999976 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 504.54599999999976 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 576.3960000000001 Td
-/F3.0 10.5 Tf
-<4261736550617468> Tj
+552.021 504.54599999999976 Td
+/F1.0 10.5 Tf
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3676,9 +3676,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-93.95700000000001 576.3960000000001 Td
+72.24000000000001 486.06599999999975 Td
 /F1.0 10.5 Tf
-<203a202f7265737473657276696365732f636c64732f> Tj
+<322e32322e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3687,18 +3687,27 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 560.6160000000001 Td
+155.16824999999994 486.06599999999975 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 486.06599999999975 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 560.6160000000001 Td
-/F3.0 10.5 Tf
-<536368656d6573> Tj
+552.021 486.06599999999975 Td
+/F1.0 10.5 Tf
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3707,106 +3716,38 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-89.946 560.6160000000001 Td
+60.24000000000001 467.58599999999973 Td
 /F1.0 10.5 Tf
-<203a2048545450> Tj
+[<322e32332e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<31> Tj
+358.25924999999995 467.58599999999973 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
 
-endstream
-endobj
-16 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 15 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
->>
-endobj
-17 0 obj
-[16 0 R /XYZ 0 792.0 null]
-endobj
-18 0 obj
-<< /Type /Names
-/Dests 19 0 R
->>
-endobj
-19 0 obj
-<< /Kids [50 0 R 190 0 R 127 0 R 80 0 R 116 0 R 51 0 R 86 0 R]
->>
-endobj
-20 0 obj
-<< /Type /Font
-/BaseFont /AAAAAB+NotoSerif-Bold
-/Subtype /TrueType
-/FontDescriptor 477 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 479 0 R
-/ToUnicode 478 0 R
->>
-endobj
-21 0 obj
-[16 0 R /XYZ 0 712.0799999999999 null]
-endobj
-22 0 obj
-<< /Type /Font
-/BaseFont /AAAAAC+NotoSerif-Italic
-/Subtype /TrueType
-/FontDescriptor 481 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 483 0 R
-/ToUnicode 482 0 R
->>
-endobj
-23 0 obj
-[16 0 R /XYZ 0 644.22 null]
-endobj
-24 0 obj
-<< /Length 12148
->>
-stream
-q
-/DeviceRGB cs
+BT
+550.66125 467.58599999999973 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 730.304 Td
-/F2.0 22 Tf
-<4368617074657220322e205061746873> Tj
+552.021 467.58599999999973 Td
+/F1.0 10.5 Tf
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3815,9 +3756,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 688.656 Td
-/F2.0 18 Tf
-<322e312e20474554202f76312f636c64732f636c6473496e666f> Tj
+72.24000000000001 449.1059999999997 Td
+/F1.0 10.5 Tf
+[<322e32332e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3826,295 +3767,147 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 654.416 Td
-/F2.0 13 Tf
-<322e312e312e20526573706f6e736573> Tj
+165.85724999999996 449.1059999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 602.160 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 602.160 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 602.160 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 578.880 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 578.880 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 578.880 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 639.720 m
-99.792 639.720 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 602.160 m
-99.792 602.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 639.970 m
-48.240 601.410 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 639.970 m
-99.792 601.410 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
+
+BT
+550.66125 449.1059999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 623.9730000000002 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+552.021 449.1059999999997 Td
+/F1.0 10.5 Tf
+<3131> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 609.6930000000001 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+72.24000000000001 430.6259999999997 Td
+/F1.0 10.5 Tf
+<322e32332e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 639.720 m
-460.656 639.720 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 602.160 m
-460.656 602.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 639.970 m
-99.792 601.410 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 639.970 m
-460.656 601.410 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 623.9730000000002 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+160.51274999999998 430.6259999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 639.720 m
-563.760 639.720 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 602.160 m
-563.760 602.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 639.970 m
-460.656 601.410 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 639.970 m
-563.760 601.410 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-463.65600000000006 623.9730000000002 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+550.66125 430.6259999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 602.160 m
-99.792 602.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 578.880 m
-99.792 578.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 602.410 m
-48.240 578.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 602.410 m
-99.792 578.630 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 585.913 Td
-/F2.0 10.5 Tf
-<323030> Tj
+552.021 430.6259999999997 Td
+/F1.0 10.5 Tf
+<3131> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 602.160 m
-460.656 602.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 578.880 m
-460.656 578.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 602.410 m
-99.792 578.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 602.410 m
-460.656 578.630 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 585.913 Td
+72.24000000000001 412.1459999999997 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<322e32332e332e20436f6e73756d6573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 602.160 m
-563.760 602.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 578.880 m
-563.760 578.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 602.410 m
-460.656 578.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 602.410 m
-563.760 578.630 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
+
+BT
+160.51274999999998 412.1459999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 412.1459999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 585.913 Td
+552.021 412.1459999999997 Td
 /F1.0 10.5 Tf
-<436c6473496e666f> Tj
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 549.2960000000002 Td
-/F2.0 13 Tf
-<322e312e322e2050726f6475636573> Tj
+72.24000000000001 393.66599999999966 Td
+/F1.0 10.5 Tf
+<322e32332e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 522.6360000000002 Td
+155.16824999999994 393.66599999999966 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+BT
+550.66125 393.66599999999966 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 524.8200000000003 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+552.021 393.66599999999966 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4123,9 +3916,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 487.1760000000003 Td
-/F2.0 18 Tf
-<322e322e20474554202f76312f6865616c7468636865636b> Tj
+60.24000000000001 375.18599999999964 Td
+/F1.0 10.5 Tf
+<322e32342e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4134,295 +3927,158 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 452.9360000000002 Td
-/F2.0 13 Tf
-<322e322e312e20526573706f6e736573> Tj
+213.95774999999998 375.18599999999964 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 400.680 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 400.680 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 400.680 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 377.400 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 377.400 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 377.400 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 438.240 m
-99.792 438.240 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 400.680 m
-99.792 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 438.490 m
-48.240 399.930 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 438.490 m
-99.792 399.930 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 422.49300000000017 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+550.66125 375.18599999999964 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 408.2130000000002 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+552.021 375.18599999999964 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 438.240 m
-460.656 438.240 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 400.680 m
-460.656 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 438.490 m
-99.792 399.930 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 438.490 m
-460.656 399.930 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 422.49300000000017 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+72.24000000000001 356.7059999999996 Td
+/F1.0 10.5 Tf
+[<322e32342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 438.240 m
-563.760 438.240 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 400.680 m
-563.760 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 438.490 m
-460.656 399.930 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 438.490 m
-563.760 399.930 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 422.49300000000017 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+165.85724999999996 356.7059999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 400.680 m
-99.792 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 377.400 m
-99.792 377.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 400.930 m
-48.240 377.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 400.930 m
-99.792 377.150 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 356.7059999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 384.43300000000016 Td
-/F2.0 10.5 Tf
-<323030> Tj
+552.021 356.7059999999996 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 400.680 m
-460.656 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 377.400 m
-460.656 377.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 400.930 m
-99.792 377.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 400.930 m
-460.656 377.150 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 384.43300000000016 Td
+72.24000000000001 338.2259999999996 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<322e32342e322e20526573706f6e736573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 400.680 m
-563.760 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 377.400 m
-563.760 377.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 400.930 m
-460.656 377.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 400.930 m
-563.760 377.150 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
+
+BT
+160.51274999999998 338.2259999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 338.2259999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 384.43300000000016 Td
+552.021 338.2259999999996 Td
 /F1.0 10.5 Tf
-<436c64734865616c7468436865636b> Tj
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+72.24000000000001 319.7459999999996 Td
+/F1.0 10.5 Tf
+<322e32342e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 347.8160000000002 Td
-/F2.0 13 Tf
-<322e322e322e2050726f6475636573> Tj
+155.16824999999994 319.7459999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
--0.500 Tc
+BT
+550.66125 319.7459999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 321.1560000000002 Td
+552.021 319.7459999999996 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 323.3400000000002 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+60.24000000000001 301.26599999999956 Td
+/F1.0 10.5 Tf
+[<322e32352e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c73>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4431,213 +4087,118 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 285.6960000000002 Td
-/F2.0 18 Tf
-<322e332e20474554202f76312f757365722f67657455736572> Tj
+224.64675 301.26599999999956 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 301.26599999999956 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 251.45600000000013 Td
-/F2.0 13 Tf
-<322e332e312e20526573706f6e736573> Tj
+552.021 301.26599999999956 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 213.480 171.840 23.280 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+72.24000000000001 282.78599999999955 Td
+/F1.0 10.5 Tf
+<322e32352e312e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-220.080 213.480 343.680 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 190.200 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-220.080 190.200 343.680 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 236.760 m
-220.080 236.760 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 213.480 m
-220.080 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 237.010 m
-48.240 212.730 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 237.010 m
-220.080 212.730 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 221.01300000000015 Td
-/F2.0 10.5 Tf
-<4854545020436f6465> Tj
+160.51274999999998 282.78599999999955 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 236.760 m
-563.760 236.760 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-220.080 213.480 m
-563.760 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 237.010 m
-220.080 212.730 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 237.010 m
-563.760 212.730 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-223.07982816 221.01300000000015 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+550.66125 282.78599999999955 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 213.480 m
-220.080 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 190.200 m
-220.080 190.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 213.730 m
-48.240 189.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 213.730 m
-220.080 189.950 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 197.23300000000015 Td
-/F2.0 10.5 Tf
-<323030> Tj
+552.021 282.78599999999955 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 213.480 m
-563.760 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 190.200 m
-563.760 190.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 213.730 m
-220.080 189.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 213.730 m
-563.760 189.950 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-223.07982816 197.23300000000015 Td
+72.24000000000001 264.30599999999953 Td
 /F1.0 10.5 Tf
-<4e6f20436f6e74656e74> Tj
+<322e32352e322e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 160.6160000000001 Td
-/F2.0 13 Tf
-<322e332e322e2050726f6475636573> Tj
+155.16824999999994 264.30599999999953 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
--0.500 Tc
+BT
+550.66125 264.30599999999953 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 133.9560000000001 Td
+552.021 264.30599999999953 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 136.1400000000001 Td
-/F4.0 10.5 Tf
-<746578742f706c61696e> Tj
+60.24000000000001 245.8259999999995 Td
+/F1.0 10.5 Tf
+[<322e32362e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f79616d6c2f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4646,551 +4207,187 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 98.4960000000001 Td
-/F2.0 18 Tf
-<322e342e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
+352.91474999999997 245.8259999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
+
+BT
+550.66125 245.8259999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<32> Tj
+552.021 245.8259999999995 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-25 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 24 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F1.0 8 0 R
-/F4.0 31 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [29 0 R 34 0 R]
->>
-endobj
-26 0 obj
-[25 0 R /XYZ 0 792.0 null]
-endobj
-27 0 obj
-[25 0 R /XYZ 0 712.0799999999999 null]
-endobj
-28 0 obj
-[25 0 R /XYZ 0 672.0 null]
-endobj
-29 0 obj
-<< /Border [0 0 0]
-/Dest (_cldsinfo)
-/Subtype /Link
-/Rect [463.65600000000006 582.8470000000001 505.0785000000001 597.1270000000001]
-/Type /Annot
->>
-endobj
-30 0 obj
-[25 0 R /XYZ 0 566.8800000000001 null]
-endobj
-31 0 obj
-<< /Type /Font
-/BaseFont /AAAAAD+mplus1mn-regular
-/Subtype /TrueType
-/FontDescriptor 485 0 R
-/FirstChar 32
-/LastChar 255
-/Widths 487 0 R
-/ToUnicode 486 0 R
->>
-endobj
-32 0 obj
-[25 0 R /XYZ 0 510.60000000000025 null]
-endobj
-33 0 obj
-[25 0 R /XYZ 0 470.5200000000002 null]
-endobj
-34 0 obj
-<< /Border [0 0 0]
-/Dest (_cldshealthcheck)
-/Subtype /Link
-/Rect [463.65600000000006 381.3670000000002 547.9710000000001 395.64700000000016]
-/Type /Annot
->>
-endobj
-35 0 obj
-[25 0 R /XYZ 0 365.4000000000002 null]
-endobj
-36 0 obj
-[25 0 R /XYZ 0 309.1200000000002 null]
-endobj
-37 0 obj
-[25 0 R /XYZ 0 269.04000000000013 null]
-endobj
-38 0 obj
-[25 0 R /XYZ 0 178.20000000000013 null]
-endobj
-39 0 obj
-[25 0 R /XYZ 0 121.9200000000001 null]
-endobj
-40 0 obj
-<< /Length 17695
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 740.816 Td
-/F2.0 13 Tf
-[<322e342e312e20506172> 20.01953125 <616d6574657273>] TJ
+72.24000000000001 227.34599999999952 Td
+/F1.0 10.5 Tf
+[<322e32362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 702.840 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 702.840 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 702.840 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 665.280 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 665.280 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 665.280 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 726.120 m
-162.800 726.120 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 702.840 m
-162.800 702.840 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 726.370 m
-48.240 702.090 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 726.370 m
-162.800 702.090 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 710.373 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+165.85724999999996 227.34599999999952 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 726.120 m
-334.640 726.120 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 702.840 m
-334.640 702.840 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 726.370 m
-162.800 702.090 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 726.370 m
-334.640 702.090 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-165.79988544 710.373 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+550.66125 227.34599999999952 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 726.120 m
-563.760 726.120 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 702.840 m
-563.760 702.840 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 726.370 m
-334.640 702.090 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 726.370 m
-563.760 702.090 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 710.373 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+552.021 227.34599999999952 Td
+/F1.0 10.5 Tf
+<3132> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 702.840 m
-162.800 702.840 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 665.280 m
-162.800 665.280 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 703.090 m
-48.240 665.030 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 703.090 m
-162.800 665.030 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 679.4530000000001 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+72.24000000000001 208.86599999999953 Td
+/F1.0 10.5 Tf
+<322e32362e322e20526573706f6e736573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 702.840 m
-334.640 702.840 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 665.280 m
-334.640 665.280 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 703.090 m
-162.800 665.030 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 703.090 m
-334.640 665.030 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 686.5930000000001 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+160.51274999999998 208.86599999999953 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 
 BT
-165.79988544 672.3130000000001 Td
+550.66125 208.86599999999953 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 672.3130000000001 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+552.021 208.86599999999953 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 702.840 m
-563.760 702.840 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 665.280 m
-563.760 665.280 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 703.090 m
-334.640 665.030 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 703.090 m
-563.760 665.030 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 679.4530000000001 Td
+72.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<322e32362e332e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 635.6960000000003 Td
-/F2.0 13 Tf
-<322e342e322e20526573706f6e736573> Tj
+155.16824999999994 190.38599999999954 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 597.720 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-220.080 597.720 343.680 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 574.440 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-220.080 574.440 343.680 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 621.000 m
-220.080 621.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 597.720 m
-220.080 597.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 621.250 m
-48.240 596.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 621.250 m
-220.080 596.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
+
+BT
+550.66125 190.38599999999954 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 605.2530000000003 Td
-/F2.0 10.5 Tf
-<4854545020436f6465> Tj
+552.021 190.38599999999954 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 621.000 m
-563.760 621.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-220.080 597.720 m
-563.760 597.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 621.250 m
-220.080 596.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 621.250 m
-563.760 596.970 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-223.07982816 605.2530000000003 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+60.24000000000001 171.90599999999955 Td
+/F1.0 10.5 Tf
+[<322e32372e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 597.720 m
-220.080 597.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 574.440 m
-220.080 574.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 597.970 m
-48.240 574.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 597.970 m
-220.080 574.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 581.4730000000003 Td
-/F2.0 10.5 Tf
-<323030> Tj
+320.84775 171.90599999999955 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 597.720 m
-563.760 597.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 574.440 m
-563.760 574.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-220.080 597.970 m
-220.080 574.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 597.970 m
-563.760 574.190 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-223.07982816 581.4730000000003 Td
-/F1.0 10.5 Tf
-<4e6f20436f6e74656e74> Tj
+550.66125 171.90599999999955 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 539.0160000000005 Td
-/F2.0 18 Tf
-[<322e352e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+552.021 171.90599999999955 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5199,563 +4396,272 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 504.7760000000005 Td
-/F2.0 13 Tf
-[<322e352e312e20506172> 20.01953125 <616d6574657273>] TJ
+72.24000000000001 153.42599999999956 Td
+/F1.0 10.5 Tf
+[<322e32372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 466.800 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 466.800 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 466.800 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 429.240 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 429.240 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 429.240 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 490.080 m
-162.800 490.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 466.800 m
-162.800 466.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 490.330 m
-48.240 466.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 490.330 m
-162.800 466.050 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 474.3330000000005 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+165.85724999999996 153.42599999999956 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 490.080 m
-334.640 490.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 466.800 m
-334.640 466.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 490.330 m
-162.800 466.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 490.330 m
-334.640 466.050 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-165.79988544 474.3330000000005 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+550.66125 153.42599999999956 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 490.080 m
-563.760 490.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 466.800 m
-563.760 466.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 490.330 m
-334.640 466.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 490.330 m
-563.760 466.050 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 474.3330000000005 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+552.021 153.42599999999956 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 466.800 m
-162.800 466.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 429.240 m
-162.800 429.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 467.050 m
-48.240 428.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 467.050 m
-162.800 428.990 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 443.4130000000005 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+72.24000000000001 134.94599999999957 Td
+/F1.0 10.5 Tf
+<322e32372e322e20526573706f6e736573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 466.800 m
-334.640 466.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 429.240 m
-334.640 429.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 467.050 m
-162.800 428.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 467.050 m
-334.640 428.990 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 450.5530000000005 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+160.51274999999998 134.94599999999957 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 
 BT
-165.79988544 436.2730000000005 Td
+550.66125 134.94599999999957 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 436.2730000000005 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+552.021 134.94599999999957 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 466.800 m
-563.760 466.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 429.240 m
-563.760 429.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 467.050 m
-334.640 428.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 467.050 m
-563.760 428.990 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 443.4130000000005 Td
+72.24000000000001 116.46599999999958 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<322e32372e332e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 399.6560000000005 Td
-/F2.0 13 Tf
-<322e352e322e20526573706f6e736573> Tj
+155.16824999999994 116.46599999999958 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 347.400 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 347.400 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 347.400 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 324.120 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 324.120 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 324.120 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 384.960 m
-99.792 384.960 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 347.400 m
-99.792 347.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 385.210 m
-48.240 346.650 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 385.210 m
-99.792 346.650 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-51.24 369.2130000000005 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+550.66125 116.46599999999958 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 354.93300000000045 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+552.021 116.46599999999958 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 384.960 m
-460.656 384.960 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 347.400 m
-460.656 347.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 385.210 m
-99.792 346.650 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 385.210 m
-460.656 346.650 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 369.2130000000005 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+60.24000000000001 97.98599999999959 Td
+/F1.0 10.5 Tf
+[<322e32382e20505554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 384.960 m
-563.760 384.960 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 347.400 m
-563.760 347.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 385.210 m
-460.656 346.650 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 385.210 m
-563.760 346.650 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 369.2130000000005 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+320.84775 97.98599999999959 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 347.400 m
-99.792 347.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 324.120 m
-99.792 324.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 347.650 m
-48.240 323.870 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 347.650 m
-99.792 323.870 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 97.98599999999959 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 331.1530000000005 Td
-/F2.0 10.5 Tf
-<323030> Tj
+552.021 97.98599999999959 Td
+/F1.0 10.5 Tf
+<3133> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 347.400 m
-460.656 347.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 324.120 m
-460.656 324.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 347.650 m
-99.792 323.870 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 347.650 m
-460.656 323.870 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 331.1530000000005 Td
+72.24000000000001 79.5059999999996 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+[<322e32382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 347.400 m
-563.760 347.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 324.120 m
-563.760 324.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 347.650 m
-460.656 323.870 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 347.650 m
-563.760 323.870 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
+
+BT
+165.85724999999996 79.5059999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 79.5059999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 331.1530000000005 Td
+552.021 79.5059999999996 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<3133> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 294.53600000000046 Td
-/F2.0 13 Tf
-<322e352e332e2050726f6475636573> Tj
+72.24000000000001 61.02599999999961 Td
+/F1.0 10.5 Tf
+<322e32382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 267.87600000000043 Td
+160.51274999999998 61.02599999999961 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+BT
+550.66125 61.02599999999961 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 270.0600000000004 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+552.021 61.02599999999961 Td
+/F1.0 10.5 Tf
+<3134> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+
+endstream
+endobj
+14 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 13 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+>>
+>>
+/Annots [461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R]
+>>
+endobj
+15 0 obj
+<< /Length 28100
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 232.41600000000042 Td
-/F2.0 18 Tf
-<322e362e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
+72.24000000000001 744.786 Td
+/F1.0 10.5 Tf
+<322e32382e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5764,391 +4670,147 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 198.17600000000039 Td
-/F2.0 13 Tf
-<322e362e312e20526573706f6e736573> Tj
+160.51274999999998 744.786 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 145.920 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 145.920 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 145.920 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 122.640 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 122.640 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 122.640 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 183.480 m
-99.792 183.480 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 145.920 m
-99.792 145.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 183.730 m
-48.240 145.170 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 183.730 m
-99.792 145.170 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 167.7330000000004 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+550.66125 744.786 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 153.4530000000004 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+552.021 744.786 Td
+/F1.0 10.5 Tf
+<3134> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 183.480 m
-460.656 183.480 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 145.920 m
-460.656 145.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 183.730 m
-99.792 145.170 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 183.730 m
-460.656 145.170 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 167.7330000000004 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+72.24000000000001 726.3059999999999 Td
+/F1.0 10.5 Tf
+<322e32382e342e2050726f6475636573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 183.480 m
-563.760 183.480 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 145.920 m
-563.760 145.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 183.730 m
-460.656 145.170 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 183.730 m
-563.760 145.170 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 167.7330000000004 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+155.16824999999994 726.3059999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 145.920 m
-99.792 145.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 122.640 m
-99.792 122.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 146.170 m
-48.240 122.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 146.170 m
-99.792 122.390 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-51.24000000000001 129.6730000000004 Td
-/F2.0 10.5 Tf
-<323030> Tj
+550.66125 726.3059999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 145.920 m
-460.656 145.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 122.640 m
-460.656 122.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 146.170 m
-99.792 122.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 146.170 m
-460.656 122.390 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 129.6730000000004 Td
+552.021 726.3059999999999 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<3134> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 145.920 m
-563.760 145.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 122.640 m
-563.760 122.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 146.170 m
-460.656 122.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 146.170 m
-563.760 122.390 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 129.6730000000004 Td
+60.24000000000001 707.8259999999999 Td
 /F1.0 10.5 Tf
-[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+<322e32392e20474554202f76322f74656d706c61746573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 93.05600000000038 Td
-/F2.0 13 Tf
-<322e362e322e2050726f6475636573> Tj
+176.54625 707.8259999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
--0.500 Tc
+BT
+550.66125 707.8259999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 66.39600000000038 Td
+552.021 707.8259999999999 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<3134> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 68.58000000000038 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+72.24000000000001 689.3459999999999 Td
+/F1.0 10.5 Tf
+<322e32392e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<33> Tj
+160.51274999999998 689.3459999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
 
-endstream
-endobj
-41 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 40 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
-/F4.0 31 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [47 0 R]
->>
-endobj
-42 0 obj
-[41 0 R /XYZ 0 792.0 null]
-endobj
-43 0 obj
-[41 0 R /XYZ 0 653.2800000000002 null]
-endobj
-44 0 obj
-[41 0 R /XYZ 0 562.4400000000004 null]
-endobj
-45 0 obj
-[41 0 R /XYZ 0 522.3600000000005 null]
-endobj
-46 0 obj
-[41 0 R /XYZ 0 417.2400000000005 null]
-endobj
-47 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 328.0870000000005 488.7510000000001 342.3670000000005]
-/Type /Annot
->>
-endobj
-48 0 obj
-[41 0 R /XYZ 0 312.12000000000046 null]
-endobj
-49 0 obj
-[41 0 R /XYZ 0 255.84000000000043 null]
-endobj
-50 0 obj
-<< /Limits [(_cldshealthcheck) (_jsonnull)]
-/Names [(_cldshealthcheck) 125 0 R (_cldsinfo) 126 0 R (_consumes) 98 0 R (_consumes_2) 105 0 R (_consumes_3) 114 0 R (_definitions) 124 0 R (_externalcomponent) 128 0 R (_externalcomponentstate) 132 0 R (_jsonarray) 133 0 R (_jsonnull) 141 0 R]
->>
-endobj
-51 0 obj
-<< /Limits [(_responses_3) (_route25)]
-/Names [(_responses_3) 37 0 R (_responses_4) 43 0 R (_responses_5) 46 0 R (_responses_6) 52 0 R (_responses_7) 58 0 R (_responses_8) 63 0 R (_responses_9) 70 0 R (_route19) 49 0 R (_route20) 117 0 R (_route21) 78 0 R (_route22) 91 0 R (_route23) 107 0 R (_route24) 100 0 R (_route25) 44 0 R]
->>
-endobj
-52 0 obj
-[41 0 R /XYZ 0 215.76000000000042 null]
-endobj
-53 0 obj
-[41 0 R /XYZ 0 110.64000000000038 null]
-endobj
-54 0 obj
-<< /Length 16091
->>
-stream
-q
-/DeviceRGB cs
+BT
+550.66125 689.3459999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 734.976 Td
-/F2.0 18 Tf
-<322e372e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
+552.021 689.3459999999999 Td
+/F1.0 10.5 Tf
+<3134> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6157,563 +4819,278 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 700.7360000000001 Td
-/F2.0 13 Tf
-[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
+72.24000000000001 670.8659999999999 Td
+/F1.0 10.5 Tf
+<322e32392e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 662.760 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 662.760 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 662.760 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 625.200 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 625.200 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 625.200 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 686.040 m
-162.800 686.040 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 686.290 m
-48.240 662.010 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 670.2930000000001 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+155.16824999999994 670.8659999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 686.040 m
-334.640 686.040 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 670.8659999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 670.2930000000001 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+552.021 670.8659999999999 Td
+/F1.0 10.5 Tf
+<3134> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 686.040 m
-563.760 686.040 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 686.290 m
-563.760 662.010 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 670.2930000000001 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+60.24000000000001 652.3859999999999 Td
+/F1.0 10.5 Tf
+<322e33302e20474554202f76322f74656d706c617465732f6e616d6573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 625.200 m
-162.800 625.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 663.010 m
-48.240 624.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
-S
-[ ] 0 d
-1 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+213.95774999999998 652.3859999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 652.3859999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 639.3730000000002 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+552.021 652.3859999999999 Td
+/F1.0 10.5 Tf
+<3134> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 625.200 m
-334.640 625.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
-S
-[ ] 0 d
-1 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+72.24000000000001 633.9059999999998 Td
+/F1.0 10.5 Tf
+<322e33302e312e20526573706f6e736573> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 646.5130000000001 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+160.51274999999998 633.9059999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 
 BT
-165.79988544 632.2330000000002 Td
+550.66125 633.9059999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 632.2330000000002 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+552.021 633.9059999999998 Td
+/F1.0 10.5 Tf
+<3134> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 625.200 m
-563.760 625.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 663.010 m
-563.760 624.950 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 639.3730000000002 Td
+72.24000000000001 615.4259999999998 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<322e33302e322e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 595.6160000000003 Td
-/F2.0 13 Tf
-<322e372e322e20526573706f6e736573> Tj
+155.16824999999994 615.4259999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 543.360 51.552 37.560 re
-f
+
+BT
+550.66125 615.4259999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.021 615.4259999999998 Td
+/F1.0 10.5 Tf
+<3134> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 543.360 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 543.360 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 520.080 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 520.080 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 520.080 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 580.920 m
-99.792 580.920 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 543.360 m
-99.792 543.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 581.170 m
-48.240 542.610 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 581.170 m
-99.792 542.610 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 565.1730000000005 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+60.24000000000001 596.9459999999998 Td
+/F1.0 10.5 Tf
+<322e33312e20474554202f76322f74656d706c617465732f7b74656d706c6174654e616d657d> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 550.8930000000004 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+267.40274999999997 596.9459999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 580.920 m
-460.656 580.920 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 543.360 m
-460.656 543.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 581.170 m
-99.792 542.610 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 581.170 m
-460.656 542.610 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-102.792 565.1730000000005 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+550.66125 596.9459999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 580.920 m
-563.760 580.920 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 543.360 m
-563.760 543.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 581.170 m
-460.656 542.610 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 581.170 m
-563.760 542.610 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 565.1730000000005 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+552.021 596.9459999999998 Td
+/F1.0 10.5 Tf
+<3135> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 543.360 m
-99.792 543.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 520.080 m
-99.792 520.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 543.610 m
-48.240 519.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 543.610 m
-99.792 519.830 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 527.1130000000003 Td
-/F2.0 10.5 Tf
-<323030> Tj
+72.24000000000001 578.4659999999998 Td
+/F1.0 10.5 Tf
+[<322e33312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 543.360 m
-460.656 543.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 520.080 m
-460.656 520.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 543.610 m
-99.792 519.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 543.610 m
-460.656 519.830 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 527.1130000000003 Td
+165.85724999999996 578.4659999999998 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 543.360 m
-563.760 543.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 520.080 m
-563.760 520.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 543.610 m
-460.656 519.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 543.610 m
-563.760 519.830 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 578.4659999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 527.1130000000003 Td
+552.021 578.4659999999998 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<3135> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 490.4960000000004 Td
-/F2.0 13 Tf
-<322e372e332e2050726f6475636573> Tj
+72.24000000000001 559.9859999999999 Td
+/F1.0 10.5 Tf
+<322e33312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 463.83600000000035 Td
+160.51274999999998 559.9859999999999 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
 BT
-66.24000000000001 466.0200000000004 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+550.66125 559.9859999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 428.3760000000004 Td
-/F2.0 18 Tf
-<322e382e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
+552.021 559.9859999999999 Td
+/F1.0 10.5 Tf
+<3135> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6722,552 +5099,238 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 394.1360000000003 Td
-/F2.0 13 Tf
-[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
+72.24000000000001 541.5059999999999 Td
+/F1.0 10.5 Tf
+<322e33312e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.160 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 356.160 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 356.160 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 318.600 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 318.600 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 318.600 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 379.440 m
-162.800 379.440 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 356.160 m
-162.800 356.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 379.690 m
-48.240 355.410 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 379.690 m
-162.800 355.410 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 363.69300000000027 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+155.16824999999994 541.5059999999999 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 379.440 m
-334.640 379.440 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 356.160 m
-334.640 356.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 379.690 m
-162.800 355.410 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 379.690 m
-334.640 355.410 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-165.79988544000003 363.69300000000027 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+550.66125 541.5059999999999 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 379.440 m
-563.760 379.440 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 356.160 m
-563.760 356.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 379.690 m
-334.640 355.410 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 379.690 m
-563.760 355.410 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 363.69300000000027 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+552.021 541.5059999999999 Td
+/F1.0 10.5 Tf
+<3135> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 356.160 m
-162.800 356.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 318.600 m
-162.800 318.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 356.410 m
-48.240 318.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 356.410 m
-162.800 318.350 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 332.7730000000003 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+48.24000000000001 523.0259999999998 Td
+/F1.0 10.5 Tf
+<332e20446566696e6974696f6e73> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 356.160 m
-334.640 356.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 318.600 m
-334.640 318.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 356.410 m
-162.800 318.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 356.410 m
-334.640 318.350 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 339.9130000000003 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+117.75674999999995 523.0259999999998 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 
 BT
-165.79988544000003 325.63300000000027 Td
+550.66125 523.0259999999998 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 325.63300000000027 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+552.021 523.0259999999998 Td
+/F1.0 10.5 Tf
+<3136> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 356.160 m
-563.760 356.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 318.600 m
-563.760 318.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 356.410 m
-334.640 318.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 356.410 m
-563.760 318.350 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 332.7730000000003 Td
+60.24000000000001 504.54599999999976 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<332e312e20436c64734865616c7468436865636b> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 289.0160000000003 Td
-/F2.0 13 Tf
-<322e382e322e20526573706f6e736573> Tj
+165.85724999999996 504.54599999999976 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 236.760 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 236.760 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 236.760 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 213.480 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 213.480 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 213.480 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 274.320 m
-99.792 274.320 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 236.760 m
-99.792 236.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 274.570 m
-48.240 236.010 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 274.570 m
-99.792 236.010 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 258.57300000000026 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+550.66125 504.54599999999976 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 244.29300000000026 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+552.021 504.54599999999976 Td
+/F1.0 10.5 Tf
+<3136> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 274.320 m
-460.656 274.320 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 236.760 m
-460.656 236.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 274.570 m
-99.792 236.010 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 274.570 m
-460.656 236.010 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 258.57300000000026 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+60.24000000000001 486.06599999999975 Td
+/F1.0 10.5 Tf
+<332e322e20436c6473496e666f> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 274.320 m
-563.760 274.320 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 236.760 m
-563.760 236.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 274.570 m
-460.656 236.010 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 274.570 m
-563.760 236.010 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 258.57300000000026 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+123.10125 486.06599999999975 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 236.760 m
-99.792 236.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 213.480 m
-99.792 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 237.010 m
-48.240 213.230 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 237.010 m
-99.792 213.230 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 486.06599999999975 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 220.5130000000003 Td
-/F2.0 10.5 Tf
-<323030> Tj
+552.021 486.06599999999975 Td
+/F1.0 10.5 Tf
+<3136> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 236.760 m
-460.656 236.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 213.480 m
-460.656 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 237.010 m
-99.792 213.230 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 237.010 m
-460.656 213.230 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 220.5130000000003 Td
+60.24000000000001 467.58599999999973 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<332e332e2044696374696f6e617279> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 236.760 m
-563.760 236.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 213.480 m
-563.760 213.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 237.010 m
-460.656 213.230 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 237.010 m
-563.760 213.230 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
+
+BT
+133.79024999999996 467.58599999999973 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 467.58599999999973 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 220.5130000000003 Td
+552.021 467.58599999999973 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<3136> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 183.89600000000024 Td
-/F2.0 13 Tf
-<322e382e332e2050726f6475636573> Tj
+60.24000000000001 449.1059999999997 Td
+/F1.0 10.5 Tf
+<332e342e2044696374696f6e617279456c656d656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 157.23600000000025 Td
+176.54625 449.1059999999997 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+BT
+550.66125 449.1059999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 159.42000000000024 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+552.021 449.1059999999997 Td
+/F1.0 10.5 Tf
+<3137> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7276,9 +5339,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 121.77600000000022 Td
-/F2.0 18 Tf
-<322e392e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
+60.24000000000001 430.6259999999997 Td
+/F1.0 10.5 Tf
+<332e352e2045787465726e616c436f6d706f6e656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7287,646 +5350,307 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 87.53600000000023 Td
-/F2.0 13 Tf
-[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
+181.89074999999997 430.6259999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
+
+BT
+550.66125 430.6259999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<34> Tj
+552.021 430.6259999999997 Td
+/F1.0 10.5 Tf
+<3138> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+60.24000000000001 412.1459999999997 Td
+/F1.0 10.5 Tf
+<332e362e2045787465726e616c436f6d706f6e656e745374617465> Tj
+ET
 
-endstream
-endobj
-55 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 54 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
-/F4.0 31 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [59 0 R 64 0 R]
->>
-endobj
-56 0 obj
-[55 0 R /XYZ 0 792.0 null]
-endobj
-57 0 obj
-[55 0 R /XYZ 0 718.32 null]
-endobj
-58 0 obj
-[55 0 R /XYZ 0 613.2000000000003 null]
-endobj
-59 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 524.0470000000004 488.7510000000001 538.3270000000003]
-/Type /Annot
->>
-endobj
-60 0 obj
-[55 0 R /XYZ 0 508.0800000000004 null]
-endobj
-61 0 obj
-[55 0 R /XYZ 0 451.80000000000035 null]
-endobj
-62 0 obj
-[55 0 R /XYZ 0 411.7200000000003 null]
-endobj
-63 0 obj
-[55 0 R /XYZ 0 306.6000000000003 null]
-endobj
-64 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 217.4470000000003 488.7510000000001 231.7270000000003]
-/Type /Annot
->>
-endobj
-65 0 obj
-[55 0 R /XYZ 0 201.48000000000027 null]
-endobj
-66 0 obj
-[55 0 R /XYZ 0 145.20000000000024 null]
-endobj
-67 0 obj
-[55 0 R /XYZ 0 105.12000000000023 null]
-endobj
-68 0 obj
-<< /Length 18930
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 732.720 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 732.720 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 695.160 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 695.160 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-162.800 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+208.61325 412.1459999999997 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 756.000 m
-334.640 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 412.1459999999997 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+552.021 412.1459999999997 Td
+/F1.0 10.5 Tf
+<3138> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+60.24000000000001 393.66599999999966 Td
+/F1.0 10.5 Tf
+[<332e372e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.160 m
-162.800 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 709.333 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+133.79024999999996 393.66599999999966 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 695.160 m
-334.640 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
 
 BT
-165.79988544 716.473 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+550.66125 393.66599999999966 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 702.193 Td
+552.021 393.66599999999966 Td
+/F1.0 10.5 Tf
+<3138> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544 702.193 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+60.24000000000001 375.18599999999964 Td
+/F1.0 10.5 Tf
+<332e382e204a736f6e4e756c6c> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 709.333 Td
+128.44574999999998 375.18599999999964 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 375.18599999999964 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 665.5760000000001 Td
-/F2.0 13 Tf
-<322e392e322e20526573706f6e736573> Tj
+552.021 375.18599999999964 Td
+/F1.0 10.5 Tf
+<3139> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 613.320 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 613.320 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 613.320 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 590.040 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 590.040 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 590.040 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 650.880 m
-99.792 650.880 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 651.130 m
-48.240 612.570 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 635.1330000000003 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+60.24000000000001 356.7059999999996 Td
+/F1.0 10.5 Tf
+<332e392e204a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 620.8530000000002 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+133.79024999999996 356.7059999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 650.880 m
-460.656 650.880 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 356.7059999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 635.1330000000003 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+552.021 356.7059999999996 Td
+/F1.0 10.5 Tf
+<3231> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 650.880 m
-563.760 650.880 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 651.130 m
-563.760 612.570 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 635.1330000000003 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+60.24000000000001 338.2259999999996 Td
+/F1.0 10.5 Tf
+<332e31302e204a736f6e5072696d6974697665> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 590.040 m
-99.792 590.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 613.570 m
-48.240 589.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 597.0730000000001 Td
-/F2.0 10.5 Tf
-<323030> Tj
+155.16824999999994 338.2259999999996 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 590.040 m
-460.656 590.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 338.2259999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 597.0730000000001 Td
+552.021 338.2259999999996 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<3232> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 590.040 m
-563.760 590.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 613.570 m
-563.760 589.790 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
+
+BT
+60.24000000000001 319.7459999999996 Td
+/F1.0 10.5 Tf
+<332e31312e204c6f6f70> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 597.0730000000001 Td
+112.41224999999997 319.7459999999996 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+
+BT
+550.66125 319.7459999999996 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 560.4560000000002 Td
-/F2.0 13 Tf
-<322e392e332e2050726f6475636573> Tj
+552.021 319.7459999999996 Td
+/F1.0 10.5 Tf
+<3233> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
--0.500 Tc
+BT
+60.24000000000001 301.26599999999956 Td
+/F1.0 10.5 Tf
+<332e31322e204c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 533.7960000000003 Td
+187.23524999999995 301.26599999999956 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+BT
+550.66125 301.26599999999956 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 535.9800000000004 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+552.021 301.26599999999956 Td
+/F1.0 10.5 Tf
+<3234> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7935,9 +5659,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 498.3360000000004 Td
-/F2.0 18 Tf
-<322e31302e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
+60.24000000000001 282.78599999999955 Td
+/F1.0 10.5 Tf
+<332e31332e204c6f6f704c6f67> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7946,552 +5670,238 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 464.09600000000034 Td
-/F2.0 13 Tf
-[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
+133.79024999999996 282.78599999999955 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 426.120 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 426.120 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 426.120 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 388.560 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 388.560 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 388.560 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 449.400 m
-162.800 449.400 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 426.120 m
-162.800 426.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 449.650 m
-48.240 425.370 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 449.650 m
-162.800 425.370 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
+
+BT
+550.66125 282.78599999999955 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 433.6530000000003 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+552.021 282.78599999999955 Td
+/F1.0 10.5 Tf
+<3235> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 449.400 m
-334.640 449.400 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 426.120 m
-334.640 426.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 449.650 m
-162.800 425.370 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 449.650 m
-334.640 425.370 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 433.6530000000003 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+60.24000000000001 264.30599999999953 Td
+/F1.0 10.5 Tf
+[<332e31342e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 449.400 m
-563.760 449.400 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 426.120 m
-563.760 426.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 449.650 m
-334.640 425.370 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 449.650 m
-563.760 425.370 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 433.6530000000003 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+160.51274999999998 264.30599999999953 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 426.120 m
-162.800 426.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 388.560 m
-162.800 388.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 426.370 m
-48.240 388.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 426.370 m
-162.800 388.310 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
+
+BT
+550.66125 264.30599999999953 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 402.73300000000035 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+552.021 264.30599999999953 Td
+/F1.0 10.5 Tf
+<3235> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 426.120 m
-334.640 426.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 388.560 m
-334.640 388.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 426.370 m
-162.800 388.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 426.370 m
-334.640 388.310 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 409.87300000000033 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+60.24000000000001 245.8259999999995 Td
+/F1.0 10.5 Tf
+[<332e31352e204c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 395.5930000000003 Td
+256.71375 245.8259999999995 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 
 BT
-165.79988544000003 395.5930000000003 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+550.66125 245.8259999999995 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 426.120 m
-563.760 426.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 388.560 m
-563.760 388.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 426.370 m
-334.640 388.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 426.370 m
-563.760 388.310 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 402.73300000000035 Td
+552.021 245.8259999999995 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<3236> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 358.97600000000034 Td
-/F2.0 13 Tf
-<322e31302e322e20526573706f6e736573> Tj
+60.24000000000001 227.34599999999952 Td
+/F1.0 10.5 Tf
+<332e31362e204d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 306.720 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 306.720 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 306.720 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 283.440 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 283.440 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 283.440 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 344.280 m
-99.792 344.280 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 306.720 m
-99.792 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 344.530 m
-48.240 305.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 344.530 m
-99.792 305.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 328.5330000000003 Td
-/F2.0 10.5 Tf
-<48545450> Tj
+187.23524999999995 227.34599999999952 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 
 BT
-51.24000000000001 314.25300000000027 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+550.66125 227.34599999999952 Td
+/F1.0 5.25 Tf
+<ca> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 344.280 m
-460.656 344.280 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 306.720 m
-460.656 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 344.530 m
-99.792 305.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 344.530 m
-460.656 305.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 328.5330000000003 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+552.021 227.34599999999952 Td
+/F1.0 10.5 Tf
+<3237> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 344.280 m
-563.760 344.280 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-460.656 306.720 m
-563.760 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 344.530 m
-460.656 305.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 344.530 m
-563.760 305.970 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 328.5330000000003 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+60.24000000000001 208.86599999999953 Td
+/F1.0 10.5 Tf
+<332e31372e204e756d626572> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 306.720 m
-99.792 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 283.440 m
-99.792 283.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 306.970 m
-48.240 283.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 306.970 m
-99.792 283.190 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 290.4730000000003 Td
-/F2.0 10.5 Tf
-<323030> Tj
+128.44574999999998 208.86599999999953 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 306.720 m
-460.656 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 283.440 m
-460.656 283.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 306.970 m
-99.792 283.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 306.970 m
-460.656 283.190 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 208.86599999999953 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-102.792 290.4730000000003 Td
+552.021 208.86599999999953 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<3238> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 306.720 m
-563.760 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 283.440 m
-563.760 283.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 306.970 m
-460.656 283.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 306.970 m
-563.760 283.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-463.65600000000006 290.4730000000003 Td
+60.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+[<332e31382e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
 
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 253.85600000000028 Td
-/F2.0 13 Tf
-<322e31302e332e2050726f6475636573> Tj
+176.54625 190.38599999999954 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
--0.500 Tc
+BT
+550.66125 190.38599999999954 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 227.19600000000028 Td
+552.021 190.38599999999954 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<3238> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-66.24000000000001 229.38000000000028 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+60.24000000000001 171.90599999999955 Td
+/F1.0 10.5 Tf
+<332e31392e20506f6c6963794d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8500,269 +5910,232 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 191.73600000000027 Td
-/F2.0 18 Tf
-<322e31312e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
+149.82374999999996 171.90599999999955 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+
+BT
+550.66125 171.90599999999955 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 157.49600000000027 Td
-/F2.0 13 Tf
-[<322e31312e312e20506172> 20.01953125 <616d6574657273>] TJ
+552.021 171.90599999999955 Td
+/F1.0 10.5 Tf
+<3238> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 119.520 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 119.520 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 119.520 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 81.960 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 81.960 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 81.960 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 142.800 m
-162.800 142.800 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 119.520 m
-162.800 119.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 143.050 m
-48.240 118.770 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 143.050 m
-162.800 118.770 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 127.05300000000025 Td
-/F2.0 10.5 Tf
-<54797065> Tj
+60.24000000000001 153.42599999999956 Td
+/F1.0 10.5 Tf
+<332e32302e2053657276696365> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 142.800 m
-334.640 142.800 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 119.520 m
-334.640 119.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 143.050 m
-162.800 118.770 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 143.050 m
-334.640 118.770 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 127.05300000000025 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+123.10125 153.42599999999956 Td
+/F1.0 10.5 Tf
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 142.800 m
-563.760 142.800 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 119.520 m
-563.760 119.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 143.050 m
-334.640 118.770 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 143.050 m
-563.760 118.770 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+BT
+550.66125 153.42599999999956 Td
+/F1.0 5.25 Tf
+<ca> Tj
+ET
+
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 127.05300000000025 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+552.021 153.42599999999956 Td
+/F1.0 10.5 Tf
+<3239> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 119.520 m
-162.800 119.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 81.960 m
-162.800 81.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 119.770 m
-48.240 81.710 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 119.770 m
-162.800 81.710 l
-S
-[ ] 0 d
-1 w
+Q
+
+endstream
+endobj
+16 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 15 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F1.0 8 0 R
+>>
+>>
+/Annots [537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R]
+>>
+endobj
+17 0 obj
+<< /Length 2379
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 730.304 Td
+/F2.0 22 Tf
+<4368617074657220312e204f76657276696577> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 96.13300000000024 Td
-/F2.0 10.5 Tf
-<50617468> Tj
+48.24 688.656 Td
+/F2.0 18 Tf
+[<312e312e2056> 60.05859375 <657273696f6e20696e666f726d6174696f6e>] TJ
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 119.520 m
-334.640 119.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 81.960 m
-334.640 81.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 119.770 m
-162.800 81.710 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 119.770 m
-334.640 81.710 l
-S
-[ ] 0 d
-1 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 660.036 Td
+/F3.0 10.5 Tf
+[<56> 60.05859375 <657273696f6e>] TJ
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 103.27300000000024 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+85.136384765625 660.036 Td
+/F1.0 10.5 Tf
+[<203a20352e302e302d534e415053484f> 20.01953125 <54>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 88.99300000000024 Td
+48.24 620.796 Td
+/F2.0 18 Tf
+<312e322e2055524920736368656d65> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 88.99300000000024 Td
+48.24 592.176 Td
 /F3.0 10.5 Tf
-<7265717569726564> Tj
+<486f7374> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 119.520 m
-563.760 119.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 81.960 m
-563.760 81.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 119.770 m
-334.640 81.710 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 119.770 m
-563.760 81.710 l
-S
-[ ] 0 d
-1 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+71.30850000000001 592.176 Td
+/F1.0 10.5 Tf
+<203a206c6f63616c686f73743a3333363939> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 96.13300000000024 Td
+48.24 576.3960000000001 Td
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 576.3960000000001 Td
+/F3.0 10.5 Tf
+<4261736550617468> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+93.95700000000001 576.3960000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<203a202f7265737473657276696365732f636c64732f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 560.6160000000001 Td
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 560.6160000000001 Td
+/F3.0 10.5 Tf
+<536368656d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+89.946 560.6160000000001 Td
+/F1.0 10.5 Tf
+<203a2048545450> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -8778,7 +6151,7 @@ q
 BT
 557.7289999999999 14.388 Td
 /F1.0 9 Tf
-<35> Tj
+<31> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8788,70 +6161,63 @@ Q
 
 endstream
 endobj
-69 0 obj
+18 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 68 0 R
+/Contents 17 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
 /F1.0 8 0 R
-/F4.0 31 0 R
 >>
-/XObject << /Stamp1 382 0 R
+/XObject << /Stamp1 603 0 R
 >>
 >>
-/Annots [71 0 R 76 0 R]
 >>
 endobj
-70 0 obj
-[69 0 R /XYZ 0 683.1600000000001 null]
+19 0 obj
+[18 0 R /XYZ 0 792.0 null]
 endobj
-71 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 594.0070000000002 488.7510000000001 608.2870000000001]
-/Type /Annot
+20 0 obj
+<< /Type /Names
+/Dests 21 0 R
 >>
 endobj
-72 0 obj
-[69 0 R /XYZ 0 578.0400000000002 null]
-endobj
-73 0 obj
-[69 0 R /XYZ 0 521.7600000000003 null]
-endobj
-74 0 obj
-[69 0 R /XYZ 0 481.68000000000035 null]
-endobj
-75 0 obj
-[69 0 R /XYZ 0 376.56000000000034 null]
-endobj
-76 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 287.4070000000003 488.7510000000001 301.6870000000003]
-/Type /Annot
+21 0 obj
+<< /Kids [54 0 R 230 0 R 299 0 R 151 0 R 88 0 R 148 0 R 212 0 R 55 0 R 194 0 R 120 0 R 82 0 R 178 0 R]
 >>
 endobj
-77 0 obj
-[69 0 R /XYZ 0 271.4400000000003 null]
-endobj
-78 0 obj
-[69 0 R /XYZ 0 215.16000000000028 null]
+22 0 obj
+<< /Type /Font
+/BaseFont /AAAAAB+NotoSerif-Bold
+/Subtype /TrueType
+/FontDescriptor 758 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 760 0 R
+/ToUnicode 759 0 R
+>>
 endobj
-79 0 obj
-[69 0 R /XYZ 0 175.08000000000027 null]
+23 0 obj
+[18 0 R /XYZ 0 712.0799999999999 null]
 endobj
-80 0 obj
-<< /Limits [(_produces_10) (_produces_6)]
-/Names [(_produces_10) 84 0 R (_produces_11) 90 0 R (_produces_12) 99 0 R (_produces_13) 106 0 R (_produces_14) 115 0 R (_produces_15) 121 0 R (_produces_2) 35 0 R (_produces_3) 38 0 R (_produces_4) 48 0 R (_produces_5) 53 0 R (_produces_6) 60 0 R]
+24 0 obj
+<< /Type /Font
+/BaseFont /AAAAAC+NotoSerif-Italic
+/Subtype /TrueType
+/FontDescriptor 762 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 764 0 R
+/ToUnicode 763 0 R
 >>
 endobj
-81 0 obj
-<< /Length 17688
+25 0 obj
+[18 0 R /XYZ 0 644.22 null]
+endobj
+26 0 obj
+<< /Length 12124
 >>
 stream
 q
@@ -8861,59 +6227,81 @@ q
 0.200 0.200 0.200 SCN
 
 BT
-48.24 740.816 Td
+48.24 730.304 Td
+/F2.0 22 Tf
+<4368617074657220322e205061746873> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 688.656 Td
+/F2.0 18 Tf
+<322e312e20474554202f76312f636c64732f636c6473496e666f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 654.416 Td
 /F2.0 13 Tf
-<322e31312e322e20526573706f6e736573> Tj
+<322e312e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 688.560 51.552 37.560 re
+48.240 602.160 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 688.560 360.864 37.560 re
+99.792 602.160 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 688.560 103.104 37.560 re
+460.656 602.160 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 665.280 51.552 23.280 re
+48.240 578.880 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 665.280 360.864 23.280 re
+99.792 578.880 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 665.280 103.104 23.280 re
+460.656 578.880 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 726.120 m
-99.792 726.120 l
+48.240 639.720 m
+99.792 639.720 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 688.560 m
-99.792 688.560 l
+48.240 602.160 m
+99.792 602.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 726.370 m
-48.240 687.810 l
+48.240 639.970 m
+48.240 601.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.370 m
-99.792 687.810 l
+99.792 639.970 m
+99.792 601.410 l
 S
 [ ] 0 d
 1 w
@@ -8921,14 +6309,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 710.373 Td
+51.24 623.9730000000002 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 696.0930000000001 Td
+51.24 609.6930000000001 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -8936,26 +6324,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.120 m
-460.656 726.120 l
+99.792 639.720 m
+460.656 639.720 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 688.560 m
-460.656 688.560 l
+99.792 602.160 m
+460.656 602.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.370 m
-99.792 687.810 l
+99.792 639.970 m
+99.792 601.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.370 m
-460.656 687.810 l
+460.656 639.970 m
+460.656 601.410 l
 S
 [ ] 0 d
 1 w
@@ -8963,7 +6351,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 710.373 Td
+102.792 623.9730000000002 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -8971,26 +6359,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.120 m
-563.760 726.120 l
+460.656 639.720 m
+563.760 639.720 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 688.560 m
-563.760 688.560 l
+460.656 602.160 m
+563.760 602.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.370 m
-460.656 687.810 l
+460.656 639.970 m
+460.656 601.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 726.370 m
-563.760 687.810 l
+563.760 639.970 m
+563.760 601.410 l
 S
 [ ] 0 d
 1 w
@@ -8998,7 +6386,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 710.373 Td
+463.65600000000006 623.9730000000002 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -9006,26 +6394,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 688.560 m
-99.792 688.560 l
+48.240 602.160 m
+99.792 602.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 665.280 m
-99.792 665.280 l
+48.240 578.880 m
+99.792 578.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 688.810 m
-48.240 665.030 l
+48.240 602.410 m
+48.240 578.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.810 m
-99.792 665.030 l
+99.792 602.410 m
+99.792 578.630 l
 S
 [ ] 0 d
 1 w
@@ -9033,7 +6421,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 672.3130000000001 Td
+51.24 585.913 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -9041,26 +6429,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.560 m
-460.656 688.560 l
+99.792 602.160 m
+460.656 602.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 665.280 m
-460.656 665.280 l
+99.792 578.880 m
+460.656 578.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.810 m
-99.792 665.030 l
+99.792 602.410 m
+99.792 578.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.810 m
-460.656 665.030 l
+460.656 602.410 m
+460.656 578.630 l
 S
 [ ] 0 d
 1 w
@@ -9068,7 +6456,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 672.3130000000001 Td
+102.792 585.913 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -9076,46 +6464,54 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.560 m
-563.760 688.560 l
+460.656 602.160 m
+563.760 602.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 665.280 m
-563.760 665.280 l
+460.656 578.880 m
+563.760 578.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.810 m
-460.656 665.030 l
+460.656 602.410 m
+460.656 578.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 688.810 m
-563.760 665.030 l
+563.760 602.410 m
+563.760 578.630 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 672.3130000000001 Td
+463.65600000000006 585.913 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<436c6473496e666f> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 635.6960000000003 Td
+48.24 549.2960000000002 Td
 /F2.0 13 Tf
-<322e31312e332e2050726f6475636573> Tj
+<322e312e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9126,7 +6522,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 609.0360000000003 Td
+56.88050000000001 522.6360000000002 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -9139,9 +6535,9 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 611.2200000000004 Td
+66.24000000000001 524.8200000000003 Td
 /F4.0 10.5 Tf
-<6170706c69636174696f6e2f786d6c> Tj
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9150,9 +6546,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 573.5760000000004 Td
+48.24000000000001 487.1760000000003 Td
 /F2.0 18 Tf
-[<322e31322e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+<322e322e20474554202f76312f6865616c7468636865636b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9161,59 +6557,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 539.3360000000005 Td
+48.24000000000001 452.9360000000002 Td
 /F2.0 13 Tf
-[<322e31322e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e322e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 501.360 114.560 23.280 re
+48.240 400.680 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 501.360 171.840 23.280 re
+99.792 400.680 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 501.360 229.120 23.280 re
+460.656 400.680 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 463.800 114.560 37.560 re
+48.240 377.400 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 463.800 171.840 37.560 re
+99.792 377.400 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 463.800 229.120 37.560 re
+460.656 377.400 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.640 m
-162.800 524.640 l
+48.240 438.240 m
+99.792 438.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-162.800 501.360 l
+48.240 400.680 m
+99.792 400.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.890 m
-48.240 500.610 l
+48.240 438.490 m
+48.240 399.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.890 m
-162.800 500.610 l
+99.792 438.490 m
+99.792 399.930 l
 S
 [ ] 0 d
 1 w
@@ -9221,34 +6617,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.89300000000054 Td
+51.24000000000001 422.49300000000017 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 408.2130000000002 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.640 m
-334.640 524.640 l
+99.792 438.240 m
+460.656 438.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 501.360 m
-334.640 501.360 l
+99.792 400.680 m
+460.656 400.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.890 m
-162.800 500.610 l
+99.792 438.490 m
+99.792 399.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.890 m
-334.640 500.610 l
+460.656 438.490 m
+460.656 399.930 l
 S
 [ ] 0 d
 1 w
@@ -9256,34 +6659,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 508.89300000000054 Td
+102.792 422.49300000000017 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.640 m
-563.760 524.640 l
+460.656 438.240 m
+563.760 438.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 501.360 m
-563.760 501.360 l
+460.656 400.680 m
+563.760 400.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.890 m
-334.640 500.610 l
+460.656 438.490 m
+460.656 399.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 524.890 m
-563.760 500.610 l
+563.760 438.490 m
+563.760 399.930 l
 S
 [ ] 0 d
 1 w
@@ -9291,7 +6694,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 508.89300000000054 Td
+463.65600000000006 422.49300000000017 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -9299,26 +6702,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-162.800 501.360 l
+48.240 400.680 m
+99.792 400.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 463.800 m
-162.800 463.800 l
+48.240 377.400 m
+99.792 377.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.610 m
-48.240 463.550 l
+48.240 400.930 m
+48.240 377.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.610 m
-162.800 463.550 l
+99.792 400.930 m
+99.792 377.150 l
 S
 [ ] 0 d
 1 w
@@ -9326,34 +6729,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 477.9730000000006 Td
+51.24000000000001 384.43300000000016 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.360 m
-334.640 501.360 l
+99.792 400.680 m
+460.656 400.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 463.800 m
-334.640 463.800 l
+99.792 377.400 m
+460.656 377.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.610 m
-162.800 463.550 l
+99.792 400.930 m
+99.792 377.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.610 m
-334.640 463.550 l
+460.656 400.930 m
+460.656 377.150 l
 S
 [ ] 0 d
 1 w
@@ -9361,158 +6764,152 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 485.11300000000057 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
-ET
-
-
-BT
-165.79988544000003 470.83300000000054 Td
-ET
-
-
-BT
-165.79988544000003 470.83300000000054 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 384.43300000000016 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.360 m
-563.760 501.360 l
+460.656 400.680 m
+563.760 400.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 463.800 m
-563.760 463.800 l
+460.656 377.400 m
+563.760 377.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.610 m
-334.640 463.550 l
+460.656 400.930 m
+460.656 377.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 501.610 m
-563.760 463.550 l
+563.760 400.930 m
+563.760 377.150 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-337.6397136 477.9730000000006 Td
+463.65600000000006 384.43300000000016 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<436c64734865616c7468436865636b> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 434.2160000000006 Td
+48.24000000000001 347.8160000000002 Td
 /F2.0 13 Tf
-<322e31322e322e20526573706f6e736573> Tj
+<322e322e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 381.960 51.552 37.560 re
-f
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 321.1560000000002 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 381.960 360.864 37.560 re
-f
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 323.3400000000002 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 285.6960000000002 Td
+/F2.0 18 Tf
+<322e332e20474554202f76312f757365722f67657455736572> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 251.45600000000013 Td
+/F2.0 13 Tf
+<322e332e312e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 381.960 103.104 37.560 re
+48.240 213.480 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 358.680 51.552 23.280 re
+220.080 213.480 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 358.680 360.864 23.280 re
+48.240 190.200 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 358.680 103.104 23.280 re
+220.080 190.200 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 419.520 m
-99.792 419.520 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 381.960 m
-99.792 381.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 419.770 m
-48.240 381.210 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 419.770 m
-99.792 381.210 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24000000000001 403.77300000000054 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 389.4930000000005 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 419.520 m
-460.656 419.520 l
+48.240 236.760 m
+220.080 236.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 381.960 m
-460.656 381.960 l
+48.240 213.480 m
+220.080 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 419.770 m
-99.792 381.210 l
+48.240 237.010 m
+48.240 212.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 419.770 m
-460.656 381.210 l
+220.080 237.010 m
+220.080 212.730 l
 S
 [ ] 0 d
 1 w
@@ -9520,34 +6917,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 403.77300000000054 Td
+51.24000000000001 221.01300000000015 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4854545020436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 419.520 m
-563.760 419.520 l
+220.080 236.760 m
+563.760 236.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 381.960 m
-563.760 381.960 l
+220.080 213.480 m
+563.760 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 419.770 m
-460.656 381.210 l
+220.080 237.010 m
+220.080 212.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 419.770 m
-563.760 381.210 l
+563.760 237.010 m
+563.760 212.730 l
 S
 [ ] 0 d
 1 w
@@ -9555,7 +6952,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 403.77300000000054 Td
+223.07982816 221.01300000000015 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -9563,26 +6960,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 381.960 m
-99.792 381.960 l
+48.240 213.480 m
+220.080 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 358.680 m
-99.792 358.680 l
+48.240 190.200 m
+220.080 190.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 382.210 m
-48.240 358.430 l
+48.240 213.730 m
+48.240 189.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 382.210 m
-99.792 358.430 l
+220.080 213.730 m
+220.080 189.950 l
 S
 [ ] 0 d
 1 w
@@ -9590,7 +6987,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 365.71300000000053 Td
+51.24000000000001 197.23300000000015 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -9598,89 +6995,46 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 381.960 m
-460.656 381.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 358.680 m
-460.656 358.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 382.210 m
-99.792 358.430 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 382.210 m
-460.656 358.430 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-102.792 365.71300000000053 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 381.960 m
-563.760 381.960 l
+220.080 213.480 m
+563.760 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 358.680 m
-563.760 358.680 l
+220.080 190.200 m
+563.760 190.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 382.210 m
-460.656 358.430 l
+220.080 213.730 m
+220.080 189.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 382.210 m
-563.760 358.430 l
+563.760 213.730 m
+563.760 189.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 365.71300000000053 Td
+223.07982816 197.23300000000015 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<4e6f20436f6e74656e74> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 329.0960000000005 Td
+48.24000000000001 160.6160000000001 Td
 /F2.0 13 Tf
-<322e31322e332e2050726f6475636573> Tj
+<322e332e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9691,7 +7045,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 302.4360000000005 Td
+56.88050000000001 133.9560000000001 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -9704,9 +7058,9 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 304.6200000000005 Td
+66.24000000000001 136.1400000000001 Td
 /F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+<746578742f706c61696e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -9715,82 +7069,177 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 266.9760000000005 Td
+48.24000000000001 98.4960000000001 Td
 /F2.0 18 Tf
-[<322e31332e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
+<322e342e20474554202f76322f64696374696f6e617279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<32> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+27 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 26 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [31 0 R 36 0 R]
+>>
+endobj
+28 0 obj
+[27 0 R /XYZ 0 792.0 null]
+endobj
+29 0 obj
+[27 0 R /XYZ 0 712.0799999999999 null]
+endobj
+30 0 obj
+[27 0 R /XYZ 0 672.0 null]
+endobj
+31 0 obj
+<< /Border [0 0 0]
+/Dest (_cldsinfo)
+/Subtype /Link
+/Rect [463.65600000000006 582.8470000000001 505.0785000000001 597.1270000000001]
+/Type /Annot
+>>
+endobj
+32 0 obj
+[27 0 R /XYZ 0 566.8800000000001 null]
+endobj
+33 0 obj
+<< /Type /Font
+/BaseFont /AAAAAD+mplus1mn-regular
+/Subtype /TrueType
+/FontDescriptor 766 0 R
+/FirstChar 32
+/LastChar 255
+/Widths 768 0 R
+/ToUnicode 767 0 R
+>>
+endobj
+34 0 obj
+[27 0 R /XYZ 0 510.60000000000025 null]
+endobj
+35 0 obj
+[27 0 R /XYZ 0 470.5200000000002 null]
+endobj
+36 0 obj
+<< /Border [0 0 0]
+/Dest (_cldshealthcheck)
+/Subtype /Link
+/Rect [463.65600000000006 381.3670000000002 547.9710000000001 395.64700000000016]
+/Type /Annot
+>>
+endobj
+37 0 obj
+[27 0 R /XYZ 0 365.4000000000002 null]
+endobj
+38 0 obj
+[27 0 R /XYZ 0 309.1200000000002 null]
+endobj
+39 0 obj
+[27 0 R /XYZ 0 269.04000000000013 null]
+endobj
+40 0 obj
+[27 0 R /XYZ 0 178.20000000000013 null]
+endobj
+41 0 obj
+[27 0 R /XYZ 0 121.9200000000001 null]
+endobj
+42 0 obj
+<< /Length 16421
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 232.73600000000044 Td
+48.24 740.816 Td
 /F2.0 13 Tf
-[<322e31332e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e342e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 194.760 114.560 23.280 re
+48.240 688.560 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 194.760 171.840 23.280 re
+99.792 688.560 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 194.760 229.120 23.280 re
+460.656 688.560 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 157.200 114.560 37.560 re
+48.240 665.280 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 157.200 171.840 37.560 re
+99.792 665.280 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 157.200 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 119.640 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-162.800 119.640 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-334.640 119.640 229.120 37.560 re
+460.656 665.280 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 218.040 m
-162.800 218.040 l
+48.240 726.120 m
+99.792 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 194.760 m
-162.800 194.760 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 218.290 m
-48.240 194.010 l
+48.240 726.370 m
+48.240 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 218.290 m
-162.800 194.010 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 1 w
@@ -9798,34 +7247,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 202.29300000000046 Td
+51.24 710.373 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24 696.0930000000001 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 218.040 m
-334.640 218.040 l
+99.792 726.120 m
+460.656 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 194.760 m
-334.640 194.760 l
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 218.290 m
-162.800 194.010 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 218.290 m
-334.640 194.010 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
 1 w
@@ -9833,34 +7289,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 202.29300000000046 Td
+102.792 710.373 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 218.040 m
-563.760 218.040 l
+460.656 726.120 m
+563.760 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 194.760 m
-563.760 194.760 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 218.290 m
-334.640 194.010 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 218.290 m
-563.760 194.010 l
+563.760 726.370 m
+563.760 687.810 l
 S
 [ ] 0 d
 1 w
@@ -9868,7 +7324,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 202.29300000000046 Td
+463.65600000000006 710.373 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -9876,26 +7332,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 194.760 m
-162.800 194.760 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 157.200 m
-162.800 157.200 l
+48.240 665.280 m
+99.792 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 195.010 m
-48.240 156.950 l
+48.240 688.810 m
+48.240 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 195.010 m
-162.800 156.950 l
+99.792 688.810 m
+99.792 665.030 l
 S
 [ ] 0 d
 1 w
@@ -9903,34 +7359,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 171.37300000000045 Td
+51.24 672.3130000000001 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 194.760 m
-334.640 194.760 l
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 157.200 m
-334.640 157.200 l
+99.792 665.280 m
+460.656 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 195.010 m
-162.800 156.950 l
+99.792 688.810 m
+99.792 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 195.010 m
-334.640 156.950 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 1 w
@@ -9938,81 +7394,265 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 178.51300000000046 Td
-/F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
-ET
-
-
-BT
-165.79988544000003 164.23300000000046 Td
-ET
-
-
-BT
-165.79988544000003 164.23300000000046 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 672.3130000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 194.760 m
-563.760 194.760 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 157.200 m
-563.760 157.200 l
+460.656 665.280 m
+563.760 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 195.010 m
-334.640 156.950 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 195.010 m
-563.760 156.950 l
+563.760 688.810 m
+563.760 665.030 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-337.6397136 171.37300000000045 Td
+463.65600000000006 672.3130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<44696374696f6e617279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 635.6960000000003 Td
+/F2.0 13 Tf
+<322e342e322e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 609.0360000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 611.2200000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 573.5760000000004 Td
+/F2.0 18 Tf
+<322e352e20505554202f76322f64696374696f6e617279> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000005 Td
+/F2.0 13 Tf
+[<322e352e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 501.360 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 501.360 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 501.360 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 463.800 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 463.800 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 463.800 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 157.200 m
-162.800 157.200 l
+48.240 524.640 m
+162.800 524.640 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 501.360 m
+162.800 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 119.640 m
-162.800 119.640 l
+48.240 524.890 m
+48.240 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 157.450 m
-48.240 119.390 l
+162.800 524.890 m
+162.800 500.610 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24000000000001 508.89300000000054 Td
+/F2.0 10.5 Tf
+<54797065> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 524.640 m
+334.640 524.640 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+162.800 501.360 m
+334.640 501.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 524.890 m
+162.800 500.610 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 524.890 m
+334.640 500.610 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544000003 508.89300000000054 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 524.640 m
+563.760 524.640 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+334.640 501.360 m
+563.760 501.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 524.890 m
+334.640 500.610 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 524.890 m
+563.760 500.610 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+337.6397136 508.89300000000054 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 501.360 m
+162.800 501.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 463.800 m
+162.800 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 501.610 m
+48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 157.450 m
-162.800 119.390 l
+162.800 501.610 m
+162.800 463.550 l
 S
 [ ] 0 d
 1 w
@@ -10020,7 +7660,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 133.81300000000044 Td
+51.24000000000001 477.9730000000006 Td
 /F2.0 10.5 Tf
 <426f6479> Tj
 ET
@@ -10028,26 +7668,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 157.200 m
-334.640 157.200 l
+162.800 501.360 m
+334.640 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.640 m
-334.640 119.640 l
+162.800 463.800 m
+334.640 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 157.450 m
-162.800 119.390 l
+162.800 501.610 m
+162.800 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 157.450 m
-334.640 119.390 l
+334.640 501.610 m
+334.640 463.550 l
 S
 [ ] 0 d
 1 w
@@ -10055,19 +7695,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 140.95300000000046 Td
+165.79988544000003 485.11300000000057 Td
 /F2.0 10.5 Tf
 <626f6479> Tj
 ET
 
 
 BT
-165.79988544000003 126.67300000000046 Td
+165.79988544000003 470.83300000000054 Td
 ET
 
 
 BT
-165.79988544000003 126.67300000000046 Td
+165.79988544000003 470.83300000000054 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -10075,26 +7715,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 157.200 m
-563.760 157.200 l
+334.640 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.640 m
-563.760 119.640 l
+334.640 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 157.450 m
-334.640 119.390 l
+334.640 501.610 m
+334.640 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 157.450 m
-563.760 119.390 l
+563.760 501.610 m
+563.760 463.550 l
 S
 [ ] 0 d
 1 w
@@ -10108,9 +7748,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-337.6397136 133.81300000000044 Td
+337.6397136 477.9730000000006 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<44696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10120,155 +7760,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 90.05600000000044 Td
+48.24000000000001 434.2160000000006 Td
 /F2.0 13 Tf
-<322e31332e322e20526573706f6e736573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<36> Tj
+<322e352e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-82 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 81 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F1.0 8 0 R
-/F4.0 31 0 R
-/F3.0 22 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [89 0 R 93 0 R]
->>
-endobj
-83 0 obj
-[82 0 R /XYZ 0 792.0 null]
-endobj
-84 0 obj
-[82 0 R /XYZ 0 653.2800000000002 null]
-endobj
-85 0 obj
-[82 0 R /XYZ 0 597.0000000000003 null]
-endobj
-86 0 obj
-<< /Limits [(_route26) (_version_information)]
-/Names [(_route26) 85 0 R (_route27) 66 0 R (_route28) 61 0 R (_route29) 73 0 R (_route30) 39 0 R (_route31) 56 0 R (_route32) 27 0 R (_route33) 32 0 R (_route34) 36 0 R (_service) 206 0 R (_templatemicroservicemodel) 209 0 R (_uri_scheme) 23 0 R (_version_information) 21 0 R]
->>
-endobj
-87 0 obj
-[82 0 R /XYZ 0 556.9200000000004 null]
-endobj
-88 0 obj
-[82 0 R /XYZ 0 451.8000000000006 null]
-endobj
-89 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 362.64700000000056 488.7510000000001 376.92700000000053]
-/Type /Annot
->>
-endobj
-90 0 obj
-[82 0 R /XYZ 0 346.6800000000005 null]
-endobj
-91 0 obj
-[82 0 R /XYZ 0 290.4000000000005 null]
-endobj
-92 0 obj
-[82 0 R /XYZ 0 250.32000000000048 null]
-endobj
-93 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [337.6397136 130.74700000000047 390.7907136 145.02700000000044]
-/Type /Annot
->>
-endobj
-94 0 obj
-[82 0 R /XYZ 0 107.64000000000044 null]
-endobj
-95 0 obj
-<< /Length 15546
->>
-stream
-q
-/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 718.440 51.552 37.560 re
+48.240 381.960 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 718.440 360.864 37.560 re
+99.792 381.960 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 718.440 103.104 37.560 re
+460.656 381.960 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 51.552 23.280 re
+48.240 358.680 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 695.160 360.864 23.280 re
+99.792 358.680 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 695.160 103.104 23.280 re
+460.656 358.680 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-99.792 756.000 l
+48.240 419.520 m
+99.792 419.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 718.440 m
-99.792 718.440 l
+48.240 381.960 m
+99.792 381.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 717.690 l
+48.240 419.770 m
+48.240 381.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 756.250 m
-99.792 717.690 l
+99.792 419.770 m
+99.792 381.210 l
 S
 [ ] 0 d
 1 w
@@ -10276,14 +7820,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24000000000001 403.77300000000054 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 725.973 Td
+51.24000000000001 389.4930000000005 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -10291,26 +7835,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 756.000 m
-460.656 756.000 l
+99.792 419.520 m
+460.656 419.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 718.440 m
-460.656 718.440 l
+99.792 381.960 m
+460.656 381.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 756.250 m
-99.792 717.690 l
+99.792 419.770 m
+99.792 381.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 756.250 m
-460.656 717.690 l
+460.656 419.770 m
+460.656 381.210 l
 S
 [ ] 0 d
 1 w
@@ -10318,7 +7862,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 740.2529999999999 Td
+102.792 403.77300000000054 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -10326,26 +7870,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 756.000 m
-563.760 756.000 l
+460.656 419.520 m
+563.760 419.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 718.440 m
-563.760 718.440 l
+460.656 381.960 m
+563.760 381.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 756.250 m
-460.656 717.690 l
+460.656 419.770 m
+460.656 381.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 717.690 l
+563.760 419.770 m
+563.760 381.210 l
 S
 [ ] 0 d
 1 w
@@ -10353,7 +7897,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 740.2529999999999 Td
+463.65600000000006 403.77300000000054 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -10361,26 +7905,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 718.440 m
-99.792 718.440 l
+48.240 381.960 m
+99.792 381.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-99.792 695.160 l
+48.240 358.680 m
+99.792 358.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 718.690 m
-48.240 694.910 l
+48.240 382.210 m
+48.240 358.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 718.690 m
-99.792 694.910 l
+99.792 382.210 m
+99.792 358.430 l
 S
 [ ] 0 d
 1 w
@@ -10388,7 +7932,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 702.193 Td
+51.24000000000001 365.71300000000053 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -10396,26 +7940,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 718.440 m
-460.656 718.440 l
+99.792 381.960 m
+460.656 381.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 695.160 m
-460.656 695.160 l
+99.792 358.680 m
+460.656 358.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 718.690 m
-99.792 694.910 l
+99.792 382.210 m
+99.792 358.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 718.690 m
-460.656 694.910 l
+460.656 382.210 m
+460.656 358.430 l
 S
 [ ] 0 d
 1 w
@@ -10423,7 +7967,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 702.193 Td
+102.792 365.71300000000053 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -10431,26 +7975,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 718.440 m
-563.760 718.440 l
+460.656 381.960 m
+563.760 381.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 695.160 m
-563.760 695.160 l
+460.656 358.680 m
+563.760 358.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 718.690 m
-460.656 694.910 l
+460.656 382.210 m
+460.656 358.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 718.690 m
-563.760 694.910 l
+563.760 382.210 m
+563.760 358.430 l
 S
 [ ] 0 d
 1 w
@@ -10464,9 +8008,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 702.193 Td
+463.65600000000006 365.71300000000053 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<44696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10476,9 +8020,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 665.5760000000001 Td
+48.24000000000001 329.0960000000005 Td
 /F2.0 13 Tf
-<322e31332e332e20436f6e73756d6573> Tj
+<322e352e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10489,7 +8033,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 638.9160000000002 Td
+56.88050000000001 302.4360000000005 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -10502,7 +8046,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 641.1000000000003 Td
+66.24000000000001 304.6200000000005 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -10513,9 +8057,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 609.2960000000003 Td
+48.24000000000001 272.8160000000005 Td
 /F2.0 13 Tf
-<322e31332e342e2050726f6475636573> Tj
+<322e352e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10526,7 +8070,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 582.6360000000003 Td
+56.88050000000001 246.15600000000046 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -10539,7 +8083,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 584.8200000000004 Td
+66.24000000000001 248.34000000000046 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -10550,20 +8094,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 547.1760000000004 Td
-/F2.0 18 Tf
-[<322e31342e20504f53> 20.01953125 <54>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 519.0960000000005 Td
+48.24000000000001 210.69600000000045 Td
 /F2.0 18 Tf
-<2f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d> Tj
+<322e362e20474554202f76322f64696374696f6e6172792f7365636f6e646172792f6e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10572,71 +8105,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 484.8560000000004 Td
+48.24000000000001 176.45600000000042 Td
 /F2.0 13 Tf
-[<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e362e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 446.880 114.560 23.280 re
+48.240 124.200 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 446.880 171.840 23.280 re
+99.792 124.200 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 446.880 229.120 23.280 re
+460.656 124.200 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 409.320 114.560 37.560 re
+48.240 100.920 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 409.320 171.840 37.560 re
+99.792 100.920 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 409.320 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 371.760 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-162.800 371.760 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-334.640 371.760 229.120 37.560 re
+460.656 100.920 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.160 m
-162.800 470.160 l
+48.240 161.760 m
+99.792 161.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 446.880 m
-162.800 446.880 l
+48.240 124.200 m
+99.792 124.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.410 m
-48.240 446.130 l
+48.240 162.010 m
+48.240 123.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 470.410 m
-162.800 446.130 l
+99.792 162.010 m
+99.792 123.450 l
 S
 [ ] 0 d
 1 w
@@ -10644,69 +8165,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 454.41300000000035 Td
+51.24000000000001 146.01300000000043 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 470.160 m
-334.640 470.160 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 446.880 m
-334.640 446.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 470.410 m
-162.800 446.130 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 470.410 m
-334.640 446.130 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 454.41300000000035 Td
+51.24000000000001 131.73300000000043 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 470.160 m
-563.760 470.160 l
+99.792 161.760 m
+460.656 161.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 446.880 m
-563.760 446.880 l
+99.792 124.200 m
+460.656 124.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 470.410 m
-334.640 446.130 l
+99.792 162.010 m
+99.792 123.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.410 m
-563.760 446.130 l
+460.656 162.010 m
+460.656 123.450 l
 S
 [ ] 0 d
 1 w
@@ -10714,34 +8207,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 454.41300000000035 Td
+102.792 146.01300000000043 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 446.880 m
-162.800 446.880 l
+460.656 161.760 m
+563.760 161.760 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 409.320 m
-162.800 409.320 l
+460.656 124.200 m
+563.760 124.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 447.130 m
-48.240 409.070 l
+460.656 162.010 m
+460.656 123.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 447.130 m
-162.800 409.070 l
+563.760 162.010 m
+563.760 123.450 l
 S
 [ ] 0 d
 1 w
@@ -10749,34 +8242,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 423.49300000000034 Td
+463.65600000000006 146.01300000000043 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 446.880 m
-334.640 446.880 l
+48.240 124.200 m
+99.792 124.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 409.320 m
-334.640 409.320 l
+48.240 100.920 m
+99.792 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 447.130 m
-162.800 409.070 l
+48.240 124.450 m
+48.240 100.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 447.130 m
-334.640 409.070 l
+99.792 124.450 m
+99.792 100.670 l
 S
 [ ] 0 d
 1 w
@@ -10784,46 +8277,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 430.6330000000003 Td
+51.24000000000001 107.95300000000042 Td
 /F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
-ET
-
-
-BT
-165.79988544000003 416.3530000000003 Td
-ET
-
-
-BT
-165.79988544000003 416.3530000000003 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 446.880 m
-563.760 446.880 l
+99.792 124.200 m
+460.656 124.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 409.320 m
-563.760 409.320 l
+99.792 100.920 m
+460.656 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 447.130 m
-334.640 409.070 l
+99.792 124.450 m
+99.792 100.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 447.130 m
-563.760 409.070 l
+460.656 124.450 m
+460.656 100.670 l
 S
 [ ] 0 d
 1 w
@@ -10831,34 +8312,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 423.49300000000034 Td
+102.792 107.95300000000042 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 409.320 m
-162.800 409.320 l
+460.656 124.200 m
+563.760 124.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 371.760 m
-162.800 371.760 l
+460.656 100.920 m
+563.760 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 409.570 m
-48.240 371.510 l
+460.656 124.450 m
+460.656 100.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 409.570 m
-162.800 371.510 l
+563.760 124.450 m
+563.760 100.670 l
 S
 [ ] 0 d
 1 w
@@ -10866,159 +8347,226 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 385.9330000000004 Td
-/F2.0 10.5 Tf
-<426f6479> Tj
+463.65600000000006 107.95300000000042 Td
+/F1.0 10.5 Tf
+[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 409.320 m
-334.640 409.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 371.760 m
-334.640 371.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 409.570 m
-162.800 371.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 409.570 m
-334.640 371.510 l
-S
-[ ] 0 d
-1 w
+q
+0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 393.0730000000004 Td
-/F2.0 10.5 Tf
-<626f6479> Tj
-ET
-
-
-BT
-165.79988544000003 378.79300000000035 Td
-ET
-
-
-BT
-165.79988544000003 378.79300000000035 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+557.7289999999999 14.388 Td
+/F1.0 9 Tf
+<33> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 409.320 m
-563.760 409.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 371.760 m
-563.760 371.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 409.570 m
-334.640 371.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 409.570 m
-563.760 371.510 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+43 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 42 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [45 0 R 49 0 R 51 0 R]
+>>
+endobj
+44 0 obj
+[43 0 R /XYZ 0 792.0 null]
+endobj
+45 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [463.65600000000006 669.2470000000002 516.45 683.5270000000002]
+/Type /Annot
+>>
+endobj
+46 0 obj
+[43 0 R /XYZ 0 653.2800000000002 null]
+endobj
+47 0 obj
+[43 0 R /XYZ 0 597.0000000000003 null]
+endobj
+48 0 obj
+[43 0 R /XYZ 0 556.9200000000004 null]
+endobj
+49 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [337.6397136 474.90700000000055 390.4337136 489.1870000000006]
+/Type /Annot
+>>
+endobj
+50 0 obj
+[43 0 R /XYZ 0 451.8000000000006 null]
+endobj
+51 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [463.65600000000006 362.64700000000056 516.45 376.92700000000053]
+/Type /Annot
+>>
+endobj
+52 0 obj
+[43 0 R /XYZ 0 346.6800000000005 null]
+endobj
+53 0 obj
+[43 0 R /XYZ 0 290.4000000000005 null]
+endobj
+54 0 obj
+<< /Limits [(_cldshealthcheck) (_dictionary)]
+/Names [(_cldshealthcheck) 216 0 R (_cldsinfo) 217 0 R (_consumes) 52 0 R (_consumes_2) 71 0 R (_consumes_3) 146 0 R (_consumes_4) 157 0 R (_consumes_5) 164 0 R (_consumes_6) 196 0 R (_definitions) 215 0 R (_dictionary) 218 0 R]
+>>
+endobj
+55 0 obj
+<< /Limits [(_responses_10) (_responses_19)]
+/Names [(_responses_10) 81 0 R (_responses_11) 89 0 R (_responses_12) 92 0 R (_responses_13) 96 0 R (_responses_14) 102 0 R (_responses_15) 107 0 R (_responses_16) 114 0 R (_responses_17) 119 0 R (_responses_18) 127 0 R (_responses_19) 132 0 R]
+>>
+endobj
+56 0 obj
+[43 0 R /XYZ 0 234.12000000000046 null]
+endobj
+57 0 obj
+[43 0 R /XYZ 0 194.04000000000045 null]
+endobj
+58 0 obj
+<< /Length 18231
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 740.816 Td
+/F2.0 13 Tf
+<322e362e322e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
 BT
-337.6397136 385.9330000000004 Td
+56.88050000000001 714.1560000000001 Td
 /F1.0 10.5 Tf
-<4d6963726f53657276696365506f6c696379> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 716.3400000000001 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 678.6960000000001 Td
+/F2.0 18 Tf
+<322e372e20474554202f76322f64696374696f6e6172792f7b64696374696f6e6172794e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 342.1760000000004 Td
+48.24000000000001 644.4560000000002 Td
 /F2.0 13 Tf
-<322e31342e322e20526573706f6e736573> Tj
+[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 289.920 51.552 37.560 re
+48.240 606.480 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 289.920 360.864 37.560 re
+162.800 606.480 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 289.920 103.104 37.560 re
+334.640 606.480 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 266.640 51.552 23.280 re
+48.240 568.920 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 266.640 360.864 23.280 re
+162.800 568.920 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 266.640 103.104 23.280 re
+334.640 568.920 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 327.480 m
-99.792 327.480 l
+48.240 629.760 m
+162.800 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 289.920 m
-99.792 289.920 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 327.730 m
-48.240 289.170 l
+48.240 630.010 m
+48.240 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 327.730 m
-99.792 289.170 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 1 w
@@ -11026,41 +8574,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 311.73300000000035 Td
+51.24000000000001 614.0130000000003 Td
 /F2.0 10.5 Tf
-<48545450> Tj
+<54797065> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 629.760 m
+334.640 629.760 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+162.800 606.480 m
+334.640 606.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 630.010 m
+162.800 605.730 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 630.010 m
+334.640 605.730 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 297.4530000000003 Td
+165.79988544000003 614.0130000000003 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 327.480 m
-460.656 327.480 l
+334.640 629.760 m
+563.760 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 289.920 m
-460.656 289.920 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 327.730 m
-99.792 289.170 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 327.730 m
-460.656 289.170 l
+563.760 630.010 m
+563.760 605.730 l
 S
 [ ] 0 d
 1 w
@@ -11068,34 +8644,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 311.73300000000035 Td
+337.6397136 614.0130000000003 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 327.480 m
-563.760 327.480 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-460.656 289.920 m
-563.760 289.920 l
+48.240 568.920 m
+162.800 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 327.730 m
-460.656 289.170 l
+48.240 606.730 m
+48.240 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 327.730 m
-563.760 289.170 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 1 w
@@ -11103,34 +8679,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 311.73300000000035 Td
+51.24000000000001 583.0930000000003 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 289.920 m
-99.792 289.920 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 266.640 m
-99.792 266.640 l
+162.800 568.920 m
+334.640 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 290.170 m
-48.240 266.390 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 290.170 m
-99.792 266.390 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 1 w
@@ -11138,34 +8714,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 273.67300000000034 Td
+165.79988544000003 590.2330000000004 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<64696374696f6e6172794e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 575.9530000000003 Td
+ET
+
+
+BT
+165.79988544000003 575.9530000000003 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 289.920 m
-460.656 289.920 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 266.640 m
-460.656 266.640 l
+334.640 568.920 m
+563.760 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 290.170 m
-99.792 266.390 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 290.170 m
-460.656 266.390 l
+563.760 606.730 m
+563.760 568.670 l
 S
 [ ] 0 d
 1 w
@@ -11173,99 +8761,279 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 273.67300000000034 Td
+337.6397136 583.0930000000003 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000004 Td
+/F2.0 13 Tf
+<322e372e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 487.080 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 487.080 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 487.080 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 463.800 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 463.800 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 463.800 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 289.920 m
-563.760 289.920 l
+48.240 524.640 m
+99.792 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-460.656 266.640 m
-563.760 266.640 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 290.170 m
-460.656 266.390 l
+48.240 524.890 m
+48.240 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 290.170 m
-563.760 266.390 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+
+BT
+51.24000000000001 508.8930000000004 Td
+/F2.0 10.5 Tf
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 494.6130000000004 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 524.640 m
+460.656 524.640 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 487.080 m
+460.656 487.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 524.890 m
+99.792 486.330 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 524.890 m
+460.656 486.330 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 273.67300000000034 Td
-/F1.0 10.5 Tf
-<4d6963726f53657276696365506f6c696379> Tj
+102.792 508.8930000000004 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 524.640 m
+563.760 524.640 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+460.656 487.080 m
+563.760 487.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 524.890 m
+460.656 486.330 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 524.890 m
+563.760 486.330 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+
+BT
+463.65600000000006 508.8930000000004 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 487.080 m
+99.792 487.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 463.800 m
+99.792 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 487.330 m
+48.240 463.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 487.330 m
+99.792 463.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 237.05600000000032 Td
-/F2.0 13 Tf
-<322e31342e332e20436f6e73756d6573> Tj
+51.24000000000001 470.8330000000004 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 487.080 m
+460.656 487.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 463.800 m
+460.656 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 487.330 m
+99.792 463.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 487.330 m
+460.656 463.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 210.3960000000003 Td
+102.792 470.8330000000004 Td
 /F1.0 10.5 Tf
-<a5> Tj
+<4f75747075742074797065> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 487.080 m
+563.760 487.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 463.800 m
+563.760 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 487.330 m
+460.656 463.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 487.330 m
+563.760 463.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-66.24000000000001 212.5800000000003 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+463.65600000000006 470.8330000000004 Td
+/F1.0 10.5 Tf
+<44696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 180.7760000000003 Td
+48.24000000000001 434.2160000000004 Td
 /F2.0 13 Tf
-<322e31342e342e2050726f6475636573> Tj
+<322e372e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11276,7 +9044,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 154.11600000000027 Td
+56.88050000000001 407.5560000000004 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -11289,7 +9057,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 156.30000000000027 Td
+66.24000000000001 409.7400000000004 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -11300,9 +9068,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 118.65600000000025 Td
+48.24000000000001 372.0960000000004 Td
 /F2.0 18 Tf
-[<322e31352e20504f53> 20.01953125 <54>] TJ
+<322e382e20505554202f76322f64696374696f6e6172792f7b6e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11311,178 +9079,71 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 90.57600000000025 Td
-/F2.0 18 Tf
-[<2f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<37> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-96 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 95 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F1.0 8 0 R
-/F4.0 31 0 R
-/F3.0 22 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [97 0 R 102 0 R 104 0 R]
->>
-endobj
-97 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 699.1270000000001 488.7510000000001 713.407]
-/Type /Annot
->>
-endobj
-98 0 obj
-[96 0 R /XYZ 0 683.1600000000001 null]
-endobj
-99 0 obj
-[96 0 R /XYZ 0 626.8800000000002 null]
-endobj
-100 0 obj
-[96 0 R /XYZ 0 570.6000000000004 null]
-endobj
-101 0 obj
-[96 0 R /XYZ 0 502.4400000000004 null]
-endobj
-102 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [337.6397136 382.86700000000036 433.5677136 397.1470000000004]
-/Type /Annot
->>
-endobj
-103 0 obj
-[96 0 R /XYZ 0 359.7600000000004 null]
-endobj
-104 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [463.65600000000006 270.60700000000037 559.5840000000001 284.88700000000034]
-/Type /Annot
->>
-endobj
-105 0 obj
-[96 0 R /XYZ 0 254.64000000000033 null]
-endobj
-106 0 obj
-[96 0 R /XYZ 0 198.3600000000003 null]
-endobj
-107 0 obj
-[96 0 R /XYZ 0 142.08000000000027 null]
-endobj
-108 0 obj
-<< /Length 17724
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 740.816 Td
+48.24000000000001 337.85600000000034 Td
 /F2.0 13 Tf
-[<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 702.840 114.560 23.280 re
+48.240 299.880 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 702.840 171.840 23.280 re
+162.800 299.880 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 702.840 229.120 23.280 re
+334.640 299.880 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 665.280 114.560 37.560 re
+48.240 262.320 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 665.280 171.840 37.560 re
+162.800 262.320 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 665.280 229.120 37.560 re
+334.640 262.320 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 627.720 114.560 37.560 re
+48.240 224.760 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-162.800 627.720 171.840 37.560 re
+162.800 224.760 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-334.640 627.720 229.120 37.560 re
+334.640 224.760 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 726.120 m
-162.800 726.120 l
+48.240 323.160 m
+162.800 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 702.840 m
-162.800 702.840 l
+48.240 299.880 m
+162.800 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 726.370 m
-48.240 702.090 l
+48.240 323.410 m
+48.240 299.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 726.370 m
-162.800 702.090 l
+162.800 323.410 m
+162.800 299.130 l
 S
 [ ] 0 d
 1 w
@@ -11490,7 +9151,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 710.373 Td
+51.24000000000001 307.4130000000003 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -11498,26 +9159,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 726.120 m
-334.640 726.120 l
+162.800 323.160 m
+334.640 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 702.840 m
-334.640 702.840 l
+162.800 299.880 m
+334.640 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 726.370 m
-162.800 702.090 l
+162.800 323.410 m
+162.800 299.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 726.370 m
-334.640 702.090 l
+334.640 323.410 m
+334.640 299.130 l
 S
 [ ] 0 d
 1 w
@@ -11525,7 +9186,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 710.373 Td
+165.79988544000003 307.4130000000003 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -11533,26 +9194,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 726.120 m
-563.760 726.120 l
+334.640 323.160 m
+563.760 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 702.840 m
-563.760 702.840 l
+334.640 299.880 m
+563.760 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 726.370 m
-334.640 702.090 l
+334.640 323.410 m
+334.640 299.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 726.370 m
-563.760 702.090 l
+563.760 323.410 m
+563.760 299.130 l
 S
 [ ] 0 d
 1 w
@@ -11560,7 +9221,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 710.373 Td
+337.6397136 307.4130000000003 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -11568,26 +9229,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 702.840 m
-162.800 702.840 l
+48.240 299.880 m
+162.800 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 665.280 m
-162.800 665.280 l
+48.240 262.320 m
+162.800 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 703.090 m
-48.240 665.030 l
+48.240 300.130 m
+48.240 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 703.090 m
-162.800 665.030 l
+162.800 300.130 m
+162.800 262.070 l
 S
 [ ] 0 d
 1 w
@@ -11595,7 +9256,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 679.4530000000001 Td
+51.24000000000001 276.49300000000034 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -11603,26 +9264,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 702.840 m
-334.640 702.840 l
+162.800 299.880 m
+334.640 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 665.280 m
-334.640 665.280 l
+162.800 262.320 m
+334.640 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 703.090 m
-162.800 665.030 l
+162.800 300.130 m
+162.800 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 703.090 m
-334.640 665.030 l
+334.640 300.130 m
+334.640 262.070 l
 S
 [ ] 0 d
 1 w
@@ -11630,19 +9291,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 686.5930000000001 Td
+165.79988544000003 283.6330000000003 Td
 /F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-165.79988544 672.3130000000001 Td
+165.79988544000003 269.3530000000003 Td
 ET
 
 
 BT
-165.79988544 672.3130000000001 Td
+165.79988544000003 269.3530000000003 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -11650,26 +9311,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 702.840 m
-563.760 702.840 l
+334.640 299.880 m
+563.760 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 665.280 m
-563.760 665.280 l
+334.640 262.320 m
+563.760 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 703.090 m
-334.640 665.030 l
+334.640 300.130 m
+334.640 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 703.090 m
-563.760 665.030 l
+563.760 300.130 m
+563.760 262.070 l
 S
 [ ] 0 d
 1 w
@@ -11677,7 +9338,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 679.4530000000001 Td
+337.6397136 276.49300000000034 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -11685,26 +9346,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 665.280 m
-162.800 665.280 l
+48.240 262.320 m
+162.800 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 627.720 m
-162.800 627.720 l
+48.240 224.760 m
+162.800 224.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 665.530 m
-48.240 627.470 l
+48.240 262.570 m
+48.240 224.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 665.530 m
-162.800 627.470 l
+162.800 262.570 m
+162.800 224.510 l
 S
 [ ] 0 d
 1 w
@@ -11712,7 +9373,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.893 Td
+51.24000000000001 238.93300000000025 Td
 /F2.0 10.5 Tf
 <426f6479> Tj
 ET
@@ -11720,26 +9381,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 665.280 m
-334.640 665.280 l
+162.800 262.320 m
+334.640 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 627.720 m
-334.640 627.720 l
+162.800 224.760 m
+334.640 224.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 665.530 m
-162.800 627.470 l
+162.800 262.570 m
+162.800 224.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 665.530 m
-334.640 627.470 l
+334.640 262.570 m
+334.640 224.510 l
 S
 [ ] 0 d
 1 w
@@ -11747,19 +9408,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 649.0330000000001 Td
+165.79988544000003 246.07300000000026 Td
 /F2.0 10.5 Tf
 <626f6479> Tj
 ET
 
 
 BT
-165.79988544 634.753 Td
+165.79988544000003 231.79300000000026 Td
 ET
 
 
 BT
-165.79988544 634.753 Td
+165.79988544000003 231.79300000000026 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -11767,26 +9428,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 665.280 m
-563.760 665.280 l
+334.640 262.320 m
+563.760 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 627.720 m
-563.760 627.720 l
+334.640 224.760 m
+563.760 224.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 665.530 m
-334.640 627.470 l
+334.640 262.570 m
+334.640 224.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 665.530 m
-563.760 627.470 l
+563.760 262.570 m
+563.760 224.510 l
 S
 [ ] 0 d
 1 w
@@ -11800,9 +9461,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-337.6397136 641.893 Td
+337.6397136 238.93300000000025 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<44696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11812,59 +9473,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 598.1360000000001 Td
+48.24000000000001 195.17600000000027 Td
 /F2.0 13 Tf
-<322e31352e322e20526573706f6e736573> Tj
+<322e382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 545.880 51.552 37.560 re
+48.240 142.920 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 545.880 360.864 37.560 re
+99.792 142.920 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 545.880 103.104 37.560 re
+460.656 142.920 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 522.600 51.552 23.280 re
+48.240 119.640 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 522.600 360.864 23.280 re
+99.792 119.640 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 522.600 103.104 23.280 re
+460.656 119.640 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 583.440 m
-99.792 583.440 l
+48.240 180.480 m
+99.792 180.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 545.880 m
-99.792 545.880 l
+48.240 142.920 m
+99.792 142.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 583.690 m
-48.240 545.130 l
+48.240 180.730 m
+48.240 142.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 583.690 m
-99.792 545.130 l
+99.792 180.730 m
+99.792 142.170 l
 S
 [ ] 0 d
 1 w
@@ -11872,14 +9533,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 567.6930000000002 Td
+51.24000000000001 164.73300000000026 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 553.4130000000001 Td
+51.24000000000001 150.45300000000026 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -11887,26 +9548,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 583.440 m
-460.656 583.440 l
+99.792 180.480 m
+460.656 180.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 545.880 m
-460.656 545.880 l
+99.792 142.920 m
+460.656 142.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 583.690 m
-99.792 545.130 l
+99.792 180.730 m
+99.792 142.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 583.690 m
-460.656 545.130 l
+460.656 180.730 m
+460.656 142.170 l
 S
 [ ] 0 d
 1 w
@@ -11914,7 +9575,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 567.6930000000002 Td
+102.792 164.73300000000026 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -11922,26 +9583,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 583.440 m
-563.760 583.440 l
+460.656 180.480 m
+563.760 180.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 545.880 m
-563.760 545.880 l
+460.656 142.920 m
+563.760 142.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 583.690 m
-460.656 545.130 l
+460.656 180.730 m
+460.656 142.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 583.690 m
-563.760 545.130 l
+563.760 180.730 m
+563.760 142.170 l
 S
 [ ] 0 d
 1 w
@@ -11949,7 +9610,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 567.6930000000002 Td
+463.65600000000006 164.73300000000026 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -11957,26 +9618,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.880 m
-99.792 545.880 l
+48.240 142.920 m
+99.792 142.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 522.600 m
-99.792 522.600 l
+48.240 119.640 m
+99.792 119.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 546.130 m
-48.240 522.350 l
+48.240 143.170 m
+48.240 119.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 546.130 m
-99.792 522.350 l
+99.792 143.170 m
+99.792 119.390 l
 S
 [ ] 0 d
 1 w
@@ -11984,7 +9645,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 529.633 Td
+51.24000000000001 126.67300000000026 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -11992,26 +9653,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 545.880 m
-460.656 545.880 l
+99.792 142.920 m
+460.656 142.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 522.600 m
-460.656 522.600 l
+99.792 119.640 m
+460.656 119.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 546.130 m
-99.792 522.350 l
+99.792 143.170 m
+99.792 119.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 546.130 m
-460.656 522.350 l
+460.656 143.170 m
+460.656 119.390 l
 S
 [ ] 0 d
 1 w
@@ -12019,7 +9680,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 529.633 Td
+102.792 126.67300000000026 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -12027,26 +9688,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 545.880 m
-563.760 545.880 l
+460.656 142.920 m
+563.760 142.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 522.600 m
-563.760 522.600 l
+460.656 119.640 m
+563.760 119.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 546.130 m
-460.656 522.350 l
+460.656 143.170 m
+460.656 119.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 546.130 m
-563.760 522.350 l
+563.760 143.170 m
+563.760 119.390 l
 S
 [ ] 0 d
 1 w
@@ -12060,9 +9721,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 529.633 Td
+463.65600000000006 126.67300000000026 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<44696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12072,9 +9733,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 493.01600000000013 Td
+48.24000000000001 90.05600000000024 Td
 /F2.0 13 Tf
-<322e31352e332e20436f6e73756d6573> Tj
+<322e382e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12085,7 +9746,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 466.3560000000001 Td
+56.88050000000001 63.39600000000024 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -12098,20 +9759,119 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 468.54000000000013 Td
+66.24000000000001 65.58000000000024 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<34> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+59 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 58 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [64 0 R 68 0 R 70 0 R]
+>>
+endobj
+60 0 obj
+[59 0 R /XYZ 0 792.0 null]
+endobj
+61 0 obj
+[59 0 R /XYZ 0 702.1200000000001 null]
+endobj
+62 0 obj
+[59 0 R /XYZ 0 662.0400000000002 null]
+endobj
+63 0 obj
+[59 0 R /XYZ 0 556.9200000000003 null]
+endobj
+64 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [463.65600000000006 467.76700000000045 516.45 482.0470000000004]
+/Type /Annot
+>>
+endobj
+65 0 obj
+[59 0 R /XYZ 0 451.8000000000004 null]
+endobj
+66 0 obj
+[59 0 R /XYZ 0 395.5200000000004 null]
+endobj
+67 0 obj
+[59 0 R /XYZ 0 355.44000000000034 null]
+endobj
+68 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [337.6397136 235.86700000000027 390.4337136 250.14700000000028]
+/Type /Annot
+>>
+endobj
+69 0 obj
+[59 0 R /XYZ 0 212.76000000000028 null]
+endobj
+70 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [463.65600000000006 123.60700000000026 516.45 137.88700000000026]
+/Type /Annot
+>>
+endobj
+71 0 obj
+[59 0 R /XYZ 0 107.64000000000024 null]
+endobj
+72 0 obj
+<< /Length 15674
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 436.7360000000001 Td
+48.24 740.816 Td
 /F2.0 13 Tf
-<322e31352e342e2050726f6475636573> Tj
+<322e382e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12122,7 +9882,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 410.0760000000001 Td
+56.88050000000001 714.1560000000001 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -12135,7 +9895,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 412.2600000000001 Td
+66.24000000000001 716.3400000000001 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -12146,9 +9906,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 374.6160000000001 Td
+48.24000000000001 678.6960000000001 Td
 /F2.0 18 Tf
-<322e31362e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
+<322e392e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12157,59 +9917,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 340.37600000000003 Td
+48.24000000000001 644.4560000000002 Td
 /F2.0 13 Tf
-[<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 302.400 114.560 23.280 re
+48.240 606.480 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 302.400 171.840 23.280 re
+162.800 606.480 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 302.400 229.120 23.280 re
+334.640 606.480 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 264.840 114.560 37.560 re
+48.240 568.920 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 264.840 171.840 37.560 re
+162.800 568.920 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 264.840 229.120 37.560 re
+334.640 568.920 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 325.680 m
-162.800 325.680 l
+48.240 629.760 m
+162.800 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 302.400 m
-162.800 302.400 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 325.930 m
-48.240 301.650 l
+48.240 630.010 m
+48.240 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 325.930 m
-162.800 301.650 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 1 w
@@ -12217,7 +9977,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 309.933 Td
+51.24000000000001 614.0130000000003 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -12225,26 +9985,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 325.680 m
-334.640 325.680 l
+162.800 629.760 m
+334.640 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 302.400 m
-334.640 302.400 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 325.930 m
-162.800 301.650 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 325.930 m
-334.640 301.650 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 1 w
@@ -12252,7 +10012,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 309.933 Td
+165.79988544000003 614.0130000000003 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -12260,26 +10020,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 325.680 m
-563.760 325.680 l
+334.640 629.760 m
+563.760 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 302.400 m
-563.760 302.400 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 325.930 m
-334.640 301.650 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 325.930 m
-563.760 301.650 l
+563.760 630.010 m
+563.760 605.730 l
 S
 [ ] 0 d
 1 w
@@ -12287,7 +10047,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 309.933 Td
+337.6397136 614.0130000000003 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -12295,26 +10055,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 302.400 m
-162.800 302.400 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 264.840 m
-162.800 264.840 l
+48.240 568.920 m
+162.800 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 302.650 m
-48.240 264.590 l
+48.240 606.730 m
+48.240 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 302.650 m
-162.800 264.590 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 1 w
@@ -12322,7 +10082,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 279.013 Td
+51.24000000000001 583.0930000000003 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -12330,26 +10090,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 302.400 m
-334.640 302.400 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 264.840 m
-334.640 264.840 l
+162.800 568.920 m
+334.640 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 302.650 m
-162.800 264.590 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 302.650 m
-334.640 264.590 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 1 w
@@ -12357,19 +10117,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 286.15299999999996 Td
+165.79988544000003 590.2330000000004 Td
 /F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 271.87299999999993 Td
+165.79988544000003 575.9530000000003 Td
 ET
 
 
 BT
-165.79988544000003 271.87299999999993 Td
+165.79988544000003 575.9530000000003 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -12377,26 +10137,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 302.400 m
-563.760 302.400 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 264.840 m
-563.760 264.840 l
+334.640 568.920 m
+563.760 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 302.650 m
-334.640 264.590 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 302.650 m
-563.760 264.590 l
+563.760 606.730 m
+563.760 568.670 l
 S
 [ ] 0 d
 1 w
@@ -12404,7 +10164,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 279.013 Td
+337.6397136 583.0930000000003 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -12414,101 +10174,51 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 235.25599999999997 Td
+48.24000000000001 539.3360000000004 Td
 /F2.0 13 Tf
-<322e31362e322e20526573706f6e736573> Tj
+<322e392e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 183.000 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 183.000 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 183.000 103.104 37.560 re
+48.240 501.360 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 159.720 51.552 23.280 re
+220.080 501.360 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 159.720 360.864 23.280 re
+48.240 478.080 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 159.720 103.104 23.280 re
+220.080 478.080 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 220.560 m
-99.792 220.560 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 183.000 m
-99.792 183.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 220.810 m
-48.240 182.250 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 220.810 m
-99.792 182.250 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24000000000001 204.81299999999996 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 190.53299999999996 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 220.560 m
-460.656 220.560 l
+48.240 524.640 m
+220.080 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 183.000 m
-460.656 183.000 l
+48.240 501.360 m
+220.080 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 220.810 m
-99.792 182.250 l
+48.240 524.890 m
+48.240 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 220.810 m
-460.656 182.250 l
+220.080 524.890 m
+220.080 500.610 l
 S
 [ ] 0 d
 1 w
@@ -12516,34 +10226,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 204.81299999999996 Td
+51.24000000000001 508.8930000000004 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4854545020436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 220.560 m
-563.760 220.560 l
+220.080 524.640 m
+563.760 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 183.000 m
-563.760 183.000 l
+220.080 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 220.810 m
-460.656 182.250 l
+220.080 524.890 m
+220.080 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 220.810 m
-563.760 182.250 l
+563.760 524.890 m
+563.760 500.610 l
 S
 [ ] 0 d
 1 w
@@ -12551,7 +10261,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 204.81299999999996 Td
+223.07982816 508.8930000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -12559,26 +10269,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 183.000 m
-99.792 183.000 l
+48.240 501.360 m
+220.080 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 159.720 m
-99.792 159.720 l
+48.240 478.080 m
+220.080 478.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 183.250 m
-48.240 159.470 l
+48.240 501.610 m
+48.240 477.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 183.250 m
-99.792 159.470 l
+220.080 501.610 m
+220.080 477.830 l
 S
 [ ] 0 d
 1 w
@@ -12586,7 +10296,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 166.75299999999996 Td
+51.24000000000001 485.11300000000045 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -12594,89 +10304,46 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 183.000 m
-460.656 183.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 159.720 m
-460.656 159.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 183.250 m
-99.792 159.470 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 183.250 m
-460.656 159.470 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-102.792 166.75299999999996 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 183.000 m
-563.760 183.000 l
+220.080 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 159.720 m
-563.760 159.720 l
+220.080 478.080 m
+563.760 478.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 183.250 m
-460.656 159.470 l
+220.080 501.610 m
+220.080 477.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 183.250 m
-563.760 159.470 l
+563.760 501.610 m
+563.760 477.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 166.75299999999996 Td
+223.07982816 485.11300000000045 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<4e6f20436f6e74656e74> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 130.1359999999999 Td
+48.24000000000001 448.4960000000005 Td
 /F2.0 13 Tf
-<322e31362e332e2050726f6475636573> Tj
+<322e392e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12687,7 +10354,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 103.47599999999991 Td
+56.88050000000001 421.83600000000047 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -12700,121 +10367,31 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 105.65999999999991 Td
+66.24000000000001 424.0200000000005 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<38> Tj
+48.24000000000001 386.3760000000005 Td
+/F2.0 18 Tf
+<322e31302e2044454c455445> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-109 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 108 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
-/F4.0 31 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [111 0 R 113 0 R 120 0 R]
->>
-endobj
-110 0 obj
-[109 0 R /XYZ 0 792.0 null]
-endobj
-111 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [337.6397136 638.8270000000001 387.64030344375 653.1070000000001]
-/Type /Annot
->>
-endobj
-112 0 obj
-[109 0 R /XYZ 0 615.72 null]
-endobj
-113 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 526.5670000000001 488.7510000000001 540.8470000000001]
-/Type /Annot
->>
-endobj
-114 0 obj
-[109 0 R /XYZ 0 510.60000000000014 null]
-endobj
-115 0 obj
-[109 0 R /XYZ 0 454.3200000000001 null]
-endobj
-116 0 obj
-<< /Limits [(_produces_7) (_responses_2)]
-/Names [(_produces_7) 65 0 R (_produces_8) 72 0 R (_produces_9) 77 0 R (_responses) 28 0 R (_responses_10) 75 0 R (_responses_11) 83 0 R (_responses_12) 88 0 R (_responses_13) 94 0 R (_responses_14) 103 0 R (_responses_15) 112 0 R (_responses_16) 119 0 R (_responses_2) 33 0 R]
->>
-endobj
-117 0 obj
-[109 0 R /XYZ 0 398.0400000000001 null]
-endobj
-118 0 obj
-[109 0 R /XYZ 0 357.96000000000004 null]
-endobj
-119 0 obj
-[109 0 R /XYZ 0 252.83999999999997 null]
-endobj
-120 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 163.68699999999995 488.7510000000001 177.96699999999996]
-/Type /Annot
->>
-endobj
-121 0 obj
-[109 0 R /XYZ 0 147.71999999999994 null]
-endobj
-122 0 obj
-<< /Length 15785
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 730.304 Td
-/F2.0 22 Tf
-<4368617074657220332e20446566696e6974696f6e73> Tj
+48.24000000000001 358.2960000000005 Td
+/F2.0 18 Tf
+<2f76322f64696374696f6e6172792f7b6e616d657d2f656c656d656e74732f7b73686f72744e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12823,67 +10400,71 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 688.656 Td
-/F2.0 18 Tf
-<332e312e20436c64734865616c7468436865636b> Tj
+48.24000000000001 324.05600000000044 Td
+/F2.0 13 Tf
+[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 648.720 220.937 23.280 re
+48.240 286.080 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 648.720 294.583 23.280 re
+162.800 286.080 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 611.160 220.937 37.560 re
+334.640 286.080 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 611.160 294.583 37.560 re
+48.240 248.520 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 573.600 220.937 37.560 re
+1.000 1.000 1.000 scn
+162.800 248.520 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 248.520 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 573.600 294.583 37.560 re
+48.240 210.960 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 536.040 220.937 37.560 re
+0.976 0.976 0.976 scn
+162.800 210.960 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 536.040 294.583 37.560 re
+0.976 0.976 0.976 scn
+334.640 210.960 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 672.000 m
-269.177 672.000 l
+48.240 309.360 m
+162.800 309.360 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 648.720 m
-269.177 648.720 l
+48.240 286.080 m
+162.800 286.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 672.250 m
-48.240 647.970 l
+48.240 309.610 m
+48.240 285.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 672.250 m
-269.177 647.970 l
+162.800 309.610 m
+162.800 285.330 l
 S
 [ ] 0 d
 1 w
@@ -12891,34 +10472,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 656.2529999999999 Td
+51.24000000000001 293.6130000000004 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 672.000 m
-563.760 672.000 l
+162.800 309.360 m
+334.640 309.360 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 648.720 m
-563.760 648.720 l
+162.800 286.080 m
+334.640 286.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 672.250 m
-269.177 647.970 l
+162.800 309.610 m
+162.800 285.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 672.250 m
-563.760 647.970 l
+334.640 309.610 m
+334.640 285.330 l
 S
 [ ] 0 d
 1 w
@@ -12926,34 +10507,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 656.2529999999999 Td
+165.79988544000003 293.6130000000004 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 648.720 m
-269.177 648.720 l
+334.640 309.360 m
+563.760 309.360 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 611.160 m
-269.177 611.160 l
+334.640 286.080 m
+563.760 286.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 648.970 m
-48.240 610.910 l
+334.640 309.610 m
+334.640 285.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.970 m
-269.177 610.910 l
+563.760 309.610 m
+563.760 285.330 l
 S
 [ ] 0 d
 1 w
@@ -12961,46 +10542,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 632.473 Td
+337.6397136 293.6130000000004 Td
 /F2.0 10.5 Tf
-<6465736372697074696f6e> Tj
-ET
-
-
-BT
-51.24 618.193 Td
-ET
-
-
-BT
-51.24 618.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.720 m
-563.760 648.720 l
+48.240 286.080 m
+162.800 286.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.160 m
-563.760 611.160 l
+48.240 248.520 m
+162.800 248.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.970 m
-269.177 610.910 l
+48.240 286.330 m
+48.240 248.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 648.970 m
-563.760 610.910 l
+162.800 286.330 m
+162.800 248.270 l
 S
 [ ] 0 d
 1 w
@@ -13008,34 +10577,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 625.333 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24000000000001 262.6930000000004 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 611.160 m
-269.177 611.160 l
+162.800 286.080 m
+334.640 286.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 573.600 m
-269.177 573.600 l
+162.800 248.520 m
+334.640 248.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 611.410 m
-48.240 573.350 l
+162.800 286.330 m
+162.800 248.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.410 m
-269.177 573.350 l
+334.640 286.330 m
+334.640 248.270 l
 S
 [ ] 0 d
 1 w
@@ -13043,46 +10612,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 594.913 Td
+165.79988544000003 269.83300000000037 Td
 /F2.0 10.5 Tf
-<6865616c7468436865636b436f6d706f6e656e74> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-51.24 580.6329999999999 Td
+165.79988544000003 255.55300000000037 Td
 ET
 
 
 BT
-51.24 580.6329999999999 Td
+165.79988544000003 255.55300000000037 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.160 m
-563.760 611.160 l
+334.640 286.080 m
+563.760 286.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.600 m
-563.760 573.600 l
+334.640 248.520 m
+563.760 248.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.410 m
-269.177 573.350 l
+334.640 286.330 m
+334.640 248.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 611.410 m
-563.760 573.350 l
+563.760 286.330 m
+563.760 248.270 l
 S
 [ ] 0 d
 1 w
@@ -13090,7 +10659,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 587.7729999999999 Td
+337.6397136 262.6930000000004 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -13098,26 +10667,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 573.600 m
-269.177 573.600 l
+48.240 248.520 m
+162.800 248.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 536.040 m
-269.177 536.040 l
+48.240 210.960 m
+162.800 210.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 573.850 m
-48.240 535.790 l
+48.240 248.770 m
+48.240 210.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.850 m
-269.177 535.790 l
+162.800 248.770 m
+162.800 210.710 l
 S
 [ ] 0 d
 1 w
@@ -13125,46 +10694,81 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 557.3530000000001 Td
+51.24000000000001 225.1330000000004 Td
 /F2.0 10.5 Tf
-<6865616c7468436865636b537461747573> Tj
+<50617468> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 248.520 m
+334.640 248.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 210.960 m
+334.640 210.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 248.770 m
+162.800 210.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 248.770 m
+334.640 210.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544000003 232.27300000000042 Td
+/F2.0 10.5 Tf
+<73686f72744e616d65> Tj
 ET
 
 
 BT
-51.24 543.073 Td
+165.79988544000003 217.99300000000042 Td
 ET
 
 
 BT
-51.24 543.073 Td
+165.79988544000003 217.99300000000042 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.600 m
-563.760 573.600 l
+334.640 248.520 m
+563.760 248.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 536.040 m
-563.760 536.040 l
+334.640 210.960 m
+563.760 210.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.850 m
-269.177 535.790 l
+334.640 248.770 m
+334.640 210.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 573.850 m
-563.760 535.790 l
+563.760 248.770 m
+563.760 210.710 l
 S
 [ ] 0 d
 1 w
@@ -13172,7 +10776,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 550.213 Td
+337.6397136 225.1330000000004 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -13182,107 +10786,51 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 500.61600000000004 Td
-/F2.0 18 Tf
-<332e322e20436c6473496e666f> Tj
+48.24000000000001 181.37600000000037 Td
+/F2.0 13 Tf
+<322e31302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 460.680 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 460.680 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 423.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 423.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 385.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 385.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 348.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 348.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 310.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 310.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 272.880 220.937 37.560 re
+48.240 143.400 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 272.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 235.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 235.320 294.583 37.560 re
+220.080 143.400 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 197.760 220.937 37.560 re
+48.240 120.120 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 197.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 160.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 160.200 294.583 37.560 re
+220.080 120.120 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 483.960 m
-269.177 483.960 l
+48.240 166.680 m
+220.080 166.680 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 460.680 m
-269.177 460.680 l
+48.240 143.400 m
+220.080 143.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 484.210 m
-48.240 459.930 l
+48.240 166.930 m
+48.240 142.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 484.210 m
-269.177 459.930 l
+220.080 166.930 m
+220.080 142.650 l
 S
 [ ] 0 d
 1 w
@@ -13290,34 +10838,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 468.21299999999997 Td
+51.24000000000001 150.9330000000004 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4854545020436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 483.960 m
-563.760 483.960 l
+220.080 166.680 m
+563.760 166.680 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 460.680 m
-563.760 460.680 l
+220.080 143.400 m
+563.760 143.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 484.210 m
-269.177 459.930 l
+220.080 166.930 m
+220.080 142.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 484.210 m
-563.760 459.930 l
+563.760 166.930 m
+563.760 142.650 l
 S
 [ ] 0 d
 1 w
@@ -13325,7 +10873,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 468.21299999999997 Td
+223.07982816 150.9330000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -13333,26 +10881,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 460.680 m
-269.177 460.680 l
+48.240 143.400 m
+220.080 143.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 423.120 m
-269.177 423.120 l
+48.240 120.120 m
+220.080 120.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 460.930 m
-48.240 422.870 l
+48.240 143.650 m
+48.240 119.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 460.930 m
-269.177 422.870 l
+220.080 143.650 m
+220.080 119.870 l
 S
 [ ] 0 d
 1 w
@@ -13360,46 +10908,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 444.43299999999994 Td
+51.24000000000001 127.15300000000039 Td
 /F2.0 10.5 Tf
-[<636c647356> 60.05859375 <657273696f6e>] TJ
-ET
-
-
-BT
-51.24 430.1529999999999 Td
-ET
-
-
-BT
-51.24 430.1529999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 460.680 m
-563.760 460.680 l
+220.080 143.400 m
+563.760 143.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.120 m
-563.760 423.120 l
+220.080 120.120 m
+563.760 120.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 460.930 m
-269.177 422.870 l
+220.080 143.650 m
+220.080 119.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 460.930 m
-563.760 422.870 l
+563.760 143.650 m
+563.760 119.870 l
 S
 [ ] 0 d
 1 w
@@ -13407,34 +10943,196 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 437.29299999999995 Td
+223.07982816 127.15300000000039 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4e6f20436f6e74656e74> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 90.53600000000037 Td
+/F2.0 13 Tf
+<322e31302e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 63.876000000000374 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 66.06000000000037 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+557.7289999999999 14.388 Td
+/F1.0 9 Tf
+<35> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+73 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 72 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+>>
+endobj
+74 0 obj
+[73 0 R /XYZ 0 792.0 null]
+endobj
+75 0 obj
+[73 0 R /XYZ 0 702.1200000000001 null]
+endobj
+76 0 obj
+[73 0 R /XYZ 0 662.0400000000002 null]
+endobj
+77 0 obj
+[73 0 R /XYZ 0 556.9200000000003 null]
+endobj
+78 0 obj
+[73 0 R /XYZ 0 466.0800000000005 null]
+endobj
+79 0 obj
+[73 0 R /XYZ 0 409.80000000000047 null]
+endobj
+80 0 obj
+[73 0 R /XYZ 0 341.64000000000044 null]
+endobj
+81 0 obj
+[73 0 R /XYZ 0 198.9600000000004 null]
+endobj
+82 0 obj
+<< /Limits [(_route2) (_route5)]
+/Names [(_route2) 95 0 R (_route20) 47 0 R (_route22) 75 0 R (_route25) 173 0 R (_route26) 189 0 R (_route29) 198 0 R (_route3) 168 0 R (_route30) 29 0 R (_route31) 34 0 R (_route32) 38 0 R (_route4) 130 0 R (_route5) 141 0 R]
+>>
+endobj
+83 0 obj
+[73 0 R /XYZ 0 108.12000000000037 null]
+endobj
+84 0 obj
+<< /Length 17394
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
+/F2.0 18 Tf
+<322e31312e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 700.7360000000001 Td
+/F2.0 13 Tf
+[<322e31312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 662.760 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 662.760 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 662.760 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 625.200 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 625.200 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 625.200 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 423.120 m
-269.177 423.120 l
+48.240 686.040 m
+162.800 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 385.560 m
-269.177 385.560 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 423.370 m
-48.240 385.310 l
+48.240 686.290 m
+48.240 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.370 m
-269.177 385.310 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 1 w
@@ -13442,46 +11140,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 406.873 Td
+51.24 670.2930000000001 Td
 /F2.0 10.5 Tf
-<7065726d697373696f6e52656164436c> Tj
-ET
-
-
-BT
-51.24 392.59299999999996 Td
-ET
-
-
-BT
-51.24 392.59299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.120 m
-563.760 423.120 l
+162.800 686.040 m
+334.640 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 385.560 m
-563.760 385.560 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.370 m
-269.177 385.310 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 423.370 m
-563.760 385.310 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 1 w
@@ -13489,34 +11175,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 399.733 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+165.79988544 670.2930000000001 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 385.560 m
-269.177 385.560 l
+334.640 686.040 m
+563.760 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 348.000 m
-269.177 348.000 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 385.810 m
-48.240 347.750 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.810 m
-269.177 347.750 l
+563.760 686.290 m
+563.760 662.010 l
 S
 [ ] 0 d
 1 w
@@ -13524,46 +11210,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 369.31299999999993 Td
+337.6397136 670.2930000000001 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e5265616454> 29.78515625 <656d706c617465>] TJ
-ET
-
-
-BT
-51.24 355.0329999999999 Td
-ET
-
-
-BT
-51.24 355.0329999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.560 m
-563.760 385.560 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.000 m
-563.760 348.000 l
+48.240 625.200 m
+162.800 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.810 m
-269.177 347.750 l
+48.240 663.010 m
+48.240 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 385.810 m
-563.760 347.750 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 1 w
@@ -13571,34 +11245,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 362.17299999999994 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24 639.3730000000002 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 348.000 m
-269.177 348.000 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 310.440 m
-269.177 310.440 l
+162.800 625.200 m
+334.640 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 348.250 m
-48.240 310.190 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.250 m
-269.177 310.190 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 1 w
@@ -13606,46 +11280,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 331.753 Td
+165.79988544 646.5130000000001 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e5265616454> 29.78515625 <6f736361>] TJ
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 317.47299999999996 Td
+165.79988544 632.2330000000002 Td
 ET
 
 
 BT
-51.24 317.47299999999996 Td
+165.79988544 632.2330000000002 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.000 m
-563.760 348.000 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.440 m
-563.760 310.440 l
+334.640 625.200 m
+563.760 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.250 m
-269.177 310.190 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 348.250 m
-563.760 310.190 l
+563.760 663.010 m
+563.760 624.950 l
 S
 [ ] 0 d
 1 w
@@ -13653,34 +11327,61 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 324.613 Td
+337.6397136 639.3730000000002 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 595.6160000000003 Td
+/F2.0 13 Tf
+<322e31312e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 557.640 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+220.080 557.640 343.680 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 534.360 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+220.080 534.360 343.680 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 310.440 m
-269.177 310.440 l
+48.240 580.920 m
+220.080 580.920 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 272.880 m
-269.177 272.880 l
+48.240 557.640 m
+220.080 557.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 310.690 m
-48.240 272.630 l
+48.240 581.170 m
+48.240 556.890 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.690 m
-269.177 272.630 l
+220.080 581.170 m
+220.080 556.890 l
 S
 [ ] 0 d
 1 w
@@ -13688,46 +11389,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 294.1929999999999 Td
+51.24 565.1730000000003 Td
 /F2.0 10.5 Tf
-<7065726d697373696f6e557064617465436c> Tj
-ET
-
-
-BT
-51.24 279.9129999999999 Td
+<4854545020436f6465> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+220.080 580.920 m
+563.760 580.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+220.080 557.640 m
+563.760 557.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+220.080 581.170 m
+220.080 556.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 581.170 m
+563.760 556.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 279.9129999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+223.07982816 565.1730000000003 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.440 m
-563.760 310.440 l
+48.240 557.640 m
+220.080 557.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 272.880 m
-563.760 272.880 l
+48.240 534.360 m
+220.080 534.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.690 m
-269.177 272.630 l
+48.240 557.890 m
+48.240 534.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 310.690 m
-563.760 272.630 l
+220.080 557.890 m
+220.080 534.110 l
 S
 [ ] 0 d
 1 w
@@ -13735,34 +11459,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 287.05299999999994 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24 541.3930000000004 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 272.880 m
-269.177 272.880 l
+220.080 557.640 m
+563.760 557.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 235.320 m
-269.177 235.320 l
+220.080 534.360 m
+563.760 534.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 273.130 m
-48.240 235.070 l
+220.080 557.890 m
+220.080 534.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 273.130 m
-269.177 235.070 l
+563.760 557.890 m
+563.760 534.110 l
 S
 [ ] 0 d
 1 w
@@ -13770,46 +11494,80 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 256.633 Td
-/F2.0 10.5 Tf
-[<7065726d697373696f6e55706461746554> 29.78515625 <656d706c617465>] TJ
+223.07982816 541.3930000000004 Td
+/F1.0 10.5 Tf
+<4e6f20436f6e74656e74> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 242.35299999999998 Td
+48.24 498.93600000000055 Td
+/F2.0 18 Tf
+[<322e31322e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 242.35299999999998 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+48.24 464.6960000000005 Td
+/F2.0 13 Tf
+[<322e31322e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 426.720 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 426.720 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 426.720 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 389.160 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 389.160 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 389.160 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 272.880 m
-563.760 272.880 l
+48.240 450.000 m
+162.800 450.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 235.320 m
-563.760 235.320 l
+48.240 426.720 m
+162.800 426.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 273.130 m
-269.177 235.070 l
+48.240 450.250 m
+48.240 425.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 273.130 m
-563.760 235.070 l
+162.800 450.250 m
+162.800 425.970 l
 S
 [ ] 0 d
 1 w
@@ -13817,34 +11575,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 249.49299999999997 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24 434.25300000000044 Td
+/F2.0 10.5 Tf
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 235.320 m
-269.177 235.320 l
+162.800 450.000 m
+334.640 450.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 197.760 m
-269.177 197.760 l
+162.800 426.720 m
+334.640 426.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 235.570 m
-48.240 197.510 l
+162.800 450.250 m
+162.800 425.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.570 m
-269.177 197.510 l
+334.640 450.250 m
+334.640 425.970 l
 S
 [ ] 0 d
 1 w
@@ -13852,46 +11610,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 219.07299999999998 Td
+165.79988544 434.25300000000044 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e55706461746554> 29.78515625 <6f736361>] TJ
-ET
-
-
-BT
-51.24 204.79299999999998 Td
-ET
-
-
-BT
-51.24 204.79299999999998 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.320 m
-563.760 235.320 l
+334.640 450.000 m
+563.760 450.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 197.760 m
-563.760 197.760 l
+334.640 426.720 m
+563.760 426.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.570 m
-269.177 197.510 l
+334.640 450.250 m
+334.640 425.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 235.570 m
-563.760 197.510 l
+563.760 450.250 m
+563.760 425.970 l
 S
 [ ] 0 d
 1 w
@@ -13899,34 +11645,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 211.93299999999996 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+337.6397136 434.25300000000044 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 197.760 m
-269.177 197.760 l
+48.240 426.720 m
+162.800 426.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 160.200 m
-269.177 160.200 l
+48.240 389.160 m
+162.800 389.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 198.010 m
-48.240 159.950 l
+48.240 426.970 m
+48.240 388.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 198.010 m
-269.177 159.950 l
+162.800 426.970 m
+162.800 388.910 l
 S
 [ ] 0 d
 1 w
@@ -13934,46 +11680,81 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 181.51299999999995 Td
+51.24 403.3330000000005 Td
 /F2.0 10.5 Tf
-<757365724e616d65> Tj
+<50617468> Tj
 ET
 
-
-BT
-51.24 167.23299999999995 Td
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 426.720 m
+334.640 426.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 389.160 m
+334.640 389.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 426.970 m
+162.800 388.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 426.970 m
+334.640 388.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544 410.47300000000047 Td
+/F2.0 10.5 Tf
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 167.23299999999995 Td
+165.79988544 396.19300000000044 Td
+ET
+
+
+BT
+165.79988544 396.19300000000044 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 197.760 m
-563.760 197.760 l
+334.640 426.720 m
+563.760 426.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 160.200 m
-563.760 160.200 l
+334.640 389.160 m
+563.760 389.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 198.010 m
-269.177 159.950 l
+334.640 426.970 m
+334.640 388.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 198.010 m
-563.760 159.950 l
+563.760 426.970 m
+563.760 388.910 l
 S
 [ ] 0 d
 1 w
@@ -13981,7 +11762,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 174.37299999999993 Td
+337.6397136 403.3330000000005 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -13991,122 +11772,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 124.77599999999991 Td
-/F2.0 18 Tf
-<332e332e2045787465726e616c436f6d706f6e656e74> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<39> Tj
+48.24 359.5760000000005 Td
+/F2.0 13 Tf
+<322e31322e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-123 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 122 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
->>
-endobj
-124 0 obj
-[123 0 R /XYZ 0 792.0 null]
-endobj
-125 0 obj
-[123 0 R /XYZ 0 712.0799999999999 null]
-endobj
-126 0 obj
-[123 0 R /XYZ 0 524.04 null]
-endobj
-127 0 obj
-<< /Limits [(_parameters_12) (_produces)]
-/Names [(_parameters_12) 118 0 R (_parameters_2) 45 0 R (_parameters_3) 57 0 R (_parameters_4) 62 0 R (_parameters_5) 67 0 R (_parameters_6) 74 0 R (_parameters_7) 79 0 R (_parameters_8) 87 0 R (_parameters_9) 92 0 R (_paths) 26 0 R (_policymodel) 203 0 R (_produces) 30 0 R]
->>
-endobj
-128 0 obj
-[123 0 R /XYZ 0 148.19999999999993 null]
-endobj
-129 0 obj
-<< /Length 20211
->>
-stream
-q
-/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
+48.240 307.320 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
+99.792 307.320 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
+460.656 307.320 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
+48.240 284.040 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
+1.000 1.000 1.000 scn
+99.792 284.040 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
+1.000 1.000 1.000 scn
+460.656 284.040 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 344.880 m
+99.792 344.880 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 307.320 m
+99.792 307.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 345.130 m
+48.240 306.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+99.792 345.130 m
+99.792 306.570 l
 S
 [ ] 0 d
 1 w
@@ -14114,34 +11832,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 329.13300000000044 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24 314.8530000000004 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+99.792 344.880 m
+460.656 344.880 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+99.792 307.320 m
+460.656 307.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+99.792 345.130 m
+99.792 306.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+460.656 345.130 m
+460.656 306.570 l
 S
 [ ] 0 d
 1 w
@@ -14149,34 +11874,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+102.792 329.13300000000044 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+460.656 344.880 m
+563.760 344.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+460.656 307.320 m
+563.760 307.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+460.656 345.130 m
+460.656 306.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+563.760 345.130 m
+563.760 306.570 l
 S
 [ ] 0 d
 1 w
@@ -14184,46 +11909,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+463.65600000000006 329.13300000000044 Td
 /F2.0 10.5 Tf
-<636f6d706f6e656e744e616d65> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+48.240 307.320 m
+99.792 307.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+48.240 284.040 m
+99.792 284.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+48.240 307.570 m
+48.240 283.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+99.792 307.570 m
+99.792 283.790 l
 S
 [ ] 0 d
 1 w
@@ -14231,34 +11944,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24 291.07300000000043 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+99.792 307.320 m
+460.656 307.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+99.792 284.040 m
+460.656 284.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+99.792 307.570 m
+99.792 283.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+460.656 307.570 m
+460.656 283.790 l
 S
 [ ] 0 d
 1 w
@@ -14266,46 +11979,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
-/F2.0 10.5 Tf
-<7374617465> Tj
-ET
-
-
-BT
-51.24 664.6329999999999 Td
-ET
-
-
-BT
-51.24 664.6329999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 291.07300000000043 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+460.656 307.320 m
+563.760 307.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+460.656 284.040 m
+563.760 284.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+460.656 307.570 m
+460.656 283.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 307.570 m
+563.760 283.790 l
 S
 [ ] 0 d
 1 w
@@ -14319,9 +12020,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.7729999999999 Td
+463.65600000000006 291.07300000000043 Td
 /F1.0 10.5 Tf
-<45787465726e616c436f6d706f6e656e745374617465> Tj
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14331,67 +12032,107 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 622.1759999999999 Td
+48.24 254.45600000000042 Td
+/F2.0 13 Tf
+<322e31322e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 227.79600000000042 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 229.98000000000042 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 192.3360000000004 Td
 /F2.0 18 Tf
-<332e342e2045787465726e616c436f6d706f6e656e745374617465> Tj
+<322e31332e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 582.240 220.937 23.280 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 158.0960000000004 Td
+/F2.0 13 Tf
+<322e31332e312e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 582.240 294.583 23.280 re
+48.240 105.840 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 544.680 220.937 37.560 re
+99.792 105.840 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 544.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.120 220.937 37.560 re
+460.656 105.840 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.120 294.583 37.560 re
+1.000 1.000 1.000 scn
+48.240 82.560 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.560 220.937 37.560 re
+99.792 82.560 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.560 294.583 37.560 re
+460.656 82.560 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 605.520 m
-269.177 605.520 l
+48.240 143.400 m
+99.792 143.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 105.840 m
+99.792 105.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 605.770 m
-48.240 581.490 l
+48.240 143.650 m
+48.240 105.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.770 m
-269.177 581.490 l
+99.792 143.650 m
+99.792 105.090 l
 S
 [ ] 0 d
 1 w
@@ -14399,34 +12140,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 589.7729999999999 Td
+51.24000000000001 127.65300000000039 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 113.37300000000039 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.520 m
-563.760 605.520 l
+99.792 143.400 m
+460.656 143.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+99.792 105.840 m
+460.656 105.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.770 m
-269.177 581.490 l
+99.792 143.650 m
+99.792 105.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 605.770 m
-563.760 581.490 l
+460.656 143.650 m
+460.656 105.090 l
 S
 [ ] 0 d
 1 w
@@ -14434,34 +12182,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 589.7729999999999 Td
+102.792 127.65300000000039 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+460.656 143.400 m
+563.760 143.400 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+460.656 105.840 m
+563.760 105.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.490 m
-48.240 544.430 l
+460.656 143.650 m
+460.656 105.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+563.760 143.650 m
+563.760 105.090 l
 S
 [ ] 0 d
 1 w
@@ -14469,46 +12217,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.9929999999999 Td
+463.65600000000006 127.65300000000039 Td
 /F2.0 10.5 Tf
-<6465736372697074696f6e> Tj
-ET
-
-
-BT
-51.24 551.713 Td
-ET
-
-
-BT
-51.24 551.713 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+48.240 105.840 m
+99.792 105.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+48.240 82.560 m
+99.792 82.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+48.240 106.090 m
+48.240 82.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.490 m
-563.760 544.430 l
+99.792 106.090 m
+99.792 82.310 l
 S
 [ ] 0 d
 1 w
@@ -14516,34 +12252,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 558.853 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24000000000001 89.59300000000037 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+99.792 105.840 m
+460.656 105.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+99.792 82.560 m
+460.656 82.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.930 m
-48.240 506.870 l
+99.792 106.090 m
+99.792 82.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+460.656 106.090 m
+460.656 82.310 l
 S
 [ ] 0 d
 1 w
@@ -14551,46 +12287,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.433 Td
-/F2.0 10.5 Tf
-<6c6576656c> Tj
-ET
-
-
-BT
-51.24 514.1529999999999 Td
-ET
-
-
-BT
-51.24 514.1529999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 89.59300000000037 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+460.656 105.840 m
+563.760 105.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+460.656 82.560 m
+563.760 82.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+460.656 106.090 m
+460.656 82.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 544.930 m
-563.760 506.870 l
+563.760 106.090 m
+563.760 82.310 l
 S
 [ ] 0 d
 1 w
@@ -14598,207 +12322,205 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.2929999999999 Td
+463.65600000000006 89.59300000000037 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
-S
-[ ] 0 d
-1 w
+q
+0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 490.873 Td
-/F2.0 10.5 Tf
-<73746174654e616d65> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<36> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+85 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 84 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [93 0 R]
+>>
+endobj
+86 0 obj
+[85 0 R /XYZ 0 792.0 null]
+endobj
+87 0 obj
+[85 0 R /XYZ 0 718.32 null]
+endobj
+88 0 obj
+<< /Limits [(_policymodel) (_produces_18)]
+/Names [(_policymodel) 306 0 R (_produces) 32 0 R (_produces_10) 83 0 R (_produces_11) 94 0 R (_produces_12) 99 0 R (_produces_13) 104 0 R (_produces_14) 109 0 R (_produces_15) 116 0 R (_produces_16) 122 0 R (_produces_17) 129 0 R (_produces_18) 133 0 R]
+>>
+endobj
+89 0 obj
+[85 0 R /XYZ 0 613.2000000000003 null]
+endobj
+90 0 obj
+[85 0 R /XYZ 0 522.3600000000005 null]
+endobj
+91 0 obj
+[85 0 R /XYZ 0 482.2800000000005 null]
+endobj
+92 0 obj
+[85 0 R /XYZ 0 377.1600000000005 null]
+endobj
+93 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 288.00700000000046 488.7510000000001 302.28700000000043]
+/Type /Annot
+>>
+endobj
+94 0 obj
+[85 0 R /XYZ 0 272.0400000000004 null]
+endobj
+95 0 obj
+[85 0 R /XYZ 0 215.76000000000042 null]
+endobj
+96 0 obj
+[85 0 R /XYZ 0 175.6800000000004 null]
+endobj
+97 0 obj
+<< /Length 16552
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
 
 BT
-51.24 476.59299999999996 Td
+48.24 740.816 Td
+/F2.0 13 Tf
+<322e31332e322e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 476.59299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+56.88050000000001 714.1560000000001 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-272.17692192000004 483.733 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+66.24000000000001 716.3400000000001 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 434.136 Td
+48.24000000000001 678.6960000000001 Td
 /F2.0 18 Tf
-[<332e352e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<322e31342e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.200 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.200 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 319.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 319.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 243.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 243.960 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 644.4560000000002 Td
+/F2.0 13 Tf
+[<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.400 220.937 37.560 re
+48.240 606.480 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.400 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 168.840 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 168.840 294.583 37.560 re
+162.800 606.480 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.280 220.937 37.560 re
+334.640 606.480 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.280 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.720 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.720 294.583 37.560 re
+48.240 568.920 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.160 220.937 37.560 re
+162.800 568.920 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.160 294.583 37.560 re
+334.640 568.920 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 417.480 m
-269.177 417.480 l
+48.240 629.760 m
+162.800 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 394.200 m
-269.177 394.200 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 417.730 m
-48.240 393.450 l
+48.240 630.010 m
+48.240 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 417.730 m
-269.177 393.450 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 1 w
@@ -14806,34 +12528,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 401.73299999999995 Td
+51.24000000000001 614.0130000000003 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 417.480 m
-563.760 417.480 l
+162.800 629.760 m
+334.640 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 394.200 m
-563.760 394.200 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 417.730 m
-269.177 393.450 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 417.730 m
-563.760 393.450 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 1 w
@@ -14841,34 +12563,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 401.73299999999995 Td
+165.79988544000003 614.0130000000003 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.200 m
-269.177 394.200 l
+334.640 629.760 m
+563.760 629.760 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.640 m
-269.177 356.640 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.450 m
-48.240 356.390 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.450 m
-269.177 356.390 l
+563.760 630.010 m
+563.760 605.730 l
 S
 [ ] 0 d
 1 w
@@ -14876,46 +12598,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 377.9529999999999 Td
+337.6397136 614.0130000000003 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
-ET
-
-
-BT
-51.24 363.6729999999999 Td
-ET
-
-
-BT
-51.24 363.6729999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.200 m
-563.760 394.200 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.640 m
-563.760 356.640 l
+48.240 568.920 m
+162.800 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.450 m
-269.177 356.390 l
+48.240 606.730 m
+48.240 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.450 m
-563.760 356.390 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 1 w
@@ -14923,34 +12633,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 370.81299999999993 Td
-/F1.0 10.5 Tf
-<6e756d626572> Tj
+51.24000000000001 583.0930000000003 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.640 m
-269.177 356.640 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+162.800 568.920 m
+334.640 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.890 m
-48.240 318.830 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.890 m
-269.177 318.830 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 1 w
@@ -14958,46 +12668,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.393 Td
+165.79988544000003 590.2330000000004 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 326.11299999999994 Td
+165.79988544000003 575.9530000000003 Td
 ET
 
 
 BT
-51.24 326.11299999999994 Td
+165.79988544000003 575.9530000000003 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.640 m
-563.760 356.640 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+334.640 568.920 m
+563.760 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.890 m
-269.177 318.830 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 356.890 m
-563.760 318.830 l
+563.760 606.730 m
+563.760 568.670 l
 S
 [ ] 0 d
 1 w
@@ -15005,34 +12715,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.253 Td
+337.6397136 583.0930000000003 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000004 Td
+/F2.0 13 Tf
+<322e31342e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 487.080 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 487.080 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 487.080 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 463.800 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 463.800 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 463.800 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+48.240 524.640 m
+99.792 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 281.520 m
-269.177 281.520 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.330 m
-48.240 281.270 l
+48.240 524.890 m
+48.240 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.330 m
-269.177 281.270 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 1 w
@@ -15040,46 +12785,76 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 302.8329999999999 Td
+51.24000000000001 508.8930000000004 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+<48545450> Tj
 ET
 
 
 BT
-51.24 288.5529999999999 Td
+51.24000000000001 494.6130000000004 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 524.640 m
+460.656 524.640 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 487.080 m
+460.656 487.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 524.890 m
+99.792 486.330 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 524.890 m
+460.656 486.330 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 288.5529999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 508.8930000000004 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+460.656 524.640 m
+563.760 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 281.520 m
-563.760 281.520 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.330 m
-269.177 281.270 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.330 m
-563.760 281.270 l
+563.760 524.890 m
+563.760 486.330 l
 S
 [ ] 0 d
 1 w
@@ -15087,34 +12862,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.6929999999999 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+463.65600000000006 508.8930000000004 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.520 m
-269.177 281.520 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.960 m
-269.177 243.960 l
+48.240 463.800 m
+99.792 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.770 m
-48.240 243.710 l
+48.240 487.330 m
+48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.770 m
-269.177 243.710 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 1 w
@@ -15122,46 +12897,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.27299999999997 Td
+51.24000000000001 470.8330000000004 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
-ET
-
-
-BT
-51.24 250.99299999999997 Td
-ET
-
-
-BT
-51.24 250.99299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.520 m
-563.760 281.520 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.960 m
-563.760 243.960 l
+99.792 463.800 m
+460.656 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.770 m
-269.177 243.710 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 281.770 m
-563.760 243.710 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 1 w
@@ -15169,81 +12932,171 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.133 Td
+102.792 470.8330000000004 Td
 /F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.960 m
-269.177 243.960 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.400 m
-269.177 206.400 l
+460.656 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.210 m
-48.240 206.150 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.210 m
-269.177 206.150 l
+563.760 487.330 m
+563.760 463.550 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-51.24 227.71299999999997 Td
-/F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
+463.65600000000006 470.8330000000004 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 434.2160000000004 Td
+/F2.0 13 Tf
+<322e31342e332e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 213.43299999999996 Td
+56.88050000000001 407.5560000000004 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-51.24 213.43299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+66.24000000000001 409.7400000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 372.0960000000004 Td
+/F2.0 18 Tf
+<322e31352e20505554> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 344.0160000000004 Td
+/F2.0 18 Tf
+<2f76322f6c6f6f702f726566726573684f70506f6c6963794a736f6e536368656d612f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 309.77600000000035 Td
+/F2.0 13 Tf
+[<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 271.800 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 271.800 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 271.800 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 234.240 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 234.240 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 234.240 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.960 m
-563.760 243.960 l
+48.240 295.080 m
+162.800 295.080 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 206.400 m
-563.760 206.400 l
+48.240 271.800 m
+162.800 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.210 m
-269.177 206.150 l
+48.240 295.330 m
+48.240 271.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.210 m
-563.760 206.150 l
+162.800 295.330 m
+162.800 271.050 l
 S
 [ ] 0 d
 1 w
@@ -15251,34 +13104,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.57299999999995 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24000000000001 279.3330000000003 Td
+/F2.0 10.5 Tf
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.400 m
-269.177 206.400 l
+162.800 295.080 m
+334.640 295.080 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 168.840 m
-269.177 168.840 l
+162.800 271.800 m
+334.640 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.650 m
-48.240 168.590 l
+162.800 295.330 m
+162.800 271.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.650 m
-269.177 168.590 l
+334.640 295.330 m
+334.640 271.050 l
 S
 [ ] 0 d
 1 w
@@ -15286,46 +13139,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.15299999999996 Td
+165.79988544000003 279.3330000000003 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
-ET
-
-
-BT
-51.24 175.87299999999996 Td
+<4e616d65> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 295.080 m
+563.760 295.080 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+334.640 271.800 m
+563.760 271.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 295.330 m
+334.640 271.050 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 295.330 m
+563.760 271.050 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 175.87299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+337.6397136 279.3330000000003 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.400 m
-563.760 206.400 l
+48.240 271.800 m
+162.800 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.840 m
-563.760 168.840 l
+48.240 234.240 m
+162.800 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.650 m
-269.177 168.590 l
+48.240 272.050 m
+48.240 233.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.650 m
-563.760 168.590 l
+162.800 272.050 m
+162.800 233.990 l
 S
 [ ] 0 d
 1 w
@@ -15333,34 +13209,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.01299999999995 Td
-/F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+51.24000000000001 248.41300000000027 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.840 m
-269.177 168.840 l
+162.800 271.800 m
+334.640 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.280 m
-269.177 131.280 l
+162.800 234.240 m
+334.640 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.090 m
-48.240 131.030 l
+162.800 272.050 m
+162.800 233.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.090 m
-269.177 131.030 l
+334.640 272.050 m
+334.640 233.990 l
 S
 [ ] 0 d
 1 w
@@ -15368,46 +13244,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.59299999999996 Td
+165.79988544000003 255.55300000000028 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 138.31299999999996 Td
+165.79988544000003 241.27300000000028 Td
 ET
 
 
 BT
-51.24 138.31299999999996 Td
+165.79988544000003 241.27300000000028 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.840 m
-563.760 168.840 l
+334.640 271.800 m
+563.760 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.280 m
-563.760 131.280 l
+334.640 234.240 m
+563.760 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.090 m
-269.177 131.030 l
+334.640 272.050 m
+334.640 233.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.090 m
-563.760 131.030 l
+563.760 272.050 m
+563.760 233.990 l
 S
 [ ] 0 d
 1 w
@@ -15415,34 +13291,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.45299999999995 Td
+337.6397136 248.41300000000027 Td
 /F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 204.6560000000003 Td
+/F2.0 13 Tf
+<322e31352e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 152.400 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 152.400 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 152.400 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 129.120 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 129.120 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 129.120 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.280 m
-269.177 131.280 l
+48.240 189.960 m
+99.792 189.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 93.720 m
-269.177 93.720 l
+48.240 152.400 m
+99.792 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.530 m
-48.240 93.470 l
+48.240 190.210 m
+48.240 151.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.530 m
-269.177 93.470 l
+99.792 190.210 m
+99.792 151.650 l
 S
 [ ] 0 d
 1 w
@@ -15450,46 +13361,76 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.03299999999992 Td
+51.24000000000001 174.21300000000028 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
+<48545450> Tj
 ET
 
 
 BT
-51.24 100.75299999999991 Td
+51.24000000000001 159.93300000000028 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 189.960 m
+460.656 189.960 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 152.400 m
+460.656 152.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 190.210 m
+99.792 151.650 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 190.210 m
+460.656 151.650 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 100.75299999999991 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 174.21300000000028 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.280 m
-563.760 131.280 l
+460.656 189.960 m
+563.760 189.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 93.720 m
-563.760 93.720 l
+460.656 152.400 m
+563.760 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.530 m
-269.177 93.470 l
+460.656 190.210 m
+460.656 151.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.530 m
-563.760 93.470 l
+563.760 190.210 m
+563.760 151.650 l
 S
 [ ] 0 d
 1 w
@@ -15497,34 +13438,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 107.89299999999992 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+463.65600000000006 174.21300000000028 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.720 m
-269.177 93.720 l
+48.240 152.400 m
+99.792 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.160 m
-269.177 56.160 l
+48.240 129.120 m
+99.792 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.970 m
-48.240 55.910 l
+48.240 152.650 m
+48.240 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.970 m
-269.177 55.910 l
+99.792 152.650 m
+99.792 128.870 l
 S
 [ ] 0 d
 1 w
@@ -15532,46 +13473,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.47299999999991 Td
+51.24000000000001 136.15300000000028 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 63.19299999999991 Td
+<323030> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 152.400 m
+460.656 152.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 129.120 m
+460.656 129.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 152.650 m
+99.792 128.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 152.650 m
+460.656 128.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 63.19299999999991 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 136.15300000000028 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.720 m
-563.760 93.720 l
+460.656 152.400 m
+563.760 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.160 m
-563.760 56.160 l
+460.656 129.120 m
+563.760 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.970 m
-269.177 55.910 l
+460.656 152.650 m
+460.656 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 93.970 m
-563.760 55.910 l
+563.760 152.650 m
+563.760 128.870 l
 S
 [ ] 0 d
 1 w
@@ -15585,13 +13549,50 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.33299999999991 Td
+463.65600000000006 136.15300000000028 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 99.53600000000026 Td
+/F2.0 13 Tf
+<322e31352e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 72.87600000000026 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 75.06000000000026 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -15605,9 +13606,9 @@ q
 0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
+557.7289999999999 14.388 Td
 /F1.0 9 Tf
-<3130> Tj
+<37> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15617,169 +13618,141 @@ Q
 
 endstream
 endobj
-130 0 obj
+98 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 129 0 R
+/Contents 97 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
+/Font << /F2.0 22 0 R
 /F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
 >>
-/XObject << /Stamp1 382 0 R
+/XObject << /Stamp1 603 0 R
 >>
 >>
-/Annots [131 0 R 134 0 R]
+/Annots [103 0 R 108 0 R]
 >>
 endobj
-131 0 obj
+99 0 obj
+[98 0 R /XYZ 0 792.0 null]
+endobj
+100 0 obj
+[98 0 R /XYZ 0 702.1200000000001 null]
+endobj
+101 0 obj
+[98 0 R /XYZ 0 662.0400000000002 null]
+endobj
+102 0 obj
+[98 0 R /XYZ 0 556.9200000000003 null]
+endobj
+103 0 obj
 << /Border [0 0 0]
-/Dest (_externalcomponentstate)
+/Dest (_loop)
 /Subtype /Link
-/Rect [272.17692192000004 668.707 397.34742192000004 682.987]
+/Rect [463.65600000000006 467.76700000000045 488.7510000000001 482.0470000000004]
 /Type /Annot
 >>
 endobj
-132 0 obj
-[130 0 R /XYZ 0 645.5999999999999 null]
+104 0 obj
+[98 0 R /XYZ 0 451.8000000000004 null]
 endobj
-133 0 obj
-[130 0 R /XYZ 0 457.56 null]
+105 0 obj
+[98 0 R /XYZ 0 395.5200000000004 null]
 endobj
-134 0 obj
+106 0 obj
+[98 0 R /XYZ 0 327.36000000000035 null]
+endobj
+107 0 obj
+[98 0 R /XYZ 0 222.2400000000003 null]
+endobj
+108 0 obj
 << /Border [0 0 0]
-/Dest (_jsonarray)
+/Dest (_loop)
 /Subtype /Link
-/Rect [272.17692192000004 67.26699999999991 322.17751176375003 81.54699999999991]
+/Rect [463.65600000000006 133.08700000000027 488.7510000000001 147.36700000000027]
 /Type /Annot
 >>
 endobj
-135 0 obj
-<< /Length 21612
+109 0 obj
+[98 0 R /XYZ 0 117.12000000000026 null]
+endobj
+110 0 obj
+<< /Length 16105
 >>
 stream
 q
 /DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
+/F2.0 18 Tf
+<322e31362e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 700.7360000000001 Td
+/F2.0 13 Tf
+[<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
+48.240 662.760 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
+162.800 662.760 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
+334.640 662.760 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
+48.240 625.200 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
+162.800 625.200 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
+334.640 625.200 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 686.040 m
+162.800 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 686.290 m
+48.240 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 1 w
@@ -15787,34 +13760,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 670.2930000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+162.800 686.040 m
+334.640 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 1 w
@@ -15822,34 +13795,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+165.79988544 670.2930000000001 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+334.640 686.040 m
+563.760 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+563.760 686.290 m
+563.760 662.010 l
 S
 [ ] 0 d
 1 w
@@ -15857,89 +13830,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.4730000000002 Td
+337.6397136 670.2930000000001 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 702.1930000000001 Td
-ET
-
-
-BT
-51.24 702.1930000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+48.240 625.200 m
+162.800 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+48.240 663.010 m
+48.240 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 709.3330000000001 Td
-/F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+51.24 639.3730000000002 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+162.800 625.200 m
+334.640 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 1 w
@@ -15947,89 +13900,116 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+165.79988544 646.5130000000001 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544 632.2330000000002 Td
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544 632.2330000000002 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+334.640 625.200 m
+563.760 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 663.010 m
+563.760 624.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.773 Td
+337.6397136 639.3730000000002 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 595.6160000000003 Td
+/F2.0 13 Tf
+<322e31362e322e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 543.360 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 543.360 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 543.360 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 520.080 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 520.080 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 520.080 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 580.920 m
+99.792 580.920 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 543.360 m
+99.792 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 581.170 m
+48.240 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+99.792 581.170 m
+99.792 542.610 l
 S
 [ ] 0 d
 1 w
@@ -16037,89 +14017,76 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 565.1730000000005 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 627.0730000000001 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 627.0730000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24 550.8930000000004 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+99.792 580.920 m
+460.656 580.920 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+99.792 581.170 m
+99.792 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+460.656 581.170 m
+460.656 542.610 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 634.2130000000001 Td
-/F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+102.792 565.1730000000005 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+460.656 580.920 m
+563.760 580.920 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+460.656 581.170 m
+460.656 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+563.760 581.170 m
+563.760 542.610 l
 S
 [ ] 0 d
 1 w
@@ -16127,46 +14094,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7930000000001 Td
+463.65600000000006 565.1730000000005 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
-ET
-
-
-BT
-51.24 589.5130000000001 Td
-ET
-
-
-BT
-51.24 589.5130000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+48.240 543.360 m
+99.792 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+48.240 520.080 m
+99.792 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+48.240 543.610 m
+48.240 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+99.792 543.610 m
+99.792 519.830 l
 S
 [ ] 0 d
 1 w
@@ -16174,34 +14129,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6530000000001 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+51.24 527.1130000000003 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+99.792 520.080 m
+460.656 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+99.792 543.610 m
+99.792 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+460.656 543.610 m
+460.656 519.830 l
 S
 [ ] 0 d
 1 w
@@ -16209,46 +14164,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.2330000000002 Td
-/F2.0 10.5 Tf
-<61734e756d626572> Tj
-ET
-
-
-BT
-51.24 551.9530000000001 Td
-ET
-
-
-BT
-51.24 551.9530000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 527.1130000000003 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+460.656 520.080 m
+563.760 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+460.656 543.610 m
+460.656 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 543.610 m
+563.760 519.830 l
 S
 [ ] 0 d
 1 w
@@ -16262,118 +14205,119 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 559.0930000000001 Td
+463.65600000000006 527.1130000000003 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 528.673 Td
-/F2.0 10.5 Tf
-<617353686f7274> Tj
+48.24 490.4960000000004 Td
+/F2.0 13 Tf
+<322e31362e332e2050726f6475636573> Tj
 ET
 
-
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
 BT
-51.24 514.393 Td
+56.88050000000001 463.83600000000035 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-51.24 514.393 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+66.24000000000001 466.0200000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
-S
-[ ] 0 d
-1 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 428.3760000000004 Td
+/F2.0 18 Tf
+<322e31372e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-272.17692192000004 521.533 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+48.24000000000001 394.1360000000003 Td
+/F2.0 13 Tf
+[<322e31372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.160 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 356.160 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 356.160 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 318.600 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 318.600 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 318.600 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 379.440 m
+162.800 379.440 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 356.160 m
+162.800 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 379.690 m
+48.240 355.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+162.800 379.690 m
+162.800 355.410 l
 S
 [ ] 0 d
 1 w
@@ -16381,46 +14325,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.1130000000001 Td
+51.24000000000001 363.69300000000027 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
-ET
-
-
-BT
-51.24 476.8330000000001 Td
-ET
-
-
-BT
-51.24 476.8330000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+162.800 379.440 m
+334.640 379.440 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+162.800 356.160 m
+334.640 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+162.800 379.690 m
+162.800 355.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+334.640 379.690 m
+334.640 355.410 l
 S
 [ ] 0 d
 1 w
@@ -16428,34 +14360,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.9730000000001 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+165.79988544000003 363.69300000000027 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+334.640 379.440 m
+563.760 379.440 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+334.640 356.160 m
+563.760 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+334.640 379.690 m
+334.640 355.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+563.760 379.690 m
+563.760 355.410 l
 S
 [ ] 0 d
 1 w
@@ -16463,46 +14395,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55300000000017 Td
+337.6397136 363.69300000000027 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 439.27300000000014 Td
-ET
-
-
-BT
-51.24 439.27300000000014 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+48.240 356.160 m
+162.800 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+48.240 318.600 m
+162.800 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+48.240 356.410 m
+48.240 318.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+162.800 356.410 m
+162.800 318.350 l
 S
 [ ] 0 d
 1 w
@@ -16510,34 +14430,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.4130000000002 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24000000000001 332.7730000000003 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+162.800 356.160 m
+334.640 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+162.800 318.600 m
+334.640 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+162.800 356.410 m
+162.800 318.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+334.640 356.410 m
+334.640 318.350 l
 S
 [ ] 0 d
 1 w
@@ -16545,46 +14465,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.9930000000002 Td
+165.79988544000003 339.9130000000003 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 401.7130000000002 Td
+165.79988544000003 325.63300000000027 Td
 ET
 
 
 BT
-51.24 401.7130000000002 Td
+165.79988544000003 325.63300000000027 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+334.640 356.160 m
+563.760 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+334.640 318.600 m
+563.760 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+334.640 356.410 m
+334.640 318.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 356.410 m
+563.760 318.350 l
 S
 [ ] 0 d
 1 w
@@ -16592,34 +14512,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.85300000000024 Td
+337.6397136 332.7730000000003 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 289.0160000000003 Td
+/F2.0 13 Tf
+<322e31372e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 236.760 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 236.760 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 236.760 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 213.480 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 213.480 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 213.480 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 274.320 m
+99.792 274.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 236.760 m
+99.792 236.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 274.570 m
+48.240 236.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+99.792 274.570 m
+99.792 236.010 l
 S
 [ ] 0 d
 1 w
@@ -16627,46 +14582,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.4330000000003 Td
+51.24000000000001 258.57300000000026 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 364.15300000000025 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 364.15300000000025 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24000000000001 244.29300000000026 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+99.792 274.320 m
+460.656 274.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+99.792 236.760 m
+460.656 236.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+99.792 274.570 m
+99.792 236.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+460.656 274.570 m
+460.656 236.010 l
 S
 [ ] 0 d
 1 w
@@ -16674,34 +14624,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.2930000000003 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+102.792 258.57300000000026 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+460.656 274.320 m
+563.760 274.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+460.656 236.760 m
+563.760 236.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+460.656 274.570 m
+460.656 236.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+563.760 274.570 m
+563.760 236.010 l
 S
 [ ] 0 d
 1 w
@@ -16709,46 +14659,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.87300000000033 Td
+463.65600000000006 258.57300000000026 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 326.5930000000003 Td
-ET
-
-
-BT
-51.24 326.5930000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+48.240 236.760 m
+99.792 236.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+48.240 213.480 m
+99.792 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+48.240 237.010 m
+48.240 213.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+99.792 237.010 m
+99.792 213.230 l
 S
 [ ] 0 d
 1 w
@@ -16756,93 +14694,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.73300000000035 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 284.13600000000037 Td
-/F2.0 18 Tf
-<332e362e204a736f6e4e756c6c> Tj
+51.24000000000001 220.5130000000003 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.200 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.200 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 267.480 m
-269.177 267.480 l
+99.792 236.760 m
+460.656 236.760 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+99.792 213.480 m
+460.656 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 267.730 m
-48.240 243.450 l
+99.792 237.010 m
+99.792 213.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.730 m
-269.177 243.450 l
+460.656 237.010 m
+460.656 213.230 l
 S
 [ ] 0 d
 1 w
@@ -16850,116 +14729,259 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 251.7330000000003 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
+102.792 220.5130000000003 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.480 m
-563.760 267.480 l
+460.656 236.760 m
+563.760 236.760 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+460.656 213.480 m
+563.760 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.730 m
-269.177 243.450 l
+460.656 237.010 m
+460.656 213.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 267.730 m
-563.760 243.450 l
+563.760 237.010 m
+563.760 213.230 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 251.7330000000003 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+463.65600000000006 220.5130000000003 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
-S
-[ ] 0 d
-1 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 183.89600000000024 Td
+/F2.0 13 Tf
+<322e31372e332e2050726f6475636573> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 227.95300000000032 Td
-/F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
+56.88050000000001 157.23600000000025 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-51.24 213.67300000000031 Td
+66.24000000000001 159.42000000000024 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 213.67300000000031 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+48.24000000000001 121.77600000000022 Td
+/F2.0 18 Tf
+<322e31382e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 87.53600000000023 Td
+/F2.0 13 Tf
+[<322e31382e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<38> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+111 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 110 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [115 0 R 121 0 R]
+>>
+endobj
+112 0 obj
+[111 0 R /XYZ 0 792.0 null]
+endobj
+113 0 obj
+[111 0 R /XYZ 0 718.32 null]
+endobj
+114 0 obj
+[111 0 R /XYZ 0 613.2000000000003 null]
+endobj
+115 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 524.0470000000004 488.7510000000001 538.3270000000003]
+/Type /Annot
+>>
+endobj
+116 0 obj
+[111 0 R /XYZ 0 508.0800000000004 null]
+endobj
+117 0 obj
+[111 0 R /XYZ 0 451.80000000000035 null]
+endobj
+118 0 obj
+[111 0 R /XYZ 0 411.7200000000003 null]
+endobj
+119 0 obj
+[111 0 R /XYZ 0 306.6000000000003 null]
+endobj
+120 0 obj
+<< /Limits [(_responses_30) (_route18)]
+/Names [(_responses_30) 203 0 R (_responses_31) 209 0 R (_responses_4) 44 0 R (_responses_5) 50 0 R (_responses_6) 57 0 R (_responses_7) 63 0 R (_responses_8) 69 0 R (_responses_9) 77 0 R (_route10) 134 0 R (_route11) 117 0 R (_route12) 112 0 R (_route13) 123 0 R (_route14) 86 0 R (_route15) 100 0 R (_route18) 41 0 R]
+>>
+endobj
+121 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 217.4470000000003 488.7510000000001 231.7270000000003]
+/Type /Annot
+>>
+endobj
+122 0 obj
+[111 0 R /XYZ 0 201.48000000000027 null]
+endobj
+123 0 obj
+[111 0 R /XYZ 0 145.20000000000024 null]
+endobj
+124 0 obj
+[111 0 R /XYZ 0 105.12000000000023 null]
+endobj
+125 0 obj
+<< /Length 18781
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 732.720 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 732.720 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 695.160 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 695.160 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+48.240 756.000 m
+162.800 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 1 w
@@ -16967,34 +14989,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.8130000000003 Td
-/F1.0 10.5 Tf
-<6e756d626572> Tj
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+162.800 756.000 m
+334.640 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 1 w
@@ -17002,46 +15024,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.3930000000003 Td
+165.79988544 740.2529999999999 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
-ET
-
-
-BT
-51.24 176.1130000000003 Td
+<4e616d65> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+334.640 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 756.250 m
+334.640 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 176.1130000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+337.6397136 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+48.240 695.160 m
+162.800 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 1 w
@@ -17049,34 +15094,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.2530000000003 Td
-/F1.0 10.5 Tf
-<696e7465676572> Tj
+51.24 709.333 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+162.800 695.160 m
+334.640 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 1 w
@@ -17084,46 +15129,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.8330000000003 Td
+165.79988544 716.473 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 138.5530000000003 Td
+165.79988544 702.193 Td
 ET
 
 
 BT
-51.24 138.5530000000003 Td
+165.79988544 702.193 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+334.640 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -17131,34 +15176,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6930000000003 Td
+337.6397136 709.333 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 665.5760000000001 Td
+/F2.0 13 Tf
+<322e31382e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 613.320 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 613.320 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 613.320 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 590.040 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 590.040 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 590.040 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 650.880 m
+99.792 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 651.130 m
+48.240 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+99.792 651.130 m
+99.792 612.570 l
 S
 [ ] 0 d
 1 w
@@ -17166,46 +15246,76 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.2730000000003 Td
+51.24 635.1330000000003 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
+<48545450> Tj
 ET
 
 
 BT
-51.24 100.9930000000003 Td
+51.24 620.8530000000002 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 650.880 m
+460.656 650.880 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 613.320 m
+460.656 613.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 651.130 m
+99.792 612.570 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 651.130 m
+460.656 612.570 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-51.24 100.9930000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 635.1330000000003 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+460.656 650.880 m
+563.760 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+460.656 613.320 m
+563.760 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+460.656 651.130 m
+460.656 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 651.130 m
+563.760 612.570 l
 S
 [ ] 0 d
 1 w
@@ -17213,34 +15323,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.1330000000003 Td
-/F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+463.65600000000006 635.1330000000003 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 590.040 m
+99.792 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 613.570 m
+48.240 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+99.792 613.570 m
+99.792 589.790 l
 S
 [ ] 0 d
 1 w
@@ -17248,46 +15358,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000029 Td
+51.24 597.0730000000001 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
-ET
-
-
-BT
-51.24 63.43300000000029 Td
-ET
-
-
-BT
-51.24 63.43300000000029 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+99.792 613.320 m
+460.656 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+99.792 590.040 m
+460.656 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+99.792 613.570 m
+99.792 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+460.656 613.570 m
+460.656 589.790 l
 S
 [ ] 0 d
 1 w
@@ -17295,244 +15393,160 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.57300000000029 Td
+102.792 597.0730000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 613.320 m
+563.760 613.320 l
+S
 [ ] 0 d
-/Stamp1 Do
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 590.040 m
+563.760 590.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 613.570 m
+460.656 589.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 613.570 m
+563.760 589.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3131> Tj
+463.65600000000006 597.0730000000001 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-Q
-Q
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
-endstream
-endobj
-136 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 135 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [137 0 R 138 0 R 139 0 R 140 0 R]
->>
-endobj
-137 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 706.2670000000002 314.65992192000004 720.5470000000001]
-/Type /Annot
->>
-endobj
-138 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 668.7070000000001 325.32792192000005 682.9870000000001]
-/Type /Annot
->>
-endobj
-139 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 631.1470000000002 340.1224219200001 645.4270000000001]
-/Type /Annot
->>
-endobj
-140 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 556.0270000000002 313.75692192 570.3070000000001]
-/Type /Annot
->>
-endobj
-141 0 obj
-[136 0 R /XYZ 0 307.56000000000034 null]
-endobj
-142 0 obj
-<< /Length 21608
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
+BT
+48.24 560.4560000000002 Td
+/F2.0 13 Tf
+<322e31382e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 533.7960000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 535.9800000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 498.3360000000004 Td
+/F2.0 18 Tf
+<322e31392e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 464.09600000000034 Td
+/F2.0 13 Tf
+[<322e31392e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
+48.240 426.120 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
+162.800 426.120 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 244.440 220.937 37.560 re
+334.640 426.120 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.880 294.583 37.560 re
+48.240 388.560 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.320 220.937 37.560 re
+162.800 388.560 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.320 294.583 37.560 re
+334.640 388.560 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 449.400 m
+162.800 449.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 426.120 m
+162.800 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 449.650 m
+48.240 425.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 449.650 m
+162.800 425.370 l
 S
 [ ] 0 d
 1 w
@@ -17540,34 +15554,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24000000000001 433.6530000000003 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+162.800 449.400 m
+334.640 449.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+162.800 426.120 m
+334.640 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 449.650 m
+162.800 425.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+334.640 449.650 m
+334.640 425.370 l
 S
 [ ] 0 d
 1 w
@@ -17575,34 +15589,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+165.79988544000003 433.6530000000003 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+334.640 449.400 m
+563.760 449.400 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+334.640 426.120 m
+563.760 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+334.640 449.650 m
+334.640 425.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+563.760 449.650 m
+563.760 425.370 l
 S
 [ ] 0 d
 1 w
@@ -17610,46 +15624,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+337.6397136 433.6530000000003 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+48.240 426.120 m
+162.800 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+48.240 388.560 m
+162.800 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+48.240 426.370 m
+48.240 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+162.800 426.370 m
+162.800 388.310 l
 S
 [ ] 0 d
 1 w
@@ -17657,34 +15659,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+51.24000000000001 402.73300000000035 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+162.800 426.120 m
+334.640 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+162.800 388.560 m
+334.640 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+162.800 426.370 m
+162.800 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 426.370 m
+334.640 388.310 l
 S
 [ ] 0 d
 1 w
@@ -17692,46 +15694,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+165.79988544000003 409.87300000000033 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544000003 395.5930000000003 Td
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544000003 395.5930000000003 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+334.640 426.120 m
+563.760 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+334.640 388.560 m
+563.760 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 426.370 m
+334.640 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 426.370 m
+563.760 388.310 l
 S
 [ ] 0 d
 1 w
@@ -17739,34 +15741,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+337.6397136 402.73300000000035 Td
 /F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 358.97600000000034 Td
+/F2.0 13 Tf
+<322e31392e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 306.720 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 306.720 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 306.720 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 283.440 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 283.440 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 283.440 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 344.280 m
+99.792 344.280 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 306.720 m
+99.792 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 344.530 m
+48.240 305.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+99.792 344.530 m
+99.792 305.970 l
 S
 [ ] 0 d
 1 w
@@ -17774,46 +15811,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24000000000001 328.5330000000003 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
-ET
-
-
-BT
-51.24 627.073 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 627.073 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24000000000001 314.25300000000027 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+99.792 344.280 m
+460.656 344.280 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+99.792 306.720 m
+460.656 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+99.792 344.530 m
+99.792 305.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+460.656 344.530 m
+460.656 305.970 l
 S
 [ ] 0 d
 1 w
@@ -17821,34 +15853,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+102.792 328.5330000000003 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+460.656 344.280 m
+563.760 344.280 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+460.656 306.720 m
+563.760 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+460.656 344.530 m
+460.656 305.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+563.760 344.530 m
+563.760 305.970 l
 S
 [ ] 0 d
 1 w
@@ -17856,89 +15888,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+463.65600000000006 328.5330000000003 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 589.5129999999999 Td
-ET
-
-
-BT
-51.24 589.5129999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+48.240 306.720 m
+99.792 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+48.240 283.440 m
+99.792 283.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+48.240 306.970 m
+48.240 283.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+99.792 306.970 m
+99.792 283.190 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 596.6529999999999 Td
-/F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+51.24000000000001 290.4730000000003 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+99.792 306.720 m
+460.656 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+99.792 283.440 m
+460.656 283.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+99.792 306.970 m
+99.792 283.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+460.656 306.970 m
+460.656 283.190 l
 S
 [ ] 0 d
 1 w
@@ -17946,89 +15958,152 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
-/F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 551.953 Td
-ET
-
-
-BT
-51.24 551.953 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 290.4730000000003 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+460.656 306.720 m
+563.760 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+460.656 283.440 m
+563.760 283.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+460.656 306.970 m
+460.656 283.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 306.970 m
+563.760 283.190 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+
+BT
+463.65600000000006 290.4730000000003 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 253.85600000000028 Td
+/F2.0 13 Tf
+<322e31392e332e2050726f6475636573> Tj
+ET
+
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-272.17692192000004 559.093 Td
+56.88050000000001 227.19600000000028 Td
 /F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 229.38000000000028 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f786d6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 191.73600000000027 Td
+/F2.0 18 Tf
+[<322e32302e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 157.49600000000027 Td
+/F2.0 13 Tf
+[<322e32302e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 119.520 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 119.520 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 119.520 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 81.960 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 81.960 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 81.960 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 142.800 m
+162.800 142.800 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 119.520 m
+162.800 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 143.050 m
+48.240 118.770 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+162.800 143.050 m
+162.800 118.770 l
 S
 [ ] 0 d
 1 w
@@ -18036,89 +16111,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24000000000001 127.05300000000025 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 514.393 Td
-ET
-
-
-BT
-51.24 514.393 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+162.800 142.800 m
+334.640 142.800 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+162.800 119.520 m
+334.640 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+162.800 143.050 m
+162.800 118.770 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+334.640 143.050 m
+334.640 118.770 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 521.533 Td
-/F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+165.79988544000003 127.05300000000025 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+334.640 142.800 m
+563.760 142.800 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+334.640 119.520 m
+563.760 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+334.640 143.050 m
+334.640 118.770 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+563.760 143.050 m
+563.760 118.770 l
 S
 [ ] 0 d
 1 w
@@ -18126,89 +16181,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+337.6397136 127.05300000000025 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 476.83299999999997 Td
-ET
-
-
-BT
-51.24 476.83299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+48.240 119.520 m
+162.800 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+48.240 81.960 m
+162.800 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+48.240 119.770 m
+48.240 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+162.800 119.770 m
+162.800 81.710 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.973 Td
-/F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+51.24000000000001 96.13300000000024 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+162.800 119.520 m
+334.640 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+162.800 81.960 m
+334.640 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+162.800 119.770 m
+162.800 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+334.640 119.770 m
+334.640 81.710 l
 S
 [ ] 0 d
 1 w
@@ -18216,46 +16251,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.553 Td
+165.79988544000003 103.27300000000024 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 439.273 Td
+165.79988544000003 88.99300000000024 Td
 ET
 
 
 BT
-51.24 439.273 Td
+165.79988544000003 88.99300000000024 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+334.640 119.520 m
+563.760 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+334.640 81.960 m
+563.760 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+334.640 119.770 m
+334.640 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 119.770 m
+563.760 81.710 l
 S
 [ ] 0 d
 1 w
@@ -18263,34 +16298,149 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.413 Td
+337.6397136 96.13300000000024 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+557.7289999999999 14.388 Td
+/F1.0 9 Tf
+<39> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+126 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 125 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [128 0 R]
+>>
+endobj
+127 0 obj
+[126 0 R /XYZ 0 683.1600000000001 null]
+endobj
+128 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 594.0070000000002 488.7510000000001 608.2870000000001]
+/Type /Annot
+>>
+endobj
+129 0 obj
+[126 0 R /XYZ 0 578.0400000000002 null]
+endobj
+130 0 obj
+[126 0 R /XYZ 0 521.7600000000003 null]
+endobj
+131 0 obj
+[126 0 R /XYZ 0 481.68000000000035 null]
+endobj
+132 0 obj
+[126 0 R /XYZ 0 376.56000000000034 null]
+endobj
+133 0 obj
+[126 0 R /XYZ 0 271.4400000000003 null]
+endobj
+134 0 obj
+[126 0 R /XYZ 0 215.16000000000028 null]
+endobj
+135 0 obj
+[126 0 R /XYZ 0 175.08000000000027 null]
+endobj
+136 0 obj
+<< /Length 15145
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 740.816 Td
+/F2.0 13 Tf
+<322e32302e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 688.560 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 688.560 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 688.560 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 665.280 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 665.280 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 665.280 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 726.120 m
+99.792 726.120 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 726.370 m
+48.240 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 1 w
@@ -18298,89 +16448,76 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 710.373 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
-ET
-
-
-BT
-51.24 401.71299999999997 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 401.71299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24 696.0930000000001 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+99.792 726.120 m
+460.656 726.120 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.853 Td
-/F1.0 10.5 Tf
-<4e756d626572> Tj
+102.792 710.373 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+460.656 726.120 m
+563.760 726.120 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+563.760 726.370 m
+563.760 687.810 l
 S
 [ ] 0 d
 1 w
@@ -18388,46 +16525,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.43299999999994 Td
+463.65600000000006 710.373 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
-ET
-
-
-BT
-51.24 364.1529999999999 Td
-ET
-
-
-BT
-51.24 364.1529999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+48.240 665.280 m
+99.792 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+48.240 688.810 m
+48.240 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+99.792 688.810 m
+99.792 665.030 l
 S
 [ ] 0 d
 1 w
@@ -18435,34 +16560,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.29299999999995 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+51.24 672.3130000000001 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+99.792 665.280 m
+460.656 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+99.792 688.810 m
+99.792 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 1 w
@@ -18470,81 +16595,172 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.873 Td
-/F2.0 10.5 Tf
-<6173537472696e67> Tj
-ET
-
-
-BT
-51.24 326.59299999999996 Td
-ET
-
-
-BT
-51.24 326.59299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 672.3130000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+460.656 665.280 m
+563.760 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 688.810 m
+563.760 665.030 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.733 Td
+463.65600000000006 672.3130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 635.6960000000003 Td
+/F2.0 13 Tf
+<322e32302e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 609.0360000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 611.2200000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 573.5760000000004 Td
+/F2.0 18 Tf
+[<322e32312e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000005 Td
+/F2.0 13 Tf
+[<322e32312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 501.360 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 501.360 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 501.360 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 463.800 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 463.800 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 463.800 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 426.240 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+162.800 426.240 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+334.640 426.240 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 524.640 m
+162.800 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 501.360 m
+162.800 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 524.890 m
+48.240 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+162.800 524.890 m
+162.800 500.610 l
 S
 [ ] 0 d
 1 w
@@ -18552,46 +16768,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.31300000000005 Td
+51.24000000000001 508.89300000000054 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 289.033 Td
-ET
-
-
-BT
-51.24 289.033 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+162.800 524.640 m
+334.640 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+162.800 501.360 m
+334.640 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+162.800 524.890 m
+162.800 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+334.640 524.890 m
+334.640 500.610 l
 S
 [ ] 0 d
 1 w
@@ -18599,34 +16803,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.17300000000006 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+165.79988544000003 508.89300000000054 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+334.640 524.640 m
+563.760 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+334.640 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.250 m
-48.240 244.190 l
+334.640 524.890 m
+334.640 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+563.760 524.890 m
+563.760 500.610 l
 S
 [ ] 0 d
 1 w
@@ -18634,46 +16838,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.7530000000001 Td
+337.6397136 508.89300000000054 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 251.4730000000001 Td
-ET
-
-
-BT
-51.24 251.4730000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+48.240 501.360 m
+162.800 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+48.240 463.800 m
+162.800 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+48.240 501.610 m
+48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.250 m
-563.760 244.190 l
+162.800 501.610 m
+162.800 463.550 l
 S
 [ ] 0 d
 1 w
@@ -18681,34 +16873,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.6130000000001 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24000000000001 477.9730000000006 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+162.800 501.360 m
+334.640 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+162.800 463.800 m
+334.640 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.690 m
-48.240 206.630 l
+162.800 501.610 m
+162.800 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+334.640 501.610 m
+334.640 463.550 l
 S
 [ ] 0 d
 1 w
@@ -18716,46 +16908,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 228.19300000000018 Td
+165.79988544000003 485.11300000000057 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 213.91300000000018 Td
+165.79988544000003 470.83300000000054 Td
 ET
 
 
 BT
-51.24 213.91300000000018 Td
+165.79988544000003 470.83300000000054 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+334.640 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+334.640 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+334.640 501.610 m
+334.640 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.690 m
-563.760 206.630 l
+563.760 501.610 m
+563.760 463.550 l
 S
 [ ] 0 d
 1 w
@@ -18763,34 +16955,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 221.05300000000017 Td
+337.6397136 477.9730000000006 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+48.240 463.800 m
+162.800 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
+48.240 426.240 m
+162.800 426.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 207.130 m
-48.240 169.070 l
+48.240 464.050 m
+48.240 425.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+162.800 464.050 m
+162.800 425.990 l
 S
 [ ] 0 d
 1 w
@@ -18798,108 +16990,159 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.63300000000024 Td
+51.24000000000001 440.4130000000005 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
+<426f6479> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 463.800 m
+334.640 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 426.240 m
+334.640 426.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 464.050 m
+162.800 425.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 464.050 m
+334.640 425.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544000003 447.5530000000005 Td
+/F2.0 10.5 Tf
+<626f6479> Tj
 ET
 
 
 BT
-51.24 176.35300000000024 Td
+165.79988544000003 433.2730000000005 Td
 ET
 
 
 BT
-51.24 176.35300000000024 Td
+165.79988544000003 433.2730000000005 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+334.640 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
+334.640 426.240 m
+563.760 426.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+334.640 464.050 m
+334.640 425.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 207.130 m
-563.760 169.070 l
+563.760 464.050 m
+563.760 425.990 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 183.49300000000022 Td
+337.6397136 440.4130000000005 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 133.89600000000019 Td
-/F2.0 18 Tf
-<332e372e204a736f6e4f626a656374> Tj
+48.24000000000001 396.6560000000005 Td
+/F2.0 13 Tf
+<322e32312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 23.280 re
+48.240 344.400 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 23.280 re
+99.792 344.400 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
+460.656 344.400 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
+48.240 321.120 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 321.120 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 321.120 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 117.240 m
-269.177 117.240 l
+48.240 381.960 m
+99.792 381.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 344.400 m
+99.792 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 117.490 m
-48.240 93.210 l
+48.240 382.210 m
+48.240 343.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.490 m
-269.177 93.210 l
+99.792 382.210 m
+99.792 343.650 l
 S
 [ ] 0 d
 1 w
@@ -18907,34 +17150,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 101.49300000000021 Td
+51.24000000000001 366.2130000000005 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 351.93300000000045 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.240 m
-563.760 117.240 l
+99.792 381.960 m
+460.656 381.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+99.792 344.400 m
+460.656 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.490 m
-269.177 93.210 l
+99.792 382.210 m
+99.792 343.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 117.490 m
-563.760 93.210 l
+460.656 382.210 m
+460.656 343.650 l
 S
 [ ] 0 d
 1 w
@@ -18942,34 +17192,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 101.49300000000021 Td
+102.792 366.2130000000005 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+460.656 381.960 m
+563.760 381.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+460.656 344.400 m
+563.760 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+460.656 382.210 m
+460.656 343.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+563.760 382.210 m
+563.760 343.650 l
 S
 [ ] 0 d
 1 w
@@ -18977,46 +17227,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.7130000000002 Td
+463.65600000000006 366.2130000000005 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
-ET
-
-
-BT
-51.24 63.433000000000206 Td
-ET
-
-
-BT
-51.24 63.433000000000206 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+48.240 344.400 m
+99.792 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+48.240 321.120 m
+99.792 321.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+48.240 344.650 m
+48.240 320.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+99.792 344.650 m
+99.792 320.870 l
 S
 [ ] 0 d
 1 w
@@ -19024,27 +17262,212 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.5730000000002 Td
-/F1.0 10.5 Tf
-<6e756d626572> Tj
+51.24000000000001 328.1530000000005 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 344.400 m
+460.656 344.400 l
+S
 [ ] 0 d
-/Stamp1 Do
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 321.120 m
+460.656 321.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 344.650 m
+99.792 320.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 344.650 m
+460.656 320.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3132> Tj
+102.792 328.1530000000005 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 344.400 m
+563.760 344.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 321.120 m
+563.760 321.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 344.650 m
+460.656 320.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 344.650 m
+563.760 320.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+463.65600000000006 328.1530000000005 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 291.53600000000046 Td
+/F2.0 13 Tf
+<322e32312e332e20436f6e73756d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 264.87600000000043 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 267.0600000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 235.25600000000043 Td
+/F2.0 13 Tf
+<322e32312e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 208.5960000000004 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 210.7800000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 173.13600000000037 Td
+/F2.0 18 Tf
+[<322e32322e20504f53> 20.01953125 <54>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 145.05600000000038 Td
+/F2.0 18 Tf
+<2f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 110.81600000000037 Td
+/F2.0 13 Tf
+[<322e32322e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19054,234 +17477,137 @@ Q
 
 endstream
 endobj
-143 0 obj
+137 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 142 0 R
+/Contents 136 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
+/Font << /F2.0 22 0 R
 /F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
 >>
-/XObject << /Stamp1 382 0 R
+/XObject << /Stamp1 603 0 R
 >>
 >>
-/Annots [144 0 R 145 0 R 146 0 R 147 0 R 148 0 R]
+/Annots [139 0 R 143 0 R 145 0 R]
 >>
 endobj
-144 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 593.587 322.17751176375003 607.867]
-/Type /Annot
->>
+138 0 obj
+[137 0 R /XYZ 0 792.0 null]
 endobj
-145 0 obj
+139 0 obj
 << /Border [0 0 0]
-/Dest (_jsonnull)
+/Dest (_loop)
 /Subtype /Link
-/Rect [272.17692192000004 556.027 314.65992192000004 570.307]
+/Rect [463.65600000000006 669.2470000000002 488.7510000000001 683.5270000000002]
 /Type /Annot
 >>
 endobj
-146 0 obj
+140 0 obj
+[137 0 R /XYZ 0 653.2800000000002 null]
+endobj
+141 0 obj
+[137 0 R /XYZ 0 597.0000000000003 null]
+endobj
+142 0 obj
+[137 0 R /XYZ 0 556.9200000000004 null]
+endobj
+143 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 518.4670000000001 325.32792192000005 532.7470000000001]
+/Rect [337.6397136 437.3470000000005 390.7907136 451.6270000000005]
 /Type /Annot
 >>
 endobj
-147 0 obj
+144 0 obj
+[137 0 R /XYZ 0 414.2400000000005 null]
+endobj
+145 0 obj
 << /Border [0 0 0]
-/Dest (_jsonprimitive)
+/Dest (_loop)
 /Subtype /Link
-/Rect [272.17692192000004 480.907 340.1224219200001 495.187]
+/Rect [463.65600000000006 325.0870000000005 488.7510000000001 339.3670000000005]
 /Type /Annot
 >>
 endobj
+146 0 obj
+[137 0 R /XYZ 0 309.12000000000046 null]
+endobj
+147 0 obj
+[137 0 R /XYZ 0 252.84000000000043 null]
+endobj
 148 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 405.787 313.75692192 420.067]
-/Type /Annot
+<< /Limits [(_produces_19) (_produces_27)]
+/Names [(_produces_19) 140 0 R (_produces_2) 37 0 R (_produces_20) 147 0 R (_produces_21) 158 0 R (_produces_22) 167 0 R (_produces_23) 172 0 R (_produces_24) 176 0 R (_produces_25) 183 0 R (_produces_26) 188 0 R (_produces_27) 197 0 R]
 >>
 endobj
 149 0 obj
-[143 0 R /XYZ 0 157.32000000000022 null]
+[137 0 R /XYZ 0 196.5600000000004 null]
 endobj
 150 0 obj
-<< /Length 22603
+[137 0 R /XYZ 0 128.40000000000038 null]
+endobj
+151 0 obj
+<< /Limits [(_parameters_15) (_paths)]
+/Names [(_parameters_15) 142 0 R (_parameters_16) 150 0 R (_parameters_17) 160 0 R (_parameters_18) 169 0 R (_parameters_19) 179 0 R (_parameters_2) 62 0 R (_parameters_20) 185 0 R (_parameters_21) 190 0 R (_parameters_22) 208 0 R (_parameters_3) 67 0 R (_parameters_4) 76 0 R (_parameters_5) 80 0 R (_parameters_6) 87 0 R (_parameters_7) 91 0 R (_parameters_8) 101 0 R (_parameters_9) 106 0 R (_paths) 28 0 R]
+>>
+endobj
+152 0 obj
+<< /Length 19757
 >>
 stream
 q
 /DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
+48.240 732.720 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
+162.800 732.720 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 244.440 220.937 37.560 re
+334.640 732.720 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.880 294.583 37.560 re
+48.240 695.160 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.320 220.937 37.560 re
+162.800 695.160 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.760 220.937 37.560 re
+334.640 695.160 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 131.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 94.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 94.200 294.583 37.560 re
+48.240 657.600 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 56.640 220.937 37.560 re
+162.800 657.600 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 56.640 294.583 37.560 re
+334.640 657.600 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
 48.240 756.000 m
-269.177 756.000 l
+162.800 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
 48.240 732.720 m
-269.177 732.720 l
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
@@ -19292,8 +17618,8 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 1 w
@@ -19303,32 +17629,32 @@ S
 BT
 51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+162.800 756.000 m
+334.640 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 1 w
@@ -19336,34 +17662,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+165.79988544 740.2529999999999 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+334.640 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -19371,46 +17697,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+337.6397136 740.2529999999999 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+48.240 695.160 m
+162.800 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 1 w
@@ -19418,34 +17732,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<696e7465676572> Tj
+51.24 709.333 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+162.800 695.160 m
+334.640 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 1 w
@@ -19453,46 +17767,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+165.79988544 716.473 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544 702.193 Td
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544 702.193 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+334.640 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -19500,34 +17814,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+337.6397136 709.333 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 695.160 m
+162.800 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 657.600 m
+162.800 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+162.800 695.410 m
+162.800 657.350 l
 S
 [ ] 0 d
 1 w
@@ -19535,46 +17849,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 671.7729999999999 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
-ET
-
-
-BT
-51.24 627.073 Td
-ET
-
-
-BT
-51.24 627.073 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<426f6479> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+162.800 695.160 m
+334.640 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+162.800 657.600 m
+334.640 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+162.800 695.410 m
+162.800 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+334.640 695.410 m
+334.640 657.350 l
 S
 [ ] 0 d
 1 w
@@ -19582,81 +17884,124 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
-/F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+165.79988544 678.913 Td
+/F2.0 10.5 Tf
+<626f6479> Tj
+ET
+
+
+BT
+165.79988544 664.6329999999999 Td
+ET
+
+
+BT
+165.79988544 664.6329999999999 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+334.640 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+334.640 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+334.640 695.410 m
+334.640 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-51.24 603.7930000000001 Td
-/F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
-ET
-
-
-BT
-51.24 589.513 Td
+337.6397136 671.7729999999999 Td
+/F1.0 10.5 Tf
+<4d6963726f53657276696365506f6c696379> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 589.513 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+48.24 628.016 Td
+/F2.0 13 Tf
+<322e32322e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 575.760 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 575.760 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 575.760 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 552.480 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 552.480 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 552.480 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+48.240 575.760 m
+99.792 575.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+48.240 613.570 m
+48.240 575.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+99.792 613.570 m
+99.792 575.010 l
 S
 [ ] 0 d
 1 w
@@ -19664,34 +18009,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.653 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24 597.5730000000001 Td
+/F2.0 10.5 Tf
+<48545450> Tj
+ET
+
+
+BT
+51.24 583.293 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+99.792 613.320 m
+460.656 613.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+99.792 575.760 m
+460.656 575.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+99.792 613.570 m
+99.792 575.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+460.656 613.570 m
+460.656 575.010 l
 S
 [ ] 0 d
 1 w
@@ -19699,46 +18051,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+102.792 597.5730000000001 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
-ET
-
-
-BT
-51.24 551.953 Td
-ET
-
-
-BT
-51.24 551.953 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+460.656 613.320 m
+563.760 613.320 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+460.656 575.760 m
+563.760 575.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+460.656 613.570 m
+460.656 575.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 613.570 m
+563.760 575.010 l
 S
 [ ] 0 d
 1 w
@@ -19746,34 +18086,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
-/F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+463.65600000000006 597.5730000000001 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 575.760 m
+99.792 575.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 552.480 m
+99.792 552.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 576.010 m
+48.240 552.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+99.792 576.010 m
+99.792 552.230 l
 S
 [ ] 0 d
 1 w
@@ -19781,46 +18121,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 559.5129999999999 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
-ET
-
-
-BT
-51.24 514.393 Td
-ET
-
-
-BT
-51.24 514.393 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+99.792 575.760 m
+460.656 575.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+99.792 552.480 m
+460.656 552.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+99.792 576.010 m
+99.792 552.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+460.656 576.010 m
+460.656 552.230 l
 S
 [ ] 0 d
 1 w
@@ -19828,81 +18156,220 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.533 Td
+102.792 559.5129999999999 Td
 /F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+460.656 575.760 m
+563.760 575.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+460.656 552.480 m
+563.760 552.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+460.656 576.010 m
+460.656 552.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+563.760 576.010 m
+563.760 552.230 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-51.24 491.113 Td
-/F2.0 10.5 Tf
-<6173496e74> Tj
+463.65600000000006 559.5129999999999 Td
+/F1.0 10.5 Tf
+<4d6963726f53657276696365506f6c696379> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 476.83299999999997 Td
+48.24 522.8960000000001 Td
+/F2.0 13 Tf
+<322e32322e332e20436f6e73756d6573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 476.83299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+56.88050000000001 496.23600000000016 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 498.4200000000002 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 466.61600000000016 Td
+/F2.0 13 Tf
+<322e32322e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 439.95600000000013 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 442.14000000000016 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 404.49600000000015 Td
+/F2.0 18 Tf
+[<322e32332e20504f53> 20.01953125 <54>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 376.41600000000017 Td
+/F2.0 18 Tf
+[<2f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 342.1760000000001 Td
+/F2.0 13 Tf
+[<322e32332e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 304.200 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 304.200 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 304.200 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 266.640 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 266.640 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 266.640 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 229.080 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+162.800 229.080 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+334.640 229.080 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+48.240 327.480 m
+162.800 327.480 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+48.240 304.200 m
+162.800 304.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+48.240 327.730 m
+48.240 303.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+162.800 327.730 m
+162.800 303.450 l
 S
 [ ] 0 d
 1 w
@@ -19910,34 +18377,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.973 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+51.24000000000001 311.73300000000006 Td
+/F2.0 10.5 Tf
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+162.800 327.480 m
+334.640 327.480 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+162.800 304.200 m
+334.640 304.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+162.800 327.730 m
+162.800 303.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+334.640 327.730 m
+334.640 303.450 l
 S
 [ ] 0 d
 1 w
@@ -19945,89 +18412,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.553 Td
+165.79988544000003 311.73300000000006 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 439.273 Td
-ET
-
-
-BT
-51.24 439.273 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+334.640 327.480 m
+563.760 327.480 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+334.640 304.200 m
+563.760 304.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+334.640 327.730 m
+334.640 303.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 327.730 m
+563.760 303.450 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.413 Td
-/F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+337.6397136 311.73300000000006 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 304.200 m
+162.800 304.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 266.640 m
+162.800 266.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 304.450 m
+48.240 266.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+162.800 304.450 m
+162.800 266.390 l
 S
 [ ] 0 d
 1 w
@@ -20035,89 +18482,81 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24000000000001 280.81300000000005 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 401.71299999999997 Td
-ET
-
-
-BT
-51.24 401.71299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+162.800 304.200 m
+334.640 304.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+162.800 266.640 m
+334.640 266.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+162.800 304.450 m
+162.800 266.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+334.640 304.450 m
+334.640 266.390 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.853 Td
-/F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+165.79988544000003 287.95300000000003 Td
+/F2.0 10.5 Tf
+<6c6f6f704e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 273.673 Td
+ET
+
+
+BT
+165.79988544000003 273.673 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+334.640 304.200 m
+563.760 304.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+334.640 266.640 m
+563.760 266.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+334.640 304.450 m
+334.640 266.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+563.760 304.450 m
+563.760 266.390 l
 S
 [ ] 0 d
 1 w
@@ -20125,89 +18564,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.433 Td
-/F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 364.153 Td
-ET
-
-
-BT
-51.24 364.153 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+337.6397136 280.81300000000005 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+48.240 266.640 m
+162.800 266.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+48.240 229.080 m
+162.800 229.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+48.240 266.890 m
+48.240 228.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+162.800 266.890 m
+162.800 228.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 371.293 Td
-/F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+51.24000000000001 243.25300000000007 Td
+/F2.0 10.5 Tf
+<426f6479> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+162.800 266.640 m
+334.640 266.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+162.800 229.080 m
+334.640 229.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+162.800 266.890 m
+162.800 228.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+334.640 266.890 m
+334.640 228.830 l
 S
 [ ] 0 d
 1 w
@@ -20215,46 +18634,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.873 Td
+165.79988544000003 250.3930000000001 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+<626f6479> Tj
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+165.79988544000003 236.11300000000008 Td
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+165.79988544000003 236.11300000000008 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+334.640 266.640 m
+563.760 266.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+334.640 229.080 m
+563.760 229.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+334.640 266.890 m
+334.640 228.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 266.890 m
+563.760 228.830 l
 S
 [ ] 0 d
 1 w
@@ -20268,36 +18687,71 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.733 Td
+337.6397136 243.25300000000007 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 199.4960000000001 Td
+/F2.0 13 Tf
+<322e32332e322e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 147.240 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 147.240 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 147.240 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 123.960 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 123.960 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 123.960 103.104 23.280 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 184.800 m
+99.792 184.800 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 147.240 m
+99.792 147.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+48.240 185.050 m
+48.240 146.490 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 185.050 m
+99.792 146.490 l
 S
 [ ] 0 d
 1 w
@@ -20305,46 +18759,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.313 Td
+51.24000000000001 169.05300000000008 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
-ET
-
-
-BT
-51.24 289.033 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 289.033 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24000000000001 154.77300000000008 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+99.792 184.800 m
+460.656 184.800 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+99.792 147.240 m
+460.656 147.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+99.792 185.050 m
+99.792 146.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+460.656 185.050 m
+460.656 146.490 l
 S
 [ ] 0 d
 1 w
@@ -20352,34 +18801,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.173 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+102.792 169.05300000000008 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+460.656 184.800 m
+563.760 184.800 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+460.656 147.240 m
+563.760 147.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.250 m
-48.240 244.190 l
+460.656 185.050 m
+460.656 146.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+563.760 185.050 m
+563.760 146.490 l
 S
 [ ] 0 d
 1 w
@@ -20387,89 +18836,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.753 Td
+463.65600000000006 169.05300000000008 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
-ET
-
-
-BT
-51.24 251.47299999999998 Td
-ET
-
-
-BT
-51.24 251.47299999999998 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+48.240 147.240 m
+99.792 147.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+48.240 123.960 m
+99.792 123.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+48.240 147.490 m
+48.240 123.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.250 m
-563.760 244.190 l
+99.792 147.490 m
+99.792 123.710 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.613 Td
-/F1.0 10.5 Tf
-<4e756d626572> Tj
+51.24000000000001 130.99300000000008 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+99.792 147.240 m
+460.656 147.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+99.792 123.960 m
+460.656 123.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.690 m
-48.240 206.630 l
+99.792 147.490 m
+99.792 123.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+460.656 147.490 m
+460.656 123.710 l
 S
 [ ] 0 d
 1 w
@@ -20477,81 +18906,298 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 228.19299999999996 Td
-/F2.0 10.5 Tf
-<617353686f7274> Tj
-ET
-
-
-BT
-51.24 213.91299999999995 Td
-ET
-
-
-BT
-51.24 213.91299999999995 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 130.99300000000008 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+460.656 147.240 m
+563.760 147.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+460.656 123.960 m
+563.760 123.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+460.656 147.490 m
+460.656 123.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.690 m
-563.760 206.630 l
+563.760 147.490 m
+563.760 123.710 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 221.05299999999994 Td
+463.65600000000006 130.99300000000008 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 94.37600000000006 Td
+/F2.0 13 Tf
+<322e32332e332e20436f6e73756d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 67.71600000000007 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 69.90000000000006 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3131> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+153 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 152 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [154 0 R 156 0 R 161 0 R 163 0 R]
+>>
+endobj
+154 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [337.6397136 668.707 433.5677136 682.987]
+/Type /Annot
+>>
+endobj
+155 0 obj
+[153 0 R /XYZ 0 645.5999999999999 null]
+endobj
+156 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [463.65600000000006 556.447 559.5840000000001 570.727]
+/Type /Annot
+>>
+endobj
+157 0 obj
+[153 0 R /XYZ 0 540.48 null]
+endobj
+158 0 obj
+[153 0 R /XYZ 0 484.20000000000016 null]
+endobj
+159 0 obj
+[153 0 R /XYZ 0 427.92000000000013 null]
+endobj
+160 0 obj
+[153 0 R /XYZ 0 359.7600000000001 null]
+endobj
+161 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [337.6397136 240.1870000000001 387.64030344375 254.4670000000001]
+/Type /Annot
+>>
+endobj
+162 0 obj
+[153 0 R /XYZ 0 217.0800000000001 null]
+endobj
+163 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 127.92700000000008 488.7510000000001 142.20700000000008]
+/Type /Annot
+>>
+endobj
+164 0 obj
+[153 0 R /XYZ 0 111.96000000000006 null]
+endobj
+165 0 obj
+<< /Length 13523
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 740.816 Td
+/F2.0 13 Tf
+<322e32332e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 714.1560000000001 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 716.3400000000001 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 678.6960000000001 Td
+/F2.0 18 Tf
+<322e32342e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 644.4560000000002 Td
+/F2.0 13 Tf
+[<322e32342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 606.480 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 606.480 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 606.480 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 568.920 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 568.920 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 568.920 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+48.240 629.760 m
+162.800 629.760 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 207.130 m
-48.240 169.070 l
+48.240 630.010 m
+48.240 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 1 w
@@ -20559,46 +19205,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.633 Td
+51.24000000000001 614.0130000000003 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
-ET
-
-
-BT
-51.24 176.353 Td
-ET
-
-
-BT
-51.24 176.353 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+162.800 629.760 m
+334.640 629.760 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 207.130 m
-563.760 169.070 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 1 w
@@ -20606,34 +19240,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.493 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+165.79988544000003 614.0130000000003 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
+334.640 629.760 m
+563.760 629.760 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 131.760 m
-269.177 131.760 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.570 m
-48.240 131.510 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.570 m
-269.177 131.510 l
+563.760 630.010 m
+563.760 605.730 l
 S
 [ ] 0 d
 1 w
@@ -20641,46 +19275,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 153.07300000000006 Td
+337.6397136 614.0130000000003 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 138.79300000000006 Td
-ET
-
-
-BT
-51.24 138.79300000000006 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.760 m
-563.760 131.760 l
+48.240 568.920 m
+162.800 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.570 m
-269.177 131.510 l
+48.240 606.730 m
+48.240 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.570 m
-563.760 131.510 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 1 w
@@ -20688,34 +19310,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.93300000000005 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24000000000001 583.0930000000003 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.760 m
-269.177 131.760 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.200 m
-269.177 94.200 l
+162.800 568.920 m
+334.640 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 132.010 m
-48.240 93.950 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 132.010 m
-269.177 93.950 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 1 w
@@ -20723,46 +19345,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.5130000000001 Td
+165.79988544000003 590.2330000000004 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<6c6f6f704e616d65> Tj
 ET
 
 
 BT
-51.24 101.2330000000001 Td
+165.79988544000003 575.9530000000003 Td
 ET
 
 
 BT
-51.24 101.2330000000001 Td
+165.79988544000003 575.9530000000003 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.760 m
-563.760 131.760 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.200 m
-563.760 94.200 l
+334.640 568.920 m
+563.760 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 132.010 m
-269.177 93.950 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 132.010 m
-563.760 93.950 l
+563.760 606.730 m
+563.760 568.670 l
 S
 [ ] 0 d
 1 w
@@ -20770,34 +19392,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.3730000000001 Td
+337.6397136 583.0930000000003 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000004 Td
+/F2.0 13 Tf
+<322e32342e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 487.080 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 487.080 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 487.080 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 463.800 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 463.800 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 463.800 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.200 m
-269.177 94.200 l
+48.240 524.640 m
+99.792 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 56.640 m
-269.177 56.640 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.450 m
-48.240 56.390 l
+48.240 524.890 m
+48.240 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.450 m
-269.177 56.390 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 1 w
@@ -20805,46 +19462,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.95300000000016 Td
+51.24000000000001 508.8930000000004 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 63.67300000000016 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 63.67300000000016 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24000000000001 494.6130000000004 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.200 m
-563.760 94.200 l
+99.792 524.640 m
+460.656 524.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 56.640 m
-563.760 56.640 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.450 m
-269.177 56.390 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.450 m
-563.760 56.390 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 1 w
@@ -20852,137 +19504,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.81300000000016 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3133> Tj
+102.792 508.8930000000004 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-151 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 150 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [152 0 R 153 0 R 154 0 R 155 0 R 156 0 R]
->>
-endobj
-152 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 443.347 322.17751176375003 457.627]
-/Type /Annot
->>
-endobj
-153 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 405.787 314.65992192000004 420.067]
-/Type /Annot
->>
-endobj
-154 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 368.227 325.32792192000005 382.507]
-/Type /Annot
->>
-endobj
-155 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 330.667 340.1224219200001 344.947]
-/Type /Annot
->>
-endobj
-156 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 255.547 313.75692192 269.827]
-/Type /Annot
->>
-endobj
-157 0 obj
-<< /Length 21915
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+460.656 524.640 m
+563.760 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+563.760 524.890 m
+563.760 486.330 l
 S
 [ ] 0 d
 1 w
@@ -20990,34 +19539,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+463.65600000000006 508.8930000000004 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+48.240 463.800 m
+99.792 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+48.240 487.330 m
+48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 1 w
@@ -21025,34 +19574,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+51.24000000000001 470.8330000000004 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+99.792 463.800 m
+460.656 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 1 w
@@ -21060,220 +19609,160 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
-/F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 470.8330000000004 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+460.656 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 487.330 m
+563.760 463.550 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 709.333 Td
+463.65600000000006 470.8330000000004 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<4c6f6f70> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 659.7360000000001 Td
-/F2.0 18 Tf
-<332e382e204a736f6e5072696d6974697665> Tj
+48.24000000000001 434.2160000000004 Td
+/F2.0 13 Tf
+<322e32342e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 619.800 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 619.800 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 582.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 582.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 544.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 544.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 507.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 507.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 469.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 469.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 432.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 432.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 394.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 394.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
-f
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 407.5560000000004 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
-f
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 409.7400000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 372.0960000000004 Td
+/F2.0 18 Tf
+[<322e32352e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c73>] TJ
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 337.85600000000034 Td
+/F2.0 13 Tf
+<322e32352e312e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
+48.240 285.600 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
+99.792 285.600 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
+460.656 285.600 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
+48.240 262.320 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
+99.792 262.320 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
+460.656 262.320 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 643.080 m
-269.177 643.080 l
+48.240 323.160 m
+99.792 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 619.800 m
-269.177 619.800 l
+48.240 285.600 m
+99.792 285.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 643.330 m
-48.240 619.050 l
+48.240 323.410 m
+48.240 284.850 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 643.330 m
-269.177 619.050 l
+99.792 323.410 m
+99.792 284.850 l
 S
 [ ] 0 d
 1 w
@@ -21281,69 +19770,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 627.3330000000001 Td
+51.24000000000001 307.4130000000003 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<48545450> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.080 m
-563.760 643.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 619.800 m
-563.760 619.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.330 m
-269.177 619.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 643.330 m
-563.760 619.050 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 627.3330000000001 Td
+51.24000000000001 293.13300000000027 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.800 m
-269.177 619.800 l
+99.792 323.160 m
+460.656 323.160 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+99.792 285.600 m
+460.656 285.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.050 m
-48.240 581.990 l
+99.792 323.410 m
+99.792 284.850 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.050 m
-269.177 581.990 l
+460.656 323.410 m
+460.656 284.850 l
 S
 [ ] 0 d
 1 w
@@ -21351,46 +19812,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.5530000000001 Td
+102.792 307.4130000000003 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
-ET
-
-
-BT
-51.24 589.2730000000001 Td
-ET
-
-
-BT
-51.24 589.2730000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.800 m
-563.760 619.800 l
+460.656 323.160 m
+563.760 323.160 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+460.656 285.600 m
+563.760 285.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.050 m
-269.177 581.990 l
+460.656 323.410 m
+460.656 284.850 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.050 m
-563.760 581.990 l
+563.760 323.410 m
+563.760 284.850 l
 S
 [ ] 0 d
 1 w
@@ -21398,34 +19847,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.4130000000001 Td
-/F1.0 10.5 Tf
-<6e756d626572> Tj
+463.65600000000006 307.4130000000003 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 285.600 m
+99.792 285.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 262.320 m
+99.792 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.490 m
-48.240 544.430 l
+48.240 285.850 m
+48.240 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+99.792 285.850 m
+99.792 262.070 l
 S
 [ ] 0 d
 1 w
@@ -21433,46 +19882,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.9930000000002 Td
+51.24000000000001 269.3530000000003 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
-ET
-
-
-BT
-51.24 551.7130000000001 Td
-ET
-
-
-BT
-51.24 551.7130000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+99.792 285.600 m
+460.656 285.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+99.792 262.320 m
+460.656 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+99.792 285.850 m
+99.792 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.490 m
-563.760 544.430 l
+460.656 285.850 m
+460.656 262.070 l
 S
 [ ] 0 d
 1 w
@@ -21480,116 +19917,270 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 558.8530000000001 Td
+102.792 269.3530000000003 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+460.656 285.600 m
+563.760 285.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+460.656 262.320 m
+563.760 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.930 m
-48.240 506.870 l
+460.656 285.850 m
+460.656 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+563.760 285.850 m
+563.760 262.070 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-51.24 528.4330000000002 Td
-/F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+463.65600000000006 269.3530000000003 Td
+/F1.0 10.5 Tf
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 514.1530000000001 Td
+48.24000000000001 232.73600000000027 Td
+/F2.0 13 Tf
+<322e32352e322e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 514.1530000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+56.88050000000001 206.07600000000025 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 544.930 m
-563.760 506.870 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-272.17692192000004 521.2930000000001 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+66.24000000000001 208.26000000000025 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 170.6160000000002 Td
+/F2.0 18 Tf
+<322e32362e20474554> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 142.53600000000023 Td
+/F2.0 18 Tf
+[<2f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f79616d6c2f7b706f6c6963794d6f64656c547970657d>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 108.29600000000022 Td
+/F2.0 13 Tf
+[<322e32362e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3132> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+166 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 165 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [171 0 R 175 0 R]
+>>
+endobj
+167 0 obj
+[166 0 R /XYZ 0 792.0 null]
+endobj
+168 0 obj
+[166 0 R /XYZ 0 702.1200000000001 null]
+endobj
+169 0 obj
+[166 0 R /XYZ 0 662.0400000000002 null]
+endobj
+170 0 obj
+[166 0 R /XYZ 0 556.9200000000003 null]
+endobj
+171 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 467.76700000000045 488.7510000000001 482.0470000000004]
+/Type /Annot
+>>
+endobj
+172 0 obj
+[166 0 R /XYZ 0 451.8000000000004 null]
+endobj
+173 0 obj
+[166 0 R /XYZ 0 395.5200000000004 null]
+endobj
+174 0 obj
+[166 0 R /XYZ 0 355.44000000000034 null]
+endobj
+175 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [463.65600000000006 266.2870000000003 524.955 280.5670000000003]
+/Type /Annot
+>>
+endobj
+176 0 obj
+[166 0 R /XYZ 0 250.32000000000028 null]
+endobj
+177 0 obj
+[166 0 R /XYZ 0 194.04000000000025 null]
+endobj
+178 0 obj
+<< /Limits [(_route6) (_version_information)]
+/Names [(_route6) 159 0 R (_route7) 149 0 R (_route8) 90 0 R (_route9) 105 0 R (_service) 310 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 61 0 R (_v2_dictionary_name_elements_shortname_delete) 79 0 R (_v2_dictionary_name_put) 66 0 R (_v2_dictionary_secondary_names_get) 56 0 R (_v2_policytoscamodels_policymodeltype_get) 184 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 177 0 R (_v2_templates_names_get) 202 0 R (_v2_templates_templatename_get) 207 0 R (_version_information) 23 0 R]
+>>
+endobj
+179 0 obj
+[166 0 R /XYZ 0 125.88000000000022 null]
+endobj
+180 0 obj
+<< /Length 18874
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 732.720 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 732.720 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 695.160 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 695.160 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 756.000 m
+162.800 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 1 w
@@ -21597,46 +20188,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000001 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
-ET
-
-
-BT
-51.24 476.5930000000001 Td
-ET
-
-
-BT
-51.24 476.5930000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+162.800 756.000 m
+334.640 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 1 w
@@ -21644,34 +20223,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.7330000000001 Td
-/F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+165.79988544 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+334.640 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -21679,46 +20258,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000016 Td
+337.6397136 740.2529999999999 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
-ET
-
-
-BT
-51.24 439.03300000000013 Td
-ET
-
-
-BT
-51.24 439.03300000000013 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+48.240 695.160 m
+162.800 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 1 w
@@ -21726,34 +20293,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.1730000000002 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24 709.333 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+162.800 695.160 m
+334.640 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 1 w
@@ -21761,46 +20328,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000001 Td
+165.79988544 716.473 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+165.79988544 702.193 Td
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+165.79988544 702.193 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+334.640 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -21808,34 +20375,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.6130000000001 Td
+337.6397136 709.333 Td
 /F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 665.5760000000001 Td
+/F2.0 13 Tf
+<322e32362e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 613.320 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 613.320 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 613.320 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 590.040 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 590.040 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 590.040 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 650.880 m
+99.792 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 651.130 m
+48.240 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+99.792 651.130 m
+99.792 612.570 l
 S
 [ ] 0 d
 1 w
@@ -21843,46 +20445,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000015 Td
+51.24 635.1330000000003 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
-ET
-
-
-BT
-51.24 363.9130000000001 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 363.9130000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24 620.8530000000002 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+99.792 650.880 m
+460.656 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+99.792 613.320 m
+460.656 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+99.792 651.130 m
+99.792 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+460.656 651.130 m
+460.656 612.570 l
 S
 [ ] 0 d
 1 w
@@ -21890,34 +20487,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05300000000017 Td
-/F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+102.792 635.1330000000003 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+460.656 650.880 m
+563.760 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+460.656 613.320 m
+563.760 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+460.656 651.130 m
+460.656 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+563.760 651.130 m
+563.760 612.570 l
 S
 [ ] 0 d
 1 w
@@ -21925,46 +20522,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000001 Td
+463.65600000000006 635.1330000000003 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
-ET
-
-
-BT
-51.24 326.35300000000007 Td
-ET
-
-
-BT
-51.24 326.35300000000007 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+48.240 590.040 m
+99.792 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+48.240 613.570 m
+48.240 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+99.792 613.570 m
+99.792 589.790 l
 S
 [ ] 0 d
 1 w
@@ -21972,34 +20557,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.4930000000001 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+51.24 597.0730000000001 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+99.792 613.320 m
+460.656 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+99.792 590.040 m
+460.656 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+99.792 613.570 m
+99.792 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+460.656 613.570 m
+460.656 589.790 l
 S
 [ ] 0 d
 1 w
@@ -22007,89 +20592,152 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.0730000000001 Td
-/F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 288.7930000000001 Td
-ET
-
-
-BT
-51.24 288.7930000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 597.0730000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+460.656 613.320 m
+563.760 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+460.656 590.040 m
+563.760 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+460.656 613.570 m
+460.656 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 613.570 m
+563.760 589.790 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 295.9330000000001 Td
+463.65600000000006 597.0730000000001 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 560.4560000000002 Td
+/F2.0 13 Tf
+<322e32362e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 533.7960000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 535.9800000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 498.3360000000004 Td
+/F2.0 18 Tf
+[<322e32372e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 464.09600000000034 Td
+/F2.0 13 Tf
+[<322e32372e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 426.120 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 426.120 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 426.120 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 388.560 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 388.560 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 388.560 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 449.400 m
+162.800 449.400 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 426.120 m
+162.800 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 449.650 m
+48.240 425.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+162.800 449.650 m
+162.800 425.370 l
 S
 [ ] 0 d
 1 w
@@ -22097,89 +20745,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000001 Td
+51.24000000000001 433.6530000000003 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 251.2330000000001 Td
-ET
-
-
-BT
-51.24 251.2330000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+162.800 449.400 m
+334.640 449.400 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+162.800 426.120 m
+334.640 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+162.800 449.650 m
+162.800 425.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+334.640 449.650 m
+334.640 425.370 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.3730000000001 Td
-/F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+165.79988544000003 433.6530000000003 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+334.640 449.400 m
+563.760 449.400 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+334.640 426.120 m
+563.760 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+334.640 449.650 m
+334.640 425.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+563.760 449.650 m
+563.760 425.370 l
 S
 [ ] 0 d
 1 w
@@ -22187,89 +20815,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000012 Td
+337.6397136 433.6530000000003 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 213.67300000000012 Td
-ET
-
-
-BT
-51.24 213.67300000000012 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+48.240 426.120 m
+162.800 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+48.240 388.560 m
+162.800 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+48.240 426.370 m
+48.240 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+162.800 426.370 m
+162.800 388.310 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 220.8130000000001 Td
-/F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+51.24000000000001 402.73300000000035 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+162.800 426.120 m
+334.640 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+162.800 388.560 m
+334.640 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+162.800 426.370 m
+162.800 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+334.640 426.370 m
+334.640 388.310 l
 S
 [ ] 0 d
 1 w
@@ -22277,89 +20885,116 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000011 Td
+165.79988544000003 409.87300000000033 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 176.1130000000001 Td
+165.79988544000003 395.5930000000003 Td
 ET
 
 
 BT
-51.24 176.1130000000001 Td
+165.79988544000003 395.5930000000003 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+334.640 426.120 m
+563.760 426.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+334.640 388.560 m
+563.760 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+334.640 426.370 m
+334.640 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 426.370 m
+563.760 388.310 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 183.2530000000001 Td
+337.6397136 402.73300000000035 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 358.97600000000034 Td
+/F2.0 13 Tf
+<322e32372e322e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 306.720 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 306.720 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 306.720 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 283.440 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 283.440 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 283.440 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 344.280 m
+99.792 344.280 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 306.720 m
+99.792 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 344.530 m
+48.240 305.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+99.792 344.530 m
+99.792 305.970 l
 S
 [ ] 0 d
 1 w
@@ -22367,46 +21002,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.8330000000001 Td
+51.24000000000001 328.5330000000003 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
-ET
-
-
-BT
-51.24 138.5530000000001 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 138.5530000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24000000000001 314.25300000000027 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+99.792 344.280 m
+460.656 344.280 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+99.792 306.720 m
+460.656 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+99.792 344.530 m
+99.792 305.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+460.656 344.530 m
+460.656 305.970 l
 S
 [ ] 0 d
 1 w
@@ -22414,34 +21044,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6930000000001 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+102.792 328.5330000000003 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+460.656 344.280 m
+563.760 344.280 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+460.656 306.720 m
+563.760 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+460.656 344.530 m
+460.656 305.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+563.760 344.530 m
+563.760 305.970 l
 S
 [ ] 0 d
 1 w
@@ -22449,89 +21079,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.2730000000001 Td
+463.65600000000006 328.5330000000003 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
-ET
-
-
-BT
-51.24 100.9930000000001 Td
-ET
-
-
-BT
-51.24 100.9930000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+48.240 306.720 m
+99.792 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+48.240 283.440 m
+99.792 283.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+48.240 306.970 m
+48.240 283.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+99.792 306.970 m
+99.792 283.190 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.1330000000001 Td
-/F1.0 10.5 Tf
-<4e756d626572> Tj
+51.24000000000001 290.4730000000003 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+99.792 306.720 m
+460.656 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+99.792 283.440 m
+460.656 283.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+99.792 306.970 m
+99.792 283.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+460.656 306.970 m
+460.656 283.190 l
 S
 [ ] 0 d
 1 w
@@ -22539,243 +21149,160 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000004 Td
-/F2.0 10.5 Tf
-<617353686f7274> Tj
-ET
-
-
-BT
-51.24 63.433000000000035 Td
-ET
-
-
-BT
-51.24 63.433000000000035 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 290.4730000000003 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+460.656 306.720 m
+563.760 306.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+460.656 283.440 m
+563.760 283.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+460.656 306.970 m
+460.656 283.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 306.970 m
+563.760 283.190 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.57300000000004 Td
+463.65600000000006 290.4730000000003 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 253.85600000000028 Td
+/F2.0 13 Tf
+<322e32372e332e2050726f6475636573> Tj
+ET
+
 0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3134> Tj
+56.88050000000001 227.19600000000028 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
 
-endstream
-endobj
-158 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 157 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [160 0 R 161 0 R 162 0 R 163 0 R 164 0 R]
->>
-endobj
-159 0 obj
-[158 0 R /XYZ 0 683.1600000000001 null]
-endobj
-160 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 292.8670000000001 322.17751176375003 307.1470000000001]
-/Type /Annot
->>
-endobj
-161 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 255.3070000000001 314.65992192000004 269.5870000000001]
-/Type /Annot
->>
-endobj
-162 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 217.74700000000013 325.32792192000005 232.0270000000001]
-/Type /Annot
->>
-endobj
-163 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 180.18700000000013 340.1224219200001 194.4670000000001]
-/Type /Annot
->>
-endobj
-164 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 105.06700000000009 313.75692192 119.3470000000001]
-/Type /Annot
->>
-endobj
-165 0 obj
-<< /Length 21453
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 229.38000000000028 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 191.73600000000027 Td
+/F2.0 18 Tf
+[<322e32382e20505554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 157.49600000000027 Td
+/F2.0 13 Tf
+[<322e32382e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
+48.240 119.520 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
+162.800 119.520 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
+334.640 119.520 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
+48.240 81.960 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
+162.800 81.960 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
+334.640 81.960 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 142.800 m
+162.800 142.800 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 119.520 m
+162.800 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 143.050 m
+48.240 118.770 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 143.050 m
+162.800 118.770 l
 S
 [ ] 0 d
 1 w
@@ -22783,34 +21310,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24000000000001 127.05300000000025 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+162.800 142.800 m
+334.640 142.800 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+162.800 119.520 m
+334.640 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+162.800 143.050 m
+162.800 118.770 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+334.640 143.050 m
+334.640 118.770 l
 S
 [ ] 0 d
 1 w
@@ -22818,34 +21345,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+165.79988544000003 127.05300000000025 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+334.640 142.800 m
+563.760 142.800 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+334.640 119.520 m
+563.760 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+334.640 143.050 m
+334.640 118.770 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+563.760 143.050 m
+563.760 118.770 l
 S
 [ ] 0 d
 1 w
@@ -22853,46 +21380,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+337.6397136 127.05300000000025 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+48.240 119.520 m
+162.800 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+48.240 81.960 m
+162.800 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+48.240 119.770 m
+48.240 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+162.800 119.770 m
+162.800 81.710 l
 S
 [ ] 0 d
 1 w
@@ -22900,34 +21415,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24000000000001 96.13300000000024 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+162.800 119.520 m
+334.640 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+162.800 81.960 m
+334.640 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+162.800 119.770 m
+162.800 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 119.770 m
+334.640 81.710 l
 S
 [ ] 0 d
 1 w
@@ -22935,46 +21450,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+165.79988544000003 103.27300000000024 Td
 /F2.0 10.5 Tf
-<626f6f6c65616e> Tj
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544000003 88.99300000000024 Td
 ET
 
 
 BT
-51.24 664.633 Td
+165.79988544000003 88.99300000000024 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+334.640 119.520 m
+563.760 119.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+334.640 81.960 m
+563.760 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+334.640 119.770 m
+334.640 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 119.770 m
+563.760 81.710 l
 S
 [ ] 0 d
 1 w
@@ -22982,34 +21497,138 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+337.6397136 96.13300000000024 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3133> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+181 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 180 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [187 0 R]
+>>
+endobj
+182 0 obj
+[181 0 R /XYZ 0 683.1600000000001 null]
+endobj
+183 0 obj
+[181 0 R /XYZ 0 578.0400000000002 null]
+endobj
+184 0 obj
+[181 0 R /XYZ 0 521.7600000000003 null]
+endobj
+185 0 obj
+[181 0 R /XYZ 0 481.68000000000035 null]
+endobj
+186 0 obj
+[181 0 R /XYZ 0 376.56000000000034 null]
+endobj
+187 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [463.65600000000006 287.4070000000003 524.955 301.6870000000003]
+/Type /Annot
+>>
+endobj
+188 0 obj
+[181 0 R /XYZ 0 271.4400000000003 null]
+endobj
+189 0 obj
+[181 0 R /XYZ 0 215.16000000000028 null]
+endobj
+190 0 obj
+[181 0 R /XYZ 0 175.08000000000027 null]
+endobj
+191 0 obj
+<< /Length 16505
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 732.720 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 732.720 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 695.160 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 695.160 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 756.000 m
+162.800 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 1 w
@@ -23017,46 +21636,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 627.0730000000001 Td
-ET
-
-
-BT
-51.24 627.0730000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+162.800 756.000 m
+334.640 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+162.800 756.250 m
+162.800 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 1 w
@@ -23064,34 +21671,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.2130000000001 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+165.79988544 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+334.640 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+334.640 756.250 m
+334.640 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -23099,46 +21706,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7930000000001 Td
+337.6397136 740.2529999999999 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 589.5130000000001 Td
-ET
-
-
-BT
-51.24 589.5130000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+48.240 732.720 m
+162.800 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+48.240 695.160 m
+162.800 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 1 w
@@ -23146,34 +21741,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6530000000001 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24 709.333 Td
+/F2.0 10.5 Tf
+<426f6479> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+162.800 732.720 m
+334.640 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+162.800 695.160 m
+334.640 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+162.800 732.970 m
+162.800 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 1 w
@@ -23181,46 +21776,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.2330000000002 Td
+165.79988544 716.473 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<626f6479> Tj
 ET
 
 
 BT
-51.24 551.9530000000002 Td
+165.79988544 702.193 Td
 ET
 
 
 BT
-51.24 551.9530000000002 Td
+165.79988544 702.193 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+334.640 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+334.640 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+334.640 732.970 m
+334.640 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -23228,34 +21823,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.0930000000002 Td
+337.6397136 709.333 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 665.5760000000001 Td
+/F2.0 13 Tf
+<322e32382e322e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 613.320 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 613.320 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 613.320 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 590.040 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 590.040 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 590.040 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 650.880 m
+99.792 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 651.130 m
+48.240 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+99.792 651.130 m
+99.792 612.570 l
 S
 [ ] 0 d
 1 w
@@ -23263,46 +21893,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.6730000000002 Td
+51.24 635.1330000000003 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 514.3930000000003 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 514.3930000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24 620.8530000000002 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+99.792 650.880 m
+460.656 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+99.792 613.320 m
+460.656 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+99.792 651.130 m
+99.792 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+460.656 651.130 m
+460.656 612.570 l
 S
 [ ] 0 d
 1 w
@@ -23310,34 +21935,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5330000000002 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+102.792 635.1330000000003 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+460.656 650.880 m
+563.760 650.880 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+460.656 613.320 m
+563.760 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+460.656 651.130 m
+460.656 612.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+563.760 651.130 m
+563.760 612.570 l
 S
 [ ] 0 d
 1 w
@@ -23345,46 +21970,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.11300000000034 Td
+463.65600000000006 635.1330000000003 Td
 /F2.0 10.5 Tf
-<6e756d626572> Tj
-ET
-
-
-BT
-51.24 476.8330000000003 Td
-ET
-
-
-BT
-51.24 476.8330000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+48.240 613.320 m
+99.792 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+48.240 590.040 m
+99.792 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+48.240 613.570 m
+48.240 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+99.792 613.570 m
+99.792 589.790 l
 S
 [ ] 0 d
 1 w
@@ -23392,34 +22005,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.97300000000035 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+51.24 597.0730000000001 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+99.792 613.320 m
+460.656 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+99.792 590.040 m
+460.656 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+99.792 613.570 m
+99.792 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+460.656 613.570 m
+460.656 589.790 l
 S
 [ ] 0 d
 1 w
@@ -23427,164 +22040,197 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.5530000000004 Td
-/F2.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-
-BT
-51.24 439.27300000000037 Td
-ET
-
-
-BT
-51.24 439.27300000000037 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 597.0730000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+460.656 613.320 m
+563.760 613.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+460.656 590.040 m
+563.760 590.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+460.656 613.570 m
+460.656 589.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 613.570 m
+563.760 589.790 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.4130000000004 Td
+463.65600000000006 597.0730000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 396.81600000000043 Td
-/F2.0 18 Tf
-<332e392e204c6f6f70> Tj
+48.24 560.4560000000002 Td
+/F2.0 13 Tf
+<322e32382e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.880 220.937 23.280 re
-f
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 533.7960000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 23.280 re
-f
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 535.9800000000004 Td
+/F4.0 10.5 Tf
+<706c61696e2f74657874> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.320 220.937 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 504.1760000000004 Td
+/F2.0 13 Tf
+<322e32382e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.320 294.583 37.560 re
-f
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 477.51600000000036 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 281.760 220.937 37.560 re
-f
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 479.7000000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 281.760 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 442.0560000000004 Td
+/F2.0 18 Tf
+<322e32392e20474554202f76322f74656d706c61746573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.200 220.937 37.560 re
-f
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 407.8160000000003 Td
+/F2.0 13 Tf
+<322e32392e312e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.640 294.583 37.560 re
+48.240 355.560 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
+99.792 355.560 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
+460.656 355.560 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
+48.240 332.280 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
+99.792 332.280 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 56.400 294.583 37.560 re
+1.000 1.000 1.000 scn
+460.656 332.280 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 380.160 m
-269.177 380.160 l
+48.240 393.120 m
+99.792 393.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 355.560 m
+99.792 355.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 380.410 m
-48.240 356.130 l
+48.240 393.370 m
+48.240 354.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 380.410 m
-269.177 356.130 l
+99.792 393.370 m
+99.792 354.810 l
 S
 [ ] 0 d
 1 w
@@ -23592,34 +22238,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 364.41300000000035 Td
+51.24000000000001 377.3730000000003 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 363.0930000000003 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 380.160 m
-563.760 380.160 l
+99.792 393.120 m
+460.656 393.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+99.792 355.560 m
+460.656 355.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 380.410 m
-269.177 356.130 l
+99.792 393.370 m
+99.792 354.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 380.410 m
-563.760 356.130 l
+460.656 393.370 m
+460.656 354.810 l
 S
 [ ] 0 d
 1 w
@@ -23627,34 +22280,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 364.41300000000035 Td
+102.792 377.3730000000003 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+460.656 393.120 m
+563.760 393.120 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+460.656 355.560 m
+563.760 355.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+460.656 393.370 m
+460.656 354.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+563.760 393.370 m
+563.760 354.810 l
 S
 [ ] 0 d
 1 w
@@ -23662,46 +22315,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000003 Td
+463.65600000000006 377.3730000000003 Td
 /F2.0 10.5 Tf
-<626c75657072696e74> Tj
-ET
-
-
-BT
-51.24 326.3530000000003 Td
-ET
-
-
-BT
-51.24 326.3530000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+48.240 355.560 m
+99.792 355.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+48.240 332.280 m
+99.792 332.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+48.240 355.810 m
+48.240 332.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+99.792 355.810 m
+99.792 332.030 l
 S
 [ ] 0 d
 1 w
@@ -23709,34 +22350,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.49300000000034 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24000000000001 339.3130000000003 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+99.792 355.560 m
+460.656 355.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+99.792 332.280 m
+460.656 332.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+99.792 355.810 m
+99.792 332.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+460.656 355.810 m
+460.656 332.030 l
 S
 [ ] 0 d
 1 w
@@ -23744,46 +22385,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.0730000000004 Td
-/F2.0 10.5 Tf
-<636f6d706f6e656e7473> Tj
-ET
-
-
-BT
-51.24 288.79300000000035 Td
-ET
-
-
-BT
-51.24 288.79300000000035 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 339.3130000000003 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+460.656 355.560 m
+563.760 355.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+460.656 332.280 m
+563.760 332.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+460.656 355.810 m
+460.656 332.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 355.810 m
+563.760 332.030 l
 S
 [ ] 0 d
 1 w
@@ -23793,54 +22422,123 @@ S
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 295.9330000000004 Td
+463.65600000000006 339.3130000000003 Td
 /F1.0 10.5 Tf
-<3c20737472696e672c20> Tj
+[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-315.25842192000005 295.9330000000004 Td
-/F1.0 10.5 Tf
-<45787465726e616c436f6d706f6e656e74> Tj
+48.24000000000001 302.6960000000003 Td
+/F2.0 13 Tf
+<322e32392e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-415.81692192 295.9330000000004 Td
+56.88050000000001 276.0360000000003 Td
 /F1.0 10.5 Tf
-<203e206d6170> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 278.22000000000025 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 240.5760000000003 Td
+/F2.0 18 Tf
+<322e33302e20474554202f76322f74656d706c617465732f6e616d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 206.3360000000003 Td
+/F2.0 13 Tf
+<322e33302e312e20526573706f6e736573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 154.080 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 154.080 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 154.080 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 130.800 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 130.800 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 130.800 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 191.640 m
+99.792 191.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 154.080 m
+99.792 154.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 191.890 m
+48.240 153.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+99.792 191.890 m
+99.792 153.330 l
 S
 [ ] 0 d
 1 w
@@ -23848,46 +22546,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000003 Td
+51.24000000000001 175.89300000000028 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 251.23300000000032 Td
+<48545450> Tj
 ET
 
 
 BT
-51.24 251.23300000000032 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+51.24000000000001 161.61300000000028 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+99.792 191.640 m
+460.656 191.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+99.792 154.080 m
+460.656 154.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+99.792 191.890 m
+99.792 153.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+460.656 191.890 m
+460.656 153.330 l
 S
 [ ] 0 d
 1 w
@@ -23895,34 +22588,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.37300000000033 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+102.792 175.89300000000028 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+460.656 191.640 m
+563.760 191.640 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+460.656 154.080 m
+563.760 154.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+460.656 191.890 m
+460.656 153.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+563.760 191.890 m
+563.760 153.330 l
 S
 [ ] 0 d
 1 w
@@ -23930,46 +22623,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000037 Td
+463.65600000000006 175.89300000000028 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
-ET
-
-
-BT
-51.24 213.67300000000037 Td
-ET
-
-
-BT
-51.24 213.67300000000037 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+48.240 154.080 m
+99.792 154.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+48.240 130.800 m
+99.792 130.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+48.240 154.330 m
+48.240 130.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+99.792 154.330 m
+99.792 130.550 l
 S
 [ ] 0 d
 1 w
@@ -23977,34 +22658,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.81300000000036 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+51.24000000000001 137.83300000000028 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+99.792 154.080 m
+460.656 154.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+99.792 130.800 m
+460.656 130.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+99.792 154.330 m
+99.792 130.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+460.656 154.330 m
+460.656 130.550 l
 S
 [ ] 0 d
 1 w
@@ -24012,46 +22693,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000037 Td
-/F2.0 10.5 Tf
-<64636165426c75657072696e744964> Tj
-ET
-
-
-BT
-51.24 176.11300000000037 Td
-ET
-
-
-BT
-51.24 176.11300000000037 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+102.792 137.83300000000028 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+460.656 154.080 m
+563.760 154.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+460.656 130.800 m
+563.760 130.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+460.656 154.330 m
+460.656 130.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 154.330 m
+563.760 130.550 l
 S
 [ ] 0 d
 1 w
@@ -24059,34 +22728,213 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000036 Td
+463.65600000000006 137.83300000000028 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 101.21600000000026 Td
+/F2.0 13 Tf
+<322e33302e322e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 74.55600000000027 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 76.74000000000026 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3134> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+192 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 191 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [195 0 R 200 0 R]
+>>
+endobj
+193 0 obj
+[192 0 R /XYZ 0 683.1600000000001 null]
+endobj
+194 0 obj
+<< /Limits [(_responses_2) (_responses_3)]
+/Names [(_responses_2) 35 0 R (_responses_20) 138 0 R (_responses_21) 144 0 R (_responses_22) 155 0 R (_responses_23) 162 0 R (_responses_24) 170 0 R (_responses_25) 174 0 R (_responses_26) 182 0 R (_responses_27) 186 0 R (_responses_28) 193 0 R (_responses_29) 199 0 R (_responses_3) 39 0 R]
+>>
+endobj
+195 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [463.65600000000006 594.0070000000002 524.955 608.2870000000001]
+/Type /Annot
+>>
+endobj
+196 0 obj
+[192 0 R /XYZ 0 578.0400000000002 null]
+endobj
+197 0 obj
+[192 0 R /XYZ 0 521.7600000000003 null]
+endobj
+198 0 obj
+[192 0 R /XYZ 0 465.48000000000036 null]
+endobj
+199 0 obj
+[192 0 R /XYZ 0 425.4000000000003 null]
+endobj
+200 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [463.65600000000006 336.2470000000003 535.2997558593751 350.52700000000027]
+/Type /Annot
+>>
+endobj
+201 0 obj
+[192 0 R /XYZ 0 320.2800000000003 null]
+endobj
+202 0 obj
+[192 0 R /XYZ 0 264.0000000000003 null]
+endobj
+203 0 obj
+[192 0 R /XYZ 0 223.9200000000003 null]
+endobj
+204 0 obj
+[192 0 R /XYZ 0 118.80000000000027 null]
+endobj
+205 0 obj
+<< /Length 7931
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
+/F2.0 18 Tf
+<322e33312e20474554202f76322f74656d706c617465732f7b74656d706c6174654e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 700.7360000000001 Td
+/F2.0 13 Tf
+[<322e33312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 662.760 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 662.760 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 662.760 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 625.200 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 625.200 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 625.200 229.120 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 686.040 m
+162.800 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 686.290 m
+48.240 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 1 w
@@ -24094,46 +22942,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000037 Td
+51.24 670.2930000000001 Td
 /F2.0 10.5 Tf
-[<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
-ET
-
-
-BT
-51.24 138.55300000000037 Td
-ET
-
-
-BT
-51.24 138.55300000000037 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+162.800 686.040 m
+334.640 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 1 w
@@ -24141,34 +22977,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.69300000000035 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+165.79988544 670.2930000000001 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+334.640 686.040 m
+563.760 686.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+563.760 686.290 m
+563.760 662.010 l
 S
 [ ] 0 d
 1 w
@@ -24176,46 +23012,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000035 Td
+337.6397136 670.2930000000001 Td
 /F2.0 10.5 Tf
-[<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
-ET
-
-
-BT
-51.24 100.99300000000035 Td
-ET
-
-
-BT
-51.24 100.99300000000035 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+48.240 625.200 m
+162.800 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+48.240 663.010 m
+48.240 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 1 w
@@ -24223,34 +23047,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13300000000035 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+51.24 639.3730000000002 Td
+/F2.0 10.5 Tf
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+162.800 625.200 m
+334.640 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 1 w
@@ -24258,243 +23082,158 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000032 Td
+165.79988544 646.5130000000001 Td
 /F2.0 10.5 Tf
-<676c6f62616c50726f706572746965734a736f6e> Tj
+<74656d706c6174654e616d65> Tj
 ET
 
 
 BT
-51.24 63.43300000000032 Td
+165.79988544 632.2330000000002 Td
 ET
 
 
 BT
-51.24 63.43300000000032 Td
+165.79988544 632.2330000000002 Td
 /F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+334.640 625.200 m
+563.760 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 663.010 m
+563.760 624.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.57300000000032 Td
+337.6397136 639.3730000000002 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-q
 0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3135> Tj
+48.24 595.6160000000003 Td
+/F2.0 13 Tf
+<322e33312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-166 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 165 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [168 0 R 169 0 R]
->>
-endobj
-167 0 obj
-[166 0 R /XYZ 0 420.2400000000004 null]
-endobj
-168 0 obj
-<< /Border [0 0 0]
-/Dest (_externalcomponent)
-/Subtype /Link
-/Rect [315.25842192000005 292.86700000000036 415.81692192 307.1470000000004]
-/Type /Annot
->>
-endobj
-169 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 67.50700000000032 325.32792192000005 81.78700000000032]
-/Type /Annot
->>
-endobj
-170 0 obj
-<< /Length 22836
->>
-stream
-q
-/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
+48.240 543.360 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
+99.792 543.360 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
+460.656 543.360 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
+48.240 520.080 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
+99.792 520.080 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
+460.656 520.080 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 580.920 m
+99.792 580.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 543.360 m
+99.792 543.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 581.170 m
+48.240 542.610 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 581.170 m
+99.792 542.610 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 565.1730000000005 Td
+/F2.0 10.5 Tf
+<48545450> Tj
+ET
+
+
+BT
+51.24 550.8930000000004 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
+ET
+
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+99.792 580.920 m
+460.656 580.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+99.792 581.170 m
+99.792 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+460.656 581.170 m
+460.656 542.610 l
 S
 [ ] 0 d
 1 w
@@ -24502,34 +23241,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+102.792 565.1730000000005 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+460.656 580.920 m
+563.760 580.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+460.656 581.170 m
+460.656 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 581.170 m
+563.760 542.610 l
 S
 [ ] 0 d
 1 w
@@ -24537,7 +23276,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+463.65600000000006 565.1730000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -24545,26 +23284,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 543.360 m
+99.792 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 520.080 m
+99.792 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 543.610 m
+48.240 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+99.792 543.610 m
+99.792 519.830 l
 S
 [ ] 0 d
 1 w
@@ -24572,46 +23311,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 527.1130000000003 Td
 /F2.0 10.5 Tf
-<6c617374436f6d70757465645374617465> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+99.792 520.080 m
+460.656 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+99.792 543.610 m
+99.792 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+460.656 543.610 m
+460.656 519.830 l
 S
 [ ] 0 d
 1 w
@@ -24619,145 +23346,241 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 716.473 Td
-/F1.0 10.5 Tf
-[<656e756d202844455349474e2c205355424d49545445442c204445504c4f> 29.78515625 <5945442c2052> 9.765625 <554e4e494e472c>] TJ
-ET
-
-
-BT
-272.17692192000004 702.193 Td
+102.792 527.1130000000003 Td
 /F1.0 10.5 Tf
-[<53> 20.01953125 <54> 20.01953125 <4f505045442c20494e5f455252> 20.01953125 <4f522c2057> 60.05859375 <414954494e4729>] TJ
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+460.656 520.080 m
+563.760 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+460.656 543.610 m
+460.656 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+563.760 543.610 m
+563.760 519.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-51.24 678.913 Td
-/F2.0 10.5 Tf
-<6c6f6f704c6f6773> Tj
+463.65600000000006 527.1130000000003 Td
+/F1.0 10.5 Tf
+[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 664.6329999999999 Td
+48.24 490.4960000000004 Td
+/F2.0 13 Tf
+<322e33312e332e2050726f6475636573> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 664.6329999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+56.88050000000001 463.83600000000035 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
-S
-[ ] 0 d
-1 w
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 466.0200000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-272.17692192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<3c20> Tj
+552.698 14.388 Td
+/F1.0 9 Tf
+<3135> Tj
 ET
 
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+206 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 205 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [210 0 R]
+>>
+endobj
+207 0 obj
+[206 0 R /XYZ 0 792.0 null]
+endobj
+208 0 obj
+[206 0 R /XYZ 0 718.32 null]
+endobj
+209 0 obj
+[206 0 R /XYZ 0 613.2000000000003 null]
+endobj
+210 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [463.65600000000006 524.0470000000004 535.2997558593751 538.3270000000003]
+/Type /Annot
+>>
+endobj
+211 0 obj
+[206 0 R /XYZ 0 508.0800000000004 null]
+endobj
+212 0 obj
+<< /Limits [(_produces_28) (_responses)]
+/Names [(_produces_28) 201 0 R (_produces_29) 204 0 R (_produces_3) 40 0 R (_produces_30) 211 0 R (_produces_4) 46 0 R (_produces_5) 53 0 R (_produces_6) 60 0 R (_produces_7) 65 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
+>>
+endobj
+213 0 obj
+<< /Length 15761
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
 
 BT
-280.76592192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<4c6f6f704c6f67> Tj
+48.24 730.304 Td
+/F2.0 22 Tf
+<4368617074657220332e20446566696e6974696f6e73> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-324.10992192000003 671.7729999999999 Td
-/F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+48.24 688.656 Td
+/F2.0 18 Tf
+<332e312e20436c64734865616c7468436865636b> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 648.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 648.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 611.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 611.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 573.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 573.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 536.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 536.040 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 672.000 m
+269.177 672.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 648.720 m
+269.177 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 672.250 m
+48.240 647.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 672.250 m
+269.177 647.970 l
 S
 [ ] 0 d
 1 w
@@ -24765,89 +23588,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3529999999998 Td
+51.24 656.2529999999999 Td
 /F2.0 10.5 Tf
-[<6c6f6f7054> 29.78515625 <656d706c617465>] TJ
-ET
-
-
-BT
-51.24 627.0729999999999 Td
-ET
-
-
-BT
-51.24 627.0729999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 672.000 m
+563.760 672.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 648.720 m
+563.760 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 672.250 m
+269.177 647.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 672.250 m
+563.760 647.970 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 634.2129999999999 Td
-/F1.0 10.5 Tf
-[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
+272.17692192000004 656.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 648.720 m
+269.177 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 611.160 m
+269.177 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 648.970 m
+48.240 610.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 648.970 m
+269.177 610.910 l
 S
 [ ] 0 d
 1 w
@@ -24855,19 +23658,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 632.473 Td
 /F2.0 10.5 Tf
-<6d6963726f53657276696365506f6c6963696573> Tj
+<6465736372697074696f6e> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 618.193 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 618.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24875,83 +23678,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 648.720 m
+563.760 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 611.160 m
+563.760 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 648.970 m
+269.177 610.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 648.970 m
+563.760 610.910 l
 S
 [ ] 0 d
 1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 596.6529999999999 Td
-/F1.0 10.5 Tf
-<3c20> Tj
-ET
-
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-280.76592192000004 596.6529999999999 Td
-/F1.0 10.5 Tf
-<4d6963726f53657276696365506f6c696379> Tj
-ET
-
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-376.69392192000004 596.6529999999999 Td
+272.17692192000004 625.333 Td
 /F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 611.160 m
+269.177 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 573.600 m
+269.177 573.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 611.410 m
+48.240 573.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 611.410 m
+269.177 573.350 l
 S
 [ ] 0 d
 1 w
@@ -24959,19 +23740,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 594.913 Td
 /F2.0 10.5 Tf
-<6d6f64656c53657276696365> Tj
+<6865616c7468436865636b436f6d706f6e656e74> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 580.6329999999999 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 580.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24979,69 +23760,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 611.160 m
+563.760 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 573.600 m
+563.760 573.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 611.410 m
+269.177 573.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 611.410 m
+563.760 573.350 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 587.7729999999999 Td
 /F1.0 10.5 Tf
-<53657276696365> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 573.600 m
+269.177 573.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 536.040 m
+269.177 536.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 573.850 m
+48.240 535.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 573.850 m
+269.177 535.790 l
 S
 [ ] 0 d
 1 w
@@ -25049,19 +23822,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 557.3530000000001 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<6865616c7468436865636b537461747573> Tj
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 543.073 Td
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 543.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25069,26 +23842,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 573.600 m
+563.760 573.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 536.040 m
+563.760 536.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 573.850 m
+269.177 535.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 573.850 m
+563.760 535.790 l
 S
 [ ] 0 d
 1 w
@@ -25096,34 +23869,117 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5329999999999 Td
+272.17692192000004 550.213 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 500.61600000000004 Td
+/F2.0 18 Tf
+<332e322e20436c6473496e666f> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 460.680 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 460.680 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 423.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 423.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 385.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 385.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 348.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 348.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 310.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 310.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 272.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 272.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 235.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 235.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 197.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 197.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 160.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 160.200 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 483.960 m
+269.177 483.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 460.680 m
+269.177 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 484.210 m
+48.240 459.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 484.210 m
+269.177 459.930 l
 S
 [ ] 0 d
 1 w
@@ -25131,103 +23987,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.1129999999999 Td
+51.24 468.21299999999997 Td
 /F2.0 10.5 Tf
-[<6f706572> 20.01953125 <6174696f6e616c506f6c6963696573>] TJ
-ET
-
-
-BT
-51.24 476.83299999999986 Td
-ET
-
-
-BT
-51.24 476.83299999999986 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 483.960 m
+563.760 483.960 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 460.680 m
+563.760 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 484.210 m
+269.177 459.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 484.210 m
+563.760 459.930 l
 S
 [ ] 0 d
 1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 483.9729999999999 Td
-/F1.0 10.5 Tf
-<3c20> Tj
-ET
-
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-280.76592192000004 483.9729999999999 Td
-/F1.0 10.5 Tf
-[<4f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
-ET
-
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-370.37271684187505 483.9729999999999 Td
-/F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+272.17692192000004 468.21299999999997 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 460.680 m
+269.177 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 423.120 m
+269.177 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 460.930 m
+48.240 422.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 460.930 m
+269.177 422.870 l
 S
 [ ] 0 d
 1 w
@@ -25235,19 +24057,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55299999999994 Td
+51.24 444.43299999999994 Td
 /F2.0 10.5 Tf
-<737667526570726573656e746174696f6e> Tj
+[<636c647356> 60.05859375 <657273696f6e>] TJ
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 430.1529999999999 Td
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 430.1529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25255,26 +24077,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 460.680 m
+563.760 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 423.120 m
+563.760 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 460.930 m
+269.177 422.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 460.930 m
+563.760 422.870 l
 S
 [ ] 0 d
 1 w
@@ -25282,7 +24104,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.41299999999995 Td
+272.17692192000004 437.29299999999995 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -25290,26 +24112,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 423.120 m
+269.177 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 385.560 m
+269.177 385.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 423.370 m
+48.240 385.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 423.370 m
+269.177 385.310 l
 S
 [ ] 0 d
 1 w
@@ -25317,19 +24139,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 406.873 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<7065726d697373696f6e52656164436c> Tj
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 392.59299999999996 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 392.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25337,26 +24159,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 423.120 m
+563.760 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 385.560 m
+563.760 385.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 423.370 m
+269.177 385.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 423.370 m
+563.760 385.310 l
 S
 [ ] 0 d
 1 w
@@ -25364,34 +24186,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.853 Td
+272.17692192000004 399.733 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 385.560 m
+269.177 385.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 348.000 m
+269.177 348.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 385.810 m
+48.240 347.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 385.810 m
+269.177 347.750 l
 S
 [ ] 0 d
 1 w
@@ -25399,19 +24221,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.43300000000005 Td
+51.24 369.31299999999993 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<7065726d697373696f6e5265616454> 29.78515625 <656d706c617465>] TJ
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 355.0329999999999 Td
 ET
 
 
 BT
-51.24 364.153 Td
+51.24 355.0329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25419,26 +24241,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 385.560 m
+563.760 385.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 348.000 m
+563.760 348.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 385.810 m
+269.177 347.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 385.810 m
+563.760 347.750 l
 S
 [ ] 0 d
 1 w
@@ -25446,101 +24268,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.29300000000006 Td
+272.17692192000004 362.17299999999994 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 321.6960000000001 Td
-/F2.0 18 Tf
-<332e31302e204c6f6f704c6f67> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 56.400 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 305.040 m
-269.177 305.040 l
+48.240 348.000 m
+269.177 348.000 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 310.440 m
+269.177 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 305.290 m
-48.240 281.010 l
+48.240 348.250 m
+48.240 310.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 305.290 m
-269.177 281.010 l
+269.177 348.250 m
+269.177 310.190 l
 S
 [ ] 0 d
 1 w
@@ -25548,34 +24303,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 289.293 Td
+51.24 331.753 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+[<7065726d697373696f6e5265616454> 29.78515625 <6f736361>] TJ
+ET
+
+
+BT
+51.24 317.47299999999996 Td
+ET
+
+
+BT
+51.24 317.47299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 305.040 m
-563.760 305.040 l
+269.177 348.000 m
+563.760 348.000 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 310.440 m
+563.760 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 305.290 m
-269.177 281.010 l
+269.177 348.250 m
+269.177 310.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 305.290 m
-563.760 281.010 l
+563.760 348.250 m
+563.760 310.190 l
 S
 [ ] 0 d
 1 w
@@ -25583,34 +24350,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 289.293 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 324.613 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 310.440 m
+269.177 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 272.880 m
+269.177 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 310.690 m
+48.240 272.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 310.690 m
+269.177 272.630 l
 S
 [ ] 0 d
 1 w
@@ -25618,19 +24385,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.513 Td
+51.24 294.1929999999999 Td
 /F2.0 10.5 Tf
-<6964> Tj
+<7065726d697373696f6e557064617465436c> Tj
 ET
 
 
 BT
-51.24 251.23299999999998 Td
+51.24 279.9129999999999 Td
 ET
 
 
 BT
-51.24 251.23299999999998 Td
+51.24 279.9129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25638,26 +24405,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 310.440 m
+563.760 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 272.880 m
+563.760 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 310.690 m
+269.177 272.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 310.690 m
+563.760 272.630 l
 S
 [ ] 0 d
 1 w
@@ -25665,34 +24432,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.373 Td
+272.17692192000004 287.05299999999994 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 272.880 m
+269.177 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 235.320 m
+269.177 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 273.130 m
+48.240 235.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 273.130 m
+269.177 235.070 l
 S
 [ ] 0 d
 1 w
@@ -25700,19 +24467,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000003 Td
+51.24 256.633 Td
 /F2.0 10.5 Tf
-<6c6f67436f6d706f6e656e74> Tj
+[<7065726d697373696f6e55706461746554> 29.78515625 <656d706c617465>] TJ
 ET
 
 
 BT
-51.24 213.67300000000003 Td
+51.24 242.35299999999998 Td
 ET
 
 
 BT
-51.24 213.67300000000003 Td
+51.24 242.35299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25720,108 +24487,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 272.880 m
+563.760 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 235.320 m
+563.760 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 273.130 m
+269.177 235.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 220.81300000000002 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 190.39300000000003 Td
-/F2.0 10.5 Tf
-<6c6f67496e7374616e74> Tj
-ET
-
-
-BT
-51.24 176.11300000000003 Td
-ET
-
-
-BT
-51.24 176.11300000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 273.130 m
+563.760 235.070 l
 S
 [ ] 0 d
 1 w
@@ -25829,34 +24514,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000001 Td
+272.17692192000004 249.49299999999997 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 235.320 m
+269.177 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 197.760 m
+269.177 197.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 235.570 m
+48.240 197.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 235.570 m
+269.177 197.510 l
 S
 [ ] 0 d
 1 w
@@ -25864,19 +24549,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000003 Td
+51.24 219.07299999999998 Td
 /F2.0 10.5 Tf
-<6c6f6754797065> Tj
+[<7065726d697373696f6e55706461746554> 29.78515625 <6f736361>] TJ
 ET
 
 
 BT
-51.24 138.55300000000003 Td
+51.24 204.79299999999998 Td
 ET
 
 
 BT
-51.24 138.55300000000003 Td
+51.24 204.79299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25884,26 +24569,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 235.320 m
+563.760 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 197.760 m
+563.760 197.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 235.570 m
+269.177 197.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 235.570 m
+563.760 197.510 l
 S
 [ ] 0 d
 1 w
@@ -25911,34 +24596,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.693 Td
+272.17692192000004 211.93299999999996 Td
 /F1.0 10.5 Tf
-[<656e756d2028494e464f2c2057> 60.05859375 <41524e494e472c20455252> 20.01953125 <4f5229>] TJ
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 197.760 m
+269.177 197.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 160.200 m
+269.177 160.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 198.010 m
+48.240 159.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 198.010 m
+269.177 159.950 l
 S
 [ ] 0 d
 1 w
@@ -25946,19 +24631,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000001 Td
+51.24 181.51299999999995 Td
 /F2.0 10.5 Tf
-<6c6f6f70> Tj
+<757365724e616d65> Tj
 ET
 
 
 BT
-51.24 100.99300000000001 Td
+51.24 167.23299999999995 Td
 ET
 
 
 BT
-51.24 100.99300000000001 Td
+51.24 167.23299999999995 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25966,128 +24651,49 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 197.760 m
+563.760 197.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 160.200 m
+563.760 160.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 198.010 m
+269.177 159.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 198.010 m
+563.760 159.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.13300000000001 Td
+272.17692192000004 174.37299999999993 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 77.71300000000001 Td
-/F2.0 10.5 Tf
-<6d657373616765> Tj
-ET
-
-
-BT
-51.24 63.43300000000001 Td
-ET
-
-
-BT
-51.24 63.43300000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+48.24 124.77599999999991 Td
+/F2.0 18 Tf
+<332e332e2044696374696f6e617279> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 70.57300000000001 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -26113,201 +24719,134 @@ Q
 
 endstream
 endobj
-171 0 obj
+214 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 170 0 R
+/Contents 213 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [172 0 R 173 0 R 174 0 R 175 0 R 176 0 R 178 0 R]
->>
-endobj
-172 0 obj
-<< /Border [0 0 0]
-/Dest (_looplog)
-/Subtype /Link
-/Rect [280.76592192000004 668.707 324.10992192000003 682.987]
-/Type /Annot
+/XObject << /Stamp1 603 0 R
 >>
-endobj
-173 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [272.17692192000004 631.1469999999999 343.82067777937505 645.4269999999999]
-/Type /Annot
 >>
-endobj
-174 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [280.76592192000004 593.587 376.69392192000004 607.867]
-/Type /Annot
 >>
 endobj
-175 0 obj
-<< /Border [0 0 0]
-/Dest (_service)
-/Subtype /Link
-/Rect [272.17692192000004 556.027 308.65392192 570.307]
-/Type /Annot
->>
+215 0 obj
+[214 0 R /XYZ 0 792.0 null]
 endobj
-176 0 obj
-<< /Border [0 0 0]
-/Dest (_operationalpolicy)
-/Subtype /Link
-/Rect [280.76592192000004 480.90699999999987 370.37271684187505 495.1869999999999]
-/Type /Annot
->>
+216 0 obj
+[214 0 R /XYZ 0 712.0799999999999 null]
 endobj
-177 0 obj
-[171 0 R /XYZ 0 345.12000000000006 null]
+217 0 obj
+[214 0 R /XYZ 0 524.04 null]
 endobj
-178 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [272.17692192000004 105.06700000000001 297.27192192000007 119.34700000000001]
-/Type /Annot
->>
+218 0 obj
+[214 0 R /XYZ 0 148.19999999999993 null]
 endobj
-179 0 obj
-<< /Length 20491
+219 0 obj
+<< /Length 21216
 >>
 stream
 q
 /DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 734.976 Td
-/F2.0 18 Tf
-[<332e31312e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.040 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.040 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 657.480 220.937 37.560 re
+48.240 732.720 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 657.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 619.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 619.920 294.583 37.560 re
+269.177 732.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 582.360 220.937 37.560 re
+48.240 695.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 582.360 294.583 37.560 re
+269.177 695.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 544.800 220.937 37.560 re
+48.240 657.600 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 544.800 294.583 37.560 re
+269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 507.240 220.937 37.560 re
+48.240 620.040 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 507.240 294.583 37.560 re
+269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 469.680 220.937 37.560 re
+48.240 582.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 469.680 294.583 37.560 re
+269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 432.120 220.937 37.560 re
+48.240 544.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 432.120 294.583 37.560 re
+269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 394.560 220.937 37.560 re
+48.240 507.360 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 394.560 294.583 37.560 re
+269.177 507.360 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 357.000 220.937 37.560 re
+48.240 469.800 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 357.000 294.583 37.560 re
+269.177 469.800 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 319.440 220.937 37.560 re
+48.240 432.240 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 319.440 294.583 37.560 re
+269.177 432.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 718.320 m
-269.177 718.320 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.040 m
-269.177 695.040 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 718.570 m
-48.240 694.290 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.570 m
-269.177 694.290 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -26315,7 +24854,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 702.573 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -26323,26 +24862,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.320 m
-563.760 718.320 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 695.040 m
-563.760 695.040 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.570 m
-269.177 694.290 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 718.570 m
-563.760 694.290 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -26350,7 +24889,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 702.573 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -26358,26 +24897,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.040 m
-269.177 695.040 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.480 m
-269.177 657.480 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.290 m
-48.240 657.230 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.290 m
-269.177 657.230 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -26385,19 +24924,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.7930000000001 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
-<626c75657072696e74> Tj
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 664.513 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 664.513 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26405,26 +24944,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.040 m
-563.760 695.040 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.480 m
-563.760 657.480 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.290 m
-269.177 657.230 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.290 m
-563.760 657.230 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -26432,7 +24971,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.653 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -26440,26 +24979,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.480 m
-269.177 657.480 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.920 m
-269.177 619.920 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.730 m
-48.240 619.670 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.730 m
-269.177 619.670 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -26467,19 +25006,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.233 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 626.953 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 626.953 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26487,26 +25026,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.480 m
-563.760 657.480 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.920 m
-563.760 619.920 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.730 m
-269.177 619.670 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.730 m
-563.760 619.670 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -26514,34 +25053,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.093 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.920 m
-269.177 619.920 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.360 m
-269.177 582.360 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.170 m
-48.240 582.110 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.170 m
-269.177 582.110 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -26549,183 +25088,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.673 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+<64696374696f6e617279456c656d656e7473> Tj
 ET
 
 
 BT
-51.24 589.393 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 589.393 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 619.920 m
-563.760 619.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.360 m
-563.760 582.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 620.170 m
-269.177 582.110 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 620.170 m
-563.760 582.110 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 596.533 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 582.360 m
-269.177 582.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 544.800 m
-269.177 544.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 582.610 m
-48.240 544.550 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.610 m
-269.177 544.550 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 566.113 Td
-/F2.0 10.5 Tf
-<6d6178696d756d496e7374616e636573416c6c6f776564> Tj
-ET
-
-
-BT
-51.24 551.833 Td
-ET
-
-
-BT
-51.24 551.833 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.360 m
-563.760 582.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.800 m
-563.760 544.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.610 m
-269.177 544.550 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 582.610 m
-563.760 544.550 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 558.973 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 544.800 m
-269.177 544.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.240 m
-269.177 507.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 545.050 m
-48.240 506.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.050 m
-269.177 506.990 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 528.5530000000001 Td
-/F2.0 10.5 Tf
-<6d6963726f536572766963654d6f64656c55736564> Tj
-ET
-
-
-BT
-51.24 514.273 Td
-ET
-
-
-BT
-51.24 514.273 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26733,26 +25108,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.800 m
-563.760 544.800 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.240 m
-563.760 507.240 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.050 m
-269.177 506.990 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.050 m
-563.760 506.990 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -26764,7 +25139,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.413 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -26773,16 +25148,16 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 521.413 Td
+280.76592192000004 634.213 Td
 /F1.0 10.5 Tf
-[<54> 29.78515625 <656d706c6174654d6963726f536572766963654d6f64656c>] TJ
+<44696374696f6e617279456c656d656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-424.355677779375 521.413 Td
+374.97192192000006 634.213 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -26790,26 +25165,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.240 m
-269.177 507.240 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.680 m
-269.177 469.680 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.490 m
-48.240 469.430 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.490 m
-269.177 469.430 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -26817,19 +25192,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.993 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-<6d6f64656c53657276696365> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-51.24 476.71299999999997 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 476.71299999999997 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26837,69 +25212,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.240 m
-563.760 507.240 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.680 m
-563.760 469.680 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.490 m
-269.177 469.430 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.490 m
-563.760 469.430 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.853 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-<53657276696365> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.680 m
-269.177 469.680 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.120 m
-269.177 432.120 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.930 m
-48.240 431.870 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.930 m
-269.177 431.870 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -26907,19 +25274,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.43300000000005 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<7365636f6e644c6576656c44696374696f6e617279> Tj
 ET
 
 
 BT
-51.24 439.153 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 439.153 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26927,26 +25294,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.680 m
-563.760 469.680 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.120 m
-563.760 432.120 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.930 m
-269.177 431.870 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.930 m
-563.760 431.870 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -26954,34 +25321,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.29300000000006 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.120 m
-269.177 432.120 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.560 m
-269.177 394.560 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.370 m
-48.240 394.310 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.370 m
-269.177 394.310 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -26989,19 +25356,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.873 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<737667526570726573656e746174696f6e> Tj
+<73756244696374696f6e61727954797065> Tj
 ET
 
 
 BT
-51.24 401.59299999999996 Td
+51.24 514.3929999999999 Td
 ET
 
 
 BT
-51.24 401.59299999999996 Td
+51.24 514.3929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27009,26 +25376,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.120 m
-563.760 432.120 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.560 m
-563.760 394.560 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.370 m
-269.177 394.310 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.370 m
-563.760 394.310 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -27036,7 +25403,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.733 Td
+272.17692192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -27044,26 +25411,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.560 m
-269.177 394.560 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.000 m
-269.177 357.000 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.810 m
-48.240 356.750 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.810 m
-269.177 356.750 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -27071,19 +25438,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.313 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
 [<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 364.033 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 364.033 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27091,26 +25458,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.560 m
-563.760 394.560 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.000 m
-563.760 357.000 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.810 m
-269.177 356.750 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.810 m
-563.760 356.750 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -27118,7 +25485,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.173 Td
+272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -27126,26 +25493,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.000 m
-269.177 357.000 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.440 m
-269.177 319.440 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.250 m
-48.240 319.190 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.250 m
-269.177 319.190 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -27153,19 +25520,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.753 Td
+51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
 <7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 326.47299999999996 Td
+51.24 439.2729999999999 Td
 ET
 
 
 BT
-51.24 326.47299999999996 Td
+51.24 439.2729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27173,26 +25540,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.000 m
-563.760 357.000 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.440 m
-563.760 319.440 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.250 m
-269.177 319.190 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.250 m
-563.760 319.190 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -27200,7 +25567,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.613 Td
+272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -27210,83 +25577,107 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 284.016 Td
+48.24 396.816 Td
 /F2.0 18 Tf
-<332e31322e204d6963726f536572766963654d6f64656c> Tj
+<332e342e2044696374696f6e617279456c656d656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 244.080 220.937 23.280 re
+48.240 356.880 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.320 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.080 294.583 23.280 re
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 281.760 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.520 220.937 37.560 re
+48.240 244.200 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.520 294.583 37.560 re
+269.177 244.200 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 168.960 220.937 37.560 re
+48.240 206.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 168.960 294.583 37.560 re
+269.177 206.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.400 220.937 37.560 re
+48.240 169.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.400 294.583 37.560 re
+269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 93.840 220.937 37.560 re
+48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 93.840 294.583 37.560 re
+269.177 131.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.280 220.937 37.560 re
+48.240 93.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.280 294.583 37.560 re
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 267.360 m
-269.177 267.360 l
+48.240 380.160 m
+269.177 380.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 244.080 m
-269.177 244.080 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 267.610 m
-48.240 243.330 l
+48.240 380.410 m
+48.240 356.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.610 m
-269.177 243.330 l
+269.177 380.410 m
+269.177 356.130 l
 S
 [ ] 0 d
 1 w
@@ -27294,7 +25685,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 251.61299999999994 Td
+51.24 364.4129999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -27302,26 +25693,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.360 m
-563.760 267.360 l
+269.177 380.160 m
+563.760 380.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 244.080 m
-563.760 244.080 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.610 m
-269.177 243.330 l
+269.177 380.410 m
+269.177 356.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 267.610 m
-563.760 243.330 l
+563.760 380.410 m
+563.760 356.130 l
 S
 [ ] 0 d
 1 w
@@ -27329,7 +25720,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 251.61299999999994 Td
+272.17692192000004 364.4129999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -27337,26 +25728,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.080 m
-269.177 244.080 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.520 m
-269.177 206.520 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.330 m
-48.240 206.270 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.330 m
-269.177 206.270 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -27364,19 +25755,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.83299999999997 Td
+51.24 340.63299999999987 Td
 /F2.0 10.5 Tf
-<626c75657072696e74> Tj
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 213.55299999999997 Td
+51.24 326.35299999999984 Td
 ET
 
 
 BT
-51.24 213.55299999999997 Td
+51.24 326.35299999999984 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27384,26 +25775,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.080 m
-563.760 244.080 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.520 m
-563.760 206.520 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.330 m
-269.177 206.270 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.330 m
-563.760 206.270 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -27411,7 +25802,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.69299999999996 Td
+272.17692192000004 333.4929999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -27419,26 +25810,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.520 m
-269.177 206.520 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.960 m
-269.177 168.960 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.770 m
-48.240 168.710 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.770 m
-269.177 168.710 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -27446,19 +25837,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.27299999999997 Td
+51.24 303.0729999999999 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 175.99299999999997 Td
+51.24 288.7929999999999 Td
 ET
 
 
 BT
-51.24 175.99299999999997 Td
+51.24 288.7929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27466,26 +25857,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.520 m
-563.760 206.520 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.960 m
-563.760 168.960 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.770 m
-269.177 168.710 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.770 m
-563.760 168.710 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -27493,34 +25884,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.13299999999995 Td
+272.17692192000004 295.93299999999994 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.960 m
-269.177 168.960 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.400 m
-269.177 131.400 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.210 m
-48.240 131.150 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.210 m
-269.177 131.150 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -27528,19 +25919,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.71299999999997 Td
+51.24 265.51299999999986 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+<6465736372697074696f6e> Tj
 ET
 
 
 BT
-51.24 138.43299999999996 Td
+51.24 251.23299999999986 Td
 ET
 
 
 BT
-51.24 138.43299999999996 Td
+51.24 251.23299999999986 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27548,26 +25939,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.960 m
-563.760 168.960 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.400 m
-563.760 131.400 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.210 m
-269.177 131.150 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.210 m
-563.760 131.150 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -27575,34 +25966,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.57299999999995 Td
+272.17692192000004 258.3729999999999 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.400 m
-269.177 131.400 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.840 m
-269.177 93.840 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.650 m
-48.240 93.590 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.650 m
-269.177 93.590 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -27610,19 +26001,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.15299999999995 Td
+51.24 227.95299999999992 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 100.87299999999995 Td
+51.24 213.67299999999992 Td
 ET
 
 
 BT
-51.24 100.87299999999995 Td
+51.24 213.67299999999992 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27630,26 +26021,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.400 m
-563.760 131.400 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.840 m
-563.760 93.840 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.650 m
-269.177 93.590 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.650 m
-563.760 93.590 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -27657,7 +26048,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.01299999999995 Td
+272.17692192000004 220.8129999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -27665,26 +26056,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.840 m
-269.177 93.840 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.280 m
-269.177 56.280 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.090 m
-48.240 56.030 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.090 m
-269.177 56.030 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -27692,19 +26083,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.59299999999995 Td
+51.24 190.39299999999992 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<73686f72744e616d65> Tj
 ET
 
 
 BT
-51.24 63.312999999999946 Td
+51.24 176.11299999999991 Td
 ET
 
 
 BT
-51.24 63.312999999999946 Td
+51.24 176.11299999999991 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27712,46 +26103,284 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.840 m
-563.760 93.840 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.280 m
-563.760 56.280 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.090 m
-269.177 56.030 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.090 m
-563.760 56.030 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 183.2529999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.8329999999999 Td
+/F2.0 10.5 Tf
+<73756244696374696f6e617279> Tj
+ET
+
+
+BT
+51.24 138.5529999999999 Td
+ET
+
+
+BT
+51.24 138.5529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.45299999999995 Td
+272.17692192000004 145.6929999999999 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.2729999999999 Td
+/F2.0 10.5 Tf
+<74797065> Tj
+ET
+
+
+BT
+51.24 100.9929999999999 Td
+ET
+
+
+BT
+51.24 100.9929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.1329999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71299999999987 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 63.432999999999865 Td
+ET
+
+
+BT
+51.24 63.432999999999865 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57299999999987 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -27777,54 +26406,35 @@ Q
 
 endstream
 endobj
-180 0 obj
+220 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 179 0 R
+/Contents 219 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 382 0 R
->>
+/XObject << /Stamp1 603 0 R
 >>
-/Annots [182 0 R 183 0 R 185 0 R]
 >>
-endobj
-181 0 obj
-[180 0 R /XYZ 0 792.0 null]
-endobj
-182 0 obj
-<< /Border [0 0 0]
-/Dest (_templatemicroservicemodel)
-/Subtype /Link
-/Rect [280.76592192000004 518.3470000000001 424.355677779375 532.6270000000001]
-/Type /Annot
+/Annots [221 0 R]
 >>
 endobj
-183 0 obj
+221 0 obj
 << /Border [0 0 0]
-/Dest (_service)
+/Dest (_dictionaryelement)
 /Subtype /Link
-/Rect [272.17692192000004 480.787 308.65392192 495.067]
+/Rect [280.76592192000004 631.147 374.97192192000006 645.427]
 /Type /Annot
 >>
 endobj
-184 0 obj
-[180 0 R /XYZ 0 307.44 null]
-endobj
-185 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [272.17692192000004 67.38699999999994 333.47592192 81.66699999999994]
-/Type /Annot
->>
+222 0 obj
+[220 0 R /XYZ 0 420.23999999999995 null]
 endobj
-186 0 obj
-<< /Length 21812
+223 0 obj
+<< /Length 19329
 >>
 stream
 q
@@ -27853,22 +26463,6 @@ f
 269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -27971,7 +26565,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-<706f6c69637954797065> Tj
+<7570646174656444617465> Tj
 ET
 
 
@@ -28018,7 +26612,7 @@ S
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -28053,17 +26647,17 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+[<7573656442> 20.01953125 <7944696374696f6e6172696573>] TJ
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28096,36 +26690,93 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 671.7729999999999 Td
+/F1.0 10.5 Tf
+<44696374696f6e617279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+333.55992192 671.7729999999999 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 622.1759999999999 Td
+/F2.0 18 Tf
+<332e352e2045787465726e616c436f6d706f6e656e74> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 582.240 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 582.240 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.120 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 605.520 m
+269.177 605.520 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 605.770 m
+48.240 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 1 w
@@ -28133,46 +26784,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 589.7729999999999 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
-ET
-
-
-BT
-51.24 627.073 Td
-ET
-
-
-BT
-51.24 627.073 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 605.520 m
+563.760 605.520 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 605.770 m
+563.760 581.490 l
 S
 [ ] 0 d
 1 w
@@ -28180,34 +26819,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+272.17692192000004 589.7729999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -28215,19 +26854,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 565.9929999999999 Td
 /F2.0 10.5 Tf
-[<7573656442> 20.01953125 <794c6f6f7054> 29.78515625 <656d706c61746573>] TJ
+<636f6d706f6e656e744e616d65> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 551.713 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 551.713 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28235,198 +26874,194 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 558.853 Td
 /F1.0 10.5 Tf
-<3c20> Tj
+<737472696e67> Tj
 ET
 
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.680 m
+269.177 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.120 m
+269.177 507.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.930 m
+48.240 506.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.930 m
+269.177 506.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-280.76592192000004 596.6529999999999 Td
-/F1.0 10.5 Tf
-[<54> 29.78515625 <656d706c6174654d6963726f536572766963654d6f64656c>] TJ
+51.24 528.433 Td
+/F2.0 10.5 Tf
+<7374617465> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-424.355677779375 596.6529999999999 Td
+51.24 514.1529999999999 Td
+ET
+
+
+BT
+51.24 514.1529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.680 m
+563.760 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.120 m
+563.760 507.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.930 m
+269.177 506.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 544.930 m
+563.760 506.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 521.2929999999999 Td
 /F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+<45787465726e616c436f6d706f6e656e745374617465> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 547.056 Td
+48.24 471.69599999999997 Td
 /F2.0 18 Tf
-<332e31332e204d6963726f53657276696365506f6c696379> Tj
+<332e362e2045787465726e616c436f6d706f6e656e745374617465> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 507.120 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 507.120 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 281.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.200 220.937 37.560 re
+48.240 431.760 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.640 294.583 37.560 re
+269.177 431.760 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
+48.240 394.200 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
+269.177 394.200 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
+48.240 356.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
+269.177 356.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
+48.240 319.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 56.400 294.583 37.560 re
+269.177 319.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 530.400 m
-269.177 530.400 l
+48.240 455.040 m
+269.177 455.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 431.760 m
+269.177 431.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 530.650 m
-48.240 506.370 l
+48.240 455.290 m
+48.240 431.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.650 m
-269.177 506.370 l
+269.177 455.290 m
+269.177 431.010 l
 S
 [ ] 0 d
 1 w
@@ -28434,7 +27069,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 514.653 Td
+51.24 439.2929999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -28442,26 +27077,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.400 m
-563.760 530.400 l
+269.177 455.040 m
+563.760 455.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 431.760 m
+563.760 431.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.650 m
-269.177 506.370 l
+269.177 455.290 m
+269.177 431.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 530.650 m
-563.760 506.370 l
+563.760 455.290 m
+563.760 431.010 l
 S
 [ ] 0 d
 1 w
@@ -28469,7 +27104,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 514.653 Td
+272.17692192000004 439.2929999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -28477,26 +27112,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 431.760 m
+269.177 431.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 394.200 m
+269.177 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
+48.240 432.010 m
+48.240 393.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 432.010 m
+269.177 393.950 l
 S
 [ ] 0 d
 1 w
@@ -28504,19 +27139,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000001 Td
+51.24 415.51299999999986 Td
 /F2.0 10.5 Tf
-<636f6e74657874> Tj
+<6465736372697074696f6e> Tj
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 401.23299999999983 Td
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 401.23299999999983 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28524,26 +27159,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 431.760 m
+563.760 431.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 394.200 m
+563.760 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 432.010 m
+269.177 393.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
+563.760 432.010 m
+563.760 393.950 l
 S
 [ ] 0 d
 1 w
@@ -28551,7 +27186,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.7330000000001 Td
+272.17692192000004 408.3729999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -28559,26 +27194,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 394.200 m
+269.177 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 356.640 m
+269.177 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+48.240 394.450 m
+48.240 356.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 394.450 m
+269.177 356.390 l
 S
 [ ] 0 d
 1 w
@@ -28586,19 +27221,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000005 Td
+51.24 377.9529999999999 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<6c6576656c> Tj
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 363.6729999999999 Td
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 363.6729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28606,26 +27241,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 394.200 m
+563.760 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 356.640 m
+563.760 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 394.450 m
+269.177 356.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+563.760 394.450 m
+563.760 356.390 l
 S
 [ ] 0 d
 1 w
@@ -28633,34 +27268,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.17300000000006 Td
+272.17692192000004 370.81299999999993 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 356.640 m
+269.177 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 319.080 m
+269.177 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 356.890 m
+48.240 318.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 356.890 m
+269.177 318.830 l
 S
 [ ] 0 d
 1 w
@@ -28668,19 +27303,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000001 Td
+51.24 340.39299999999986 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+<73746174654e616d65> Tj
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 326.11299999999983 Td
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 326.11299999999983 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28688,26 +27323,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 356.640 m
+563.760 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 319.080 m
+563.760 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 356.890 m
+269.177 318.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 356.890 m
+563.760 318.830 l
 S
 [ ] 0 d
 1 w
@@ -28715,34 +27350,93 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.6130000000001 Td
+272.17692192000004 333.2529999999999 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 283.6559999999999 Td
+/F2.0 18 Tf
+[<332e372e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 243.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 243.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 168.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 168.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 55.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 55.920 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 267.000 m
+269.177 267.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 243.720 m
+269.177 243.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 267.250 m
+48.240 242.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 267.250 m
+269.177 242.970 l
 S
 [ ] 0 d
 1 w
@@ -28750,46 +27444,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000004 Td
+51.24 251.25299999999982 Td
 /F2.0 10.5 Tf
-<6465766963655479706553636f7065> Tj
-ET
-
-
-BT
-51.24 363.913 Td
-ET
-
-
-BT
-51.24 363.913 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 267.000 m
+563.760 267.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 243.720 m
+563.760 243.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 267.250 m
+269.177 242.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 267.250 m
+563.760 242.970 l
 S
 [ ] 0 d
 1 w
@@ -28797,34 +27479,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05300000000005 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 251.25299999999982 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 243.720 m
+269.177 243.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 206.160 m
+269.177 206.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 243.970 m
+48.240 205.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 243.970 m
+269.177 205.910 l
 S
 [ ] 0 d
 1 w
@@ -28832,19 +27514,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000001 Td
+51.24 227.47299999999984 Td
 /F2.0 10.5 Tf
-<6a736f6e526570726573656e746174696f6e> Tj
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 213.19299999999984 Td
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 213.19299999999984 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28852,69 +27534,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 243.720 m
+563.760 243.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 206.160 m
+563.760 206.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 243.970 m
+269.177 205.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 243.970 m
+563.760 205.910 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.4930000000001 Td
+272.17692192000004 220.33299999999983 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<6e756d626572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 206.160 m
+269.177 206.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 168.600 m
+269.177 168.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 206.410 m
+48.240 168.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 206.410 m
+269.177 168.350 l
 S
 [ ] 0 d
 1 w
@@ -28922,19 +27596,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.07300000000004 Td
+51.24 189.91299999999984 Td
 /F2.0 10.5 Tf
-<6d6963726f536572766963654d6f64656c> Tj
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 288.793 Td
+51.24 175.63299999999984 Td
 ET
 
 
 BT
-51.24 288.793 Td
+51.24 175.63299999999984 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28942,69 +27616,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 206.160 m
+563.760 206.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 168.600 m
+563.760 168.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 206.410 m
+269.177 168.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 206.410 m
+563.760 168.350 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 295.93300000000005 Td
+272.17692192000004 182.77299999999983 Td
 /F1.0 10.5 Tf
-<4d6963726f536572766963654d6f64656c> Tj
+<696e7465676572> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 168.600 m
+269.177 168.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 131.040 m
+269.177 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 168.850 m
+48.240 130.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 168.850 m
+269.177 130.790 l
 S
 [ ] 0 d
 1 w
@@ -29012,19 +27678,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000001 Td
+51.24 152.35299999999984 Td
 /F2.0 10.5 Tf
-<6d6f64656c54797065> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 138.07299999999984 Td
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 138.07299999999984 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29032,26 +27698,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 168.600 m
+563.760 168.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 131.040 m
+563.760 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 168.850 m
+269.177 130.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 168.850 m
+563.760 130.790 l
 S
 [ ] 0 d
 1 w
@@ -29059,34 +27725,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.3730000000001 Td
+272.17692192000004 145.21299999999982 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 131.040 m
+269.177 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 93.480 m
+269.177 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 131.290 m
+48.240 93.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 131.290 m
+269.177 93.230 l
 S
 [ ] 0 d
 1 w
@@ -29094,19 +27760,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000006 Td
+51.24 114.79299999999982 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 213.67300000000006 Td
+51.24 100.51299999999982 Td
 ET
 
 
 BT
-51.24 213.67300000000006 Td
+51.24 100.51299999999982 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29114,26 +27780,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 131.040 m
+563.760 131.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 93.480 m
+563.760 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 131.290 m
+269.177 93.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 131.290 m
+563.760 93.230 l
 S
 [ ] 0 d
 1 w
@@ -29141,34 +27807,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.81300000000005 Td
+272.17692192000004 107.65299999999982 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 93.480 m
+269.177 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 55.920 m
+269.177 55.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 93.730 m
+48.240 55.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 93.730 m
+269.177 55.670 l
 S
 [ ] 0 d
 1 w
@@ -29176,19 +27842,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000006 Td
+51.24 77.23299999999982 Td
 /F2.0 10.5 Tf
-[<706f6c69637954> 29.78515625 <6f736361>] TJ
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 176.11300000000006 Td
+51.24 62.95299999999982 Td
 ET
 
 
 BT
-51.24 176.11300000000006 Td
+51.24 62.95299999999982 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29196,26 +27862,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 93.480 m
+563.760 93.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 55.920 m
+563.760 55.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 93.730 m
+269.177 55.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 93.730 m
+563.760 55.670 l
 S
 [ ] 0 d
 1 w
@@ -29223,348 +27889,84 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000004 Td
+272.17692192000004 70.09299999999982 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
-S
-[ ] 0 d
-1 w
+q
+0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 152.83300000000006 Td
-/F2.0 10.5 Tf
-<70726f70657274696573> Tj
-ET
-
-
-BT
-51.24 138.55300000000005 Td
-ET
-
-
-BT
-51.24 138.55300000000005 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<3138> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 145.69300000000004 Td
-/F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 115.27300000000004 Td
-/F2.0 10.5 Tf
-<736861726564> Tj
-ET
-
-
-BT
-51.24 100.99300000000004 Td
-ET
-
-
-BT
-51.24 100.99300000000004 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 108.13300000000004 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 77.71300000000004 Td
-/F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 63.433000000000035 Td
-ET
-
-
-BT
-51.24 63.433000000000035 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 70.57300000000004 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3138> Tj
-ET
-
-0.000 0.000 0.000 SCN
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 Q
 Q
 
 endstream
 endobj
-187 0 obj
+224 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 186 0 R
+/Contents 223 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 382 0 R
+/XObject << /Stamp1 603 0 R
 >>
 >>
-/Annots [188 0 R 191 0 R 192 0 R 193 0 R]
+/Annots [225 0 R 227 0 R]
 >>
 endobj
-188 0 obj
+225 0 obj
 << /Border [0 0 0]
-/Dest (_templatemicroservicemodel)
+/Dest (_dictionary)
 /Subtype /Link
-/Rect [280.76592192000004 593.587 424.355677779375 607.867]
+/Rect [280.76592192000004 668.707 333.55992192 682.987]
 /Type /Annot
 >>
 endobj
-189 0 obj
-[187 0 R /XYZ 0 570.48 null]
-endobj
-190 0 obj
-<< /Limits [(_jsonobject) (_parameters_11)]
-/Names [(_jsonobject) 149 0 R (_jsonprimitive) 159 0 R (_loop) 167 0 R (_looplog) 177 0 R (_looptemplate) 181 0 R (_microservicemodel) 184 0 R (_microservicepolicy) 189 0 R (_number) 197 0 R (_operationalpolicy) 198 0 R (_overview) 17 0 R (_parameters) 42 0 R (_parameters_10) 101 0 R (_parameters_11) 110 0 R]
->>
+226 0 obj
+[224 0 R /XYZ 0 645.5999999999999 null]
 endobj
-191 0 obj
+227 0 obj
 << /Border [0 0 0]
-/Dest (_jsonobject)
+/Dest (_externalcomponentstate)
 /Subtype /Link
-/Rect [272.17692192000004 330.4270000000001 325.32792192000005 344.7070000000001]
+/Rect [272.17692192000004 518.227 397.34742192000004 532.507]
 /Type /Annot
 >>
 endobj
-192 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicemodel)
-/Subtype /Link
-/Rect [272.17692192000004 292.867 369.21792192000004 307.14700000000005]
-/Type /Annot
->>
+228 0 obj
+[224 0 R /XYZ 0 495.11999999999995 null]
 endobj
-193 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 142.62700000000007 325.32792192000005 156.90700000000004]
-/Type /Annot
+229 0 obj
+[224 0 R /XYZ 0 307.07999999999987 null]
+endobj
+230 0 obj
+<< /Limits [(_dictionaryelement) (_looplog)]
+/Names [(_dictionaryelement) 222 0 R (_externalcomponent) 226 0 R (_externalcomponentstate) 228 0 R (_jsonarray) 229 0 R (_jsonnull) 238 0 R (_jsonobject) 248 0 R (_jsonprimitive) 256 0 R (_loop) 264 0 R (_loopelementmodel) 274 0 R (_looplog) 279 0 R]
 >>
 endobj
-194 0 obj
-<< /Length 19132
+231 0 obj
+<< /Length 21606
 >>
 stream
 q
@@ -29593,6 +27995,110 @@ f
 269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -29695,7 +28201,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+<6173446f75626c65> Tj
 ET
 
 
@@ -29742,7 +28248,7 @@ S
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -29777,17 +28283,17 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-[<7573656442> 20.01953125 <794c6f6f7073>] TJ
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29820,150 +28326,36 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<3c20> Tj
-ET
-
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-280.76592192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<4c6f6f70> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-305.86092192000007 671.7729999999999 Td
-/F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 622.1759999999999 Td
-/F2.0 18 Tf
-<332e31342e204e756d626572> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 593.5559999999999 Td
-/F3.0 10.5 Tf
-<54797065> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-71.4345 593.5559999999999 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<203a206f626a656374> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 554.316 Td
-/F2.0 18 Tf
-[<332e31352e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+<6e756d6265722028666c6f617429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 514.380 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 514.380 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 476.820 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 476.820 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 439.260 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 439.260 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 401.700 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 401.700 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 364.140 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 364.140 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 326.580 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 326.580 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 537.660 m
-269.177 537.660 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.380 m
-269.177 514.380 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 537.910 m
-48.240 513.630 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 537.910 m
-269.177 513.630 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -29971,34 +28363,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 521.913 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6173496e74> Tj
+ET
+
+
+BT
+51.24 627.073 Td
+ET
+
+
+BT
+51.24 627.073 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 537.660 m
-563.760 537.660 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.380 m
-563.760 514.380 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 537.910 m
-269.177 513.630 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 537.910 m
-563.760 513.630 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -30006,34 +28410,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.913 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 634.213 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.380 m
-269.177 514.380 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 476.820 m
-269.177 476.820 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.630 m
-48.240 476.570 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.630 m
-269.177 476.570 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -30041,19 +28445,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 498.1330000000001 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 483.85300000000007 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 483.85300000000007 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30061,26 +28465,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.380 m
-563.760 514.380 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 476.820 m
-563.760 476.820 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.630 m
-269.177 476.570 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 514.630 m
-563.760 476.570 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -30094,9 +28498,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 490.9930000000001 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -30104,26 +28508,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 476.820 m
-269.177 476.820 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 439.260 m
-269.177 439.260 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 477.070 m
-48.240 439.010 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 477.070 m
-269.177 439.010 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -30131,19 +28535,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 460.57300000000004 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-<6a736f6e526570726573656e746174696f6e> Tj
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 446.293 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 446.293 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30151,26 +28555,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 476.820 m
-563.760 476.820 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.260 m
-563.760 439.260 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 477.070 m
-269.177 439.010 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 477.070 m
-563.760 439.010 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -30184,9 +28588,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 453.43300000000005 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30194,26 +28598,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 439.260 m
-269.177 439.260 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.700 m
-269.177 401.700 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 439.510 m
-48.240 401.450 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.510 m
-269.177 401.450 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -30221,19 +28625,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 423.0130000000001 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<6c6f6f70> Tj
+<61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 408.73300000000006 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 408.73300000000006 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30241,26 +28645,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.260 m
-563.760 439.260 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.700 m
-563.760 401.700 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.510 m
-269.177 401.450 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 439.510 m
-563.760 401.450 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -30274,9 +28678,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 415.8730000000001 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -30284,26 +28688,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.700 m
-269.177 401.700 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 364.140 m
-269.177 364.140 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.950 m
-48.240 363.890 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.950 m
-269.177 363.890 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -30311,19 +28715,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 385.45300000000003 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<61734a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 371.173 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 371.173 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30331,61 +28735,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.700 m
-563.760 401.700 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.140 m
-563.760 364.140 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.950 m
-269.177 363.890 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 401.950 m
-563.760 363.890 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 378.31300000000005 Td
+272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 364.140 m
-269.177 364.140 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 326.580 m
-269.177 326.580 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 364.390 m
-48.240 326.330 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.390 m
-269.177 326.330 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -30393,19 +28805,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 347.8930000000001 Td
+51.24 453.553 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 333.61300000000006 Td
+51.24 439.273 Td
 ET
 
 
 BT
-51.24 333.61300000000006 Td
+51.24 439.273 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30413,128 +28825,151 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.140 m
-563.760 364.140 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 326.580 m
-563.760 326.580 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.390 m
-269.177 326.330 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 364.390 m
-563.760 326.330 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 340.7530000000001 Td
+272.17692192000004 446.413 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.490 m
+48.240 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+
+BT
+51.24 415.993 Td
+/F2.0 10.5 Tf
+<61734e756d626572> Tj
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.490 m
+563.760 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-48.24 291.1560000000001 Td
-/F2.0 18 Tf
-<332e31362e20506f6c6963794d6f64656c> Tj
+272.17692192000004 408.853 Td
+/F1.0 10.5 Tf
+<4e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 251.220 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 251.220 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 213.660 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 213.660 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 176.100 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 176.100 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 138.540 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 138.540 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 100.980 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 100.980 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 63.420 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 63.420 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 274.500 m
-269.177 274.500 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 251.220 m
-269.177 251.220 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 274.750 m
-48.240 250.470 l
+48.240 394.930 m
+48.240 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 274.750 m
-269.177 250.470 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 1 w
@@ -30542,34 +28977,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 258.75300000000004 Td
+51.24 378.43299999999994 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<617353686f7274> Tj
+ET
+
+
+BT
+51.24 364.1529999999999 Td
+ET
+
+
+BT
+51.24 364.1529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 274.500 m
-563.760 274.500 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.220 m
-563.760 251.220 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 274.750 m
-269.177 250.470 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 274.750 m
-563.760 250.470 l
+563.760 394.930 m
+563.760 356.870 l
 S
 [ ] 0 d
 1 w
@@ -30577,34 +29024,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.75300000000004 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 371.29299999999995 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 251.220 m
-269.177 251.220 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 213.660 m
-269.177 213.660 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 251.470 m
-48.240 213.410 l
+48.240 357.370 m
+48.240 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.470 m
-269.177 213.410 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 1 w
@@ -30612,19 +29059,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 234.97300000000007 Td
+51.24 340.873 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 220.69300000000007 Td
+51.24 326.59299999999996 Td
 ET
 
 
 BT
-51.24 220.69300000000007 Td
+51.24 326.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30632,26 +29079,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.220 m
-563.760 251.220 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 213.660 m
-563.760 213.660 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.470 m
-269.177 213.410 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 251.470 m
-563.760 213.410 l
+563.760 357.370 m
+563.760 319.310 l
 S
 [ ] 0 d
 1 w
@@ -30659,7 +29106,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 227.83300000000006 Td
+272.17692192000004 333.733 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -30667,26 +29114,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 213.660 m
-269.177 213.660 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 176.100 m
-269.177 176.100 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 213.910 m
-48.240 175.850 l
+48.240 319.810 m
+48.240 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 213.910 m
-269.177 175.850 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 1 w
@@ -30694,19 +29141,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 197.41300000000007 Td
+51.24 303.31300000000005 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 183.13300000000007 Td
+51.24 289.033 Td
 ET
 
 
 BT
-51.24 183.13300000000007 Td
+51.24 289.033 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30714,26 +29161,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 213.660 m
-563.760 213.660 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.100 m
-563.760 176.100 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 213.910 m
-269.177 175.850 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 213.910 m
-563.760 175.850 l
+563.760 319.810 m
+563.760 281.750 l
 S
 [ ] 0 d
 1 w
@@ -30741,34 +29188,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 190.27300000000005 Td
+272.17692192000004 296.17300000000006 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 176.100 m
-269.177 176.100 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 138.540 m
-269.177 138.540 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 176.350 m
-48.240 138.290 l
+48.240 282.250 m
+48.240 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.350 m
-269.177 138.290 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 1 w
@@ -30776,19 +29223,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 159.85300000000007 Td
+51.24 265.7530000000001 Td
 /F2.0 10.5 Tf
-[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
+<6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 145.57300000000006 Td
+51.24 251.4730000000001 Td
 ET
 
 
 BT
-51.24 145.57300000000006 Td
+51.24 251.4730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30796,26 +29243,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.100 m
-563.760 176.100 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 138.540 m
-563.760 138.540 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.350 m
-269.177 138.290 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 176.350 m
-563.760 138.290 l
+563.760 282.250 m
+563.760 244.190 l
 S
 [ ] 0 d
 1 w
@@ -30823,34 +29270,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 152.71300000000005 Td
+272.17692192000004 258.6130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 138.540 m
-269.177 138.540 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 100.980 m
-269.177 100.980 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 138.790 m
-48.240 100.730 l
+48.240 244.690 m
+48.240 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 138.790 m
-269.177 100.730 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 1 w
@@ -30858,19 +29305,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 122.29300000000006 Td
+51.24 228.19300000000018 Td
 /F2.0 10.5 Tf
-[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
+<6a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 108.01300000000006 Td
+51.24 213.91300000000018 Td
 ET
 
 
 BT
-51.24 108.01300000000006 Td
+51.24 213.91300000000018 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30878,26 +29325,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 138.540 m
-563.760 138.540 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 100.980 m
-563.760 100.980 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 138.790 m
-269.177 100.730 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 138.790 m
-563.760 100.730 l
+563.760 244.690 m
+563.760 206.630 l
 S
 [ ] 0 d
 1 w
@@ -30905,34 +29352,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 115.15300000000006 Td
+272.17692192000004 221.05300000000017 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 100.980 m
-269.177 100.980 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 63.420 m
-269.177 63.420 l
+48.240 169.320 m
+269.177 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 101.230 m
-48.240 63.170 l
+48.240 207.130 m
+48.240 169.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 101.230 m
-269.177 63.170 l
+269.177 207.130 m
+269.177 169.070 l
 S
 [ ] 0 d
 1 w
@@ -30940,19 +29387,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 84.73300000000005 Td
+51.24 190.63300000000024 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c54797065> Tj
+<6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 70.45300000000005 Td
+51.24 176.35300000000024 Td
 ET
 
 
 BT
-51.24 70.45300000000005 Td
+51.24 176.35300000000024 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -30960,26 +29407,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 100.980 m
-563.760 100.980 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 63.420 m
-563.760 63.420 l
+269.177 169.320 m
+563.760 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 101.230 m
-269.177 63.170 l
+269.177 207.130 m
+269.177 169.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 101.230 m
-563.760 63.170 l
+563.760 207.130 m
+563.760 169.070 l
 S
 [ ] 0 d
 1 w
@@ -30987,103 +29434,276 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 77.59300000000005 Td
+272.17692192000004 183.49300000000022 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3139> Tj
+48.24 133.89600000000019 Td
+/F2.0 18 Tf
+<332e382e204a736f6e4e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-195 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 194 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 382 0 R
->>
->>
-/Annots [196 0 R 199 0 R 200 0 R 201 0 R 202 0 R]
->>
-endobj
-196 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [280.76592192000004 668.707 305.86092192000007 682.987]
-/Type /Annot
->>
+1.000 1.000 1.000 scn
+48.240 93.960 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.960 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 117.240 m
+269.177 117.240 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 117.490 m
+48.240 93.210 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 117.490 m
+269.177 93.210 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 101.49300000000021 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 117.240 m
+563.760 117.240 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 117.490 m
+269.177 93.210 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 117.490 m
+563.760 93.210 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 101.49300000000021 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.7130000000002 Td
+/F2.0 10.5 Tf
+<6173426967446563696d616c> Tj
+ET
+
+
+BT
+51.24 63.433000000000206 Td
+ET
+
+
+BT
+51.24 63.433000000000206 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.5730000000002 Td
+/F1.0 10.5 Tf
+<6e756d626572> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3139> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
 endobj
-197 0 obj
-[195 0 R /XYZ 0 645.5999999999999 null]
+232 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 231 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [233 0 R 234 0 R 235 0 R 236 0 R 237 0 R]
+>>
 endobj
-198 0 obj
-[195 0 R /XYZ 0 577.74 null]
+233 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 593.587 322.17751176375003 607.867]
+/Type /Annot
+>>
 endobj
-199 0 obj
+234 0 obj
 << /Border [0 0 0]
-/Dest (_jsonobject)
+/Dest (_jsonnull)
 /Subtype /Link
-/Rect [272.17692192000004 487.9270000000001 325.32792192000005 502.2070000000001]
+/Rect [272.17692192000004 556.027 314.65992192000004 570.307]
 /Type /Annot
 >>
 endobj
-200 0 obj
+235 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 450.367 325.32792192000005 464.64700000000005]
+/Rect [272.17692192000004 518.4670000000001 325.32792192000005 532.7470000000001]
 /Type /Annot
 >>
 endobj
-201 0 obj
+236 0 obj
 << /Border [0 0 0]
-/Dest (_loop)
+/Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [272.17692192000004 412.8070000000001 297.27192192000007 427.0870000000001]
+/Rect [272.17692192000004 480.907 340.1224219200001 495.187]
 /Type /Annot
 >>
 endobj
-202 0 obj
+237 0 obj
 << /Border [0 0 0]
-/Dest (_policymodel)
+/Dest (_number)
 /Subtype /Link
-/Rect [272.17692192000004 337.68700000000007 333.47592192 351.9670000000001]
+/Rect [272.17692192000004 405.787 313.75692192 420.067]
 /Type /Annot
 >>
 endobj
-203 0 obj
-[195 0 R /XYZ 0 314.5800000000001 null]
+238 0 obj
+[232 0 R /XYZ 0 157.32000000000022 null]
 endobj
-204 0 obj
-<< /Length 15919
+239 0 obj
+<< /Length 22601
 >>
 stream
 q
@@ -31128,6 +29748,118 @@ f
 269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 94.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 94.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -31230,7 +29962,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-[<706f6c69637956> 60.05859375 <617269616e74>] TJ
+<6173426967496e7465676572> Tj
 ET
 
 
@@ -31277,7 +30009,7 @@ S
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e7465676572> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -31312,7 +30044,7 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<6173426f6f6c65616e> Tj
 ET
 
 
@@ -31359,7 +30091,7 @@ S
 BT
 272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -31394,7 +30126,7 @@ S
 BT
 51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
@@ -31441,7 +30173,7 @@ S
 BT
 272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
 0.000 0.000 0.000 scn
@@ -31474,19 +30206,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
-<76657273696f6e> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 589.513 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 589.513 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -31521,77 +30253,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 596.653 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 547.056 Td
-/F2.0 18 Tf
-<332e31372e2053657276696365> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 507.120 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 507.120 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.440 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 530.400 m
-269.177 530.400 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 530.650 m
-48.240 506.370 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.650 m
-269.177 506.370 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -31599,34 +30288,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 514.653 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6173446f75626c65> Tj
+ET
+
+
+BT
+51.24 551.953 Td
+ET
+
+
+BT
+51.24 551.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.400 m
-563.760 530.400 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 530.650 m
-269.177 506.370 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 530.650 m
-563.760 506.370 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -31634,34 +30335,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 514.653 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 559.093 Td
+/F1.0 10.5 Tf
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -31669,19 +30370,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000001 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<7265736f7572636544657461696c73> Tj
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -31689,69 +30390,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.7330000000001 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<6e756d6265722028666c6f617429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -31759,19 +30452,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000005 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
-<7365727669636544657461696c73> Tj
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -31779,26 +30472,108 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.973 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.553 Td
+/F2.0 10.5 Tf
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 439.273 Td
+ET
+
+
+BT
+51.24 439.273 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -31812,9 +30587,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 446.17300000000006 Td
+272.17692192000004 446.413 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -31822,26 +30597,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -31849,19 +30624,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000001 Td
+51.24 415.993 Td
 /F2.0 10.5 Tf
-<7365727669636555756964> Tj
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 401.71299999999997 Td
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 401.71299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -31869,104 +30644,159 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.6130000000001 Td
+272.17692192000004 408.853 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.930 m
+48.240 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24 359.01600000000013 Td
-/F2.0 18 Tf
-[<332e31382e2054> 29.78515625 <656d706c6174654d6963726f536572766963654d6f64656c>] TJ
+51.24 378.433 Td
+/F2.0 10.5 Tf
+<61734a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 364.153 Td
+ET
+
+
+BT
+51.24 364.153 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.080 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.080 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 243.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 243.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.400 220.937 37.560 re
-f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.400 294.583 37.560 re
-f
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.930 m
+563.760 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 371.293 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.360 m
-269.177 342.360 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.610 m
-48.240 318.330 l
+48.240 357.370 m
+48.240 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.610 m
-269.177 318.330 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 1 w
@@ -31974,69 +30804,89 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 326.61300000000006 Td
+51.24 340.873 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 326.59299999999996 Td
+ET
+
+
+BT
+51.24 326.59299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.360 m
-563.760 342.360 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.610 m
-269.177 318.330 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 342.610 m
-563.760 318.330 l
+563.760 357.370 m
+563.760 319.310 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 326.61300000000006 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 333.733 Td
+/F1.0 10.5 Tf
+<4a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.520 m
-269.177 281.520 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.330 m
-48.240 281.270 l
+48.240 319.810 m
+48.240 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.330 m
-269.177 281.270 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 1 w
@@ -32044,19 +30894,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 302.833 Td
+51.24 303.313 Td
 /F2.0 10.5 Tf
-<666c6f774f72646572> Tj
+<61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 288.553 Td
+51.24 289.033 Td
 ET
 
 
 BT
-51.24 288.553 Td
+51.24 289.033 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32064,26 +30914,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.520 m
-563.760 281.520 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.330 m
-269.177 281.270 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.330 m
-563.760 281.270 l
+563.760 319.810 m
+563.760 281.750 l
 S
 [ ] 0 d
 1 w
@@ -32091,34 +30941,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.69300000000004 Td
+272.17692192000004 296.173 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.520 m
-269.177 281.520 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.960 m
-269.177 243.960 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.770 m
-48.240 243.710 l
+48.240 282.250 m
+48.240 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.770 m
-269.177 243.710 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 1 w
@@ -32126,19 +30976,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.2730000000001 Td
+51.24 265.753 Td
 /F2.0 10.5 Tf
-[<6c6f6f7054> 29.78515625 <656d706c617465>] TJ
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 250.99300000000008 Td
+51.24 251.47299999999998 Td
 ET
 
 
 BT
-51.24 250.99300000000008 Td
+51.24 251.47299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32146,26 +30996,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.520 m
-563.760 281.520 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.960 m
-563.760 243.960 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.770 m
-269.177 243.710 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 281.770 m
-563.760 243.710 l
+563.760 282.250 m
+563.760 244.190 l
 S
 [ ] 0 d
 1 w
@@ -32179,9 +31029,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.1330000000001 Td
+272.17692192000004 258.613 Td
 /F1.0 10.5 Tf
-[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
+<4e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -32189,26 +31039,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.960 m
-269.177 243.960 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.400 m
-269.177 206.400 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.210 m
-48.240 206.150 l
+48.240 244.690 m
+48.240 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.210 m
-269.177 206.150 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 1 w
@@ -32216,19 +31066,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.71300000000008 Td
+51.24 228.19299999999996 Td
 /F2.0 10.5 Tf
-<6d6963726f536572766963654d6f64656c> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 213.43300000000008 Td
+51.24 213.91299999999995 Td
 ET
 
 
 BT
-51.24 213.43300000000008 Td
+51.24 213.91299999999995 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32236,1486 +31086,17739 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.960 m
-563.760 243.960 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.400 m
-563.760 206.400 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.210 m
-269.177 206.150 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.210 m
-563.760 206.150 l
+563.760 244.690 m
+563.760 206.630 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 220.57300000000006 Td
+272.17692192000004 221.05299999999994 Td
 /F1.0 10.5 Tf
-<4d6963726f536572766963654d6f64656c> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.880 m
+269.177 206.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.320 m
+269.177 169.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 207.130 m
+48.240 169.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 207.130 m
+269.177 169.070 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+
+BT
+51.24 190.633 Td
+/F2.0 10.5 Tf
+<6173537472696e67> Tj
+ET
+
+
+BT
+51.24 176.353 Td
+ET
+
+
+BT
+51.24 176.353 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.880 m
+563.760 206.880 l
+S
 [ ] 0 d
-/Stamp1 Do
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.320 m
+563.760 169.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 207.130 m
+269.177 169.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 207.130 m
+563.760 169.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3230> Tj
+272.17692192000004 183.493 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.320 m
+269.177 169.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.760 m
+269.177 131.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.570 m
+48.240 131.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.570 m
+269.177 131.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 153.07300000000006 Td
+/F2.0 10.5 Tf
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 138.79300000000006 Td
+ET
+
+
+BT
+51.24 138.79300000000006 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.320 m
+563.760 169.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.760 m
+563.760 131.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.570 m
+269.177 131.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.570 m
+563.760 131.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 145.93300000000005 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.760 m
+269.177 131.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.200 m
+269.177 94.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 132.010 m
+48.240 93.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 132.010 m
+269.177 93.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.5130000000001 Td
+/F2.0 10.5 Tf
+<6a736f6e4e756c6c> Tj
+ET
+
+
+BT
+51.24 101.2330000000001 Td
+ET
+
+
+BT
+51.24 101.2330000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.760 m
+563.760 131.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.200 m
+563.760 94.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 132.010 m
+269.177 93.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 132.010 m
+563.760 93.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.3730000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.200 m
+269.177 94.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.640 m
+269.177 56.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.450 m
+48.240 56.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.450 m
+269.177 56.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.95300000000016 Td
+/F2.0 10.5 Tf
+<6a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 63.67300000000016 Td
+ET
+
+
+BT
+51.24 63.67300000000016 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.200 m
+563.760 94.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.640 m
+563.760 56.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.450 m
+269.177 56.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.450 m
+563.760 56.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.81300000000016 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3230> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+240 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 239 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [241 0 R 242 0 R 243 0 R 244 0 R 245 0 R]
+>>
+endobj
+241 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 443.347 322.17751176375003 457.627]
+/Type /Annot
+>>
+endobj
+242 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 405.787 314.65992192000004 420.067]
+/Type /Annot
+>>
+endobj
+243 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 368.227 325.32792192000005 382.507]
+/Type /Annot
+>>
+endobj
+244 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 330.667 340.1224219200001 344.947]
+/Type /Annot
+>>
+endobj
+245 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 255.547 313.75692192 269.827]
+/Type /Annot
+>>
+endobj
+246 0 obj
+<< /Length 21911
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<6a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 659.7360000000001 Td
+/F2.0 18 Tf
+<332e392e204a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 619.800 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 619.800 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 582.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 582.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 544.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 544.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 507.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 507.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 469.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 469.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 432.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 432.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 394.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 394.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 643.080 m
+269.177 643.080 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 619.800 m
+269.177 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 643.330 m
+48.240 619.050 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 643.330 m
+269.177 619.050 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 627.3330000000001 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 643.080 m
+563.760 643.080 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 619.800 m
+563.760 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 643.330 m
+269.177 619.050 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 643.330 m
+563.760 619.050 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 627.3330000000001 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 619.800 m
+269.177 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.240 m
+269.177 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.050 m
+48.240 581.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.050 m
+269.177 581.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.5530000000001 Td
+/F2.0 10.5 Tf
+<6173426967446563696d616c> Tj
+ET
+
+
+BT
+51.24 589.2730000000001 Td
+ET
+
+
+BT
+51.24 589.2730000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 619.800 m
+563.760 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.240 m
+563.760 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.050 m
+269.177 581.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.050 m
+563.760 581.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.4130000000001 Td
+/F1.0 10.5 Tf
+<6e756d626572> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.240 m
+269.177 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.680 m
+269.177 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.490 m
+48.240 544.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.490 m
+269.177 544.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 565.9930000000002 Td
+/F2.0 10.5 Tf
+<6173426967496e7465676572> Tj
+ET
+
+
+BT
+51.24 551.7130000000001 Td
+ET
+
+
+BT
+51.24 551.7130000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.240 m
+563.760 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.680 m
+563.760 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.490 m
+269.177 544.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.490 m
+563.760 544.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 558.8530000000001 Td
+/F1.0 10.5 Tf
+<696e7465676572> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.680 m
+269.177 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.120 m
+269.177 507.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.930 m
+48.240 506.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.930 m
+269.177 506.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.4330000000002 Td
+/F2.0 10.5 Tf
+<6173426f6f6c65616e> Tj
+ET
+
+
+BT
+51.24 514.1530000000001 Td
+ET
+
+
+BT
+51.24 514.1530000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.680 m
+563.760 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.120 m
+563.760 507.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.930 m
+269.177 506.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 544.930 m
+563.760 506.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.2930000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.120 m
+269.177 507.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.560 m
+269.177 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.370 m
+48.240 469.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.370 m
+269.177 469.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 490.8730000000001 Td
+/F2.0 10.5 Tf
+[<617342> 20.01953125 <797465>] TJ
+ET
+
+
+BT
+51.24 476.5930000000001 Td
+ET
+
+
+BT
+51.24 476.5930000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.120 m
+563.760 507.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.560 m
+563.760 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.370 m
+269.177 469.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.370 m
+563.760 469.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.7330000000001 Td
+/F1.0 10.5 Tf
+[<737472696e67202862> 20.01953125 <79746529>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.560 m
+269.177 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.000 m
+269.177 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.810 m
+48.240 431.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.810 m
+269.177 431.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.31300000000016 Td
+/F2.0 10.5 Tf
+[<617343686172> 20.01953125 <6163746572>] TJ
+ET
+
+
+BT
+51.24 439.03300000000013 Td
+ET
+
+
+BT
+51.24 439.03300000000013 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.560 m
+563.760 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.810 m
+269.177 431.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 469.810 m
+563.760 431.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.1730000000002 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.000 m
+269.177 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.250 m
+48.240 394.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.250 m
+269.177 394.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.7530000000001 Td
+/F2.0 10.5 Tf
+<6173446f75626c65> Tj
+ET
+
+
+BT
+51.24 401.47300000000007 Td
+ET
+
+
+BT
+51.24 401.47300000000007 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.250 m
+269.177 394.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.250 m
+563.760 394.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.6130000000001 Td
+/F1.0 10.5 Tf
+<6e756d6265722028646f75626c6529> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 356.880 m
+269.177 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.690 m
+48.240 356.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.690 m
+269.177 356.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.19300000000015 Td
+/F2.0 10.5 Tf
+<6173466c6f6174> Tj
+ET
+
+
+BT
+51.24 363.9130000000001 Td
+ET
+
+
+BT
+51.24 363.9130000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 356.880 m
+563.760 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.690 m
+269.177 356.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.690 m
+563.760 356.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.05300000000017 Td
+/F1.0 10.5 Tf
+<6e756d6265722028666c6f617429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 356.880 m
+269.177 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.130 m
+48.240 319.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.130 m
+269.177 319.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.6330000000001 Td
+/F2.0 10.5 Tf
+<6173496e74> Tj
+ET
+
+
+BT
+51.24 326.35300000000007 Td
+ET
+
+
+BT
+51.24 326.35300000000007 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 356.880 m
+563.760 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.130 m
+269.177 319.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.130 m
+563.760 319.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.4930000000001 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.570 m
+48.240 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.0730000000001 Td
+/F2.0 10.5 Tf
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 288.7930000000001 Td
+ET
+
+
+BT
+51.24 288.7930000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.570 m
+563.760 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 295.9330000000001 Td
+/F1.0 10.5 Tf
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.010 m
+48.240 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 265.5130000000001 Td
+/F2.0 10.5 Tf
+<61734a736f6e4e756c6c> Tj
+ET
+
+
+BT
+51.24 251.2330000000001 Td
+ET
+
+
+BT
+51.24 251.2330000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.010 m
+563.760 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 258.3730000000001 Td
+/F1.0 10.5 Tf
+<4a736f6e4e756c6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.450 m
+48.240 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 227.95300000000012 Td
+/F2.0 10.5 Tf
+<61734a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 213.67300000000012 Td
+ET
+
+
+BT
+51.24 213.67300000000012 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 244.450 m
+563.760 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 220.8130000000001 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39300000000011 Td
+/F2.0 10.5 Tf
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 176.1130000000001 Td
+ET
+
+
+BT
+51.24 176.1130000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 183.2530000000001 Td
+/F1.0 10.5 Tf
+<4a736f6e5072696d6974697665> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.8330000000001 Td
+/F2.0 10.5 Tf
+<61734c6f6e67> Tj
+ET
+
+
+BT
+51.24 138.5530000000001 Td
+ET
+
+
+BT
+51.24 138.5530000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 145.6930000000001 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.2730000000001 Td
+/F2.0 10.5 Tf
+<61734e756d626572> Tj
+ET
+
+
+BT
+51.24 100.9930000000001 Td
+ET
+
+
+BT
+51.24 100.9930000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 108.1330000000001 Td
+/F1.0 10.5 Tf
+<4e756d626572> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71300000000004 Td
+/F2.0 10.5 Tf
+<617353686f7274> Tj
+ET
+
+
+BT
+51.24 63.433000000000035 Td
+ET
+
+
+BT
+51.24 63.433000000000035 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57300000000004 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3231> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+247 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 246 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [249 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
+>>
+endobj
+248 0 obj
+[247 0 R /XYZ 0 683.1600000000001 null]
+endobj
+249 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 292.8670000000001 322.17751176375003 307.1470000000001]
+/Type /Annot
+>>
+endobj
+250 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 255.3070000000001 314.65992192000004 269.5870000000001]
+/Type /Annot
+>>
+endobj
+251 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 217.74700000000013 325.32792192000005 232.0270000000001]
+/Type /Annot
+>>
+endobj
+252 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 180.18700000000013 340.1224219200001 194.4670000000001]
+/Type /Annot
+>>
+endobj
+253 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 105.06700000000009 313.75692192 119.3470000000001]
+/Type /Annot
+>>
+endobj
+254 0 obj
+<< /Length 21524
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<6173537472696e67> Tj
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.410 m
+48.240 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.913 Td
+/F2.0 10.5 Tf
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 664.633 Td
+ET
+
+
+BT
+51.24 664.633 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.410 m
+563.760 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 671.773 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.850 m
+48.240 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.3530000000001 Td
+/F2.0 10.5 Tf
+<6a736f6e4e756c6c> Tj
+ET
+
+
+BT
+51.24 627.0730000000001 Td
+ET
+
+
+BT
+51.24 627.0730000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.850 m
+563.760 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 634.2130000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7930000000001 Td
+/F2.0 10.5 Tf
+<6a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 589.5130000000001 Td
+ET
+
+
+BT
+51.24 589.5130000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.6530000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.2330000000002 Td
+/F2.0 10.5 Tf
+<6a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 551.9530000000002 Td
+ET
+
+
+BT
+51.24 551.9530000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.0930000000002 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 509.4960000000004 Td
+/F2.0 18 Tf
+<332e31302e204a736f6e5072696d6974697665> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.560 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.560 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 432.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 432.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 394.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 394.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 492.840 m
+269.177 492.840 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 469.560 m
+269.177 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 493.090 m
+48.240 468.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 493.090 m
+269.177 468.810 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 477.0930000000003 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 492.840 m
+563.760 492.840 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 469.560 m
+563.760 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 493.090 m
+269.177 468.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 493.090 m
+563.760 468.810 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 477.0930000000003 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.560 m
+269.177 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.000 m
+269.177 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.810 m
+48.240 431.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.810 m
+269.177 431.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.3130000000003 Td
+/F2.0 10.5 Tf
+<6173426967446563696d616c> Tj
+ET
+
+
+BT
+51.24 439.03300000000024 Td
+ET
+
+
+BT
+51.24 439.03300000000024 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.560 m
+563.760 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.810 m
+269.177 431.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 469.810 m
+563.760 431.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.1730000000003 Td
+/F1.0 10.5 Tf
+<6e756d626572> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.000 m
+269.177 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.250 m
+48.240 394.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.250 m
+269.177 394.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.7530000000003 Td
+/F2.0 10.5 Tf
+<6173426967496e7465676572> Tj
+ET
+
+
+BT
+51.24 401.4730000000003 Td
+ET
+
+
+BT
+51.24 401.4730000000003 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.250 m
+269.177 394.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.250 m
+563.760 394.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.61300000000034 Td
+/F1.0 10.5 Tf
+<696e7465676572> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 356.880 m
+269.177 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.690 m
+48.240 356.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.690 m
+269.177 356.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.19300000000027 Td
+/F2.0 10.5 Tf
+<6173426f6f6c65616e> Tj
+ET
+
+
+BT
+51.24 363.91300000000024 Td
+ET
+
+
+BT
+51.24 363.91300000000024 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 356.880 m
+563.760 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.690 m
+269.177 356.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.690 m
+563.760 356.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.0530000000003 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 356.880 m
+269.177 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.130 m
+48.240 319.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.130 m
+269.177 319.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.6330000000003 Td
+/F2.0 10.5 Tf
+[<617342> 20.01953125 <797465>] TJ
+ET
+
+
+BT
+51.24 326.3530000000003 Td
+ET
+
+
+BT
+51.24 326.3530000000003 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 356.880 m
+563.760 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.130 m
+269.177 319.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.130 m
+563.760 319.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.49300000000034 Td
+/F1.0 10.5 Tf
+[<737472696e67202862> 20.01953125 <79746529>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.570 m
+48.240 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.07300000000026 Td
+/F2.0 10.5 Tf
+[<617343686172> 20.01953125 <6163746572>] TJ
+ET
+
+
+BT
+51.24 288.79300000000023 Td
+ET
+
+
+BT
+51.24 288.79300000000023 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.570 m
+563.760 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 295.9330000000003 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.010 m
+48.240 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 265.5130000000003 Td
+/F2.0 10.5 Tf
+<6173446f75626c65> Tj
+ET
+
+
+BT
+51.24 251.23300000000032 Td
+ET
+
+
+BT
+51.24 251.23300000000032 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.010 m
+563.760 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 258.37300000000033 Td
+/F1.0 10.5 Tf
+<6e756d6265722028646f75626c6529> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.450 m
+48.240 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 227.95300000000032 Td
+/F2.0 10.5 Tf
+<6173466c6f6174> Tj
+ET
+
+
+BT
+51.24 213.67300000000031 Td
+ET
+
+
+BT
+51.24 213.67300000000031 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 244.450 m
+563.760 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 220.8130000000003 Td
+/F1.0 10.5 Tf
+<6e756d6265722028666c6f617429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39300000000028 Td
+/F2.0 10.5 Tf
+<6173496e74> Tj
+ET
+
+
+BT
+51.24 176.11300000000028 Td
+ET
+
+
+BT
+51.24 176.11300000000028 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.25300000000027 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.83300000000028 Td
+/F2.0 10.5 Tf
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 138.55300000000028 Td
+ET
+
+
+BT
+51.24 138.55300000000028 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 145.69300000000027 Td
+/F1.0 10.5 Tf
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.27300000000027 Td
+/F2.0 10.5 Tf
+<61734a736f6e4e756c6c> Tj
+ET
+
+
+BT
+51.24 100.99300000000027 Td
+ET
+
+
+BT
+51.24 100.99300000000027 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 108.13300000000027 Td
+/F1.0 10.5 Tf
+<4a736f6e4e756c6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71300000000026 Td
+/F2.0 10.5 Tf
+<61734a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 63.43300000000026 Td
+ET
+
+
+BT
+51.24 63.43300000000026 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 70.57300000000026 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3232> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+255 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 254 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [257 0 R 258 0 R 259 0 R]
+>>
+endobj
+256 0 obj
+[255 0 R /XYZ 0 532.9200000000003 null]
+endobj
+257 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 142.6270000000003 322.17751176375003 156.90700000000027]
+/Type /Annot
+>>
+endobj
+258 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 105.06700000000026 314.65992192000004 119.34700000000026]
+/Type /Annot
+>>
+endobj
+259 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 67.50700000000026 325.32792192000005 81.78700000000026]
+/Type /Annot
+>>
+endobj
+260 0 obj
+<< /Length 21478
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<4a736f6e5072696d6974697665> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.410 m
+48.240 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.913 Td
+/F2.0 10.5 Tf
+<61734c6f6e67> Tj
+ET
+
+
+BT
+51.24 664.633 Td
+ET
+
+
+BT
+51.24 664.633 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.410 m
+563.760 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 671.773 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.850 m
+48.240 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.3530000000001 Td
+/F2.0 10.5 Tf
+<61734e756d626572> Tj
+ET
+
+
+BT
+51.24 627.073 Td
+ET
+
+
+BT
+51.24 627.073 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.850 m
+563.760 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 634.213 Td
+/F1.0 10.5 Tf
+<4e756d626572> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7929999999999 Td
+/F2.0 10.5 Tf
+<617353686f7274> Tj
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.6529999999999 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.233 Td
+/F2.0 10.5 Tf
+<6173537472696e67> Tj
+ET
+
+
+BT
+51.24 551.953 Td
+ET
+
+
+BT
+51.24 551.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.093 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 545.170 m
+48.240 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.673 Td
+/F2.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+
+BT
+51.24 514.393 Td
+ET
+
+
+BT
+51.24 514.393 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 545.170 m
+563.760 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.533 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.610 m
+48.240 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 491.1130000000001 Td
+/F2.0 10.5 Tf
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 476.8330000000001 Td
+ET
+
+
+BT
+51.24 476.8330000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.9730000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.55300000000017 Td
+/F2.0 10.5 Tf
+<6a736f6e4e756c6c> Tj
+ET
+
+
+BT
+51.24 439.27300000000014 Td
+ET
+
+
+BT
+51.24 439.27300000000014 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.4130000000002 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.490 m
+48.240 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.9930000000002 Td
+/F2.0 10.5 Tf
+<6a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 401.7130000000002 Td
+ET
+
+
+BT
+51.24 401.7130000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.490 m
+563.760 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.85300000000024 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.930 m
+48.240 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.4330000000003 Td
+/F2.0 10.5 Tf
+<6a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 364.15300000000025 Td
+ET
+
+
+BT
+51.24 364.15300000000025 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.930 m
+563.760 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.2930000000003 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.370 m
+48.240 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.87300000000033 Td
+/F2.0 10.5 Tf
+<6e756d626572> Tj
+ET
+
+
+BT
+51.24 326.5930000000003 Td
+ET
+
+
+BT
+51.24 326.5930000000003 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.370 m
+563.760 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.73300000000035 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.000 m
+269.177 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.810 m
+48.240 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.3130000000004 Td
+/F2.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+
+BT
+51.24 289.03300000000036 Td
+ET
+
+
+BT
+51.24 289.03300000000036 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.000 m
+563.760 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.810 m
+563.760 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 296.1730000000004 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 246.57600000000042 Td
+/F2.0 18 Tf
+<332e31312e204c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 229.920 m
+269.177 229.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 230.170 m
+48.240 205.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 230.170 m
+269.177 205.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 214.17300000000043 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 229.920 m
+563.760 229.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 230.170 m
+269.177 205.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 230.170 m
+563.760 205.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 214.17300000000043 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39300000000043 Td
+/F2.0 10.5 Tf
+<636f6d706f6e656e7473> Tj
+ET
+
+
+BT
+51.24 176.11300000000043 Td
+ET
+
+
+BT
+51.24 176.11300000000043 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.2530000000004 Td
+/F1.0 10.5 Tf
+<3c20737472696e672c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+315.25842192000005 183.2530000000004 Td
+/F1.0 10.5 Tf
+<45787465726e616c436f6d706f6e656e74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+415.81692192 183.2530000000004 Td
+/F1.0 10.5 Tf
+<203e206d6170> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.83300000000042 Td
+/F2.0 10.5 Tf
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 138.55300000000042 Td
+ET
+
+
+BT
+51.24 138.55300000000042 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 145.6930000000004 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.27300000000041 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 100.99300000000041 Td
+ET
+
+
+BT
+51.24 100.99300000000041 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.13300000000041 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.7130000000004 Td
+/F2.0 10.5 Tf
+[<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
+ET
+
+
+BT
+51.24 63.433000000000405 Td
+ET
+
+
+BT
+51.24 63.433000000000405 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.5730000000004 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3233> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+261 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 260 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [262 0 R 263 0 R 265 0 R]
+>>
+endobj
+262 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 706.267 340.1224219200001 720.547]
+/Type /Annot
+>>
+endobj
+263 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 631.147 313.75692192 645.427]
+/Type /Annot
+>>
+endobj
+264 0 obj
+[261 0 R /XYZ 0 270.0000000000004 null]
+endobj
+265 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponent)
+/Subtype /Link
+/Rect [315.25842192000005 180.18700000000044 415.81692192 194.46700000000044]
+/Type /Annot
+>>
+endobj
+266 0 obj
+<< /Length 22976
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+[<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.410 m
+48.240 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.913 Td
+/F2.0 10.5 Tf
+<676c6f62616c50726f706572746965734a736f6e> Tj
+ET
+
+
+BT
+51.24 664.6329999999999 Td
+ET
+
+
+BT
+51.24 664.6329999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.410 m
+563.760 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 671.7729999999999 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.850 m
+48.240 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.3530000000001 Td
+/F2.0 10.5 Tf
+<6c617374436f6d70757465645374617465> Tj
+ET
+
+
+BT
+51.24 627.073 Td
+ET
+
+
+BT
+51.24 627.073 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.850 m
+563.760 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 641.3530000000001 Td
+/F1.0 10.5 Tf
+[<656e756d202844455349474e2c205355424d49545445442c204445504c4f> 29.78515625 <5945442c2052> 9.765625 <554e4e494e472c>] TJ
+ET
+
+
+BT
+272.17692192000004 627.073 Td
+/F1.0 10.5 Tf
+[<53> 20.01953125 <54> 20.01953125 <4f505045442c20494e5f455252> 20.01953125 <4f522c2057> 60.05859375 <414954494e4729>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7929999999999 Td
+/F2.0 10.5 Tf
+<6c6f6f704c6f6773> Tj
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.6529999999999 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 596.6529999999999 Td
+/F1.0 10.5 Tf
+<4c6f6f704c6f67> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+324.10992192000003 596.6529999999999 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.233 Td
+/F2.0 10.5 Tf
+[<6c6f6f7054> 29.78515625 <656d706c617465>] TJ
+ET
+
+
+BT
+51.24 551.953 Td
+ET
+
+
+BT
+51.24 551.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 559.093 Td
+/F1.0 10.5 Tf
+[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 545.170 m
+48.240 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.673 Td
+/F2.0 10.5 Tf
+<6d6963726f53657276696365506f6c6963696573> Tj
+ET
+
+
+BT
+51.24 514.3929999999999 Td
+ET
+
+
+BT
+51.24 514.3929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 545.170 m
+563.760 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.5329999999999 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 521.5329999999999 Td
+/F1.0 10.5 Tf
+<4d6963726f53657276696365506f6c696379> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+376.69392192000004 521.5329999999999 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.610 m
+48.240 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 491.11299999999994 Td
+/F2.0 10.5 Tf
+<6d6f64656c53657276696365> Tj
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 483.97299999999996 Td
+/F1.0 10.5 Tf
+<53657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.55299999999994 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 439.2729999999999 Td
+ET
+
+
+BT
+51.24 439.2729999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.41299999999995 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.490 m
+48.240 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.99299999999994 Td
+/F2.0 10.5 Tf
+[<6f706572> 20.01953125 <6174696f6e616c506f6c6963696573>] TJ
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.490 m
+563.760 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.85299999999995 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 408.85299999999995 Td
+/F1.0 10.5 Tf
+[<4f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+370.37271684187505 408.85299999999995 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.930 m
+48.240 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.43299999999994 Td
+/F2.0 10.5 Tf
+<737667526570726573656e746174696f6e> Tj
+ET
+
+
+BT
+51.24 364.1529999999999 Td
+ET
+
+
+BT
+51.24 364.1529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.930 m
+563.760 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.29299999999995 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.370 m
+48.240 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.8729999999999 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 326.59299999999985 Td
+ET
+
+
+BT
+51.24 326.59299999999985 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.370 m
+563.760 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.7329999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.000 m
+269.177 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.810 m
+48.240 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.31299999999993 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 289.0329999999999 Td
+ET
+
+
+BT
+51.24 289.0329999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.000 m
+563.760 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.810 m
+563.760 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 296.17299999999994 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 246.57599999999996 Td
+/F2.0 18 Tf
+<332e31322e204c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 229.920 m
+269.177 229.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 230.170 m
+48.240 205.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 230.170 m
+269.177 205.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 214.17299999999997 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 229.920 m
+563.760 229.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 230.170 m
+269.177 205.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 230.170 m
+563.760 205.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 214.17299999999997 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39299999999997 Td
+/F2.0 10.5 Tf
+<626c75657072696e74> Tj
+ET
+
+
+BT
+51.24 176.11299999999997 Td
+ET
+
+
+BT
+51.24 176.11299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.25299999999996 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.83299999999997 Td
+/F2.0 10.5 Tf
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 138.55299999999997 Td
+ET
+
+
+BT
+51.24 138.55299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 145.69299999999996 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.27299999999995 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 100.99299999999995 Td
+ET
+
+
+BT
+51.24 100.99299999999995 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.13299999999995 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71299999999995 Td
+/F2.0 10.5 Tf
+<64636165426c75657072696e744964> Tj
+ET
+
+
+BT
+51.24 63.43299999999995 Td
+ET
+
+
+BT
+51.24 63.43299999999995 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57299999999995 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3234> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+267 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 266 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R]
+>>
+endobj
+268 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 668.707 325.32792192000005 682.987]
+/Type /Annot
+>>
+endobj
+269 0 obj
+<< /Border [0 0 0]
+/Dest (_looplog)
+/Subtype /Link
+/Rect [280.76592192000004 593.587 324.10992192000003 607.867]
+/Type /Annot
+>>
+endobj
+270 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [272.17692192000004 556.027 343.82067777937505 570.307]
+/Type /Annot
+>>
+endobj
+271 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [280.76592192000004 518.467 376.69392192000004 532.747]
+/Type /Annot
+>>
+endobj
+272 0 obj
+<< /Border [0 0 0]
+/Dest (_service)
+/Subtype /Link
+/Rect [272.17692192000004 480.9069999999999 308.65392192 495.18699999999995]
+/Type /Annot
+>>
+endobj
+273 0 obj
+<< /Border [0 0 0]
+/Dest (_operationalpolicy)
+/Subtype /Link
+/Rect [280.76592192000004 405.7869999999999 370.37271684187505 420.06699999999995]
+/Type /Annot
+>>
+endobj
+274 0 obj
+[267 0 R /XYZ 0 269.99999999999994 null]
+endobj
+275 0 obj
+<< /Length 20786
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<6c6f6f70456c656d656e7454797065> Tj
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.410 m
+48.240 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.913 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 664.6329999999999 Td
+ET
+
+
+BT
+51.24 664.6329999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.410 m
+563.760 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 671.7729999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.850 m
+48.240 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.3530000000001 Td
+/F2.0 10.5 Tf
+<706f6c6963794d6f64656c73> Tj
+ET
+
+
+BT
+51.24 627.073 Td
+ET
+
+
+BT
+51.24 627.073 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.850 m
+563.760 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 634.213 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 634.213 Td
+/F1.0 10.5 Tf
+<506f6c6963794d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+342.0649219200001 634.213 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7929999999999 Td
+/F2.0 10.5 Tf
+<73686f72744e616d65> Tj
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.6529999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.233 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 551.953 Td
+ET
+
+
+BT
+51.24 551.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.093 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 545.170 m
+48.240 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.673 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 514.3929999999999 Td
+ET
+
+
+BT
+51.24 514.3929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 545.170 m
+563.760 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.5329999999999 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.610 m
+48.240 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 491.11299999999994 Td
+/F2.0 10.5 Tf
+[<7573656442> 20.01953125 <794c6f6f7054> 29.78515625 <656d706c61746573>] TJ
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.97299999999996 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 483.97299999999996 Td
+/F1.0 10.5 Tf
+[<4c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+450.12267777937507 483.97299999999996 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 434.376 Td
+/F2.0 18 Tf
+<332e31332e204c6f6f704c6f67> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.440 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.440 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 417.720 m
+269.177 417.720 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 417.970 m
+48.240 393.690 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 417.970 m
+269.177 393.690 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 401.9729999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 417.720 m
+563.760 417.720 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 417.970 m
+269.177 393.690 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 417.970 m
+563.760 393.690 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 401.9729999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 356.880 m
+269.177 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.690 m
+48.240 356.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.690 m
+269.177 356.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.1929999999999 Td
+/F2.0 10.5 Tf
+<6964> Tj
+ET
+
+
+BT
+51.24 363.9129999999999 Td
+ET
+
+
+BT
+51.24 363.9129999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 356.880 m
+563.760 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.690 m
+269.177 356.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.690 m
+563.760 356.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.05299999999994 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 356.880 m
+269.177 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.130 m
+48.240 319.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.130 m
+269.177 319.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.63299999999987 Td
+/F2.0 10.5 Tf
+<6c6f67436f6d706f6e656e74> Tj
+ET
+
+
+BT
+51.24 326.35299999999984 Td
+ET
+
+
+BT
+51.24 326.35299999999984 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 356.880 m
+563.760 356.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.130 m
+269.177 319.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.130 m
+563.760 319.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.4929999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.570 m
+48.240 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.0729999999999 Td
+/F2.0 10.5 Tf
+<6c6f67496e7374616e74> Tj
+ET
+
+
+BT
+51.24 288.7929999999999 Td
+ET
+
+
+BT
+51.24 288.7929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.570 m
+563.760 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 295.93299999999994 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.010 m
+48.240 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 265.51299999999986 Td
+/F2.0 10.5 Tf
+<6c6f6754797065> Tj
+ET
+
+
+BT
+51.24 251.23299999999986 Td
+ET
+
+
+BT
+51.24 251.23299999999986 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.010 m
+563.760 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 258.3729999999999 Td
+/F1.0 10.5 Tf
+[<656e756d2028494e464f2c2057> 60.05859375 <41524e494e472c20455252> 20.01953125 <4f5229>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.450 m
+48.240 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 227.95299999999992 Td
+/F2.0 10.5 Tf
+<6c6f6f70> Tj
+ET
+
+
+BT
+51.24 213.67299999999992 Td
+ET
+
+
+BT
+51.24 213.67299999999992 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 244.450 m
+563.760 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 220.8129999999999 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39299999999992 Td
+/F2.0 10.5 Tf
+<6d657373616765> Tj
+ET
+
+
+BT
+51.24 176.11299999999991 Td
+ET
+
+
+BT
+51.24 176.11299999999991 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.2529999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 133.6559999999999 Td
+/F2.0 18 Tf
+[<332e31342e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 117.000 m
+269.177 117.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 93.720 m
+269.177 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 117.250 m
+48.240 92.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 117.250 m
+269.177 92.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 101.25299999999989 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 117.000 m
+563.760 117.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 93.720 m
+563.760 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 117.250 m
+269.177 92.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 117.250 m
+563.760 92.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 101.25299999999989 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.720 m
+269.177 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.160 m
+269.177 56.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.970 m
+48.240 55.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.970 m
+269.177 55.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.47299999999989 Td
+/F2.0 10.5 Tf
+<616c6c6f7765644c6f6f7054797065> Tj
+ET
+
+
+BT
+51.24 63.192999999999884 Td
+ET
+
+
+BT
+51.24 63.192999999999884 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.720 m
+563.760 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.160 m
+563.760 56.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.970 m
+269.177 55.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 93.970 m
+563.760 55.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.33299999999988 Td
+/F1.0 10.5 Tf
+<656e756d20284f50454e2c20434c4f5345442c2048594252494429> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3235> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+276 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 275 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [277 0 R 278 0 R 280 0 R]
+>>
+endobj
+277 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [280.76592192000004 631.147 342.0649219200001 645.427]
+/Type /Annot
+>>
+endobj
+278 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplateloopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 480.9069999999999 450.12267777937507 495.18699999999995]
+/Type /Annot
+>>
+endobj
+279 0 obj
+[276 0 R /XYZ 0 457.79999999999995 null]
+endobj
+280 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 217.74699999999993 297.27192192000007 232.02699999999993]
+/Type /Annot
+>>
+endobj
+281 0 obj
+[276 0 R /XYZ 0 157.0799999999999 null]
+endobj
+282 0 obj
+<< /Length 20545
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<626c75657072696e74> Tj
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.410 m
+48.240 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.913 Td
+/F2.0 10.5 Tf
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 664.633 Td
+ET
+
+
+BT
+51.24 664.633 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.410 m
+563.760 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 671.773 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.850 m
+48.240 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.3530000000001 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 627.073 Td
+ET
+
+
+BT
+51.24 627.073 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.850 m
+563.760 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 634.213 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7930000000001 Td
+/F2.0 10.5 Tf
+<64636165426c75657072696e744964> Tj
+ET
+
+
+BT
+51.24 589.513 Td
+ET
+
+
+BT
+51.24 589.513 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.653 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.233 Td
+/F2.0 10.5 Tf
+<6c6f6f70456c656d656e744d6f64656c7355736564> Tj
+ET
+
+
+BT
+51.24 551.953 Td
+ET
+
+
+BT
+51.24 551.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.093 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 559.093 Td
+/F1.0 10.5 Tf
+[<4c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+450.12267777937507 559.093 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 545.170 m
+48.240 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.673 Td
+/F2.0 10.5 Tf
+<6d6178696d756d496e7374616e636573416c6c6f776564> Tj
+ET
+
+
+BT
+51.24 514.393 Td
+ET
+
+
+BT
+51.24 514.393 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 545.170 m
+563.760 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.533 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.610 m
+48.240 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 491.113 Td
+/F2.0 10.5 Tf
+<6d6f64656c53657276696365> Tj
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 483.973 Td
+/F1.0 10.5 Tf
+<53657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.553 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 439.273 Td
+ET
+
+
+BT
+51.24 439.273 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.413 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.490 m
+48.240 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.993 Td
+/F2.0 10.5 Tf
+<737667526570726573656e746174696f6e> Tj
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.490 m
+563.760 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.853 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.930 m
+48.240 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.433 Td
+/F2.0 10.5 Tf
+<756e69717565426c75657072696e74> Tj
+ET
+
+
+BT
+51.24 364.153 Td
+ET
+
+
+BT
+51.24 364.153 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.930 m
+269.177 356.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.930 m
+563.760 356.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 371.293 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.120 m
+269.177 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.370 m
+48.240 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.873 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 326.59299999999996 Td
+ET
+
+
+BT
+51.24 326.59299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.120 m
+563.760 357.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.370 m
+269.177 319.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.370 m
+563.760 319.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 333.733 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.560 m
+269.177 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.000 m
+269.177 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.810 m
+48.240 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.313 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 289.033 Td
+ET
+
+
+BT
+51.24 289.033 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.560 m
+563.760 319.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.000 m
+563.760 282.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.810 m
+269.177 281.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.810 m
+563.760 281.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 296.173 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 246.57600000000002 Td
+/F2.0 18 Tf
+[<332e31352e204c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 229.920 m
+269.177 229.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 230.170 m
+48.240 205.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 230.170 m
+269.177 205.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 214.17300000000003 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 229.920 m
+563.760 229.920 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 230.170 m
+269.177 205.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 230.170 m
+563.760 205.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 214.17300000000003 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39300000000003 Td
+/F2.0 10.5 Tf
+<666c6f774f72646572> Tj
+ET
+
+
+BT
+51.24 176.11300000000003 Td
+ET
+
+
+BT
+51.24 176.11300000000003 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.25300000000001 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.83300000000003 Td
+/F2.0 10.5 Tf
+<6c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+
+BT
+51.24 138.55300000000003 Td
+ET
+
+
+BT
+51.24 138.55300000000003 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 145.693 Td
+/F1.0 10.5 Tf
+<4c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.27300000000001 Td
+/F2.0 10.5 Tf
+[<6c6f6f7054> 29.78515625 <656d706c617465>] TJ
+ET
+
+
+BT
+51.24 100.99300000000001 Td
+ET
+
+
+BT
+51.24 100.99300000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 108.13300000000001 Td
+/F1.0 10.5 Tf
+[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3236> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+283 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 282 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [284 0 R 285 0 R 287 0 R 288 0 R]
+>>
+endobj
+284 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplateloopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 556.027 450.12267777937507 570.307]
+/Type /Annot
+>>
+endobj
+285 0 obj
+<< /Border [0 0 0]
+/Dest (_service)
+/Subtype /Link
+/Rect [272.17692192000004 480.907 308.65392192 495.187]
+/Type /Annot
+>>
+endobj
+286 0 obj
+[283 0 R /XYZ 0 270.0 null]
+endobj
+287 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 142.62700000000004 369.88992192000006 156.90700000000004]
+/Type /Annot
+>>
+endobj
+288 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [272.17692192000004 105.06700000000001 343.82067777937505 119.34700000000001]
+/Type /Annot
+>>
+endobj
+289 0 obj
+<< /Length 21277
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
+/F2.0 18 Tf
+<332e31362e204d6963726f53657276696365506f6c696379> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.040 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.040 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 657.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 657.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 619.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 619.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 582.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 582.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 544.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 544.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 507.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 507.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 469.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 469.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 432.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 432.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 394.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 394.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 357.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 357.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 94.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 94.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 718.320 m
+269.177 718.320 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 695.040 m
+269.177 695.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 718.570 m
+48.240 694.290 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 718.570 m
+269.177 694.290 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 702.573 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 718.320 m
+563.760 718.320 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 695.040 m
+563.760 695.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 718.570 m
+269.177 694.290 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 718.570 m
+563.760 694.290 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 702.573 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.040 m
+269.177 695.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.480 m
+269.177 657.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.290 m
+48.240 657.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.290 m
+269.177 657.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.7930000000001 Td
+/F2.0 10.5 Tf
+[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
+ET
+
+
+BT
+51.24 664.513 Td
+ET
+
+
+BT
+51.24 664.513 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.040 m
+563.760 695.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.480 m
+563.760 657.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.290 m
+269.177 657.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.290 m
+563.760 657.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 671.653 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.480 m
+269.177 657.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 619.920 m
+269.177 619.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.730 m
+48.240 619.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.730 m
+269.177 619.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.233 Td
+/F2.0 10.5 Tf
+<636f6e74657874> Tj
+ET
+
+
+BT
+51.24 626.953 Td
+ET
+
+
+BT
+51.24 626.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.480 m
+563.760 657.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 619.920 m
+563.760 619.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.730 m
+269.177 619.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.730 m
+563.760 619.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 634.093 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 619.920 m
+269.177 619.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.360 m
+269.177 582.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.170 m
+48.240 582.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.170 m
+269.177 582.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.673 Td
+/F2.0 10.5 Tf
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 589.393 Td
+ET
+
+
+BT
+51.24 589.393 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 619.920 m
+563.760 619.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.360 m
+563.760 582.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.170 m
+269.177 582.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.170 m
+563.760 582.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.533 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.360 m
+269.177 582.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.800 m
+269.177 544.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.610 m
+48.240 544.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.610 m
+269.177 544.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.113 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 551.833 Td
+ET
+
+
+BT
+51.24 551.833 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.360 m
+563.760 582.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.800 m
+563.760 544.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.610 m
+269.177 544.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.610 m
+563.760 544.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 558.973 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.800 m
+269.177 544.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.240 m
+269.177 507.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 545.050 m
+48.240 506.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.050 m
+269.177 506.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.5530000000001 Td
+/F2.0 10.5 Tf
+<64636165426c75657072696e744964> Tj
+ET
+
+
+BT
+51.24 514.273 Td
+ET
+
+
+BT
+51.24 514.273 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.800 m
+563.760 544.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.240 m
+563.760 507.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.050 m
+269.177 506.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 545.050 m
+563.760 506.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.413 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.240 m
+269.177 507.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.680 m
+269.177 469.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.490 m
+48.240 469.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.490 m
+269.177 469.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 490.993 Td
+/F2.0 10.5 Tf
+[<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
+ET
+
+
+BT
+51.24 476.71299999999997 Td
+ET
+
+
+BT
+51.24 476.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.240 m
+563.760 507.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.680 m
+563.760 469.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.490 m
+269.177 469.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.490 m
+563.760 469.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.853 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.680 m
+269.177 469.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.120 m
+269.177 432.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.930 m
+48.240 431.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.930 m
+269.177 431.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.43300000000005 Td
+/F2.0 10.5 Tf
+[<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
+ET
+
+
+BT
+51.24 439.153 Td
+ET
+
+
+BT
+51.24 439.153 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.680 m
+563.760 469.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.120 m
+563.760 432.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.930 m
+269.177 431.870 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 469.930 m
+563.760 431.870 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.29300000000006 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.120 m
+269.177 432.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.560 m
+269.177 394.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.370 m
+48.240 394.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.370 m
+269.177 394.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.873 Td
+/F2.0 10.5 Tf
+<6465766963655479706553636f7065> Tj
+ET
+
+
+BT
+51.24 401.59299999999996 Td
+ET
+
+
+BT
+51.24 401.59299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.120 m
+563.760 432.120 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.560 m
+563.760 394.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.370 m
+269.177 394.310 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.370 m
+563.760 394.310 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.733 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.560 m
+269.177 394.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.000 m
+269.177 357.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.810 m
+48.240 356.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.810 m
+269.177 356.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 378.313 Td
+/F2.0 10.5 Tf
+<6a736f6e526570726573656e746174696f6e> Tj
+ET
+
+
+BT
+51.24 364.033 Td
+ET
+
+
+BT
+51.24 364.033 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.560 m
+563.760 394.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.000 m
+563.760 357.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.810 m
+269.177 356.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 394.810 m
+563.760 356.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 371.173 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.000 m
+269.177 357.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.440 m
+269.177 319.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 357.250 m
+48.240 319.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.250 m
+269.177 319.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 340.753 Td
+/F2.0 10.5 Tf
+<6c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+
+BT
+51.24 326.47299999999996 Td
+ET
+
+
+BT
+51.24 326.47299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.000 m
+563.760 357.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.440 m
+563.760 319.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 357.250 m
+269.177 319.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 357.250 m
+563.760 319.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 333.613 Td
+/F1.0 10.5 Tf
+<4c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.440 m
+269.177 319.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.880 m
+269.177 281.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.690 m
+48.240 281.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.690 m
+269.177 281.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.193 Td
+/F2.0 10.5 Tf
+<6d6f64656c54797065> Tj
+ET
+
+
+BT
+51.24 288.913 Td
+ET
+
+
+BT
+51.24 288.913 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.440 m
+563.760 319.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.880 m
+563.760 281.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.690 m
+269.177 281.630 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.690 m
+563.760 281.630 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 296.053 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.880 m
+269.177 281.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.320 m
+269.177 244.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.130 m
+48.240 244.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.130 m
+269.177 244.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 265.633 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 251.35299999999998 Td
+ET
+
+
+BT
+51.24 251.35299999999998 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.880 m
+563.760 281.880 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.320 m
+563.760 244.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.130 m
+269.177 244.070 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.130 m
+563.760 244.070 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 258.493 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.320 m
+269.177 244.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.760 m
+269.177 206.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.570 m
+48.240 206.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.570 m
+269.177 206.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 228.073 Td
+/F2.0 10.5 Tf
+<70647047726f7570> Tj
+ET
+
+
+BT
+51.24 213.793 Td
+ET
+
+
+BT
+51.24 213.793 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.320 m
+563.760 244.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.760 m
+563.760 206.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.570 m
+269.177 206.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 244.570 m
+563.760 206.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 220.933 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.760 m
+269.177 206.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.200 m
+269.177 169.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 207.010 m
+48.240 168.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 207.010 m
+269.177 168.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.513 Td
+/F2.0 10.5 Tf
+[<706f6c69637954> 29.78515625 <6f736361>] TJ
+ET
+
+
+BT
+51.24 176.233 Td
+ET
+
+
+BT
+51.24 176.233 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.760 m
+563.760 206.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.200 m
+563.760 169.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 207.010 m
+269.177 168.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 207.010 m
+563.760 168.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.373 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.200 m
+269.177 169.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.640 m
+269.177 131.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.450 m
+48.240 131.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.450 m
+269.177 131.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.95299999999995 Td
+/F2.0 10.5 Tf
+<736861726564> Tj
+ET
+
+
+BT
+51.24 138.67299999999994 Td
+ET
+
+
+BT
+51.24 138.67299999999994 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.200 m
+563.760 169.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.640 m
+563.760 131.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.450 m
+269.177 131.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.450 m
+563.760 131.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 145.81299999999993 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.640 m
+269.177 131.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.080 m
+269.177 94.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.890 m
+48.240 93.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.890 m
+269.177 93.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 115.39299999999999 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 101.11299999999999 Td
+ET
+
+
+BT
+51.24 101.11299999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.640 m
+563.760 131.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.080 m
+563.760 94.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.890 m
+269.177 93.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.890 m
+563.760 93.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.25299999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.080 m
+269.177 94.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.520 m
+269.177 56.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.330 m
+48.240 56.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.330 m
+269.177 56.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.83300000000004 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 63.55300000000004 Td
+ET
+
+
+BT
+51.24 63.55300000000004 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.080 m
+563.760 94.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.520 m
+563.760 56.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.330 m
+269.177 56.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.330 m
+563.760 56.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.69300000000004 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3237> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+290 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 289 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [292 0 R 293 0 R 294 0 R]
+>>
+endobj
+291 0 obj
+[290 0 R /XYZ 0 792.0 null]
+endobj
+292 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 668.5870000000001 325.32792192000005 682.8670000000001]
+/Type /Annot
+>>
+endobj
+293 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 368.10699999999997 325.32792192000005 382.387]
+/Type /Annot
+>>
+endobj
+294 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 330.54699999999997 369.88992192000006 344.827]
+/Type /Annot
+>>
+endobj
+295 0 obj
+<< /Length 18305
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+[<7573656442> 20.01953125 <794c6f6f7073>] TJ
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 709.333 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+305.86092192000007 709.333 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 659.7360000000001 Td
+/F2.0 18 Tf
+<332e31372e204e756d626572> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 631.1160000000001 Td
+/F3.0 10.5 Tf
+<54797065> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+71.4345 631.1160000000001 Td
+/F1.0 10.5 Tf
+<203a206f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 591.8760000000002 Td
+/F2.0 18 Tf
+[<332e31382e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 551.940 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 551.940 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 514.380 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 514.380 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 476.820 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 476.820 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 439.260 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 439.260 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 401.700 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 401.700 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 364.140 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 364.140 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 326.580 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 326.580 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 289.020 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 289.020 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 251.460 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 251.460 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 213.900 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 213.900 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 176.340 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 176.340 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 138.780 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 138.780 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 575.220 m
+269.177 575.220 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 551.940 m
+269.177 551.940 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 575.470 m
+48.240 551.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 575.470 m
+269.177 551.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 559.4730000000002 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 575.220 m
+563.760 575.220 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 551.940 m
+563.760 551.940 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 575.470 m
+269.177 551.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 575.470 m
+563.760 551.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.4730000000002 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 551.940 m
+269.177 551.940 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 514.380 m
+269.177 514.380 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 552.190 m
+48.240 514.130 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 552.190 m
+269.177 514.130 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 535.6930000000002 Td
+/F2.0 10.5 Tf
+[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
+ET
+
+
+BT
+51.24 521.4130000000002 Td
+ET
+
+
+BT
+51.24 521.4130000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 551.940 m
+563.760 551.940 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 514.380 m
+563.760 514.380 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 552.190 m
+269.177 514.130 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 552.190 m
+563.760 514.130 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 528.5530000000002 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 514.380 m
+269.177 514.380 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 476.820 m
+269.177 476.820 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 514.630 m
+48.240 476.570 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 514.630 m
+269.177 476.570 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 498.1330000000002 Td
+/F2.0 10.5 Tf
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 483.8530000000002 Td
+ET
+
+
+BT
+51.24 483.8530000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 514.380 m
+563.760 514.380 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 476.820 m
+563.760 476.820 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 514.630 m
+269.177 476.570 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 514.630 m
+563.760 476.570 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 490.9930000000002 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 476.820 m
+269.177 476.820 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 439.260 m
+269.177 439.260 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 477.070 m
+48.240 439.010 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 477.070 m
+269.177 439.010 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 460.57300000000026 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 446.29300000000023 Td
+ET
+
+
+BT
+51.24 446.29300000000023 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 476.820 m
+563.760 476.820 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 439.260 m
+563.760 439.260 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 477.070 m
+269.177 439.010 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 477.070 m
+563.760 439.010 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 453.4330000000003 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 439.260 m
+269.177 439.260 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 401.700 m
+269.177 401.700 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 439.510 m
+48.240 401.450 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 439.510 m
+269.177 401.450 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 423.0130000000002 Td
+/F2.0 10.5 Tf
+<6a736f6e526570726573656e746174696f6e> Tj
+ET
+
+
+BT
+51.24 408.7330000000002 Td
+ET
+
+
+BT
+51.24 408.7330000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 439.260 m
+563.760 439.260 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 401.700 m
+563.760 401.700 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 439.510 m
+269.177 401.450 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 439.510 m
+563.760 401.450 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 415.8730000000002 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 401.700 m
+269.177 401.700 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 364.140 m
+269.177 364.140 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 401.950 m
+48.240 363.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 401.950 m
+269.177 363.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 385.45300000000026 Td
+/F2.0 10.5 Tf
+<6c6f6f70> Tj
+ET
+
+
+BT
+51.24 371.17300000000023 Td
+ET
+
+
+BT
+51.24 371.17300000000023 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 401.700 m
+563.760 401.700 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 364.140 m
+563.760 364.140 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 401.950 m
+269.177 363.890 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 401.950 m
+563.760 363.890 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 378.3130000000003 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 364.140 m
+269.177 364.140 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 326.580 m
+269.177 326.580 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 364.390 m
+48.240 326.330 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 364.390 m
+269.177 326.330 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 347.8930000000002 Td
+/F2.0 10.5 Tf
+<6c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+
+BT
+51.24 333.61300000000017 Td
+ET
+
+
+BT
+51.24 333.61300000000017 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 364.140 m
+563.760 364.140 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 326.580 m
+563.760 326.580 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 364.390 m
+269.177 326.330 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 364.390 m
+563.760 326.330 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 340.7530000000002 Td
+/F1.0 10.5 Tf
+<4c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 326.580 m
+269.177 326.580 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 289.020 m
+269.177 289.020 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 326.830 m
+48.240 288.770 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 326.830 m
+269.177 288.770 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 310.33300000000025 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 296.0530000000002 Td
+ET
+
+
+BT
+51.24 296.0530000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 326.580 m
+563.760 326.580 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 289.020 m
+563.760 289.020 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 326.830 m
+269.177 288.770 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 326.830 m
+563.760 288.770 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 303.19300000000027 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 289.020 m
+269.177 289.020 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 251.460 m
+269.177 251.460 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 289.270 m
+48.240 251.210 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 289.270 m
+269.177 251.210 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 272.7730000000002 Td
+/F2.0 10.5 Tf
+<70647047726f7570> Tj
+ET
+
+
+BT
+51.24 258.49300000000017 Td
+ET
+
+
+BT
+51.24 258.49300000000017 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 289.020 m
+563.760 289.020 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 251.460 m
+563.760 251.460 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 289.270 m
+269.177 251.210 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 289.270 m
+563.760 251.210 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 265.6330000000002 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 251.460 m
+269.177 251.460 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 213.900 m
+269.177 213.900 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 251.710 m
+48.240 213.650 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 251.710 m
+269.177 213.650 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 235.21300000000022 Td
+/F2.0 10.5 Tf
+<706f6c6963794d6f64656c> Tj
+ET
+
+
+BT
+51.24 220.93300000000022 Td
+ET
+
+
+BT
+51.24 220.93300000000022 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 251.460 m
+563.760 251.460 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 213.900 m
+563.760 213.900 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 251.710 m
+269.177 213.650 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 251.710 m
+563.760 213.650 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 228.0730000000002 Td
+/F1.0 10.5 Tf
+<506f6c6963794d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 213.900 m
+269.177 213.900 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 176.340 m
+269.177 176.340 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 214.150 m
+48.240 176.090 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 214.150 m
+269.177 176.090 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 197.65300000000022 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 183.37300000000022 Td
+ET
+
+
+BT
+51.24 183.37300000000022 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 213.900 m
+563.760 213.900 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 176.340 m
+563.760 176.340 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 214.150 m
+269.177 176.090 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 214.150 m
+563.760 176.090 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 190.5130000000002 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 176.340 m
+269.177 176.340 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 138.780 m
+269.177 138.780 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 176.590 m
+48.240 138.530 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 176.590 m
+269.177 138.530 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 160.09300000000022 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 145.81300000000022 Td
+ET
+
+
+BT
+51.24 145.81300000000022 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 176.340 m
+563.760 176.340 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 138.780 m
+563.760 138.780 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 176.590 m
+269.177 138.530 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 176.590 m
+563.760 138.530 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 152.9530000000002 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 103.3560000000002 Td
+/F2.0 18 Tf
+<332e31392e20506f6c6963794d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3238> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+296 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 295 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [297 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R]
+>>
+endobj
+297 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [280.76592192000004 706.267 305.86092192000007 720.547]
+/Type /Annot
+>>
+endobj
+298 0 obj
+[296 0 R /XYZ 0 683.1600000000001 null]
+endobj
+299 0 obj
+<< /Limits [(_looptemplate) (_parameters_14)]
+/Names [(_looptemplate) 281 0 R (_looptemplateloopelementmodel) 286 0 R (_microservicepolicy) 291 0 R (_number) 298 0 R (_operationalpolicy) 300 0 R (_overview) 19 0 R (_parameters) 48 0 R (_parameters_10) 113 0 R (_parameters_11) 118 0 R (_parameters_12) 124 0 R (_parameters_13) 131 0 R (_parameters_14) 135 0 R]
+>>
+endobj
+300 0 obj
+[296 0 R /XYZ 0 615.3000000000002 null]
+endobj
+301 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 525.4870000000003 325.32792192000005 539.7670000000003]
+/Type /Annot
+>>
+endobj
+302 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 412.8070000000002 325.32792192000005 427.0870000000002]
+/Type /Annot
+>>
+endobj
+303 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 375.24700000000024 297.27192192000007 389.52700000000027]
+/Type /Annot
+>>
+endobj
+304 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 337.6870000000002 369.88992192000006 351.9670000000002]
+/Type /Annot
+>>
+endobj
+305 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [272.17692192000004 225.00700000000023 333.47592192 239.2870000000002]
+/Type /Annot
+>>
+endobj
+306 0 obj
+[296 0 R /XYZ 0 126.7800000000002 null]
+endobj
+307 0 obj
+<< /Length 19335
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 709.333 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.410 m
+48.240 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 678.913 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 664.6329999999999 Td
+ET
+
+
+BT
+51.24 664.6329999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.410 m
+269.177 657.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 695.410 m
+563.760 657.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 671.7729999999999 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.600 m
+269.177 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 657.850 m
+48.240 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 641.3530000000001 Td
+/F2.0 10.5 Tf
+[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
+ET
+
+
+BT
+51.24 627.073 Td
+ET
+
+
+BT
+51.24 627.073 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.600 m
+563.760 657.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 657.850 m
+563.760 619.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 634.213 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7929999999999 Td
+/F2.0 10.5 Tf
+[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+ET
+
+
+BT
+51.24 589.5129999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.6529999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.233 Td
+/F2.0 10.5 Tf
+<706f6c6963794d6f64656c54797065> Tj
+ET
+
+
+BT
+51.24 551.953 Td
+ET
+
+
+BT
+51.24 551.953 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.093 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 545.170 m
+48.240 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 528.673 Td
+/F2.0 10.5 Tf
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 514.3929999999999 Td
+ET
+
+
+BT
+51.24 514.3929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 545.170 m
+269.177 507.110 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 545.170 m
+563.760 507.110 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 521.5329999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.360 m
+269.177 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 507.610 m
+48.240 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 491.113 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+ET
+
+
+BT
+51.24 476.83299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 507.610 m
+269.177 469.550 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 507.610 m
+563.760 469.550 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 483.973 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.55299999999994 Td
+/F2.0 10.5 Tf
+[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
+ET
+
+
+BT
+51.24 439.2729999999999 Td
+ET
+
+
+BT
+51.24 439.2729999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.41299999999995 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 446.41299999999995 Td
+/F1.0 10.5 Tf
+<4c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+378.47892192000006 446.41299999999995 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.490 m
+48.240 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.99299999999994 Td
+/F2.0 10.5 Tf
+<76657273696f6e> Tj
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.490 m
+563.760 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.85299999999995 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 359.256 Td
+/F2.0 18 Tf
+<332e32302e2053657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.320 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.320 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 342.600 m
+269.177 342.600 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 342.850 m
+48.240 318.570 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 342.850 m
+269.177 318.570 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 326.8529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 342.600 m
+563.760 342.600 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 342.850 m
+269.177 318.570 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 342.850 m
+563.760 318.570 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 326.8529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.320 m
+269.177 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 319.570 m
+48.240 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 303.0729999999999 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 288.7929999999999 Td
+ET
+
+
+BT
+51.24 288.7929999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.320 m
+563.760 319.320 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 319.570 m
+269.177 281.510 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 319.570 m
+563.760 281.510 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 295.93299999999994 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.010 m
+48.240 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 265.51299999999986 Td
+/F2.0 10.5 Tf
+<7265736f7572636544657461696c73> Tj
+ET
+
+
+BT
+51.24 251.23299999999986 Td
+ET
+
+
+BT
+51.24 251.23299999999986 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.010 m
+563.760 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 258.3729999999999 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.450 m
+48.240 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 227.95299999999992 Td
+/F2.0 10.5 Tf
+<7365727669636544657461696c73> Tj
+ET
+
+
+BT
+51.24 213.67299999999992 Td
+ET
+
+
+BT
+51.24 213.67299999999992 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.450 m
+269.177 206.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 244.450 m
+563.760 206.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 220.8129999999999 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39299999999992 Td
+/F2.0 10.5 Tf
+<7365727669636555756964> Tj
+ET
+
+
+BT
+51.24 176.11299999999991 Td
+ET
+
+
+BT
+51.24 176.11299999999991 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 183.2529999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 152.8329999999999 Td
+/F2.0 10.5 Tf
+<76657273696f6e> Tj
+ET
+
+
+BT
+51.24 138.5529999999999 Td
+ET
+
+
+BT
+51.24 138.5529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 169.330 m
+563.760 131.270 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 145.6929999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3239> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+308 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 307 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 603 0 R
+>>
+>>
+/Annots [309 0 R 311 0 R 312 0 R]
+>>
+endobj
+309 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 443.3469999999999 378.47892192000006 457.62699999999995]
+/Type /Annot
+>>
+endobj
+310 0 obj
+[308 0 R /XYZ 0 382.67999999999995 null]
+endobj
+311 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 255.30699999999987 325.32792192000005 269.5869999999999]
+/Type /Annot
+>>
+endobj
+312 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 217.74699999999993 325.32792192000005 232.02699999999993]
+/Type /Annot
+>>
+endobj
+313 0 obj
+<< /Border [0 0 0]
+/Dest (_overview)
+/Subtype /Link
+/Rect [48.24 695.6999999999998 107.9745 709.9799999999999]
+/Type /Annot
+>>
+endobj
+314 0 obj
+<< /Border [0 0 0]
+/Dest (_overview)
+/Subtype /Link
+/Rect [557.8905 695.6999999999998 563.76 709.9799999999999]
+/Type /Annot
+>>
+endobj
+315 0 obj
+<< /Border [0 0 0]
+/Dest (_version_information)
+/Subtype /Link
+/Rect [60.24 677.2199999999998 181.28338476562502 691.4999999999999]
+/Type /Annot
+>>
+endobj
+316 0 obj
+<< /Border [0 0 0]
+/Dest (_version_information)
+/Subtype /Link
+/Rect [557.8905 677.2199999999998 563.76 691.4999999999999]
+/Type /Annot
+>>
+endobj
+317 0 obj
+<< /Border [0 0 0]
+/Dest (_uri_scheme)
+/Subtype /Link
+/Rect [60.24000000000001 658.7399999999998 138.6225 673.0199999999999]
+/Type /Annot
+>>
+endobj
+318 0 obj
+<< /Border [0 0 0]
+/Dest (_uri_scheme)
+/Subtype /Link
+/Rect [557.8905 658.7399999999998 563.76 673.0199999999999]
+/Type /Annot
+>>
+endobj
+319 0 obj
+<< /Border [0 0 0]
+/Dest (_paths)
+/Subtype /Link
+/Rect [48.24000000000001 640.2599999999998 86.78550000000001 654.5399999999998]
+/Type /Annot
+>>
+endobj
+320 0 obj
+<< /Border [0 0 0]
+/Dest (_paths)
+/Subtype /Link
+/Rect [557.8905 640.2599999999998 563.76 654.5399999999998]
+/Type /Annot
+>>
+endobj
+321 0 obj
+<< /Border [0 0 0]
+/Dest (_route30)
+/Subtype /Link
+/Rect [60.24000000000001 621.7799999999997 183.88800000000003 636.0599999999998]
+/Type /Annot
+>>
+endobj
+322 0 obj
+<< /Border [0 0 0]
+/Dest (_route30)
+/Subtype /Link
+/Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
+/Type /Annot
+>>
+endobj
+323 0 obj
+<< /Border [0 0 0]
+/Dest (_responses)
+/Subtype /Link
+/Rect [72.24000000000001 603.2999999999997 152.0295 617.5799999999998]
+/Type /Annot
+>>
+endobj
+324 0 obj
+<< /Border [0 0 0]
+/Dest (_responses)
+/Subtype /Link
+/Rect [557.8905 603.2999999999997 563.76 617.5799999999998]
+/Type /Annot
+>>
+endobj
+325 0 obj
+<< /Border [0 0 0]
+/Dest (_produces)
+/Subtype /Link
+/Rect [72.24000000000001 584.8199999999997 146.4015 599.0999999999998]
+/Type /Annot
+>>
+endobj
+326 0 obj
+<< /Border [0 0 0]
+/Dest (_produces)
+/Subtype /Link
+/Rect [557.8905 584.8199999999997 563.76 599.0999999999998]
+/Type /Annot
+>>
+endobj
+327 0 obj
+<< /Border [0 0 0]
+/Dest (_route31)
+/Subtype /Link
+/Rect [60.24000000000001 566.3399999999997 181.64100000000002 580.6199999999998]
+/Type /Annot
+>>
+endobj
+328 0 obj
+<< /Border [0 0 0]
+/Dest (_route31)
+/Subtype /Link
+/Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
+/Type /Annot
+>>
+endobj
+329 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_2)
+/Subtype /Link
+/Rect [72.24000000000001 547.8599999999998 152.0295 562.1399999999998]
+/Type /Annot
+>>
+endobj
+330 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_2)
+/Subtype /Link
+/Rect [557.8905 547.8599999999998 563.76 562.1399999999998]
+/Type /Annot
+>>
+endobj
+331 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_2)
+/Subtype /Link
+/Rect [72.24000000000001 529.3799999999998 146.4015 543.6599999999997]
+/Type /Annot
+>>
+endobj
+332 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_2)
+/Subtype /Link
+/Rect [557.8905 529.3799999999998 563.76 543.6599999999997]
+/Type /Annot
+>>
+endobj
+333 0 obj
+<< /Border [0 0 0]
+/Dest (_route32)
+/Subtype /Link
+/Rect [60.24000000000001 510.89999999999975 183.8775 525.1799999999997]
+/Type /Annot
+>>
+endobj
+334 0 obj
+<< /Border [0 0 0]
+/Dest (_route32)
+/Subtype /Link
+/Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
+/Type /Annot
+>>
+endobj
+335 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_3)
+/Subtype /Link
+/Rect [72.24000000000001 492.41999999999973 152.0295 506.6999999999997]
+/Type /Annot
+>>
+endobj
+336 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_3)
+/Subtype /Link
+/Rect [557.8905 492.41999999999973 563.76 506.6999999999997]
+/Type /Annot
+>>
+endobj
+337 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_3)
+/Subtype /Link
+/Rect [72.24000000000001 473.9399999999997 146.4015 488.2199999999997]
+/Type /Annot
+>>
+endobj
+338 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_3)
+/Subtype /Link
+/Rect [557.8905 473.9399999999997 563.76 488.2199999999997]
+/Type /Annot
+>>
+endobj
+339 0 obj
+<< /Border [0 0 0]
+/Dest (_route18)
+/Subtype /Link
+/Rect [60.24000000000001 455.4599999999997 172.716 469.73999999999967]
+/Type /Annot
+>>
+endobj
+340 0 obj
+<< /Border [0 0 0]
+/Dest (_route18)
+/Subtype /Link
+/Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
+/Type /Annot
+>>
+endobj
+341 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_4)
+/Subtype /Link
+/Rect [72.24000000000001 436.9799999999997 152.0295 451.25999999999965]
+/Type /Annot
+>>
+endobj
+342 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_4)
+/Subtype /Link
+/Rect [557.8905 436.9799999999997 563.76 451.25999999999965]
+/Type /Annot
+>>
+endobj
+343 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_4)
+/Subtype /Link
+/Rect [72.24000000000001 418.49999999999966 146.4015 432.77999999999963]
+/Type /Annot
+>>
+endobj
+344 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_4)
+/Subtype /Link
+/Rect [557.8905 418.49999999999966 563.76 432.77999999999963]
+/Type /Annot
+>>
+endobj
+345 0 obj
+<< /Border [0 0 0]
+/Dest (_route20)
+/Subtype /Link
+/Rect [60.24000000000001 400.01999999999964 172.548 414.2999999999996]
+/Type /Annot
+>>
+endobj
+346 0 obj
+<< /Border [0 0 0]
+/Dest (_route20)
+/Subtype /Link
+/Rect [557.8905 400.01999999999964 563.76 414.2999999999996]
+/Type /Annot
+>>
+endobj
+347 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters)
+/Subtype /Link
+/Rect [72.24000000000001 381.5399999999996 157.84629492187503 395.8199999999996]
+/Type /Annot
+>>
+endobj
+348 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters)
+/Subtype /Link
+/Rect [557.8905 381.5399999999996 563.76 395.8199999999996]
+/Type /Annot
+>>
+endobj
+349 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_5)
+/Subtype /Link
+/Rect [72.24000000000001 363.0599999999996 152.0295 377.3399999999996]
+/Type /Annot
+>>
+endobj
+350 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_5)
+/Subtype /Link
+/Rect [557.8905 363.0599999999996 563.76 377.3399999999996]
+/Type /Annot
+>>
+endobj
+351 0 obj
+<< /Border [0 0 0]
+/Dest (_consumes)
+/Subtype /Link
+/Rect [72.24000000000001 344.5799999999996 151.368 358.85999999999956]
+/Type /Annot
+>>
+endobj
+352 0 obj
+<< /Border [0 0 0]
+/Dest (_consumes)
+/Subtype /Link
+/Rect [557.8905 344.5799999999996 563.76 358.85999999999956]
+/Type /Annot
+>>
+endobj
+353 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_5)
+/Subtype /Link
+/Rect [72.24000000000001 326.09999999999957 146.4015 340.37999999999954]
+/Type /Annot
+>>
+endobj
+354 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_5)
+/Subtype /Link
+/Rect [557.8905 326.09999999999957 563.76 340.37999999999954]
+/Type /Annot
+>>
+endobj
+355 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_secondary_names_get)
+/Subtype /Link
+/Rect [60.24000000000001 307.61999999999955 263.25750000000005 321.8999999999995]
+/Type /Annot
+>>
+endobj
+356 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_secondary_names_get)
+/Subtype /Link
+/Rect [557.8905 307.61999999999955 563.76 321.8999999999995]
+/Type /Annot
+>>
+endobj
+357 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_6)
+/Subtype /Link
+/Rect [72.24000000000001 289.13999999999953 152.0295 303.4199999999995]
+/Type /Annot
+>>
+endobj
+358 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_6)
+/Subtype /Link
+/Rect [557.8905 289.13999999999953 563.76 303.4199999999995]
+/Type /Annot
+>>
+endobj
+359 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_6)
+/Subtype /Link
+/Rect [72.24000000000001 270.6599999999995 146.4015 284.9399999999995]
+/Type /Annot
+>>
+endobj
+360 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_6)
+/Subtype /Link
+/Rect [557.8905 270.6599999999995 563.76 284.9399999999995]
+/Type /Annot
+>>
+endobj
+361 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_dictionaryname_get)
+/Subtype /Link
+/Rect [60.24000000000001 252.17999999999947 265.76700000000005 266.45999999999947]
+/Type /Annot
+>>
+endobj
+362 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_dictionaryname_get)
+/Subtype /Link
+/Rect [557.8905 252.17999999999947 563.76 266.45999999999947]
+/Type /Annot
+>>
+endobj
+363 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_2)
+/Subtype /Link
+/Rect [72.24000000000001 233.69999999999948 157.84629492187503 247.97999999999948]
+/Type /Annot
+>>
+endobj
+364 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_2)
+/Subtype /Link
+/Rect [557.8905 233.69999999999948 563.76 247.97999999999948]
+/Type /Annot
+>>
+endobj
+365 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_7)
+/Subtype /Link
+/Rect [72.24000000000001 215.2199999999995 152.0295 229.4999999999995]
+/Type /Annot
+>>
+endobj
+366 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_7)
+/Subtype /Link
+/Rect [557.8905 215.2199999999995 563.76 229.4999999999995]
+/Type /Annot
+>>
+endobj
+367 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_7)
+/Subtype /Link
+/Rect [72.24000000000001 196.7399999999995 146.4015 211.0199999999995]
+/Type /Annot
+>>
+endobj
+368 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_7)
+/Subtype /Link
+/Rect [557.8905 196.7399999999995 563.76 211.0199999999995]
+/Type /Annot
+>>
+endobj
+369 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_name_put)
+/Subtype /Link
+/Rect [60.24000000000001 178.2599999999995 212.763 192.5399999999995]
+/Type /Annot
+>>
+endobj
+370 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_name_put)
+/Subtype /Link
+/Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
+/Type /Annot
+>>
+endobj
+371 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_3)
+/Subtype /Link
+/Rect [72.24000000000001 159.77999999999952 157.84629492187503 174.05999999999952]
+/Type /Annot
+>>
+endobj
+372 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_3)
+/Subtype /Link
+/Rect [557.8905 159.77999999999952 563.76 174.05999999999952]
+/Type /Annot
+>>
+endobj
+373 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_8)
+/Subtype /Link
+/Rect [72.24000000000001 141.29999999999953 152.0295 155.57999999999953]
+/Type /Annot
+>>
+endobj
+374 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_8)
+/Subtype /Link
+/Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
+/Type /Annot
+>>
+endobj
+375 0 obj
+<< /Border [0 0 0]
+/Dest (_consumes_2)
+/Subtype /Link
+/Rect [72.24000000000001 122.81999999999954 151.368 137.09999999999954]
+/Type /Annot
+>>
+endobj
+376 0 obj
+<< /Border [0 0 0]
+/Dest (_consumes_2)
+/Subtype /Link
+/Rect [557.8905 122.81999999999954 563.76 137.09999999999954]
+/Type /Annot
+>>
+endobj
+377 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_8)
+/Subtype /Link
+/Rect [72.24000000000001 104.33999999999955 146.4015 118.61999999999955]
+/Type /Annot
+>>
+endobj
+378 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_8)
+/Subtype /Link
+/Rect [557.8905 104.33999999999955 563.76 118.61999999999955]
+/Type /Annot
+>>
+endobj
+379 0 obj
+<< /Border [0 0 0]
+/Dest (_route22)
+/Subtype /Link
+/Rect [60.24000000000001 85.85999999999956 232.70250000000001 100.13999999999956]
+/Type /Annot
+>>
+endobj
+380 0 obj
+<< /Border [0 0 0]
+/Dest (_route22)
+/Subtype /Link
+/Rect [557.8905 85.85999999999956 563.76 100.13999999999956]
+/Type /Annot
+>>
+endobj
+381 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_4)
+/Subtype /Link
+/Rect [72.24000000000001 67.37999999999957 157.84629492187503 81.65999999999957]
+/Type /Annot
+>>
+endobj
+382 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_4)
+/Subtype /Link
+/Rect [557.8905 67.37999999999957 563.76 81.65999999999957]
+/Type /Annot
+>>
+endobj
+383 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_9)
+/Subtype /Link
+/Rect [72.24000000000001 48.89999999999957 152.0295 63.17999999999957]
+/Type /Annot
+>>
+endobj
+384 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_9)
+/Subtype /Link
+/Rect [557.8905 48.89999999999957 563.76 63.17999999999957]
+/Type /Annot
+>>
+endobj
+385 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_9)
+/Subtype /Link
+/Rect [72.24000000000001 741.7199999999999 146.4015 756.0]
+/Type /Annot
+>>
+endobj
+386 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_9)
+/Subtype /Link
+/Rect [557.8905 741.7199999999999 563.76 756.0]
+/Type /Annot
+>>
+endobj
+387 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_name_elements_shortname_delete)
+/Subtype /Link
+/Rect [60.24000000000001 723.2399999999999 354.36600000000004 737.52]
+/Type /Annot
+>>
+endobj
+388 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_dictionary_name_elements_shortname_delete)
+/Subtype /Link
+/Rect [557.8905 723.2399999999999 563.76 737.52]
+/Type /Annot
+>>
+endobj
+389 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_5)
+/Subtype /Link
+/Rect [72.24000000000001 704.7599999999999 163.71579492187502 719.04]
+/Type /Annot
+>>
+endobj
+390 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_5)
+/Subtype /Link
+/Rect [557.8905 704.7599999999999 563.76 719.04]
+/Type /Annot
+>>
+endobj
+391 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_10)
+/Subtype /Link
+/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
+/Type /Annot
+>>
+endobj
+392 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_10)
+/Subtype /Link
+/Rect [557.8905 686.2799999999999 563.76 700.56]
+/Type /Annot
+>>
+endobj
+393 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_10)
+/Subtype /Link
+/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
+/Type /Annot
+>>
+endobj
+394 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_10)
+/Subtype /Link
+/Rect [557.8905 667.7999999999998 563.76 682.0799999999999]
+/Type /Annot
+>>
+endobj
+395 0 obj
+<< /Border [0 0 0]
+/Dest (_route14)
+/Subtype /Link
+/Rect [60.24000000000001 649.3199999999998 245.15550000000002 663.5999999999999]
+/Type /Annot
+>>
+endobj
+396 0 obj
+<< /Border [0 0 0]
+/Dest (_route14)
+/Subtype /Link
+/Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
+/Type /Annot
+>>
+endobj
+397 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_6)
+/Subtype /Link
+/Rect [72.24000000000001 630.8399999999998 163.71579492187502 645.1199999999999]
+/Type /Annot
+>>
+endobj
+398 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_6)
+/Subtype /Link
+/Rect [557.8905 630.8399999999998 563.76 645.1199999999999]
+/Type /Annot
+>>
+endobj
+399 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_11)
+/Subtype /Link
+/Rect [72.24000000000001 612.3599999999998 157.899 626.6399999999999]
+/Type /Annot
+>>
+endobj
+400 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_11)
+/Subtype /Link
+/Rect [557.8905 612.3599999999998 563.76 626.6399999999999]
+/Type /Annot
+>>
+endobj
+401 0 obj
+<< /Border [0 0 0]
+/Dest (_route8)
+/Subtype /Link
+/Rect [60.24000000000001 593.8799999999998 248.431294921875 608.1599999999999]
+/Type /Annot
+>>
+endobj
+402 0 obj
+<< /Border [0 0 0]
+/Dest (_route8)
+/Subtype /Link
+/Rect [557.8905 593.8799999999998 563.76 608.1599999999999]
+/Type /Annot
+>>
+endobj
+403 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_7)
+/Subtype /Link
+/Rect [72.24000000000001 575.3999999999997 163.71579492187502 589.6799999999998]
+/Type /Annot
+>>
+endobj
+404 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_7)
+/Subtype /Link
+/Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
+/Type /Annot
+>>
+endobj
+405 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_12)
+/Subtype /Link
+/Rect [72.24000000000001 556.9199999999998 157.899 571.1999999999998]
+/Type /Annot
+>>
 endobj
-205 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 204 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 20 0 R
-/F3.0 22 0 R
-/F1.0 8 0 R
+406 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_12)
+/Subtype /Link
+/Rect [557.8905 556.9199999999998 563.76 571.1999999999998]
+/Type /Annot
 >>
-/XObject << /Stamp1 382 0 R
+endobj
+407 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_11)
+/Subtype /Link
+/Rect [72.24000000000001 538.4399999999998 152.27100000000002 552.7199999999998]
+/Type /Annot
 >>
+endobj
+408 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_11)
+/Subtype /Link
+/Rect [557.8905 538.4399999999998 563.76 552.7199999999998]
+/Type /Annot
 >>
-/Annots [207 0 R 208 0 R 210 0 R 211 0 R]
+endobj
+409 0 obj
+<< /Border [0 0 0]
+/Dest (_route2)
+/Subtype /Link
+/Rect [60.24000000000001 519.9599999999998 214.8735 534.2399999999998]
+/Type /Annot
 >>
 endobj
-206 0 obj
-[205 0 R /XYZ 0 570.48 null]
+410 0 obj
+<< /Border [0 0 0]
+/Dest (_route2)
+/Subtype /Link
+/Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
+/Type /Annot
+>>
 endobj
-207 0 obj
+411 0 obj
 << /Border [0 0 0]
-/Dest (_jsonobject)
+/Dest (_responses_13)
 /Subtype /Link
-/Rect [272.17692192000004 480.6670000000001 325.32792192000005 494.9470000000001]
+/Rect [72.24000000000001 501.4799999999998 157.899 515.7599999999998]
 /Type /Annot
 >>
 endobj
-208 0 obj
+412 0 obj
 << /Border [0 0 0]
-/Dest (_jsonobject)
+/Dest (_responses_13)
 /Subtype /Link
-/Rect [272.17692192000004 443.107 325.32792192000005 457.38700000000006]
+/Rect [557.8905 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
-209 0 obj
-[205 0 R /XYZ 0 382.4400000000001 null]
+413 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_12)
+/Subtype /Link
+/Rect [72.24000000000001 482.9999999999998 152.27100000000002 497.27999999999975]
+/Type /Annot
+>>
 endobj
-210 0 obj
+414 0 obj
 << /Border [0 0 0]
-/Dest (_looptemplate)
+/Dest (_produces_12)
 /Subtype /Link
-/Rect [272.17692192000004 255.0670000000001 343.82067777937505 269.3470000000001]
+/Rect [557.8905 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
-211 0 obj
+415 0 obj
 << /Border [0 0 0]
-/Dest (_microservicemodel)
+/Dest (_route15)
 /Subtype /Link
-/Rect [272.17692192000004 217.5070000000001 369.21792192000004 231.7870000000001]
+/Rect [60.24000000000001 464.51999999999975 259.467 478.7999999999997]
 /Type /Annot
 >>
 endobj
-212 0 obj
+416 0 obj
 << /Border [0 0 0]
-/Dest (_overview)
+/Dest (_route15)
 /Subtype /Link
-/Rect [48.24 695.6999999999998 107.9745 709.9799999999999]
+/Rect [557.8905 464.51999999999975 563.76 478.7999999999997]
 /Type /Annot
 >>
 endobj
-213 0 obj
+417 0 obj
 << /Border [0 0 0]
-/Dest (_overview)
+/Dest (_parameters_8)
 /Subtype /Link
-/Rect [557.8905 695.6999999999998 563.76 709.9799999999999]
+/Rect [72.24000000000001 446.03999999999974 163.71579492187502 460.3199999999997]
 /Type /Annot
 >>
 endobj
-214 0 obj
+418 0 obj
 << /Border [0 0 0]
-/Dest (_version_information)
+/Dest (_parameters_8)
 /Subtype /Link
-/Rect [60.24 677.2199999999998 181.28338476562502 691.4999999999999]
+/Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-215 0 obj
+419 0 obj
 << /Border [0 0 0]
-/Dest (_version_information)
+/Dest (_responses_14)
 /Subtype /Link
-/Rect [557.8905 677.2199999999998 563.76 691.4999999999999]
+/Rect [72.24000000000001 427.5599999999997 157.899 441.8399999999997]
 /Type /Annot
 >>
 endobj
-216 0 obj
+420 0 obj
 << /Border [0 0 0]
-/Dest (_uri_scheme)
+/Dest (_responses_14)
 /Subtype /Link
-/Rect [60.24000000000001 658.7399999999998 138.6225 673.0199999999999]
+/Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-217 0 obj
+421 0 obj
 << /Border [0 0 0]
-/Dest (_uri_scheme)
+/Dest (_produces_13)
 /Subtype /Link
-/Rect [557.8905 658.7399999999998 563.76 673.0199999999999]
+/Rect [72.24000000000001 409.0799999999997 152.27100000000002 423.3599999999997]
 /Type /Annot
 >>
 endobj
-218 0 obj
+422 0 obj
 << /Border [0 0 0]
-/Dest (_paths)
+/Dest (_produces_13)
 /Subtype /Link
-/Rect [48.24000000000001 640.2599999999998 86.78550000000001 654.5399999999998]
+/Rect [557.8905 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
-219 0 obj
+423 0 obj
 << /Border [0 0 0]
-/Dest (_paths)
+/Dest (_route9)
 /Subtype /Link
-/Rect [557.8905 640.2599999999998 563.76 654.5399999999998]
+/Rect [60.24000000000001 390.5999999999997 355.8885 404.87999999999965]
 /Type /Annot
 >>
 endobj
-220 0 obj
+424 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route9)
 /Subtype /Link
-/Rect [60.24000000000001 621.7799999999997 183.88800000000003 636.0599999999998]
+/Rect [557.8905 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
-221 0 obj
+425 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_parameters_9)
 /Subtype /Link
-/Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
+/Rect [72.24000000000001 372.11999999999966 163.71579492187502 386.39999999999964]
 /Type /Annot
 >>
 endobj
-222 0 obj
+426 0 obj
 << /Border [0 0 0]
-/Dest (_responses)
+/Dest (_parameters_9)
 /Subtype /Link
-/Rect [72.24000000000001 603.2999999999997 152.0295 617.5799999999998]
+/Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-223 0 obj
+427 0 obj
 << /Border [0 0 0]
-/Dest (_responses)
+/Dest (_responses_15)
 /Subtype /Link
-/Rect [557.8905 603.2999999999997 563.76 617.5799999999998]
+/Rect [72.24000000000001 353.63999999999965 157.899 367.9199999999996]
 /Type /Annot
 >>
 endobj
-224 0 obj
+428 0 obj
 << /Border [0 0 0]
-/Dest (_produces)
+/Dest (_responses_15)
 /Subtype /Link
-/Rect [72.24000000000001 584.8199999999997 146.4015 599.0999999999998]
+/Rect [557.8905 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
-225 0 obj
+429 0 obj
 << /Border [0 0 0]
-/Dest (_produces)
+/Dest (_produces_14)
 /Subtype /Link
-/Rect [557.8905 584.8199999999997 563.76 599.0999999999998]
+/Rect [72.24000000000001 335.1599999999996 152.27100000000002 349.4399999999996]
 /Type /Annot
 >>
 endobj
-226 0 obj
+430 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_produces_14)
 /Subtype /Link
-/Rect [60.24000000000001 566.3399999999997 181.64100000000002 580.6199999999998]
+/Rect [557.8905 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
-227 0 obj
+431 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route12)
 /Subtype /Link
-/Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
+/Rect [60.24000000000001 316.6799999999996 248.45250000000001 330.9599999999996]
 /Type /Annot
 >>
 endobj
-228 0 obj
+432 0 obj
 << /Border [0 0 0]
-/Dest (_responses_2)
+/Dest (_route12)
 /Subtype /Link
-/Rect [72.24000000000001 547.8599999999998 152.0295 562.1399999999998]
+/Rect [557.8905 316.6799999999996 563.76 330.9599999999996]
 /Type /Annot
 >>
 endobj
-229 0 obj
+433 0 obj
 << /Border [0 0 0]
-/Dest (_responses_2)
+/Dest (_parameters_10)
 /Subtype /Link
-/Rect [557.8905 547.8599999999998 563.76 562.1399999999998]
+/Rect [72.24000000000001 298.1999999999996 163.71579492187502 312.47999999999956]
 /Type /Annot
 >>
 endobj
-230 0 obj
+434 0 obj
 << /Border [0 0 0]
-/Dest (_produces_2)
+/Dest (_parameters_10)
 /Subtype /Link
-/Rect [72.24000000000001 529.3799999999998 146.4015 543.6599999999997]
+/Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
-231 0 obj
+435 0 obj
 << /Border [0 0 0]
-/Dest (_produces_2)
+/Dest (_responses_16)
 /Subtype /Link
-/Rect [557.8905 529.3799999999998 563.76 543.6599999999997]
+/Rect [72.24000000000001 279.7199999999996 157.899 293.99999999999955]
 /Type /Annot
 >>
 endobj
-232 0 obj
+436 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_responses_16)
 /Subtype /Link
-/Rect [60.24000000000001 510.89999999999975 183.8775 525.1799999999997]
+/Rect [557.8905 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
-233 0 obj
+437 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_produces_15)
 /Subtype /Link
-/Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
+/Rect [72.24000000000001 261.23999999999955 152.27100000000002 275.5199999999995]
 /Type /Annot
 >>
 endobj
-234 0 obj
+438 0 obj
 << /Border [0 0 0]
-/Dest (_responses_3)
+/Dest (_produces_15)
 /Subtype /Link
-/Rect [72.24000000000001 492.41999999999973 152.0295 506.6999999999997]
+/Rect [557.8905 261.23999999999955 563.76 275.5199999999995]
 /Type /Annot
 >>
 endobj
-235 0 obj
+439 0 obj
 << /Border [0 0 0]
-/Dest (_responses_3)
+/Dest (_route11)
 /Subtype /Link
-/Rect [557.8905 492.41999999999973 563.76 506.6999999999997]
+/Rect [60.24000000000001 242.7599999999995 235.842 257.0399999999995]
 /Type /Annot
 >>
 endobj
-236 0 obj
+440 0 obj
 << /Border [0 0 0]
-/Dest (_produces_3)
+/Dest (_route11)
 /Subtype /Link
-/Rect [72.24000000000001 473.9399999999997 146.4015 488.2199999999997]
+/Rect [557.8905 242.7599999999995 563.76 257.0399999999995]
 /Type /Annot
 >>
 endobj
-237 0 obj
+441 0 obj
 << /Border [0 0 0]
-/Dest (_produces_3)
+/Dest (_parameters_11)
 /Subtype /Link
-/Rect [557.8905 473.9399999999997 563.76 488.2199999999997]
+/Rect [72.24000000000001 224.27999999999952 163.71579492187502 238.55999999999952]
 /Type /Annot
 >>
 endobj
-238 0 obj
+442 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_parameters_11)
 /Subtype /Link
-/Rect [60.24000000000001 455.4599999999997 239.28600000000003 469.73999999999967]
+/Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-239 0 obj
+443 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_responses_17)
 /Subtype /Link
-/Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
+/Rect [72.24000000000001 205.79999999999953 157.899 220.07999999999953]
 /Type /Annot
 >>
 endobj
-240 0 obj
+444 0 obj
 << /Border [0 0 0]
-/Dest (_parameters)
+/Dest (_responses_17)
 /Subtype /Link
-/Rect [72.24000000000001 436.9799999999997 157.84629492187503 451.25999999999965]
+/Rect [557.8905 205.79999999999953 563.76 220.07999999999953]
 /Type /Annot
 >>
 endobj
-241 0 obj
+445 0 obj
 << /Border [0 0 0]
-/Dest (_parameters)
+/Dest (_produces_16)
 /Subtype /Link
-/Rect [557.8905 436.9799999999997 563.76 451.25999999999965]
+/Rect [72.24000000000001 187.31999999999954 152.27100000000002 201.59999999999954]
 /Type /Annot
 >>
 endobj
-242 0 obj
+446 0 obj
 << /Border [0 0 0]
-/Dest (_responses_4)
+/Dest (_produces_16)
 /Subtype /Link
-/Rect [72.24000000000001 418.49999999999966 152.0295 432.77999999999963]
+/Rect [557.8905 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
-243 0 obj
+447 0 obj
 << /Border [0 0 0]
-/Dest (_responses_4)
+/Dest (_route13)
 /Subtype /Link
-/Rect [557.8905 418.49999999999966 563.76 432.77999999999963]
+/Rect [60.24000000000001 168.83999999999955 249.70200000000003 183.11999999999955]
 /Type /Annot
 >>
 endobj
-244 0 obj
+448 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route13)
 /Subtype /Link
-/Rect [60.24000000000001 400.01999999999964 242.56179492187502 414.2999999999996]
+/Rect [557.8905 168.83999999999955 563.76 183.11999999999955]
 /Type /Annot
 >>
 endobj
-245 0 obj
+449 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_parameters_12)
 /Subtype /Link
-/Rect [557.8905 400.01999999999964 563.76 414.2999999999996]
+/Rect [72.24000000000001 150.35999999999956 163.71579492187502 164.63999999999956]
 /Type /Annot
 >>
 endobj
-246 0 obj
+450 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_2)
+/Dest (_parameters_12)
 /Subtype /Link
-/Rect [72.24000000000001 381.5399999999996 157.84629492187503 395.8199999999996]
+/Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-247 0 obj
+451 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_2)
+/Dest (_responses_18)
 /Subtype /Link
-/Rect [557.8905 381.5399999999996 563.76 395.8199999999996]
+/Rect [72.24000000000001 131.87999999999957 157.899 146.15999999999957]
 /Type /Annot
 >>
 endobj
-248 0 obj
+452 0 obj
 << /Border [0 0 0]
-/Dest (_responses_5)
+/Dest (_responses_18)
 /Subtype /Link
-/Rect [72.24000000000001 363.0599999999996 152.0295 377.3399999999996]
+/Rect [557.8905 131.87999999999957 563.76 146.15999999999957]
 /Type /Annot
 >>
 endobj
-249 0 obj
+453 0 obj
 << /Border [0 0 0]
-/Dest (_responses_5)
+/Dest (_produces_17)
 /Subtype /Link
-/Rect [557.8905 363.0599999999996 563.76 377.3399999999996]
+/Rect [72.24000000000001 113.39999999999958 152.27100000000002 127.67999999999958]
 /Type /Annot
 >>
 endobj
-250 0 obj
+454 0 obj
 << /Border [0 0 0]
-/Dest (_produces_4)
+/Dest (_produces_17)
 /Subtype /Link
-/Rect [72.24000000000001 344.5799999999996 146.4015 358.85999999999956]
+/Rect [557.8905 113.39999999999958 563.76 127.67999999999958]
 /Type /Annot
 >>
 endobj
-251 0 obj
+455 0 obj
 << /Border [0 0 0]
-/Dest (_produces_4)
+/Dest (_route4)
 /Subtype /Link
-/Rect [557.8905 344.5799999999996 563.76 358.85999999999956]
+/Rect [60.24000000000001 94.91999999999959 307.641 109.19999999999959]
 /Type /Annot
 >>
 endobj
-252 0 obj
+456 0 obj
 << /Border [0 0 0]
-/Dest (_route19)
+/Dest (_route4)
 /Subtype /Link
-/Rect [60.24000000000001 326.09999999999957 209.00400000000002 340.37999999999954]
+/Rect [557.8905 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
-253 0 obj
+457 0 obj
 << /Border [0 0 0]
-/Dest (_route19)
+/Dest (_parameters_13)
 /Subtype /Link
-/Rect [557.8905 326.09999999999957 563.76 340.37999999999954]
+/Rect [72.24000000000001 76.4399999999996 163.71579492187502 90.7199999999996]
 /Type /Annot
 >>
 endobj
-254 0 obj
+458 0 obj
 << /Border [0 0 0]
-/Dest (_responses_6)
+/Dest (_parameters_13)
 /Subtype /Link
-/Rect [72.24000000000001 307.61999999999955 152.0295 321.8999999999995]
+/Rect [557.8905 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
-255 0 obj
+459 0 obj
 << /Border [0 0 0]
-/Dest (_responses_6)
+/Dest (_responses_19)
 /Subtype /Link
-/Rect [557.8905 307.61999999999955 563.76 321.8999999999995]
+/Rect [72.24000000000001 57.95999999999961 157.899 72.23999999999961]
 /Type /Annot
 >>
 endobj
-256 0 obj
+460 0 obj
 << /Border [0 0 0]
-/Dest (_produces_5)
+/Dest (_responses_19)
 /Subtype /Link
-/Rect [72.24000000000001 289.13999999999953 146.4015 303.4199999999995]
+/Rect [557.8905 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
-257 0 obj
+461 0 obj
 << /Border [0 0 0]
-/Dest (_produces_5)
+/Dest (_produces_18)
 /Subtype /Link
-/Rect [557.8905 289.13999999999953 563.76 303.4199999999995]
+/Rect [72.24000000000001 741.7199999999999 152.27100000000002 756.0]
 /Type /Annot
 >>
 endobj
-258 0 obj
+462 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_produces_18)
 /Subtype /Link
-/Rect [60.24000000000001 270.6599999999995 253.59750000000003 284.9399999999995]
+/Rect [557.8905 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
-259 0 obj
+463 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route10)
 /Subtype /Link
-/Rect [557.8905 270.6599999999995 563.76 284.9399999999995]
+/Rect [60.24000000000001 723.2399999999999 261.860794921875 737.52]
 /Type /Annot
 >>
 endobj
-260 0 obj
+464 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_3)
+/Dest (_route10)
 /Subtype /Link
-/Rect [72.24000000000001 252.17999999999947 157.84629492187503 266.45999999999947]
+/Rect [557.8905 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
-261 0 obj
+465 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_3)
+/Dest (_parameters_14)
 /Subtype /Link
-/Rect [557.8905 252.17999999999947 563.76 266.45999999999947]
+/Rect [72.24000000000001 704.7599999999999 163.71579492187502 719.04]
 /Type /Annot
 >>
 endobj
-262 0 obj
+466 0 obj
 << /Border [0 0 0]
-/Dest (_responses_7)
+/Dest (_parameters_14)
 /Subtype /Link
-/Rect [72.24000000000001 233.69999999999948 152.0295 247.97999999999948]
+/Rect [557.8905 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-263 0 obj
+467 0 obj
 << /Border [0 0 0]
-/Dest (_responses_7)
+/Dest (_responses_20)
 /Subtype /Link
-/Rect [557.8905 233.69999999999948 563.76 247.97999999999948]
+/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
 /Type /Annot
 >>
 endobj
-264 0 obj
+468 0 obj
 << /Border [0 0 0]
-/Dest (_produces_6)
+/Dest (_responses_20)
 /Subtype /Link
-/Rect [72.24000000000001 215.2199999999995 146.4015 229.4999999999995]
+/Rect [552.021 686.2799999999999 563.76 700.56]
 /Type /Annot
 >>
 endobj
-265 0 obj
+469 0 obj
 << /Border [0 0 0]
-/Dest (_produces_6)
+/Dest (_produces_19)
 /Subtype /Link
-/Rect [557.8905 215.2199999999995 563.76 229.4999999999995]
+/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
 /Type /Annot
 >>
 endobj
-266 0 obj
+470 0 obj
 << /Border [0 0 0]
-/Dest (_route28)
+/Dest (_produces_19)
 /Subtype /Link
-/Rect [60.24000000000001 196.7399999999995 242.58300000000003 211.0199999999995]
+/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
-267 0 obj
+471 0 obj
 << /Border [0 0 0]
-/Dest (_route28)
+/Dest (_route5)
 /Subtype /Link
-/Rect [557.8905 196.7399999999995 563.76 211.0199999999995]
+/Rect [60.24000000000001 649.3199999999998 339.560794921875 663.5999999999999]
 /Type /Annot
 >>
 endobj
-268 0 obj
+472 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_4)
+/Dest (_route5)
 /Subtype /Link
-/Rect [72.24000000000001 178.2599999999995 157.84629492187503 192.5399999999995]
+/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
-269 0 obj
+473 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_4)
+/Dest (_parameters_15)
 /Subtype /Link
-/Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
+/Rect [72.24000000000001 630.8399999999998 163.71579492187502 645.1199999999999]
 /Type /Annot
 >>
 endobj
-270 0 obj
+474 0 obj
 << /Border [0 0 0]
-/Dest (_responses_8)
+/Dest (_parameters_15)
 /Subtype /Link
-/Rect [72.24000000000001 159.77999999999952 152.0295 174.05999999999952]
+/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
-271 0 obj
+475 0 obj
 << /Border [0 0 0]
-/Dest (_responses_8)
+/Dest (_responses_21)
 /Subtype /Link
-/Rect [557.8905 159.77999999999952 563.76 174.05999999999952]
+/Rect [72.24000000000001 612.3599999999998 157.899 626.6399999999999]
 /Type /Annot
 >>
 endobj
-272 0 obj
+476 0 obj
 << /Border [0 0 0]
-/Dest (_produces_7)
+/Dest (_responses_21)
 /Subtype /Link
-/Rect [72.24000000000001 141.29999999999953 146.4015 155.57999999999953]
+/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
-273 0 obj
+477 0 obj
 << /Border [0 0 0]
-/Dest (_produces_7)
+/Dest (_consumes_3)
 /Subtype /Link
-/Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
+/Rect [72.24000000000001 593.8799999999998 157.2375 608.1599999999999]
 /Type /Annot
 >>
 endobj
-274 0 obj
+478 0 obj
 << /Border [0 0 0]
-/Dest (_route27)
+/Dest (_consumes_3)
 /Subtype /Link
-/Rect [60.24000000000001 122.81999999999954 229.97250000000003 137.09999999999954]
+/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
 >>
 endobj
-275 0 obj
+479 0 obj
 << /Border [0 0 0]
-/Dest (_route27)
+/Dest (_produces_20)
 /Subtype /Link
-/Rect [557.8905 122.81999999999954 563.76 137.09999999999954]
+/Rect [72.24000000000001 575.3999999999997 152.27100000000002 589.6799999999998]
 /Type /Annot
 >>
 endobj
-276 0 obj
+480 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_5)
+/Dest (_produces_20)
 /Subtype /Link
-/Rect [72.24000000000001 104.33999999999955 157.84629492187503 118.61999999999955]
+/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-277 0 obj
+481 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_5)
+/Dest (_route7)
 /Subtype /Link
-/Rect [557.8905 104.33999999999955 563.76 118.61999999999955]
+/Rect [60.24000000000001 556.9199999999998 350.38629492187505 571.1999999999998]
 /Type /Annot
 >>
 endobj
-278 0 obj
+482 0 obj
 << /Border [0 0 0]
-/Dest (_responses_9)
+/Dest (_route7)
 /Subtype /Link
-/Rect [72.24000000000001 85.85999999999956 152.0295 100.13999999999956]
+/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
 /Type /Annot
 >>
 endobj
-279 0 obj
+483 0 obj
 << /Border [0 0 0]
-/Dest (_responses_9)
+/Dest (_parameters_16)
 /Subtype /Link
-/Rect [557.8905 85.85999999999956 563.76 100.13999999999956]
+/Rect [72.24000000000001 538.4399999999998 163.71579492187502 552.7199999999998]
 /Type /Annot
 >>
 endobj
-280 0 obj
+484 0 obj
 << /Border [0 0 0]
-/Dest (_produces_8)
+/Dest (_parameters_16)
 /Subtype /Link
-/Rect [72.24000000000001 67.37999999999957 146.4015 81.65999999999957]
+/Rect [552.021 538.4399999999998 563.76 552.7199999999998]
 /Type /Annot
 >>
 endobj
-281 0 obj
+485 0 obj
 << /Border [0 0 0]
-/Dest (_produces_8)
+/Dest (_responses_22)
 /Subtype /Link
-/Rect [557.8905 67.37999999999957 563.76 81.65999999999957]
+/Rect [72.24000000000001 519.9599999999998 157.899 534.2399999999998]
 /Type /Annot
 >>
 endobj
-282 0 obj
+486 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_responses_22)
 /Subtype /Link
-/Rect [60.24000000000001 48.89999999999957 249.70200000000003 63.17999999999957]
+/Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-283 0 obj
+487 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_consumes_4)
 /Subtype /Link
-/Rect [557.8905 48.89999999999957 563.76 63.17999999999957]
+/Rect [72.24000000000001 501.4799999999998 157.2375 515.7599999999998]
 /Type /Annot
 >>
 endobj
-284 0 obj
+488 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_6)
+/Dest (_consumes_4)
 /Subtype /Link
-/Rect [72.24000000000001 741.7199999999999 163.71579492187502 756.0]
+/Rect [552.021 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
-285 0 obj
+489 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_6)
+/Dest (_produces_21)
 /Subtype /Link
-/Rect [557.8905 741.7199999999999 563.76 756.0]
+/Rect [72.24000000000001 482.9999999999998 152.27100000000002 497.27999999999975]
 /Type /Annot
 >>
 endobj
-286 0 obj
+490 0 obj
 << /Border [0 0 0]
-/Dest (_responses_10)
+/Dest (_produces_21)
 /Subtype /Link
-/Rect [72.24000000000001 723.2399999999999 157.899 737.52]
+/Rect [552.021 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
-287 0 obj
+491 0 obj
 << /Border [0 0 0]
-/Dest (_responses_10)
+/Dest (_route6)
 /Subtype /Link
-/Rect [557.8905 723.2399999999999 563.76 737.52]
+/Rect [60.24000000000001 464.51999999999975 352.81158984375 478.7999999999997]
 /Type /Annot
 >>
 endobj
-288 0 obj
+492 0 obj
 << /Border [0 0 0]
-/Dest (_produces_9)
+/Dest (_route6)
 /Subtype /Link
-/Rect [72.24000000000001 704.7599999999999 152.27100000000002 719.04]
+/Rect [552.021 464.51999999999975 563.76 478.7999999999997]
 /Type /Annot
 >>
 endobj
-289 0 obj
+493 0 obj
 << /Border [0 0 0]
-/Dest (_produces_9)
+/Dest (_parameters_17)
 /Subtype /Link
-/Rect [557.8905 704.7599999999999 563.76 719.04]
+/Rect [72.24000000000001 446.03999999999974 163.71579492187502 460.3199999999997]
 /Type /Annot
 >>
 endobj
-290 0 obj
+494 0 obj
 << /Border [0 0 0]
-/Dest (_route21)
+/Dest (_parameters_17)
 /Subtype /Link
-/Rect [60.24000000000001 686.2799999999999 307.641 700.56]
+/Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-291 0 obj
+495 0 obj
 << /Border [0 0 0]
-/Dest (_route21)
+/Dest (_responses_23)
 /Subtype /Link
-/Rect [557.8905 686.2799999999999 563.76 700.56]
+/Rect [72.24000000000001 427.5599999999997 157.899 441.8399999999997]
 /Type /Annot
 >>
 endobj
-292 0 obj
+496 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_7)
+/Dest (_responses_23)
 /Subtype /Link
-/Rect [72.24000000000001 667.7999999999998 163.71579492187502 682.0799999999999]
+/Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-293 0 obj
+497 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_7)
+/Dest (_consumes_5)
 /Subtype /Link
-/Rect [557.8905 667.7999999999998 563.76 682.0799999999999]
+/Rect [72.24000000000001 409.0799999999997 157.2375 423.3599999999997]
 /Type /Annot
 >>
 endobj
-294 0 obj
+498 0 obj
 << /Border [0 0 0]
-/Dest (_responses_11)
+/Dest (_consumes_5)
 /Subtype /Link
-/Rect [72.24000000000001 649.3199999999998 157.899 663.5999999999999]
+/Rect [552.021 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
-295 0 obj
+499 0 obj
 << /Border [0 0 0]
-/Dest (_responses_11)
+/Dest (_produces_22)
 /Subtype /Link
-/Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
+/Rect [72.24000000000001 390.5999999999997 152.27100000000002 404.87999999999965]
 /Type /Annot
 >>
 endobj
-296 0 obj
+500 0 obj
 << /Border [0 0 0]
-/Dest (_produces_10)
+/Dest (_produces_22)
 /Subtype /Link
-/Rect [72.24000000000001 630.8399999999998 152.27100000000002 645.1199999999999]
+/Rect [552.021 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
-297 0 obj
+501 0 obj
 << /Border [0 0 0]
-/Dest (_produces_10)
+/Dest (_route3)
 /Subtype /Link
-/Rect [557.8905 630.8399999999998 563.76 645.1199999999999]
+/Rect [60.24000000000001 372.11999999999966 212.0595 386.39999999999964]
 /Type /Annot
 >>
 endobj
-298 0 obj
+502 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route3)
 /Subtype /Link
-/Rect [60.24000000000001 612.3599999999998 261.860794921875 626.6399999999999]
+/Rect [552.021 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-299 0 obj
+503 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_parameters_18)
 /Subtype /Link
-/Rect [557.8905 612.3599999999998 563.76 626.6399999999999]
+/Rect [72.24000000000001 353.63999999999965 163.71579492187502 367.9199999999996]
 /Type /Annot
 >>
 endobj
-300 0 obj
+504 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_8)
+/Dest (_parameters_18)
 /Subtype /Link
-/Rect [72.24000000000001 593.8799999999998 163.71579492187502 608.1599999999999]
+/Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
-301 0 obj
+505 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_8)
+/Dest (_responses_24)
 /Subtype /Link
-/Rect [557.8905 593.8799999999998 563.76 608.1599999999999]
+/Rect [72.24000000000001 335.1599999999996 157.899 349.4399999999996]
 /Type /Annot
 >>
 endobj
-302 0 obj
+506 0 obj
 << /Border [0 0 0]
-/Dest (_responses_12)
+/Dest (_responses_24)
 /Subtype /Link
-/Rect [72.24000000000001 575.3999999999997 157.899 589.6799999999998]
+/Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
-303 0 obj
+507 0 obj
 << /Border [0 0 0]
-/Dest (_responses_12)
+/Dest (_produces_23)
 /Subtype /Link
-/Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
+/Rect [72.24000000000001 316.6799999999996 152.27100000000002 330.9599999999996]
 /Type /Annot
 >>
 endobj
-304 0 obj
+508 0 obj
 << /Border [0 0 0]
-/Dest (_produces_11)
+/Dest (_produces_23)
 /Subtype /Link
-/Rect [72.24000000000001 556.9199999999998 152.27100000000002 571.1999999999998]
+/Rect [552.021 316.6799999999996 563.76 330.9599999999996]
 /Type /Annot
 >>
 endobj
-305 0 obj
+509 0 obj
 << /Border [0 0 0]
-/Dest (_produces_11)
+/Dest (_route25)
 /Subtype /Link
-/Rect [557.8905 556.9199999999998 563.76 571.1999999999998]
+/Rect [60.24000000000001 298.1999999999996 221.091755859375 312.47999999999956]
+/Type /Annot
+>>
+endobj
+510 0 obj
+<< /Border [0 0 0]
+/Dest (_route25)
+/Subtype /Link
+/Rect [552.021 298.1999999999996 563.76 312.47999999999956]
+/Type /Annot
+>>
+endobj
+511 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_25)
+/Subtype /Link
+/Rect [72.24000000000001 279.7199999999996 157.899 293.99999999999955]
+/Type /Annot
+>>
+endobj
+512 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_25)
+/Subtype /Link
+/Rect [552.021 279.7199999999996 563.76 293.99999999999955]
+/Type /Annot
+>>
+endobj
+513 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_24)
+/Subtype /Link
+/Rect [72.24000000000001 261.23999999999955 152.27100000000002 275.5199999999995]
+/Type /Annot
+>>
+endobj
+514 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_24)
+/Subtype /Link
+/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
+/Type /Annot
+>>
+endobj
+515 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
+/Subtype /Link
+/Rect [60.24000000000001 242.7599999999995 346.913255859375 257.0399999999995]
+/Type /Annot
+>>
+endobj
+516 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
+/Subtype /Link
+/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
+/Type /Annot
+>>
+endobj
+517 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_19)
+/Subtype /Link
+/Rect [72.24000000000001 224.27999999999952 163.71579492187502 238.55999999999952]
+/Type /Annot
+>>
+endobj
+518 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_19)
+/Subtype /Link
+/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
+/Type /Annot
+>>
+endobj
+519 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_26)
+/Subtype /Link
+/Rect [72.24000000000001 205.79999999999953 157.899 220.07999999999953]
+/Type /Annot
+>>
+endobj
+520 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_26)
+/Subtype /Link
+/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
+/Type /Annot
+>>
+endobj
+521 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_25)
+/Subtype /Link
+/Rect [72.24000000000001 187.31999999999954 152.27100000000002 201.59999999999954]
+/Type /Annot
+>>
+endobj
+522 0 obj
+<< /Border [0 0 0]
+/Dest (_produces_25)
+/Subtype /Link
+/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
+/Type /Annot
+>>
+endobj
+523 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_policytoscamodels_policymodeltype_get)
+/Subtype /Link
+/Rect [60.24000000000001 168.83999999999955 318.89925585937505 183.11999999999955]
+/Type /Annot
+>>
+endobj
+524 0 obj
+<< /Border [0 0 0]
+/Dest (_v2_policytoscamodels_policymodeltype_get)
+/Subtype /Link
+/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
+/Type /Annot
+>>
+endobj
+525 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_20)
+/Subtype /Link
+/Rect [72.24000000000001 150.35999999999956 163.71579492187502 164.63999999999956]
+/Type /Annot
+>>
+endobj
+526 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters_20)
+/Subtype /Link
+/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-306 0 obj
+527 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_responses_27)
 /Subtype /Link
-/Rect [60.24000000000001 538.4399999999998 339.560794921875 552.7199999999998]
+/Rect [72.24000000000001 131.87999999999957 157.899 146.15999999999957]
 /Type /Annot
 >>
 endobj
-307 0 obj
+528 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_responses_27)
 /Subtype /Link
-/Rect [557.8905 538.4399999999998 563.76 552.7199999999998]
+/Rect [552.021 131.87999999999957 563.76 146.15999999999957]
 /Type /Annot
 >>
 endobj
-308 0 obj
+529 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_9)
+/Dest (_produces_26)
 /Subtype /Link
-/Rect [72.24000000000001 519.9599999999998 163.71579492187502 534.2399999999998]
+/Rect [72.24000000000001 113.39999999999958 152.27100000000002 127.67999999999958]
 /Type /Annot
 >>
 endobj
-309 0 obj
+530 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_9)
+/Dest (_produces_26)
 /Subtype /Link
-/Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
+/Rect [552.021 113.39999999999958 563.76 127.67999999999958]
 /Type /Annot
 >>
 endobj
-310 0 obj
+531 0 obj
 << /Border [0 0 0]
-/Dest (_responses_13)
+/Dest (_route26)
 /Subtype /Link
-/Rect [72.24000000000001 501.4799999999998 157.899 515.7599999999998]
+/Rect [60.24000000000001 94.91999999999959 318.73125585937504 109.19999999999959]
 /Type /Annot
 >>
 endobj
-311 0 obj
+532 0 obj
 << /Border [0 0 0]
-/Dest (_responses_13)
+/Dest (_route26)
 /Subtype /Link
-/Rect [557.8905 501.4799999999998 563.76 515.7599999999998]
+/Rect [552.021 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
-312 0 obj
+533 0 obj
 << /Border [0 0 0]
-/Dest (_consumes)
+/Dest (_parameters_21)
 /Subtype /Link
-/Rect [72.24000000000001 482.9999999999998 157.2375 497.27999999999975]
+/Rect [72.24000000000001 76.4399999999996 163.71579492187502 90.7199999999996]
 /Type /Annot
 >>
 endobj
-313 0 obj
+534 0 obj
 << /Border [0 0 0]
-/Dest (_consumes)
+/Dest (_parameters_21)
 /Subtype /Link
-/Rect [557.8905 482.9999999999998 563.76 497.27999999999975]
+/Rect [552.021 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
-314 0 obj
+535 0 obj
 << /Border [0 0 0]
-/Dest (_produces_12)
+/Dest (_responses_28)
 /Subtype /Link
-/Rect [72.24000000000001 464.51999999999975 152.27100000000002 478.7999999999997]
+/Rect [72.24000000000001 57.95999999999961 157.899 72.23999999999961]
 /Type /Annot
 >>
 endobj
-315 0 obj
+536 0 obj
 << /Border [0 0 0]
-/Dest (_produces_12)
+/Dest (_responses_28)
 /Subtype /Link
-/Rect [557.8905 464.51999999999975 563.76 478.7999999999997]
+/Rect [552.021 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
-316 0 obj
+537 0 obj
 << /Border [0 0 0]
-/Dest (_route24)
+/Dest (_consumes_6)
 /Subtype /Link
-/Rect [60.24000000000001 446.03999999999974 350.38629492187505 460.3199999999997]
+/Rect [72.24000000000001 741.7199999999999 157.2375 756.0]
 /Type /Annot
 >>
 endobj
-317 0 obj
+538 0 obj
 << /Border [0 0 0]
-/Dest (_route24)
+/Dest (_consumes_6)
 /Subtype /Link
-/Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
+/Rect [552.021 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
-318 0 obj
+539 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_10)
+/Dest (_produces_27)
 /Subtype /Link
-/Rect [72.24000000000001 427.5599999999997 163.71579492187502 441.8399999999997]
+/Rect [72.24000000000001 723.2399999999999 152.27100000000002 737.52]
 /Type /Annot
 >>
 endobj
-319 0 obj
+540 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_10)
+/Dest (_produces_27)
 /Subtype /Link
-/Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
+/Rect [552.021 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
-320 0 obj
+541 0 obj
 << /Border [0 0 0]
-/Dest (_responses_14)
+/Dest (_route29)
 /Subtype /Link
-/Rect [72.24000000000001 409.0799999999997 157.899 423.3599999999997]
+/Rect [60.24000000000001 704.7599999999999 175.8555 719.04]
 /Type /Annot
 >>
 endobj
-321 0 obj
+542 0 obj
 << /Border [0 0 0]
-/Dest (_responses_14)
+/Dest (_route29)
 /Subtype /Link
-/Rect [557.8905 409.0799999999997 563.76 423.3599999999997]
+/Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-322 0 obj
+543 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_2)
+/Dest (_responses_29)
 /Subtype /Link
-/Rect [72.24000000000001 390.5999999999997 157.2375 404.87999999999965]
+/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
 /Type /Annot
 >>
 endobj
-323 0 obj
+544 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_2)
+/Dest (_responses_29)
 /Subtype /Link
-/Rect [557.8905 390.5999999999997 563.76 404.87999999999965]
+/Rect [552.021 686.2799999999999 563.76 700.56]
 /Type /Annot
 >>
 endobj
-324 0 obj
+545 0 obj
 << /Border [0 0 0]
-/Dest (_produces_13)
+/Dest (_produces_28)
 /Subtype /Link
-/Rect [72.24000000000001 372.11999999999966 152.27100000000002 386.39999999999964]
+/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
 /Type /Annot
 >>
 endobj
-325 0 obj
+546 0 obj
 << /Border [0 0 0]
-/Dest (_produces_13)
+/Dest (_produces_28)
 /Subtype /Link
-/Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
+/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
-326 0 obj
+547 0 obj
 << /Border [0 0 0]
-/Dest (_route23)
+/Dest (_v2_templates_names_get)
 /Subtype /Link
-/Rect [60.24000000000001 353.63999999999965 352.81158984375 367.9199999999996]
+/Rect [60.24000000000001 649.3199999999998 211.818 663.5999999999999]
 /Type /Annot
 >>
 endobj
-327 0 obj
+548 0 obj
 << /Border [0 0 0]
-/Dest (_route23)
+/Dest (_v2_templates_names_get)
 /Subtype /Link
-/Rect [557.8905 353.63999999999965 563.76 367.9199999999996]
+/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
-328 0 obj
+549 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_11)
+/Dest (_responses_30)
 /Subtype /Link
-/Rect [72.24000000000001 335.1599999999996 163.71579492187502 349.4399999999996]
+/Rect [72.24000000000001 630.8399999999998 157.899 645.1199999999999]
 /Type /Annot
 >>
 endobj
-329 0 obj
+550 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_11)
+/Dest (_responses_30)
 /Subtype /Link
-/Rect [557.8905 335.1599999999996 563.76 349.4399999999996]
+/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
-330 0 obj
+551 0 obj
 << /Border [0 0 0]
-/Dest (_responses_15)
+/Dest (_produces_29)
 /Subtype /Link
-/Rect [72.24000000000001 316.6799999999996 157.899 330.9599999999996]
+/Rect [72.24000000000001 612.3599999999998 152.27100000000002 626.6399999999999]
 /Type /Annot
 >>
 endobj
-331 0 obj
+552 0 obj
 << /Border [0 0 0]
-/Dest (_responses_15)
+/Dest (_produces_29)
 /Subtype /Link
-/Rect [557.8905 316.6799999999996 563.76 330.9599999999996]
+/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
-332 0 obj
+553 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_3)
+/Dest (_v2_templates_templatename_get)
 /Subtype /Link
-/Rect [72.24000000000001 298.1999999999996 157.2375 312.47999999999956]
+/Rect [60.24000000000001 593.8799999999998 261.44100000000003 608.1599999999999]
 /Type /Annot
 >>
 endobj
-333 0 obj
+554 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_3)
+/Dest (_v2_templates_templatename_get)
 /Subtype /Link
-/Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
+/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
 >>
 endobj
-334 0 obj
+555 0 obj
 << /Border [0 0 0]
-/Dest (_produces_14)
+/Dest (_parameters_22)
 /Subtype /Link
-/Rect [72.24000000000001 279.7199999999996 152.27100000000002 293.99999999999955]
+/Rect [72.24000000000001 575.3999999999997 163.71579492187502 589.6799999999998]
 /Type /Annot
 >>
 endobj
-335 0 obj
+556 0 obj
 << /Border [0 0 0]
-/Dest (_produces_14)
+/Dest (_parameters_22)
 /Subtype /Link
-/Rect [557.8905 279.7199999999996 563.76 293.99999999999955]
+/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-336 0 obj
+557 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_responses_31)
 /Subtype /Link
-/Rect [60.24000000000001 261.23999999999955 212.0595 275.5199999999995]
+/Rect [72.24000000000001 556.9199999999998 157.899 571.1999999999998]
 /Type /Annot
 >>
 endobj
-337 0 obj
+558 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_responses_31)
 /Subtype /Link
-/Rect [557.8905 261.23999999999955 563.76 275.5199999999995]
+/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
 /Type /Annot
 >>
 endobj
-338 0 obj
+559 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_12)
+/Dest (_produces_30)
 /Subtype /Link
-/Rect [72.24000000000001 242.7599999999995 163.71579492187502 257.0399999999995]
+/Rect [72.24000000000001 538.4399999999998 152.27100000000002 552.7199999999998]
 /Type /Annot
 >>
 endobj
-339 0 obj
+560 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_12)
+/Dest (_produces_30)
 /Subtype /Link
-/Rect [557.8905 242.7599999999995 563.76 257.0399999999995]
+/Rect [552.021 538.4399999999998 563.76 552.7199999999998]
 /Type /Annot
 >>
 endobj
-340 0 obj
+561 0 obj
 << /Border [0 0 0]
-/Dest (_responses_16)
+/Dest (_definitions)
 /Subtype /Link
-/Rect [72.24000000000001 224.27999999999952 157.899 238.55999999999952]
+/Rect [48.24000000000001 519.9599999999998 114.66300000000001 534.2399999999998]
 /Type /Annot
 >>
 endobj
-341 0 obj
+562 0 obj
 << /Border [0 0 0]
-/Dest (_responses_16)
+/Dest (_definitions)
 /Subtype /Link
-/Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
+/Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-342 0 obj
+563 0 obj
 << /Border [0 0 0]
-/Dest (_produces_15)
+/Dest (_cldshealthcheck)
 /Subtype /Link
-/Rect [72.24000000000001 205.79999999999953 152.27100000000002 220.07999999999953]
+/Rect [60.24000000000001 501.4799999999998 164.26350000000002 515.7599999999998]
 /Type /Annot
 >>
 endobj
-343 0 obj
+564 0 obj
 << /Border [0 0 0]
-/Dest (_produces_15)
+/Dest (_cldshealthcheck)
 /Subtype /Link
-/Rect [557.8905 205.79999999999953 563.76 220.07999999999953]
+/Rect [552.021 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
-344 0 obj
+565 0 obj
 << /Border [0 0 0]
-/Dest (_definitions)
+/Dest (_cldsinfo)
 /Subtype /Link
-/Rect [48.24000000000001 187.31999999999954 114.66300000000001 201.59999999999954]
+/Rect [60.24000000000001 482.9999999999998 121.37100000000001 497.27999999999975]
 /Type /Annot
 >>
 endobj
-345 0 obj
+566 0 obj
 << /Border [0 0 0]
-/Dest (_definitions)
+/Dest (_cldsinfo)
 /Subtype /Link
-/Rect [557.8905 187.31999999999954 563.76 201.59999999999954]
+/Rect [552.021 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
-346 0 obj
+567 0 obj
 << /Border [0 0 0]
-/Dest (_cldshealthcheck)
+/Dest (_dictionary)
 /Subtype /Link
-/Rect [60.24000000000001 168.83999999999955 164.26350000000002 183.11999999999955]
+/Rect [60.24000000000001 464.51999999999975 132.7425 478.7999999999997]
 /Type /Annot
 >>
 endobj
-347 0 obj
+568 0 obj
 << /Border [0 0 0]
-/Dest (_cldshealthcheck)
+/Dest (_dictionary)
 /Subtype /Link
-/Rect [557.8905 168.83999999999955 563.76 183.11999999999955]
+/Rect [552.021 464.51999999999975 563.76 478.7999999999997]
 /Type /Annot
 >>
 endobj
-348 0 obj
+569 0 obj
 << /Border [0 0 0]
-/Dest (_cldsinfo)
+/Dest (_dictionaryelement)
 /Subtype /Link
-/Rect [60.24000000000001 150.35999999999956 121.37100000000001 164.63999999999956]
+/Rect [60.24000000000001 446.03999999999974 174.1545 460.3199999999997]
 /Type /Annot
 >>
 endobj
-349 0 obj
+570 0 obj
 << /Border [0 0 0]
-/Dest (_cldsinfo)
+/Dest (_dictionaryelement)
 /Subtype /Link
-/Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
+/Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-350 0 obj
+571 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
-/Rect [60.24000000000001 131.87999999999957 180.507 146.15999999999957]
+/Rect [60.24000000000001 427.5599999999997 180.507 441.8399999999997]
 /Type /Annot
 >>
 endobj
-351 0 obj
+572 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
-/Rect [557.8905 131.87999999999957 563.76 146.15999999999957]
+/Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-352 0 obj
+573 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
-/Rect [60.24000000000001 113.39999999999958 205.11900000000003 127.67999999999958]
+/Rect [60.24000000000001 409.0799999999997 205.11900000000003 423.3599999999997]
 /Type /Annot
 >>
 endobj
-353 0 obj
+574 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
-/Rect [552.021 113.39999999999958 563.76 127.67999999999958]
+/Rect [552.021 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
-354 0 obj
+575 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
-/Rect [60.24000000000001 94.91999999999959 129.94908984375002 109.19999999999959]
+/Rect [60.24000000000001 390.5999999999997 129.94908984375002 404.87999999999965]
 /Type /Annot
 >>
 endobj
-355 0 obj
+576 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
-/Rect [552.021 94.91999999999959 563.76 109.19999999999959]
+/Rect [552.021 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
-356 0 obj
+577 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
-/Rect [60.24000000000001 76.4399999999996 122.43150000000001 90.7199999999996]
+/Rect [60.24000000000001 372.11999999999966 122.43150000000001 386.39999999999964]
 /Type /Annot
 >>
 endobj
-357 0 obj
+578 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
-/Rect [552.021 76.4399999999996 563.76 90.7199999999996]
+/Rect [552.021 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-358 0 obj
+579 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [60.24000000000001 57.95999999999961 133.09950000000003 72.23999999999961]
+/Rect [60.24000000000001 353.63999999999965 133.09950000000003 367.9199999999996]
 /Type /Annot
 >>
 endobj
-359 0 obj
+580 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [552.021 57.95999999999961 563.76 72.23999999999961]
+/Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
-360 0 obj
+581 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [60.24 741.7199999999999 147.894 756.0]
+/Rect [60.24000000000001 335.1599999999996 153.76350000000002 349.4399999999996]
 /Type /Annot
 >>
 endobj
-361 0 obj
+582 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [552.021 741.7199999999999 563.76 756.0]
+/Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
-362 0 obj
+583 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [60.24000000000001 723.2399999999999 105.04350000000001 737.52]
+/Rect [60.24000000000001 316.6799999999996 110.91300000000001 330.9599999999996]
 /Type /Annot
 >>
 endobj
-363 0 obj
+584 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [552.021 723.2399999999999 563.76 737.52]
+/Rect [552.021 316.6799999999996 563.76 330.9599999999996]
 /Type /Annot
 >>
 endobj
-364 0 obj
+585 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [60.24000000000001 298.1999999999996 183.531 312.47999999999956]
+/Type /Annot
+>>
+endobj
+586 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [552.021 298.1999999999996 563.76 312.47999999999956]
+/Type /Annot
+>>
+endobj
+587 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
-/Rect [60.24000000000001 704.7599999999999 129.16200000000003 719.04]
+/Rect [60.24000000000001 279.7199999999996 129.16200000000003 293.99999999999955]
 /Type /Annot
 >>
 endobj
-365 0 obj
+588 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
-/Rect [552.021 704.7599999999999 563.76 719.04]
+/Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
-366 0 obj
+589 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
-/Rect [60.24000000000001 686.2799999999999 157.46175585937502 700.56]
+/Rect [60.24000000000001 261.23999999999955 157.46175585937502 275.5199999999995]
 /Type /Annot
 >>
 endobj
-367 0 obj
+590 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
-/Rect [552.021 686.2799999999999 563.76 700.56]
+/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
 /Type /Annot
 >>
 endobj
-368 0 obj
+591 0 obj
 << /Border [0 0 0]
-/Dest (_microservicemodel)
+/Dest (_looptemplateloopelementmodel)
 /Subtype /Link
-/Rect [60.24000000000001 667.7999999999998 182.85900000000004 682.0799999999999]
+/Rect [60.24000000000001 242.7599999999995 255.174755859375 257.0399999999995]
 /Type /Annot
 >>
 endobj
-369 0 obj
+592 0 obj
 << /Border [0 0 0]
-/Dest (_microservicemodel)
+/Dest (_looptemplateloopelementmodel)
 /Subtype /Link
-/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
+/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
 /Type /Annot
 >>
 endobj
-370 0 obj
+593 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
-/Rect [60.24000000000001 649.3199999999998 181.74600000000004 663.5999999999999]
+/Rect [60.24000000000001 224.27999999999952 181.74600000000004 238.55999999999952]
 /Type /Annot
 >>
 endobj
-371 0 obj
+594 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
-/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
+/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-372 0 obj
+595 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
-/Rect [60.24000000000001 630.8399999999998 127.39800000000001 645.1199999999999]
+/Rect [60.24000000000001 205.79999999999953 127.39800000000001 220.07999999999953]
 /Type /Annot
 >>
 endobj
-373 0 obj
+596 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
-/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
+/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
 /Type /Annot
 >>
 endobj
-374 0 obj
+597 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
-/Rect [60.24000000000001 612.3599999999998 175.42479492187502 626.6399999999999]
+/Rect [60.24000000000001 187.31999999999954 175.42479492187502 201.59999999999954]
 /Type /Annot
 >>
 endobj
-375 0 obj
+598 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
-/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
+/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
-376 0 obj
+599 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
-/Rect [60.24000000000001 593.8799999999998 147.11700000000002 608.1599999999999]
+/Rect [60.24000000000001 168.83999999999955 147.11700000000002 183.11999999999955]
 /Type /Annot
 >>
 endobj
-377 0 obj
+600 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
-/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
+/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
 /Type /Annot
 >>
 endobj
-378 0 obj
+601 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
-/Rect [60.24000000000001 575.3999999999997 122.29500000000002 589.6799999999998]
+/Rect [60.24000000000001 150.35999999999956 122.29500000000002 164.63999999999956]
 /Type /Annot
 >>
 endobj
-379 0 obj
+602 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
-/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
-/Type /Annot
->>
-endobj
-380 0 obj
-<< /Border [0 0 0]
-/Dest (_templatemicroservicemodel)
-/Subtype /Link
-/Rect [60.24000000000001 556.9199999999998 229.40775585937502 571.1999999999998]
-/Type /Annot
->>
-endobj
-381 0 obj
-<< /Border [0 0 0]
-/Dest (_templatemicroservicemodel)
-/Subtype /Link
-/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
+/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-382 0 obj
+603 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 612.0 792.0]
@@ -33743,822 +48846,1372 @@ Q
 
 endstream
 endobj
-383 0 obj
+604 0 obj
 << /Type /Outlines
-/Count 87
-/First 384 0 R
-/Last 452 0 R
+/Count 147
+/First 605 0 R
+/Last 731 0 R
 >>
 endobj
-384 0 obj
+605 0 obj
 << /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
-/Parent 383 0 R
+/Parent 604 0 R
 /Count 0
-/Next 385 0 R
+/Next 606 0 R
 /Dest [7 0 R /XYZ 0 792.0 null]
 >>
 endobj
-385 0 obj
+606 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 383 0 R
+/Parent 604 0 R
 /Count 0
-/Next 386 0 R
-/Prev 384 0 R
+/Next 607 0 R
+/Prev 605 0 R
 /Dest [10 0 R /XYZ 0 792.0 null]
 >>
 endobj
-386 0 obj
+607 0 obj
 << /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
-/Parent 383 0 R
+/Parent 604 0 R
 /Count 2
-/First 387 0 R
-/Last 388 0 R
-/Next 389 0 R
-/Prev 385 0 R
-/Dest [16 0 R /XYZ 0 792.0 null]
+/First 608 0 R
+/Last 609 0 R
+/Next 610 0 R
+/Prev 606 0 R
+/Dest [18 0 R /XYZ 0 792.0 null]
 >>
 endobj
-387 0 obj
+608 0 obj
 << /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
-/Parent 386 0 R
+/Parent 607 0 R
 /Count 0
-/Next 388 0 R
-/Dest [16 0 R /XYZ 0 712.0799999999999 null]
+/Next 609 0 R
+/Dest [18 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-388 0 obj
+609 0 obj
 << /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
-/Parent 386 0 R
+/Parent 607 0 R
 /Count 0
-/Prev 387 0 R
-/Dest [16 0 R /XYZ 0 644.22 null]
+/Prev 608 0 R
+/Dest [18 0 R /XYZ 0 644.22 null]
 >>
 endobj
-389 0 obj
+610 0 obj
 << /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
-/Parent 383 0 R
-/Count 62
-/First 390 0 R
-/Last 448 0 R
-/Next 452 0 R
-/Prev 386 0 R
-/Dest [25 0 R /XYZ 0 792.0 null]
+/Parent 604 0 R
+/Count 120
+/First 611 0 R
+/Last 727 0 R
+/Next 731 0 R
+/Prev 607 0 R
+/Dest [27 0 R /XYZ 0 792.0 null]
 >>
 endobj
-390 0 obj
+611 0 obj
 << /Title <feff0032002e0031002e00200047004500540020002f00760031002f0063006c00640073002f0063006c006400730049006e0066006f>
-/Parent 389 0 R
+/Parent 610 0 R
 /Count 2
-/First 391 0 R
-/Last 392 0 R
-/Next 393 0 R
-/Dest [25 0 R /XYZ 0 712.0799999999999 null]
+/First 612 0 R
+/Last 613 0 R
+/Next 614 0 R
+/Dest [27 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-391 0 obj
+612 0 obj
 << /Title <feff0032002e0031002e0031002e00200052006500730070006f006e007300650073>
-/Parent 390 0 R
+/Parent 611 0 R
 /Count 0
-/Next 392 0 R
-/Dest [25 0 R /XYZ 0 672.0 null]
+/Next 613 0 R
+/Dest [27 0 R /XYZ 0 672.0 null]
 >>
 endobj
-392 0 obj
+613 0 obj
 << /Title <feff0032002e0031002e0032002e002000500072006f00640075006300650073>
-/Parent 390 0 R
+/Parent 611 0 R
 /Count 0
-/Prev 391 0 R
-/Dest [25 0 R /XYZ 0 566.8800000000001 null]
+/Prev 612 0 R
+/Dest [27 0 R /XYZ 0 566.8800000000001 null]
 >>
 endobj
-393 0 obj
+614 0 obj
 << /Title <feff0032002e0032002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
-/Parent 389 0 R
+/Parent 610 0 R
 /Count 2
-/First 394 0 R
-/Last 395 0 R
-/Next 396 0 R
-/Prev 390 0 R
-/Dest [25 0 R /XYZ 0 510.60000000000025 null]
+/First 615 0 R
+/Last 616 0 R
+/Next 617 0 R
+/Prev 611 0 R
+/Dest [27 0 R /XYZ 0 510.60000000000025 null]
 >>
 endobj
-394 0 obj
+615 0 obj
 << /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 393 0 R
+/Parent 614 0 R
 /Count 0
-/Next 395 0 R
-/Dest [25 0 R /XYZ 0 470.5200000000002 null]
+/Next 616 0 R
+/Dest [27 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-395 0 obj
+616 0 obj
 << /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
-/Parent 393 0 R
+/Parent 614 0 R
 /Count 0
-/Prev 394 0 R
-/Dest [25 0 R /XYZ 0 365.4000000000002 null]
+/Prev 615 0 R
+/Dest [27 0 R /XYZ 0 365.4000000000002 null]
 >>
 endobj
-396 0 obj
+617 0 obj
 << /Title <feff0032002e0033002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
-/Parent 389 0 R
+/Parent 610 0 R
 /Count 2
-/First 397 0 R
-/Last 398 0 R
-/Next 399 0 R
-/Prev 393 0 R
-/Dest [25 0 R /XYZ 0 309.1200000000002 null]
+/First 618 0 R
+/Last 619 0 R
+/Next 620 0 R
+/Prev 614 0 R
+/Dest [27 0 R /XYZ 0 309.1200000000002 null]
 >>
 endobj
-397 0 obj
+618 0 obj
 << /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 396 0 R
+/Parent 617 0 R
 /Count 0
-/Next 398 0 R
-/Dest [25 0 R /XYZ 0 269.04000000000013 null]
+/Next 619 0 R
+/Dest [27 0 R /XYZ 0 269.04000000000013 null]
 >>
 endobj
-398 0 obj
+619 0 obj
 << /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
-/Parent 396 0 R
+/Parent 617 0 R
 /Count 0
-/Prev 397 0 R
-/Dest [25 0 R /XYZ 0 178.20000000000013 null]
+/Prev 618 0 R
+/Dest [27 0 R /XYZ 0 178.20000000000013 null]
 >>
 endobj
-399 0 obj
-<< /Title <feff0032002e0034002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+620 0 obj
+<< /Title <feff0032002e0034002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079>
+/Parent 610 0 R
 /Count 2
-/First 400 0 R
-/Last 401 0 R
-/Next 402 0 R
-/Prev 396 0 R
-/Dest [25 0 R /XYZ 0 121.9200000000001 null]
+/First 621 0 R
+/Last 622 0 R
+/Next 623 0 R
+/Prev 617 0 R
+/Dest [27 0 R /XYZ 0 121.9200000000001 null]
 >>
 endobj
-400 0 obj
-<< /Title <feff0032002e0034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 399 0 R
+621 0 obj
+<< /Title <feff0032002e0034002e0031002e00200052006500730070006f006e007300650073>
+/Parent 620 0 R
 /Count 0
-/Next 401 0 R
-/Dest [41 0 R /XYZ 0 792.0 null]
+/Next 622 0 R
+/Dest [43 0 R /XYZ 0 792.0 null]
 >>
 endobj
-401 0 obj
-<< /Title <feff0032002e0034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 399 0 R
+622 0 obj
+<< /Title <feff0032002e0034002e0032002e002000500072006f00640075006300650073>
+/Parent 620 0 R
 /Count 0
-/Prev 400 0 R
-/Dest [41 0 R /XYZ 0 653.2800000000002 null]
+/Prev 621 0 R
+/Dest [43 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-402 0 obj
-<< /Title <feff0032002e0035002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
-/Count 3
-/First 403 0 R
-/Last 405 0 R
-/Next 406 0 R
-/Prev 399 0 R
-/Dest [41 0 R /XYZ 0 562.4400000000004 null]
+623 0 obj
+<< /Title <feff0032002e0035002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079>
+/Parent 610 0 R
+/Count 4
+/First 624 0 R
+/Last 627 0 R
+/Next 628 0 R
+/Prev 620 0 R
+/Dest [43 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-403 0 obj
+624 0 obj
 << /Title <feff0032002e0035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 402 0 R
+/Parent 623 0 R
 /Count 0
-/Next 404 0 R
-/Dest [41 0 R /XYZ 0 522.3600000000005 null]
+/Next 625 0 R
+/Dest [43 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-404 0 obj
+625 0 obj
 << /Title <feff0032002e0035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 402 0 R
+/Parent 623 0 R
 /Count 0
-/Next 405 0 R
-/Prev 403 0 R
-/Dest [41 0 R /XYZ 0 417.2400000000005 null]
+/Next 626 0 R
+/Prev 624 0 R
+/Dest [43 0 R /XYZ 0 451.8000000000006 null]
 >>
 endobj
-405 0 obj
-<< /Title <feff0032002e0035002e0033002e002000500072006f00640075006300650073>
-/Parent 402 0 R
+626 0 obj
+<< /Title <feff0032002e0035002e0033002e00200043006f006e00730075006d00650073>
+/Parent 623 0 R
 /Count 0
-/Prev 404 0 R
-/Dest [41 0 R /XYZ 0 312.12000000000046 null]
+/Next 627 0 R
+/Prev 625 0 R
+/Dest [43 0 R /XYZ 0 346.6800000000005 null]
 >>
 endobj
-406 0 obj
-<< /Title <feff0032002e0036002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
-/Parent 389 0 R
+627 0 obj
+<< /Title <feff0032002e0035002e0034002e002000500072006f00640075006300650073>
+/Parent 623 0 R
+/Count 0
+/Prev 626 0 R
+/Dest [43 0 R /XYZ 0 290.4000000000005 null]
+>>
+endobj
+628 0 obj
+<< /Title <feff0032002e0036002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007300650063006f006e0064006100720079002f006e0061006d00650073>
+/Parent 610 0 R
 /Count 2
-/First 407 0 R
-/Last 408 0 R
-/Next 409 0 R
-/Prev 402 0 R
-/Dest [41 0 R /XYZ 0 255.84000000000043 null]
+/First 629 0 R
+/Last 630 0 R
+/Next 631 0 R
+/Prev 623 0 R
+/Dest [43 0 R /XYZ 0 234.12000000000046 null]
 >>
 endobj
-407 0 obj
+629 0 obj
 << /Title <feff0032002e0036002e0031002e00200052006500730070006f006e007300650073>
-/Parent 406 0 R
+/Parent 628 0 R
 /Count 0
-/Next 408 0 R
-/Dest [41 0 R /XYZ 0 215.76000000000042 null]
+/Next 630 0 R
+/Dest [43 0 R /XYZ 0 194.04000000000045 null]
 >>
 endobj
-408 0 obj
+630 0 obj
 << /Title <feff0032002e0036002e0032002e002000500072006f00640075006300650073>
-/Parent 406 0 R
+/Parent 628 0 R
 /Count 0
-/Prev 407 0 R
-/Dest [41 0 R /XYZ 0 110.64000000000038 null]
+/Prev 629 0 R
+/Dest [59 0 R /XYZ 0 792.0 null]
 >>
 endobj
-409 0 obj
-<< /Title <feff0032002e0037002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+631 0 obj
+<< /Title <feff0032002e0037002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
+/Parent 610 0 R
 /Count 3
-/First 410 0 R
-/Last 412 0 R
-/Next 413 0 R
-/Prev 406 0 R
-/Dest [55 0 R /XYZ 0 792.0 null]
+/First 632 0 R
+/Last 634 0 R
+/Next 635 0 R
+/Prev 628 0 R
+/Dest [59 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-410 0 obj
+632 0 obj
 << /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 409 0 R
+/Parent 631 0 R
 /Count 0
-/Next 411 0 R
-/Dest [55 0 R /XYZ 0 718.32 null]
+/Next 633 0 R
+/Dest [59 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-411 0 obj
+633 0 obj
 << /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 409 0 R
+/Parent 631 0 R
 /Count 0
-/Next 412 0 R
-/Prev 410 0 R
-/Dest [55 0 R /XYZ 0 613.2000000000003 null]
+/Next 634 0 R
+/Prev 632 0 R
+/Dest [59 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-412 0 obj
+634 0 obj
 << /Title <feff0032002e0037002e0033002e002000500072006f00640075006300650073>
-/Parent 409 0 R
+/Parent 631 0 R
 /Count 0
-/Prev 411 0 R
-/Dest [55 0 R /XYZ 0 508.0800000000004 null]
+/Prev 633 0 R
+/Dest [59 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
-413 0 obj
-<< /Title <feff0032002e0038002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
-/Count 3
-/First 414 0 R
-/Last 416 0 R
-/Next 417 0 R
-/Prev 409 0 R
-/Dest [55 0 R /XYZ 0 451.80000000000035 null]
+635 0 obj
+<< /Title <feff0032002e0038002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
+/Parent 610 0 R
+/Count 4
+/First 636 0 R
+/Last 639 0 R
+/Next 640 0 R
+/Prev 631 0 R
+/Dest [59 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
-414 0 obj
+636 0 obj
 << /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 413 0 R
+/Parent 635 0 R
 /Count 0
-/Next 415 0 R
-/Dest [55 0 R /XYZ 0 411.7200000000003 null]
+/Next 637 0 R
+/Dest [59 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
-415 0 obj
+637 0 obj
 << /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 413 0 R
+/Parent 635 0 R
 /Count 0
-/Next 416 0 R
-/Prev 414 0 R
-/Dest [55 0 R /XYZ 0 306.6000000000003 null]
+/Next 638 0 R
+/Prev 636 0 R
+/Dest [59 0 R /XYZ 0 212.76000000000028 null]
 >>
 endobj
-416 0 obj
-<< /Title <feff0032002e0038002e0033002e002000500072006f00640075006300650073>
-/Parent 413 0 R
+638 0 obj
+<< /Title <feff0032002e0038002e0033002e00200043006f006e00730075006d00650073>
+/Parent 635 0 R
 /Count 0
-/Prev 415 0 R
-/Dest [55 0 R /XYZ 0 201.48000000000027 null]
+/Next 639 0 R
+/Prev 637 0 R
+/Dest [59 0 R /XYZ 0 107.64000000000024 null]
 >>
 endobj
-417 0 obj
-<< /Title <feff0032002e0039002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+639 0 obj
+<< /Title <feff0032002e0038002e0034002e002000500072006f00640075006300650073>
+/Parent 635 0 R
+/Count 0
+/Prev 638 0 R
+/Dest [73 0 R /XYZ 0 792.0 null]
+>>
+endobj
+640 0 obj
+<< /Title <feff0032002e0039002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
+/Parent 610 0 R
 /Count 3
-/First 418 0 R
-/Last 420 0 R
-/Next 421 0 R
-/Prev 413 0 R
-/Dest [55 0 R /XYZ 0 145.20000000000024 null]
+/First 641 0 R
+/Last 643 0 R
+/Next 644 0 R
+/Prev 635 0 R
+/Dest [73 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-418 0 obj
+641 0 obj
 << /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 417 0 R
+/Parent 640 0 R
 /Count 0
-/Next 419 0 R
-/Dest [55 0 R /XYZ 0 105.12000000000023 null]
+/Next 642 0 R
+/Dest [73 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-419 0 obj
+642 0 obj
 << /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 417 0 R
+/Parent 640 0 R
 /Count 0
-/Next 420 0 R
-/Prev 418 0 R
-/Dest [69 0 R /XYZ 0 683.1600000000001 null]
+/Next 643 0 R
+/Prev 641 0 R
+/Dest [73 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-420 0 obj
+643 0 obj
 << /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
-/Parent 417 0 R
+/Parent 640 0 R
 /Count 0
-/Prev 419 0 R
-/Dest [69 0 R /XYZ 0 578.0400000000002 null]
+/Prev 642 0 R
+/Dest [73 0 R /XYZ 0 466.0800000000005 null]
 >>
 endobj
-421 0 obj
-<< /Title <feff0032002e00310030002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+644 0 obj
+<< /Title <feff0032002e00310030002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d002f0065006c0065006d0065006e00740073002f007b00730068006f00720074004e0061006d0065007d>
+/Parent 610 0 R
 /Count 3
-/First 422 0 R
-/Last 424 0 R
-/Next 425 0 R
-/Prev 417 0 R
-/Dest [69 0 R /XYZ 0 521.7600000000003 null]
+/First 645 0 R
+/Last 647 0 R
+/Next 648 0 R
+/Prev 640 0 R
+/Dest [73 0 R /XYZ 0 409.80000000000047 null]
 >>
 endobj
-422 0 obj
+645 0 obj
 << /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 421 0 R
+/Parent 644 0 R
 /Count 0
-/Next 423 0 R
-/Dest [69 0 R /XYZ 0 481.68000000000035 null]
+/Next 646 0 R
+/Dest [73 0 R /XYZ 0 341.64000000000044 null]
 >>
 endobj
-423 0 obj
+646 0 obj
 << /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 421 0 R
+/Parent 644 0 R
 /Count 0
-/Next 424 0 R
-/Prev 422 0 R
-/Dest [69 0 R /XYZ 0 376.56000000000034 null]
+/Next 647 0 R
+/Prev 645 0 R
+/Dest [73 0 R /XYZ 0 198.9600000000004 null]
 >>
 endobj
-424 0 obj
+647 0 obj
 << /Title <feff0032002e00310030002e0033002e002000500072006f00640075006300650073>
-/Parent 421 0 R
+/Parent 644 0 R
 /Count 0
-/Prev 423 0 R
-/Dest [69 0 R /XYZ 0 271.4400000000003 null]
+/Prev 646 0 R
+/Dest [73 0 R /XYZ 0 108.12000000000037 null]
 >>
 endobj
-425 0 obj
-<< /Title <feff0032002e00310031002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
-/Count 3
-/First 426 0 R
-/Last 428 0 R
-/Next 429 0 R
-/Prev 421 0 R
-/Dest [69 0 R /XYZ 0 215.16000000000028 null]
+648 0 obj
+<< /Title <feff0032002e00310031002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 2
+/First 649 0 R
+/Last 650 0 R
+/Next 651 0 R
+/Prev 644 0 R
+/Dest [85 0 R /XYZ 0 792.0 null]
 >>
 endobj
-426 0 obj
+649 0 obj
 << /Title <feff0032002e00310031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 425 0 R
+/Parent 648 0 R
 /Count 0
-/Next 427 0 R
-/Dest [69 0 R /XYZ 0 175.08000000000027 null]
+/Next 650 0 R
+/Dest [85 0 R /XYZ 0 718.32 null]
 >>
 endobj
-427 0 obj
+650 0 obj
 << /Title <feff0032002e00310031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 425 0 R
-/Count 0
-/Next 428 0 R
-/Prev 426 0 R
-/Dest [82 0 R /XYZ 0 792.0 null]
->>
-endobj
-428 0 obj
-<< /Title <feff0032002e00310031002e0033002e002000500072006f00640075006300650073>
-/Parent 425 0 R
+/Parent 648 0 R
 /Count 0
-/Prev 427 0 R
-/Dest [82 0 R /XYZ 0 653.2800000000002 null]
+/Prev 649 0 R
+/Dest [85 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-429 0 obj
-<< /Title <feff0032002e00310032002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+651 0 obj
+<< /Title <feff0032002e00310032002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
 /Count 3
-/First 430 0 R
-/Last 432 0 R
-/Next 433 0 R
-/Prev 425 0 R
-/Dest [82 0 R /XYZ 0 597.0000000000003 null]
+/First 652 0 R
+/Last 654 0 R
+/Next 655 0 R
+/Prev 648 0 R
+/Dest [85 0 R /XYZ 0 522.3600000000005 null]
 >>
 endobj
-430 0 obj
+652 0 obj
 << /Title <feff0032002e00310032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 429 0 R
+/Parent 651 0 R
 /Count 0
-/Next 431 0 R
-/Dest [82 0 R /XYZ 0 556.9200000000004 null]
+/Next 653 0 R
+/Dest [85 0 R /XYZ 0 482.2800000000005 null]
 >>
 endobj
-431 0 obj
+653 0 obj
 << /Title <feff0032002e00310032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 429 0 R
+/Parent 651 0 R
 /Count 0
-/Next 432 0 R
-/Prev 430 0 R
-/Dest [82 0 R /XYZ 0 451.8000000000006 null]
+/Next 654 0 R
+/Prev 652 0 R
+/Dest [85 0 R /XYZ 0 377.1600000000005 null]
 >>
 endobj
-432 0 obj
+654 0 obj
 << /Title <feff0032002e00310032002e0033002e002000500072006f00640075006300650073>
-/Parent 429 0 R
+/Parent 651 0 R
 /Count 0
-/Prev 431 0 R
-/Dest [82 0 R /XYZ 0 346.6800000000005 null]
+/Prev 653 0 R
+/Dest [85 0 R /XYZ 0 272.0400000000004 null]
 >>
 endobj
-433 0 obj
-<< /Title <feff0032002e00310033002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+655 0 obj
+<< /Title <feff0032002e00310033002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
+/Parent 610 0 R
+/Count 2
+/First 656 0 R
+/Last 657 0 R
+/Next 658 0 R
+/Prev 651 0 R
+/Dest [85 0 R /XYZ 0 215.76000000000042 null]
+>>
+endobj
+656 0 obj
+<< /Title <feff0032002e00310033002e0031002e00200052006500730070006f006e007300650073>
+/Parent 655 0 R
+/Count 0
+/Next 657 0 R
+/Dest [85 0 R /XYZ 0 175.6800000000004 null]
+>>
+endobj
+657 0 obj
+<< /Title <feff0032002e00310033002e0032002e002000500072006f00640075006300650073>
+/Parent 655 0 R
+/Count 0
+/Prev 656 0 R
+/Dest [98 0 R /XYZ 0 792.0 null]
+>>
+endobj
+658 0 obj
+<< /Title <feff0032002e00310034002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 659 0 R
+/Last 661 0 R
+/Next 662 0 R
+/Prev 655 0 R
+/Dest [98 0 R /XYZ 0 702.1200000000001 null]
+>>
+endobj
+659 0 obj
+<< /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 658 0 R
+/Count 0
+/Next 660 0 R
+/Dest [98 0 R /XYZ 0 662.0400000000002 null]
+>>
+endobj
+660 0 obj
+<< /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
+/Parent 658 0 R
+/Count 0
+/Next 661 0 R
+/Prev 659 0 R
+/Dest [98 0 R /XYZ 0 556.9200000000003 null]
+>>
+endobj
+661 0 obj
+<< /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
+/Parent 658 0 R
+/Count 0
+/Prev 660 0 R
+/Dest [98 0 R /XYZ 0 451.8000000000004 null]
+>>
+endobj
+662 0 obj
+<< /Title <feff0032002e00310035002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004f00700050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 663 0 R
+/Last 665 0 R
+/Next 666 0 R
+/Prev 658 0 R
+/Dest [98 0 R /XYZ 0 395.5200000000004 null]
+>>
+endobj
+663 0 obj
+<< /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 662 0 R
+/Count 0
+/Next 664 0 R
+/Dest [98 0 R /XYZ 0 327.36000000000035 null]
+>>
+endobj
+664 0 obj
+<< /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
+/Parent 662 0 R
+/Count 0
+/Next 665 0 R
+/Prev 663 0 R
+/Dest [98 0 R /XYZ 0 222.2400000000003 null]
+>>
+endobj
+665 0 obj
+<< /Title <feff0032002e00310035002e0033002e002000500072006f00640075006300650073>
+/Parent 662 0 R
+/Count 0
+/Prev 664 0 R
+/Dest [98 0 R /XYZ 0 117.12000000000026 null]
+>>
+endobj
+666 0 obj
+<< /Title <feff0032002e00310036002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 667 0 R
+/Last 669 0 R
+/Next 670 0 R
+/Prev 662 0 R
+/Dest [111 0 R /XYZ 0 792.0 null]
+>>
+endobj
+667 0 obj
+<< /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 666 0 R
+/Count 0
+/Next 668 0 R
+/Dest [111 0 R /XYZ 0 718.32 null]
+>>
+endobj
+668 0 obj
+<< /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
+/Parent 666 0 R
+/Count 0
+/Next 669 0 R
+/Prev 667 0 R
+/Dest [111 0 R /XYZ 0 613.2000000000003 null]
+>>
+endobj
+669 0 obj
+<< /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
+/Parent 666 0 R
+/Count 0
+/Prev 668 0 R
+/Dest [111 0 R /XYZ 0 508.0800000000004 null]
+>>
+endobj
+670 0 obj
+<< /Title <feff0032002e00310037002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 671 0 R
+/Last 673 0 R
+/Next 674 0 R
+/Prev 666 0 R
+/Dest [111 0 R /XYZ 0 451.80000000000035 null]
+>>
+endobj
+671 0 obj
+<< /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 670 0 R
+/Count 0
+/Next 672 0 R
+/Dest [111 0 R /XYZ 0 411.7200000000003 null]
+>>
+endobj
+672 0 obj
+<< /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
+/Parent 670 0 R
+/Count 0
+/Next 673 0 R
+/Prev 671 0 R
+/Dest [111 0 R /XYZ 0 306.6000000000003 null]
+>>
+endobj
+673 0 obj
+<< /Title <feff0032002e00310037002e0033002e002000500072006f00640075006300650073>
+/Parent 670 0 R
+/Count 0
+/Prev 672 0 R
+/Dest [111 0 R /XYZ 0 201.48000000000027 null]
+>>
+endobj
+674 0 obj
+<< /Title <feff0032002e00310038002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 675 0 R
+/Last 677 0 R
+/Next 678 0 R
+/Prev 670 0 R
+/Dest [111 0 R /XYZ 0 145.20000000000024 null]
+>>
+endobj
+675 0 obj
+<< /Title <feff0032002e00310038002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 674 0 R
+/Count 0
+/Next 676 0 R
+/Dest [111 0 R /XYZ 0 105.12000000000023 null]
+>>
+endobj
+676 0 obj
+<< /Title <feff0032002e00310038002e0032002e00200052006500730070006f006e007300650073>
+/Parent 674 0 R
+/Count 0
+/Next 677 0 R
+/Prev 675 0 R
+/Dest [126 0 R /XYZ 0 683.1600000000001 null]
+>>
+endobj
+677 0 obj
+<< /Title <feff0032002e00310038002e0033002e002000500072006f00640075006300650073>
+/Parent 674 0 R
+/Count 0
+/Prev 676 0 R
+/Dest [126 0 R /XYZ 0 578.0400000000002 null]
+>>
+endobj
+678 0 obj
+<< /Title <feff0032002e00310039002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 679 0 R
+/Last 681 0 R
+/Next 682 0 R
+/Prev 674 0 R
+/Dest [126 0 R /XYZ 0 521.7600000000003 null]
+>>
+endobj
+679 0 obj
+<< /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 678 0 R
+/Count 0
+/Next 680 0 R
+/Dest [126 0 R /XYZ 0 481.68000000000035 null]
+>>
+endobj
+680 0 obj
+<< /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
+/Parent 678 0 R
+/Count 0
+/Next 681 0 R
+/Prev 679 0 R
+/Dest [126 0 R /XYZ 0 376.56000000000034 null]
+>>
+endobj
+681 0 obj
+<< /Title <feff0032002e00310039002e0033002e002000500072006f00640075006300650073>
+/Parent 678 0 R
+/Count 0
+/Prev 680 0 R
+/Dest [126 0 R /XYZ 0 271.4400000000003 null]
+>>
+endobj
+682 0 obj
+<< /Title <feff0032002e00320030002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 683 0 R
+/Last 685 0 R
+/Next 686 0 R
+/Prev 678 0 R
+/Dest [126 0 R /XYZ 0 215.16000000000028 null]
+>>
+endobj
+683 0 obj
+<< /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 682 0 R
+/Count 0
+/Next 684 0 R
+/Dest [126 0 R /XYZ 0 175.08000000000027 null]
+>>
+endobj
+684 0 obj
+<< /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
+/Parent 682 0 R
+/Count 0
+/Next 685 0 R
+/Prev 683 0 R
+/Dest [137 0 R /XYZ 0 792.0 null]
+>>
+endobj
+685 0 obj
+<< /Title <feff0032002e00320030002e0033002e002000500072006f00640075006300650073>
+/Parent 682 0 R
+/Count 0
+/Prev 684 0 R
+/Dest [137 0 R /XYZ 0 653.2800000000002 null]
+>>
+endobj
+686 0 obj
+<< /Title <feff0032002e00320031002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
 /Count 4
-/First 434 0 R
-/Last 437 0 R
-/Next 438 0 R
-/Prev 429 0 R
-/Dest [82 0 R /XYZ 0 290.4000000000005 null]
+/First 687 0 R
+/Last 690 0 R
+/Next 691 0 R
+/Prev 682 0 R
+/Dest [137 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-434 0 obj
-<< /Title <feff0032002e00310033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 433 0 R
+687 0 obj
+<< /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 686 0 R
 /Count 0
-/Next 435 0 R
-/Dest [82 0 R /XYZ 0 250.32000000000048 null]
+/Next 688 0 R
+/Dest [137 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-435 0 obj
-<< /Title <feff0032002e00310033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 433 0 R
+688 0 obj
+<< /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
+/Parent 686 0 R
 /Count 0
-/Next 436 0 R
-/Prev 434 0 R
-/Dest [82 0 R /XYZ 0 107.64000000000044 null]
+/Next 689 0 R
+/Prev 687 0 R
+/Dest [137 0 R /XYZ 0 414.2400000000005 null]
 >>
 endobj
-436 0 obj
-<< /Title <feff0032002e00310033002e0033002e00200043006f006e00730075006d00650073>
-/Parent 433 0 R
+689 0 obj
+<< /Title <feff0032002e00320031002e0033002e00200043006f006e00730075006d00650073>
+/Parent 686 0 R
 /Count 0
-/Next 437 0 R
-/Prev 435 0 R
-/Dest [96 0 R /XYZ 0 683.1600000000001 null]
+/Next 690 0 R
+/Prev 688 0 R
+/Dest [137 0 R /XYZ 0 309.12000000000046 null]
 >>
 endobj
-437 0 obj
-<< /Title <feff0032002e00310033002e0034002e002000500072006f00640075006300650073>
-/Parent 433 0 R
+690 0 obj
+<< /Title <feff0032002e00320031002e0034002e002000500072006f00640075006300650073>
+/Parent 686 0 R
 /Count 0
-/Prev 436 0 R
-/Dest [96 0 R /XYZ 0 626.8800000000002 null]
+/Prev 689 0 R
+/Dest [137 0 R /XYZ 0 252.84000000000043 null]
 >>
 endobj
-438 0 obj
-<< /Title <feff0032002e00310034002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+691 0 obj
+<< /Title <feff0032002e00320032002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
 /Count 4
-/First 439 0 R
-/Last 442 0 R
-/Next 443 0 R
-/Prev 433 0 R
-/Dest [96 0 R /XYZ 0 570.6000000000004 null]
+/First 692 0 R
+/Last 695 0 R
+/Next 696 0 R
+/Prev 686 0 R
+/Dest [137 0 R /XYZ 0 196.5600000000004 null]
 >>
 endobj
-439 0 obj
-<< /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 438 0 R
+692 0 obj
+<< /Title <feff0032002e00320032002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 691 0 R
 /Count 0
-/Next 440 0 R
-/Dest [96 0 R /XYZ 0 502.4400000000004 null]
+/Next 693 0 R
+/Dest [137 0 R /XYZ 0 128.40000000000038 null]
 >>
 endobj
-440 0 obj
-<< /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 438 0 R
+693 0 obj
+<< /Title <feff0032002e00320032002e0032002e00200052006500730070006f006e007300650073>
+/Parent 691 0 R
 /Count 0
-/Next 441 0 R
-/Prev 439 0 R
-/Dest [96 0 R /XYZ 0 359.7600000000004 null]
+/Next 694 0 R
+/Prev 692 0 R
+/Dest [153 0 R /XYZ 0 645.5999999999999 null]
 >>
 endobj
-441 0 obj
-<< /Title <feff0032002e00310034002e0033002e00200043006f006e00730075006d00650073>
-/Parent 438 0 R
+694 0 obj
+<< /Title <feff0032002e00320032002e0033002e00200043006f006e00730075006d00650073>
+/Parent 691 0 R
 /Count 0
-/Next 442 0 R
-/Prev 440 0 R
-/Dest [96 0 R /XYZ 0 254.64000000000033 null]
+/Next 695 0 R
+/Prev 693 0 R
+/Dest [153 0 R /XYZ 0 540.48 null]
 >>
 endobj
-442 0 obj
-<< /Title <feff0032002e00310034002e0034002e002000500072006f00640075006300650073>
-/Parent 438 0 R
+695 0 obj
+<< /Title <feff0032002e00320032002e0034002e002000500072006f00640075006300650073>
+/Parent 691 0 R
 /Count 0
-/Prev 441 0 R
-/Dest [96 0 R /XYZ 0 198.3600000000003 null]
+/Prev 694 0 R
+/Dest [153 0 R /XYZ 0 484.20000000000016 null]
 >>
 endobj
-443 0 obj
-<< /Title <feff0032002e00310035002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+696 0 obj
+<< /Title <feff0032002e00320033002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
 /Count 4
-/First 444 0 R
-/Last 447 0 R
-/Next 448 0 R
-/Prev 438 0 R
-/Dest [96 0 R /XYZ 0 142.08000000000027 null]
+/First 697 0 R
+/Last 700 0 R
+/Next 701 0 R
+/Prev 691 0 R
+/Dest [153 0 R /XYZ 0 427.92000000000013 null]
 >>
 endobj
-444 0 obj
-<< /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 443 0 R
+697 0 obj
+<< /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 696 0 R
 /Count 0
-/Next 445 0 R
-/Dest [109 0 R /XYZ 0 792.0 null]
+/Next 698 0 R
+/Dest [153 0 R /XYZ 0 359.7600000000001 null]
 >>
 endobj
-445 0 obj
-<< /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 443 0 R
+698 0 obj
+<< /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
+/Parent 696 0 R
 /Count 0
-/Next 446 0 R
-/Prev 444 0 R
-/Dest [109 0 R /XYZ 0 615.72 null]
+/Next 699 0 R
+/Prev 697 0 R
+/Dest [153 0 R /XYZ 0 217.0800000000001 null]
 >>
 endobj
-446 0 obj
-<< /Title <feff0032002e00310035002e0033002e00200043006f006e00730075006d00650073>
-/Parent 443 0 R
+699 0 obj
+<< /Title <feff0032002e00320033002e0033002e00200043006f006e00730075006d00650073>
+/Parent 696 0 R
 /Count 0
-/Next 447 0 R
-/Prev 445 0 R
-/Dest [109 0 R /XYZ 0 510.60000000000014 null]
+/Next 700 0 R
+/Prev 698 0 R
+/Dest [153 0 R /XYZ 0 111.96000000000006 null]
 >>
 endobj
-447 0 obj
-<< /Title <feff0032002e00310035002e0034002e002000500072006f00640075006300650073>
-/Parent 443 0 R
+700 0 obj
+<< /Title <feff0032002e00320033002e0034002e002000500072006f00640075006300650073>
+/Parent 696 0 R
 /Count 0
-/Prev 446 0 R
-/Dest [109 0 R /XYZ 0 454.3200000000001 null]
+/Prev 699 0 R
+/Dest [166 0 R /XYZ 0 792.0 null]
 >>
 endobj
-448 0 obj
-<< /Title <feff0032002e00310036002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 389 0 R
+701 0 obj
+<< /Title <feff0032002e00320034002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 610 0 R
 /Count 3
-/First 449 0 R
-/Last 451 0 R
-/Prev 443 0 R
-/Dest [109 0 R /XYZ 0 398.0400000000001 null]
+/First 702 0 R
+/Last 704 0 R
+/Next 705 0 R
+/Prev 696 0 R
+/Dest [166 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-449 0 obj
-<< /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 448 0 R
+702 0 obj
+<< /Title <feff0032002e00320034002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 701 0 R
 /Count 0
-/Next 450 0 R
-/Dest [109 0 R /XYZ 0 357.96000000000004 null]
+/Next 703 0 R
+/Dest [166 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-450 0 obj
-<< /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 448 0 R
+703 0 obj
+<< /Title <feff0032002e00320034002e0032002e00200052006500730070006f006e007300650073>
+/Parent 701 0 R
 /Count 0
-/Next 451 0 R
-/Prev 449 0 R
-/Dest [109 0 R /XYZ 0 252.83999999999997 null]
+/Next 704 0 R
+/Prev 702 0 R
+/Dest [166 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-451 0 obj
-<< /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
-/Parent 448 0 R
+704 0 obj
+<< /Title <feff0032002e00320034002e0033002e002000500072006f00640075006300650073>
+/Parent 701 0 R
 /Count 0
-/Prev 450 0 R
-/Dest [109 0 R /XYZ 0 147.71999999999994 null]
+/Prev 703 0 R
+/Dest [166 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
-452 0 obj
+705 0 obj
+<< /Title <feff0032002e00320035002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
+/Parent 610 0 R
+/Count 2
+/First 706 0 R
+/Last 707 0 R
+/Next 708 0 R
+/Prev 701 0 R
+/Dest [166 0 R /XYZ 0 395.5200000000004 null]
+>>
+endobj
+706 0 obj
+<< /Title <feff0032002e00320035002e0031002e00200052006500730070006f006e007300650073>
+/Parent 705 0 R
+/Count 0
+/Next 707 0 R
+/Dest [166 0 R /XYZ 0 355.44000000000034 null]
+>>
+endobj
+707 0 obj
+<< /Title <feff0032002e00320035002e0032002e002000500072006f00640075006300650073>
+/Parent 705 0 R
+/Count 0
+/Prev 706 0 R
+/Dest [166 0 R /XYZ 0 250.32000000000028 null]
+>>
+endobj
+708 0 obj
+<< /Title <feff0032002e00320036002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f00790061006d006c002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
+/Parent 610 0 R
+/Count 3
+/First 709 0 R
+/Last 711 0 R
+/Next 712 0 R
+/Prev 705 0 R
+/Dest [166 0 R /XYZ 0 194.04000000000025 null]
+>>
+endobj
+709 0 obj
+<< /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 708 0 R
+/Count 0
+/Next 710 0 R
+/Dest [166 0 R /XYZ 0 125.88000000000022 null]
+>>
+endobj
+710 0 obj
+<< /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
+/Parent 708 0 R
+/Count 0
+/Next 711 0 R
+/Prev 709 0 R
+/Dest [181 0 R /XYZ 0 683.1600000000001 null]
+>>
+endobj
+711 0 obj
+<< /Title <feff0032002e00320036002e0033002e002000500072006f00640075006300650073>
+/Parent 708 0 R
+/Count 0
+/Prev 710 0 R
+/Dest [181 0 R /XYZ 0 578.0400000000002 null]
+>>
+endobj
+712 0 obj
+<< /Title <feff0032002e00320037002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
+/Parent 610 0 R
+/Count 3
+/First 713 0 R
+/Last 715 0 R
+/Next 716 0 R
+/Prev 708 0 R
+/Dest [181 0 R /XYZ 0 521.7600000000003 null]
+>>
+endobj
+713 0 obj
+<< /Title <feff0032002e00320037002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 712 0 R
+/Count 0
+/Next 714 0 R
+/Dest [181 0 R /XYZ 0 481.68000000000035 null]
+>>
+endobj
+714 0 obj
+<< /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
+/Parent 712 0 R
+/Count 0
+/Next 715 0 R
+/Prev 713 0 R
+/Dest [181 0 R /XYZ 0 376.56000000000034 null]
+>>
+endobj
+715 0 obj
+<< /Title <feff0032002e00320037002e0033002e002000500072006f00640075006300650073>
+/Parent 712 0 R
+/Count 0
+/Prev 714 0 R
+/Dest [181 0 R /XYZ 0 271.4400000000003 null]
+>>
+endobj
+716 0 obj
+<< /Title <feff0032002e00320038002e00200050005500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
+/Parent 610 0 R
+/Count 4
+/First 717 0 R
+/Last 720 0 R
+/Next 721 0 R
+/Prev 712 0 R
+/Dest [181 0 R /XYZ 0 215.16000000000028 null]
+>>
+endobj
+717 0 obj
+<< /Title <feff0032002e00320038002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 716 0 R
+/Count 0
+/Next 718 0 R
+/Dest [181 0 R /XYZ 0 175.08000000000027 null]
+>>
+endobj
+718 0 obj
+<< /Title <feff0032002e00320038002e0032002e00200052006500730070006f006e007300650073>
+/Parent 716 0 R
+/Count 0
+/Next 719 0 R
+/Prev 717 0 R
+/Dest [192 0 R /XYZ 0 683.1600000000001 null]
+>>
+endobj
+719 0 obj
+<< /Title <feff0032002e00320038002e0033002e00200043006f006e00730075006d00650073>
+/Parent 716 0 R
+/Count 0
+/Next 720 0 R
+/Prev 718 0 R
+/Dest [192 0 R /XYZ 0 578.0400000000002 null]
+>>
+endobj
+720 0 obj
+<< /Title <feff0032002e00320038002e0034002e002000500072006f00640075006300650073>
+/Parent 716 0 R
+/Count 0
+/Prev 719 0 R
+/Dest [192 0 R /XYZ 0 521.7600000000003 null]
+>>
+endobj
+721 0 obj
+<< /Title <feff0032002e00320039002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073>
+/Parent 610 0 R
+/Count 2
+/First 722 0 R
+/Last 723 0 R
+/Next 724 0 R
+/Prev 716 0 R
+/Dest [192 0 R /XYZ 0 465.48000000000036 null]
+>>
+endobj
+722 0 obj
+<< /Title <feff0032002e00320039002e0031002e00200052006500730070006f006e007300650073>
+/Parent 721 0 R
+/Count 0
+/Next 723 0 R
+/Dest [192 0 R /XYZ 0 425.4000000000003 null]
+>>
+endobj
+723 0 obj
+<< /Title <feff0032002e00320039002e0032002e002000500072006f00640075006300650073>
+/Parent 721 0 R
+/Count 0
+/Prev 722 0 R
+/Dest [192 0 R /XYZ 0 320.2800000000003 null]
+>>
+endobj
+724 0 obj
+<< /Title <feff0032002e00330030002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f006e0061006d00650073>
+/Parent 610 0 R
+/Count 2
+/First 725 0 R
+/Last 726 0 R
+/Next 727 0 R
+/Prev 721 0 R
+/Dest [192 0 R /XYZ 0 264.0000000000003 null]
+>>
+endobj
+725 0 obj
+<< /Title <feff0032002e00330030002e0031002e00200052006500730070006f006e007300650073>
+/Parent 724 0 R
+/Count 0
+/Next 726 0 R
+/Dest [192 0 R /XYZ 0 223.9200000000003 null]
+>>
+endobj
+726 0 obj
+<< /Title <feff0032002e00330030002e0032002e002000500072006f00640075006300650073>
+/Parent 724 0 R
+/Count 0
+/Prev 725 0 R
+/Dest [192 0 R /XYZ 0 118.80000000000027 null]
+>>
+endobj
+727 0 obj
+<< /Title <feff0032002e00330031002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f007b00740065006d0070006c006100740065004e0061006d0065007d>
+/Parent 610 0 R
+/Count 3
+/First 728 0 R
+/Last 730 0 R
+/Prev 724 0 R
+/Dest [206 0 R /XYZ 0 792.0 null]
+>>
+endobj
+728 0 obj
+<< /Title <feff0032002e00330031002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 727 0 R
+/Count 0
+/Next 729 0 R
+/Dest [206 0 R /XYZ 0 718.32 null]
+>>
+endobj
+729 0 obj
+<< /Title <feff0032002e00330031002e0032002e00200052006500730070006f006e007300650073>
+/Parent 727 0 R
+/Count 0
+/Next 730 0 R
+/Prev 728 0 R
+/Dest [206 0 R /XYZ 0 613.2000000000003 null]
+>>
+endobj
+730 0 obj
+<< /Title <feff0032002e00330031002e0033002e002000500072006f00640075006300650073>
+/Parent 727 0 R
+/Count 0
+/Prev 729 0 R
+/Dest [206 0 R /XYZ 0 508.0800000000004 null]
+>>
+endobj
+731 0 obj
 << /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
-/Parent 383 0 R
-/Count 18
-/First 453 0 R
-/Last 470 0 R
-/Prev 389 0 R
-/Dest [123 0 R /XYZ 0 792.0 null]
+/Parent 604 0 R
+/Count 20
+/First 732 0 R
+/Last 751 0 R
+/Prev 610 0 R
+/Dest [214 0 R /XYZ 0 792.0 null]
 >>
 endobj
-453 0 obj
+732 0 obj
 << /Title <feff0033002e0031002e00200043006c00640073004800650061006c007400680043006800650063006b>
-/Parent 452 0 R
+/Parent 731 0 R
 /Count 0
-/Next 454 0 R
-/Dest [123 0 R /XYZ 0 712.0799999999999 null]
+/Next 733 0 R
+/Dest [214 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-454 0 obj
+733 0 obj
 << /Title <feff0033002e0032002e00200043006c006400730049006e0066006f>
-/Parent 452 0 R
+/Parent 731 0 R
 /Count 0
-/Next 455 0 R
-/Prev 453 0 R
-/Dest [123 0 R /XYZ 0 524.04 null]
+/Next 734 0 R
+/Prev 732 0 R
+/Dest [214 0 R /XYZ 0 524.04 null]
 >>
 endobj
-455 0 obj
-<< /Title <feff0033002e0033002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
-/Parent 452 0 R
+734 0 obj
+<< /Title <feff0033002e0033002e002000440069006300740069006f006e006100720079>
+/Parent 731 0 R
 /Count 0
-/Next 456 0 R
-/Prev 454 0 R
-/Dest [123 0 R /XYZ 0 148.19999999999993 null]
+/Next 735 0 R
+/Prev 733 0 R
+/Dest [214 0 R /XYZ 0 148.19999999999993 null]
 >>
 endobj
-456 0 obj
-<< /Title <feff0033002e0034002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
-/Parent 452 0 R
+735 0 obj
+<< /Title <feff0033002e0034002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
+/Parent 731 0 R
 /Count 0
-/Next 457 0 R
-/Prev 455 0 R
-/Dest [130 0 R /XYZ 0 645.5999999999999 null]
+/Next 736 0 R
+/Prev 734 0 R
+/Dest [220 0 R /XYZ 0 420.23999999999995 null]
 >>
 endobj
-457 0 obj
-<< /Title <feff0033002e0035002e0020004a0073006f006e00410072007200610079>
-/Parent 452 0 R
+736 0 obj
+<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
+/Parent 731 0 R
 /Count 0
-/Next 458 0 R
-/Prev 456 0 R
-/Dest [130 0 R /XYZ 0 457.56 null]
+/Next 737 0 R
+/Prev 735 0 R
+/Dest [224 0 R /XYZ 0 645.5999999999999 null]
 >>
 endobj
-458 0 obj
-<< /Title <feff0033002e0036002e0020004a0073006f006e004e0075006c006c>
-/Parent 452 0 R
+737 0 obj
+<< /Title <feff0033002e0036002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
+/Parent 731 0 R
 /Count 0
-/Next 459 0 R
-/Prev 457 0 R
-/Dest [136 0 R /XYZ 0 307.56000000000034 null]
+/Next 738 0 R
+/Prev 736 0 R
+/Dest [224 0 R /XYZ 0 495.11999999999995 null]
 >>
 endobj
-459 0 obj
-<< /Title <feff0033002e0037002e0020004a0073006f006e004f0062006a006500630074>
-/Parent 452 0 R
+738 0 obj
+<< /Title <feff0033002e0037002e0020004a0073006f006e00410072007200610079>
+/Parent 731 0 R
 /Count 0
-/Next 460 0 R
-/Prev 458 0 R
-/Dest [143 0 R /XYZ 0 157.32000000000022 null]
+/Next 739 0 R
+/Prev 737 0 R
+/Dest [224 0 R /XYZ 0 307.07999999999987 null]
 >>
 endobj
-460 0 obj
-<< /Title <feff0033002e0038002e0020004a0073006f006e005000720069006d00690074006900760065>
-/Parent 452 0 R
+739 0 obj
+<< /Title <feff0033002e0038002e0020004a0073006f006e004e0075006c006c>
+/Parent 731 0 R
 /Count 0
-/Next 461 0 R
-/Prev 459 0 R
-/Dest [158 0 R /XYZ 0 683.1600000000001 null]
+/Next 740 0 R
+/Prev 738 0 R
+/Dest [232 0 R /XYZ 0 157.32000000000022 null]
 >>
 endobj
-461 0 obj
-<< /Title <feff0033002e0039002e0020004c006f006f0070>
-/Parent 452 0 R
+740 0 obj
+<< /Title <feff0033002e0039002e0020004a0073006f006e004f0062006a006500630074>
+/Parent 731 0 R
 /Count 0
-/Next 462 0 R
-/Prev 460 0 R
-/Dest [166 0 R /XYZ 0 420.2400000000004 null]
+/Next 741 0 R
+/Prev 739 0 R
+/Dest [247 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-462 0 obj
-<< /Title <feff0033002e00310030002e0020004c006f006f0070004c006f0067>
-/Parent 452 0 R
+741 0 obj
+<< /Title <feff0033002e00310030002e0020004a0073006f006e005000720069006d00690074006900760065>
+/Parent 731 0 R
 /Count 0
-/Next 463 0 R
-/Prev 461 0 R
-/Dest [171 0 R /XYZ 0 345.12000000000006 null]
+/Next 742 0 R
+/Prev 740 0 R
+/Dest [255 0 R /XYZ 0 532.9200000000003 null]
 >>
 endobj
-463 0 obj
-<< /Title <feff0033002e00310031002e0020004c006f006f007000540065006d0070006c006100740065>
-/Parent 452 0 R
+742 0 obj
+<< /Title <feff0033002e00310031002e0020004c006f006f0070>
+/Parent 731 0 R
 /Count 0
-/Next 464 0 R
-/Prev 462 0 R
-/Dest [180 0 R /XYZ 0 792.0 null]
+/Next 743 0 R
+/Prev 741 0 R
+/Dest [261 0 R /XYZ 0 270.0000000000004 null]
 >>
 endobj
-464 0 obj
-<< /Title <feff0033002e00310032002e0020004d006900630072006f0053006500720076006900630065004d006f00640065006c>
-/Parent 452 0 R
+743 0 obj
+<< /Title <feff0033002e00310032002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 731 0 R
 /Count 0
-/Next 465 0 R
-/Prev 463 0 R
-/Dest [180 0 R /XYZ 0 307.44 null]
+/Next 744 0 R
+/Prev 742 0 R
+/Dest [267 0 R /XYZ 0 269.99999999999994 null]
 >>
 endobj
-465 0 obj
-<< /Title <feff0033002e00310033002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
-/Parent 452 0 R
+744 0 obj
+<< /Title <feff0033002e00310033002e0020004c006f006f0070004c006f0067>
+/Parent 731 0 R
 /Count 0
-/Next 466 0 R
-/Prev 464 0 R
-/Dest [187 0 R /XYZ 0 570.48 null]
+/Next 745 0 R
+/Prev 743 0 R
+/Dest [276 0 R /XYZ 0 457.79999999999995 null]
 >>
 endobj
-466 0 obj
-<< /Title <feff0033002e00310034002e0020004e0075006d006200650072>
-/Parent 452 0 R
+745 0 obj
+<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065>
+/Parent 731 0 R
 /Count 0
-/Next 467 0 R
-/Prev 465 0 R
-/Dest [195 0 R /XYZ 0 645.5999999999999 null]
+/Next 746 0 R
+/Prev 744 0 R
+/Dest [276 0 R /XYZ 0 157.0799999999999 null]
 >>
 endobj
-467 0 obj
-<< /Title <feff0033002e00310035002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
-/Parent 452 0 R
+746 0 obj
+<< /Title <feff0033002e00310035002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 731 0 R
 /Count 0
-/Next 468 0 R
-/Prev 466 0 R
-/Dest [195 0 R /XYZ 0 577.74 null]
+/Next 747 0 R
+/Prev 745 0 R
+/Dest [283 0 R /XYZ 0 270.0 null]
 >>
 endobj
-468 0 obj
-<< /Title <feff0033002e00310036002e00200050006f006c006900630079004d006f00640065006c>
-/Parent 452 0 R
+747 0 obj
+<< /Title <feff0033002e00310036002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
+/Parent 731 0 R
 /Count 0
-/Next 469 0 R
-/Prev 467 0 R
-/Dest [195 0 R /XYZ 0 314.5800000000001 null]
+/Next 748 0 R
+/Prev 746 0 R
+/Dest [290 0 R /XYZ 0 792.0 null]
 >>
 endobj
-469 0 obj
-<< /Title <feff0033002e00310037002e00200053006500720076006900630065>
-/Parent 452 0 R
+748 0 obj
+<< /Title <feff0033002e00310037002e0020004e0075006d006200650072>
+/Parent 731 0 R
 /Count 0
-/Next 470 0 R
-/Prev 468 0 R
-/Dest [205 0 R /XYZ 0 570.48 null]
+/Next 749 0 R
+/Prev 747 0 R
+/Dest [296 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-470 0 obj
-<< /Title <feff0033002e00310038002e002000540065006d0070006c006100740065004d006900630072006f0053006500720076006900630065004d006f00640065006c>
-/Parent 452 0 R
+749 0 obj
+<< /Title <feff0033002e00310038002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
+/Parent 731 0 R
 /Count 0
-/Prev 469 0 R
-/Dest [205 0 R /XYZ 0 382.4400000000001 null]
+/Next 750 0 R
+/Prev 748 0 R
+/Dest [296 0 R /XYZ 0 615.3000000000002 null]
 >>
 endobj
-471 0 obj
+750 0 obj
+<< /Title <feff0033002e00310039002e00200050006f006c006900630079004d006f00640065006c>
+/Parent 731 0 R
+/Count 0
+/Next 751 0 R
+/Prev 749 0 R
+/Dest [296 0 R /XYZ 0 126.7800000000002 null]
+>>
+endobj
+751 0 obj
+<< /Title <feff0033002e00320030002e00200053006500720076006900630065>
+/Parent 731 0 R
+/Count 0
+/Prev 750 0 R
+/Dest [308 0 R /XYZ 0 382.67999999999995 null]
+>>
+endobj
+752 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (iii)
 >> 3 << /P (iv)
->> 4 << /P (1)
->> 5 << /P (2)
->> 6 << /P (3)
->> 7 << /P (4)
->> 8 << /P (5)
->> 9 << /P (6)
->> 10 << /P (7)
->> 11 << /P (8)
->> 12 << /P (9)
->> 13 << /P (10)
->> 14 << /P (11)
->> 15 << /P (12)
->> 17 << /P (14)
->> 18 << /P (15)
->> 19 << /P (16)
->> 20 << /P (17)
->> 21 << /P (18)
->> 22 << /P (19)
->> 23 << /P (20)
+>> 4 << /P (v)
+>> 5 << /P (1)
+>> 6 << /P (2)
+>> 7 << /P (3)
+>> 8 << /P (4)
+>> 9 << /P (5)
+>> 10 << /P (6)
+>> 11 << /P (7)
+>> 12 << /P (8)
+>> 13 << /P (9)
+>> 14 << /P (10)
+>> 15 << /P (11)
+>> 16 << /P (12)
+>> 17 << /P (13)
+>> 18 << /P (14)
+>> 19 << /P (15)
+>> 20 << /P (16)
+>> 21 << /P (17)
+>> 22 << /P (18)
+>> 23 << /P (19)
+>> 25 << /P (21)
+>> 26 << /P (22)
+>> 27 << /P (23)
+>> 28 << /P (24)
+>> 29 << /P (25)
+>> 30 << /P (26)
+>> 31 << /P (27)
+>> 32 << /P (28)
+>> 33 << /P (29)
 >>]
 >>
 endobj
-472 0 obj
+753 0 obj
 << /Length1 12112
 /Length 7776
 /Filter [/FlateDecode]
@@ -34591,10 +50244,10 @@ G)Dz
 ”a•dç4äf�t†#Ë�e=<¥òª¦'½ýcÞɕߪù‘좼pNƒ/(i€�À$
šVô·(ý.½°Œÿ¾>Ö½t`jxp\5=àÛàÛ¥¬›Ž³€×X©wÚ«šŸ�	rèWõΪVÙö‡°-…/M³sœ
6C,”é€C¬ÁÐT¨Ä«6Ó¿˜¡éé‰|³¹Ïß?`dUlêó�™'ÌÄof]q¾ŸÑÄ÷³\LÀcM§&–>÷'àÚÆä¼sçNÓXpZ,ë©é™þaÿ:Î;Ù?p¹õï) Í€tð¡šá¾�ñ)ÐØÌxÿÀ¤jzh@åžðöÁ%x'Cµâ�Y&DÕaà2|§‚bôØÏú$£‡!V;n�ç…ç£;¿“
”õ>œÅøpȽ,“rÐ<@1e®ÙTRV×TfdPl<_oˆTpž�šA«¡Ò§€RŽWÙ¢Y,JVz ¿"Ìwnú_is[£þ‡ˆà±aì�Ÿ’¬\!ï¢ðox½(P®°Çÿ�û/’
 endstream
 endobj
-473 0 obj
+754 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAA+NotoSerif
-/FontFile2 472 0 R
+/FontFile2 753 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -34605,7 +50258,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-474 0 obj
+755 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -34615,45 +50268,44 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-475 0 obj
+756 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 1000 559 1000 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-476 0 obj
-<< /Length1 11108
-/Length 7380
+757 0 obj
+<< /Length1 11308
+/Length 7514
 /Filter [/FlateDecode]
 >>
 stream
-xœ½zy|[Õ•ÿ½ï=-–mY’µØ’-k±$ËZ­Õ²,Ëû¾ÛQœÄqìx·%ïN0!II �°–@ʤ!Pe(¿_3ü:À@7~mJ™4¤@™Â0¥ýtøuøÐÄ~ù�÷$Çi™¿Fþ<ëÝóÞ;ç{Ï9÷,÷	a„�9MõÇú¦Îýèù+@y!,Ž.
Ìÿç?BHs&:Ùß÷Ù¹�Ï#¤�{n‰ÍÝ¢ÉJÞãƒñŸFFûÄ-ܳé
ãÜXß-S¨ÏÁø+kZ:®¿üéþ¿ƒK0î�šœ�ãš¹?�ñ-0~|¢/6øfùGG2Hâf»�Ôã.#d±Âu1xJ�S.úÆ^3"HŠÃåñ“É)©	’0M$–¤KerÊÈTª²P¶:G£]yD§Ï5Myæ|‹Õfw8�Ëíñúü…
T„‚ß,ÿàƒÑ¾ëÂïa?JGÈï)!Ü.5!“
-	½ÎNìSÚJôº�]¥²‡tú›ò˜#l‰Œa‡½Ä(KX]çÍ\)"R˜°ûØ1üÚÑ«TL êëŸSnÎÏ€·	n•Bl1áõHJ0ÂŽT
K€b‰B‚rÞúÚþÃ?ÚéñìüÇ#û^[(\j™k�ZsZZ^ma ._D|ð,ýoE£oaÅsÏaé›ccoÒ¿ÿî±+Ouv>uåرOžìèxò“øÜ"QRÎkLâö²rÄB’™™·„c·¤±ìí3J£2ÅTUÊÉ´hÒs*›ºÜG?IR˜5߉¥ªÝ&Šp6æÈò
-u|…Ák»æѸtâð¯þ*˜Ÿ…™��JÃZ—ø’Z/.!½£^Ç•1Òz%?•´î81üþ ¼I"^H^,ÄŽm·Vgmhé,ê«2¦ž�š}ag1µÓ¹¹wüÎ'úÞ¨«
-Óíïboß÷j™�~ÿ¹³É_8ÐhstÝŸctÌ`¨Dˆ³,k•V-8>qŒ��éŒÞUFæ©Iæ1÷̸;ËÖÊ·º¶T›Ím;šö(ß^ª‰tú«ŒÂ;î
Ì<;{aW¹³s¦¢äαʭßz[šW¹Éi*6K˶—k³*绂ÛkòöXZ'+¦n÷mž)ÞÔãÛV“g�ÜÖZ5×]¥H.è¼½k÷sÃÌbßP�îÚ9¯ ¤‡iÈâ¦Ð²`C¨»eØãóIÖ’»U¶�rÉЇlª¥ŸU8û=qù«ËžBŽÏàÝ»�E9‚XL�Säܽ›<¿Ø|ÿaó/{3:7µ¤Ó~VWí «�Y1bE)<Sº6]o²“z-(#
L·zx=>FŸø¢{K•ùÁ}¦°Ï©è)#y‚y'E¦É¤#$Å%E"wqEÎÎ<ØÐ÷øk[gOØ65(¼‘]š†==�=ÌMNåˆ7éÃU’li2Öú*õç¹ÉIìÔľ¿Ÿp˜«69k«­]Õ	Ýtΰ©lâL++(N
3“:Öšn—&E<PÜW“Ï•ùª6z¶>2^T¼óÅù™yà·Çûï�˜”E[+SÔÞ‰¬’€#ëCmŽ–-œöÚ{r—P%O-Š�˜øû»j;žÇÜï?‹�ïßn·YsŠ¬J{O£sé%q–^rì×÷”~ûÅÓ�Å}p3ØÒzMFH‹µ:nÖ§ke·Ú¥O
-Ü”]òÂÒϨ‹^÷0>;põ,D‹Ì1s4 jB(ÜÒoÇ7ñNÆœ„7›„$ã)é‰pÁœ+JÈãs·î-˜zåîèßMøMµC¥Ýwµj¼~Ûçwñ¢wC±FW7Ý¢+¶djCþ+ÓYãÈ/³*²Û}FŸ^ŒçËÇ6Öéj^¾¥æÀHØ×»·9ÔÓT®µmé�•ô=2â/;ú¦±²§ÐÕVS‘+ÔtùŠûkLߺ¡Ü¬ux[KÝ™rWiØ®æ•
óÊc2N|EúüŒe$é‰ØŸ"–Ș€Hº|~ð<R9¾°õŽV½Ó“–lqßû� #X¿ÉÛul<XºpvbòüÁÆò#•Ô�å`m ÕÙÕÛ+5•uXm¡d{kP‡ó±Ií2ÊüãO
O¾²·¶õ½øò³ôÅî .7”ì=¿Pô½³÷=øø�¹`+3ƒó„k—žk±š¼1gr`ÒN‚Þy¤¿ä‹EJ­$²ôûL•Í¤—àó8?Ÿ¦5Y3KÝ­išLQ
-·ö¡d…BÆOÊP©Rð“øãs™™Ru:,Îm‘�zùZ½% ÆbIéjY¦]ü~GßÔÚ’›SßÜœKŸß€æ€Q‹ìLžÄŒ3Èo Ì‰p&Ž‡6­†Â_‹tÌ)uÉP¹­¨f~ƒƒ~ŸþíR´SaÊ‹³MòN"‚s±qiû=•½ÅªŒ¢žšÃ͵ÛªâÞªzª¼r°Î#HÂ[niøéÛ±¤,�•|ÏìÎJŽ¾|m—º"ÚÜ0Y›»[¨®î)Êd}úúç.ØÛ�)~5Ž;m®‘Y¥¾ÜÕ«tÙgÉ¡†ùî*¥(Ý}iïKô—çº6¿ˆ“Îîxa®H[Ö["÷FJûö·åZ·Ÿ¸__X­Kq)-ÛZ=�ñäÏžÆÒ·&¥]Æ2§Ê=ØînòÓãÇ?<VÇÄ
Fo/�Þ”°ª˜|Ë¥ôÚµúrQr	G§b†Ìy©ûô~©;¢0f‰DÙFy„8õNýa?}úâ…ùÙÑ“ã>âË3ôg?žŒëâ²¹@™Ýô"ýÕYlÀêkÕO}Æä Xÿ_�\�jÐßx\#˜	°X¯keZˆï�çX5éÑ}i×Z#rc¶H”eTD¨iþý~q˜~_¡•»ù
]/} ÆÏ,È#?´z²’¢ô�¾†VíB	™Ì\™ìqƒµxµ/¯È¦ôAK˜þß_qVž|Ï’4.–™15) BýmµKè>FL,.ò
-;Wú@ÂÆû™ý·ñ×/ö¡2–&†¾ý5ú“óÝÛ„Õçïø?w–ê*·—©Ã½eS'úmŽÑgŒ�¹õµ*ânUŽ]-¼åÏÒµfÎ
;U%#õfÖÌŸ<ÑÆåc[{i4š–´Òçüñ¼ºàv‚.* þ&¦þWT‘@¥]7ŽßK>ÐÅheé3q–QÞµbu$Î6Ê"Äp%KL(�uoDdìƒ,Âúþ)í‹kŽõ’÷ÍÅÏéy|håÊ¢>¯ “[ÆL,朕Úìf˜q×düÄÊM̹IKþjk;{Îæ£ëçh)q9Î'˜	)˺ÐA\f؉óë‡T×
-¶ÖZEì\_çÔ3¯ù·�5Øe;
‘#ÃÔ»¬7¬òõ¿Š;Q®.Ixwm«D;›Çþ.ëÑÑ$e�ùÚ¹-gK”8Þð÷­ØëñÍ­™„×*‹zOª)ЈèþCt‹ÌT˜›BS+~N4ãN\MT…ÅJägØTê5)õù"÷kž¿¨'?ˆ²ªµÅU÷3`³2yþæ�ð:mPç?g™d‘¥ÏVÜ	¿M¼÷+ëIÔÈ⽫ü'e	RÆž° ®!¾1ëð2ç�ýÄ·UË‘	mëú	Îå-/Òןy�¾ö|$ò=Ì9wãs[®ýÑعo[ï¾vƒ¡ýîm½û;�k{
-Ù›ããÿ´º§¸òTGÇSWâµcÿظãŒg&Ë_Ñ„‡U¹‰ú ôè•ÓÕužl7DŸ•x;߯U.õ¸Ç*rTÁmU­ÕýÜ]Mô«ìRY­�âé“tÈØ~WwûB‹iç`q¢toë#[B¥³Éœ);L¤~ç*X
Fÿâ¸-ŽcNs¶xþ¬,(ðdó+º7hþß=ÌUˆ1[³-�™UÜ[9¹ÚO^ÿ_m·÷”ÉènkØœB·†ß £,zâcÃtCs´*'îÛLÍWq´êæ½
-”à«ë¿Õ�U¯‰ì{_�t@Ùcƒe*î)×åo¸32~l³©qÿ«ÑéSãžœð¶°ÂÓ4×û5Y
{GF�o³4?øŽÔÓ>äòÖÚ¥]û6ÙtÅmO[U8׺5z{CÏ£Ñ"6Ò–Ø•–þ
…λ¥±®.ß²yxWCÿwv”³Ø¥€ÙÏ7†µöf0²/ÛDX0f-ñ“±ò){‰)�Þ›L-
-¦Qé¦û©/Vœ�ª‘|º=ø=»Gçcv.@–üüÈò®Š_ñfäë1r�Õ9—º˜õÜýúþýï>ØÄDè.âuv�YZ§ª+'šòã1.#ã?>5rO½x;™¶²Ö?‹Ì×äèëgšI}<ìÅ·B8&W¢3Ûe,R¹œ
ªq:Ûû²pîÊå"ºçºQ�£ÏMs§zÒ²Âî(%SI2M*Kz—Jâql†qBÌ©‡
-Ñq­‘úJ5@Ã)Ó¥nñÒAEIeE–8XU•EL&«²”|]nt¥W:H
 !
-3ëQo yB2}]¿»ìý&ýrqšq;üxa±µÆ­êuºä¯˜¼šÔ{UÌ>¶1úíq_j–Sǧ÷Z$ºâÊ
E•ó]Ÿ\9ÃWºqAW—¡²¯øq.©-ê$n×Ûœ%
…­.…¡}_ïÒ—ù…Pà1‡òÒó:voxæ$�;펔è¯ð^àJ‘e¹²e§ž·.zˆ¥\—çŽwyx¥¼ÍRüc'†‚½MAyz€Þ%Ì.´ª”Ö –�?æ�%´›xlÔGS¡V§Têl
nÞL˜úÍ‘
-¥³<ïdL .tPz«W-ˆÒOk"F›£±«âÐE,t�œ<1îÿç~ÁúaïõÏÉÏA·¶Uëõk‹“Õx¢ì%º§¸¿¾éÀ«cý�yÁáVfÅÊ�¹Ó»µ1 ÉÌ°÷=,-Úÿ›§?Üеشa§ÚÛ[k±ŒœÝûËÿ›iéÓÜY¦Ö23èªÖ�tå@e+«nÅ~q4
-·–]/' UáÀQÛ³!0ál ]lê-xbÜï{¼¿hkC‘LHQ˜$±ÊV¬á?,}j+�JÚBî:›l㢣P-ˆ�Ì/wdVúçcÇ/©Ê´ç\2«I�4�ïVò£W§—uæ�ž­ŒÎ¨ èŒ�ò™Þ�ËÓ²íù
-Þl¬eÚAЙœUYod�ƒ·KL¡Ì»ÞÞ_Yy×?,L¾t[ùRiªê/õn®óKüÎ�GÈ�ž;Õ|[ľ˜ÚxôÂþ£ï?X¾íÕ[G‡�÷Ú�©«­-ŹŒÍ 3�pML?²\Ÿè½îÓq—-8nÌ&›ÜmÉ~å•‚á'£ýw7kwïd˜²3s¬¤¯d[Üò^6Z??ܸí¡aŸÂìÓT•f¹´ª`OåÔá%O¢ú"EK©iêQÔ�¶£	g%rWõól/â{F¦KŽ‡öËçvÉñMvMû؈¨Ó×ïNµ�üTyVšØ”,ËU‰
-†žOÖérø©*Yª×òÕÐñ>{í±�ýâ÷Èòå+UΊ<[“_sárÝn»Øì)5ü†ôÅ}»v¼|ª½ã�9¥^ÝÁ4�/f˜*ÔúÌy>­�Ò+,št™Fž,ä+‚•uƦ½½>ŒIÌ“)5�ÆÒ:_jñ?pxb>9Yc+ÊÕy
-Q u¨äå·
J‰Y'O×ä_½º¡md°Ì“¬‘wù6–è´áMþÀÖrƒ±²‡]o�[8ZðwÈæl…¾º¶û+ñ�\ÛÈÍbSØæ®4KdF¿Ž»tˆÒY2²­nyF<6Hrªš7:[nßhë<z.ñtùpµÁ³q6L/X<ÙLJRÚ©s�Š¥_Èë6Ù­EåÚ${ïC#´Á€õÀÆ\ÀIœåš¡³ÆwnVo˜‘ka&ÀŸS9Â}©3;ÛYª7„ªyx\Z¶Å#ÏXšç<l*Ô‹ÅúB“±0W"É-¼ºÄ:݃'¶x&ž5qý"Ô÷"�/gט˜-ÂÖ¨g=&‚j:øÓfaáÆ Zi+Örï_‡ª¿vúÞÄì{r;�’«´�×áY¶‘lT6Š×U<Ùß°.ÁÌ6#dIf[«qsÙS�N´æ½Òž˜wÆ*U�I`B'ó»	ªæ`Û�Xä›(à	rëÂ8'tzUÝ`�´øYuZSÖmiÊìááŽ-Ç豶æ8N°‘e@exS‹¿n€Õœ¯~˜P7ð2COrbZÇ7û¥‚uI¹b�gÂcÆ5­æM=Ufòé¸ø¬JÀºéôIƒ$§®c˲¿ê¸t n³³Ò"ýÎK0çÃUæ
-Ú¶0ÿW9/ñôÝG­ãA:¶ìËìÜ8Z˜[áwnß´ÜÖNâÖÑÞ?¸h"�\iì‡i™_ ÿkoMÐÿIÿe×›ëpæïzã`Ý’BánÛÜrö»Ý%'ÌôGô¿ÕÜ÷›£X‹•Õ÷]<;=L�ŽM|gÂïŸø»'±û'TÔxPó¦ßtêñhmÒËjœ�—Õ„Ù}c„ñ,™Á�-Ä’ä�vƒC'Æü¾ÑÇæ´BÒ%9LJ±-õ/
oÚ4jgê”VúNÖýjãy7¯Ü©¬8ò›‡Ž_<\±©Áa3F4Gâ‰é_\øùûþñƒc'FÜ	R"j;*@hýaÂWò•°ñÞR'W_”¯ˆÛëI³@ê¬Ø^˜¹ç¶$…);ד«H¥äF¯ºœ}¥@´Ûüê¤ØI{•]±¡­g$¿4_ž¨­+Ï Ÿ´ù³’–ûòaÀQößèo�q]wƒ/Mžè·™‚å*MQ›ËÛT�‘YÔWÛ±g£-<÷tß=‘¼¾©-›´!›*3í¬œí°gNKsK»Ü®�.¹t¨Æ(7¹³t^‡-3»¬c¼ªýÖ¶<æ]CUíдHãÐh=gvF¨e°lÃþîÀk
¼RN-R3{—>¿,QXAÁ#Ÿß-c+9±7¯N#ò×uûª¦šó/É	ç<‡¹ôÕðÉü}|Iš@Û´k3qÿ¨GW~�>¼´k$Þïy¡~ÓSõL-’(ÛŒkâ�û&�‰<däÔ¶oqžü®Hç5Pøí´Üb[A�M–‘çSsñY®K-~À[¦Oyëøg¶BMJliª|¬Áli›­Åm/¶xÊæVòb‰¾…º,7ú-ô-z¶máÆ»ïZp¢k¡.™eÚµ„¾HAŸKÎ6¹uÄ®HŽ!•{0Ó àH$iä!AªMį“r‚‹¯’» ã×Ôj2�bú¶²»=¥!—++�¥Ëdp\¿Š÷2à`Þè0"ÝkdÊ-Uòꮊ»ÜTAàO'ÿüãL9�ËIJ¥læ'WT	ñ{JµU§Ñ_}ð»ßDÿ%Y©³ª¹D—ª$”ÌmHD©7)Gy�
-/�ª6*í® [”Åb�3Kч]‹og–ºÈiM~† Ó»ÅNý¥¡¹¾\éŽ55¬
àËÙ€»«±’l.cC$ãÛŽø«ùÊ›„$lÇ«ÛÃì/Á䮀“‹/IÔ‡Kû.¶9ZŒª¥¹ä]\QNæüýéEUÜ¥¯$†ÂW&hÚq¨ˆ»yz›R ÏœéËP‘'
±Xr¶;�¦é;ƒ±XEJ†Æ¢¾ï¥L�R§�ÅRÕ.#öãzŸ¬Hž"7çžÏ)Œû#‚øö4Ì¥ŒyãÈLBHò„ɾùˆ{E\ë ôÕͬÞK=�ã0jD¹Í--†ÜÒšÈÌ#ƒúñ‡G*2éûSÔº<Q[\%äJL]jš4•O)B!y€âqÉæª>&Ô,C¿~ïÝ¡þ‡'j-’�žÞýmä¾l�„³˱‰i–ÁÁž\SØm‘ÉÜ? €.7É¡�Åã
-"!—Û˜Ž"±`ò2±ÇÇnï°)‹Ë“A–XFÄÁÈÞ.³¯áÚXjxñ{o´Zµ©c;wŒ§j­­×Q~ËT5î	Ö勉݄(¿.€{�~+ªt58éS[wªÄÙ·l¥Ÿv6¸•±å½›Ò—C¬ÏïµãåÌDYF¸ÂH|Ã"ÄÊß±sŒ•ùÆ÷^\ÆcëÚ¹ŽbJwƒ÷l½%[¬Ú¹w;\Êè·ŽÒ'Ù×ü»	q~]�~ºzª%?ñk
²£	ô$ú.Æ;ðO	QLœ!¾"ëÉ“äJGuSRÿÂ)æŒqåü˜+çF¸�r?äùxÇy?åKù½üW“„IÍIg’þ]�'x+Y™¼9ùÑäÏS$)w¤ü<•›º=õt*-´§„/§‰Òv¤ýJ$u"æ…"¤plFûˆfˆ&¨ŽµpàPÁÑG7›á1׸\Äçô¢§Msõð€{¿B
èͦ¹GP€ô¢ñÅõsœ 
-ðžz3�hš£‚{ÏÀ½çPž‘r®"-ça�û3ÔÍ)@zÊ�zệzõ’åÈDíB'‚ôÄ8Þ¸~‘£ˆŸóþ™�n¦>…ûÍ€Ñ�Ìä§(D†�è^êD¤Kׯr,HA=
­ÛA¸³NøG–Î $ØE7ÒÍ‚Ùu?„AÃ0ûÿ,¡7gýe`Lq‚Äy¸‚8�s˜­Ž“¿DCøÉ|‚âPP—ÿÊùRtËuxÎÌ<\ÓÒRvÐ×ãøGˆ.
ÂO}t4PÏy…õ2ØÏõ!4tÓßµ@”…^TŒ$УH‘:T™H‰T(å"2B§œ2ó!3XÁ«È	õƒ¹‘ù�êÁªDU÷jP-ªCõ¨
5¢&ÔŒZP+jCíP
o@´u¡Mh3Ú‚ºQêe¥gãí7tâ`‘`Š©z`„¿» #	:³·øH‚N 
-}7AgÞÕ¾� “H‡~� “€ëR‚N¡4œ� SH�­	:èõ	:è›t.’á�‰sÒáÉ{x¨ŸMÐùpÏ	:å¼=	I‰‚=	åU	º9ˆX‚.@=Ä	z2RWôdTLfÜøõ•šìLÐS€>“ §";y6AOEÝäot!ʧ
-t!ꤶWLN-ÌŒ�Ìi\Η¦frr8:¨©›è·kÊ¢QM;siVÓ>8;8³cpÀŽ*Ð$šBh�¢a4‚æÀ…\	skÀ¼“ð7Œ¢hFu`ú!Ìh IDáO†^~j–
Â÷ ðÚ
ÿ�½yrnRÓ183:®1	wMÂ]ì£h¨|2:Åô$phšœ˜œ[˜¤±¾áщa�M³ò°†½³	îœ`¹,â8žêù£@†±
Ž›È�ó„”õ,ÿæÍ‘Á™ÙÑÉ	M�ÝéÑÌ�€;3·ÌÂM
hÈzòÀÙ<)c>åFËßÆðgÅ�Îjú4s3}ƒ±¾™qÍäÐj›¬B0ʪ°Ž9Óêd§7ƒÆ�6É"»©9¾¦:–ñ7kký㕃³£Ãš¹Á¾ØMž®dmËX{‚…8¼b•}s}šù‰‘щ9ð¥‡Á
ÍöÍ
¶«ØVÂCsìç�Íe.î*ëD04
Úâ57
3p30#ssSEGÿäÀ }˜U±½2æ˜r�Ië¤sð|ÄL|’åb+:µ³ô\Ÿ‚c"aG‚óÎ�;í±Ä´XÖ³só£“ë8ïdÿìÀe-êÞ³@›éàH�£ýƒ³ ±ù‰�ÁÍÜÈ ¦lª¯¾W¬še7tÙ�cG�Ë ð�MhˆÑã똌FXí”�¼>¸/>ZûŒ(ëÙÅ8òª9ö±ì“3ÃŽhŬ£±®¢ª¹£ÊÆ ¸ù|ûVIµçЩ´ºZú,PÁñ* w4Ú«‚%ËJg£„¾zkx[ZñAdÃÛ…Ë�É–¿!ß"Á,Ÿ‰ÐüåTöÿ
!ª.K
+xœ½zy|u–çïWU:,Û²$ë°%[Ö-Ë:­Ó²,ß÷}EqDZãÛ–lÇG‚		GHBH�„p2L:º;„4C³ÓÓCXè‹íN3Li Ù]ÂÒM÷g†eøЉ]ÙW%9>H7ó×:ŸŠª^U½÷ý½ûý$„BäB4Õë›:áEP~€–Gç‡vÿ)5Ί�6�ìïûÿË„ô6x掑ØìmƆäOàú\522Ø'nᾈ�á)¸6Äún›Bëð,œÂûHÓÒátÿåßü{¸þ=\÷NMÎÌr
<=BÆR¸~j¢/6øfùLJáúwq3€Ý@ê±ýW²~÷ýp`ÄàEˆÁÄEßù‡W]$ÅáòøI‚ä”ÔI˜&KÒ¥2¹ed*UY([�£Ñ.¿¢ÓŒ&s®%Ïj³;œ®|·Çëó
+‚…(„Š¾[þÿ‡?ŒöÞøwü t„ÞbÂãV2©�ÐëÄ^¥½X¯;T*GX§/¶+�:KL"‘©Äé(6‰Å¦bVE7¸D3WŠH„fì9z¿~äÁ¨úÆ”‡óKàm†G¥„[Lø¼’b‚°„#UƒÄb 8@¢� <·¿¾ïÐOwx½;þåðÞ×ç[E–Ú`°Ö’––[[¬Ë>Oÿá­hô-¬xá,}slìMú�ß?zõ™ÎÎg®=úéÓO_[!JÊy�I<>VŽXH2+ó“%Ø#é!,{ûŒÒ¤L1W•†s2­šôœÊ¦.Ï‘O“Í÷b©j�™"\Í9²Ü_aôÇ®{5n�8ük�¿
+ÖgeV'¤Ò°Öí¾¤Ö‡‹IŸ×¤×qeŒ´„^ÉÏdù­ÛO¿ƒ?,Ù Ï'/`ç–Û«³Ö5ŒtöU™‚SÏOͼ¸£ˆÚáÚØ;~÷S}êªJèöw±¯ï©¶ÌEô¢ÜÕ(h´;»vÇ×3*â,ÉZ¡U+Ž/œ
#$d:“o…‘yj’ùÀ_Î>7îÉr•è�å›Ü›ª-–¶íMwî/ßZª‰tªL»îN??{qg¹«sº¢øî±ÊÍO¾-Í­Üà2Y¤e[˵Y•s]¡­5¹wZ['+¦vû7Nmèño©ÉµEîh­ší®R$çwîîÚõÂ0üà�'¨vÎ+(AcYÜZlƒµb�{ý
!ÉÃZr—Ê^¬S.ºƒú°]µøs¢
+g¿G#._`s;Rè/ð¼k—«0G‹	r
+]»v‘¯-4ïÇÚø›ÞŒÎ
-ét€ÕU;è*dBŽXV
+Ïœ®M×›¤^ÊHÓ­Ÿ×Ïè_òlª²<¼×\âw)zÊHž`NÄI‘i2éIqI‘ÈST‘³ã_4ô=ñú晓ö

+_d§¦áΞÇ�s“SyFâMúP•$[šŒµþJýkÜä$N vjbï?L8-U\µÕ¶®ê„nº
g>ØÔÆd	Ì@\…i9‚â03©c­éqûaQÄCE}5y\™¿j½wó£ã…E;^š›þÉÞúš‡~w¬ÿþˆYY¸¹2Eí›È*:S±>ÜælÙ4Ài¯½ÿç÷UòÔÂ؉�‰¸§¶ã˜û£ç±éƒÝ¦’6[N¡Méèit-žgé%Gÿõ¾Ò¿{éôãqܶô�^“!Ïc­Ž›†õéZÆí„vñÓ‚ 7e§€¼¸øKê’Ï3ŒÏ\;Ù"kÁ�(ˆšJ·8ð-¼“1'áÍf!ÉxJz"]0çŠb2ÌøÜí{ò§^¹7ú÷
síPi÷=mÆšýoÜq×k;CxÁ·®H£«ÛÖ¢+²fjÃëþ3ÓUãÌ+³)²Úý&¿^ŒçÊÇÖ×éj^¾­fÿH‰¿wOs¸§©\kßÔ+î{t$P<väMSeO�»­¦Â Ötù‹úkÌ߶®Ü¢wæûZK=™rwiخ֕
ëÊe*N<"ý
Æ2’ôDî‰/KdLB$Ýþx$
+©_Ü|W«ÞåM˵xîD�ªßàë::*�?;1ùÚ�ÆòÃ×�å`m°ÕÕÕÛ+5—uØìádGkH‡ó°Yí6ÉãÏO¾²§¶õ½ðòóô¥ï"®4ïym¾ð‡gxðñ¡6rÁVæ	W‡^k±š¼y	ÎäĤƒ½óH-~=Ä‹”ZIdñ�™*»Y/Á¯áLüƒ4­Ù–a\ìnMÓdŠR¸µ�$+2~R†J•2�ŸÆŸœË¬È”ªÓ!8S´…êåëõÖ V‹%¥«e™ñ;ø}Sk‹!§¾¹Ù@Ÿß‚æ€Q‹P)™ÜJðdŒ7P–D:ÇS›VCáoe:攺l¬ÜRX3·ÎI@ÿn1Ú©0g‰ÅÙfy'ÁlZÜz_eo‘*£°§æPsí–`†ª¨·ªž*¯¬óJ’’M·5üâíXR–×F¾gñd%G_¾¾S]mn˜¬5ìR—TW÷f²¾¿íÆ.ØÛÏ)
5Ž;­ÁÄD©ß°2J—|–j˜ë®RŠÒÑó{ÎÓ_ŸëÚøN:»ýÅÙBmYo±Ü)íÛ×f°m=ñ ¾ Z—âVZ·´z¡âÉŸ?�¥oMK×»Me.•g°ÝÓþôgÇŽ}t´ŽÉŒÞ΃ޔUL½åRzíj}¹)¹„#‚S1Cæœïþ1ý?ZìŽ(LY"Q¶I!N½€SÒOŸ¾tqnfô丟øúýùÏ&㺸bÉW&E7¼Ds±úzõúSŸ35âÿ�R�Zà¯�«3	ëµb­Lùý‰›&�#z ízkDnʉ²LŠµ�ÿ €_TB?‡¯ÒÊ]Š¼ ®—Þãgæç’Ù¼YIQz_C+�v¢„Lf­Lõ¸ÉZ¼Ò——eSz� ¥„þG†¯8+W~ç¢4.–Y15) Âýmµ‹çé>FL,.ò*»VzÂƘˆþ[†…ü{MŒPKC„o}�þôµî­?Åê×îúç»Ku•[ËÔ%½eS'úíÎÑçæM�†úZq¯*Ç¡Þö•tµ™
%.UñH½…5ó§OµqùØÞ^�¦B6ú\ ^×@ÜNÐEäßÄÒÿŠ*¨´k®ãÏ’u1ZYü\œe’w-†Y‰³M²q
îd‰	£±.âBDÆÞ1Ê"¬_à_Ðþ¸æX/ù€Ñ\üœžÃ—ï,èsó3ù±%ÌÄ`ÎYîÍn…)wMÆ?@¬ÜÌœ›åq±äoW°v°çl=ºqŽ–Wâ¼q‚™�²®IĆ�8¯~x~u½1s­MÄ®õ
N=Ãñz`ó‘XƒC¶Ã9<L½ËzÃ
+_ÿ«¸=àjà2�„wÕ¶J´3iqìï²MRæ[®ŸÛ´þ	¶E‰óç
ÿ²-±ßÚšIxµ²¨÷¤š|�ˆî?H·È̆šZös¢wâj¢(,.P"?Ãn¤R¯K©/¸ßòü=ùa”U­=®Ú¸ŸY
›�©ó·†„×hƒ:·ð‰8Ë,‹,~¾ìNømâݸ_)XO¢Fî_á?ñ,³@�2ö„q=ù�‰Ã+œwnÎ�ßV„#“ÚÖÌœ+›^¢o<÷"}ý‘È1çÜiŒÏmºþgSçÞ-½{Û�Æö{·ôîë4­ž)doŽ�ÿ÷•3ÅÕg::ž¹ïÍûÈæW¼2YÿŠ& =¬¨MÔ‡¥G®ž®–¨se» û,çÛ¹~{°r±ÇÝ8V‘£
+m©j¥¨îîi¢_eCe¥BŠ¶�¤Ã¦ö{ºÛç[ÌKX8ç‹…az[SÙ*�-æLÛa&õK8WÀ
+2úÇmqëpš«eÀû•2?ߛͯè>0Ü ù¿÷1w!ÄLÍ–`fVQoåäJ?y㿵íî)“ÑݶKzLÓ¾@GYôÄ—¦†m
ÍѪœ¸o3=_=äѪ[Ï*Ђ¯ìÿV&VE¼$²ïuÒ	m�Â6\ÔS®Ë[wwdüèFsã¾W£ÛN�{sJ¶”(¼!K}@“Õ°gdôØkóÃïH½íCn_­CÚµwƒ]WÔæô¶U•l›£»z‹²™¶Ø¡´ö¯+ÈpÕ8¬�uuyÖ�Ã;ú¿·½œÅ.ÌÆx½1®¶7ƒ‘íxÙ!ŠÉÖ²�?+Ÿr›Ó)áýÉÔ‚à@•n.vœúrÙÙ©©Ñ¯»¦gîÔù�RV–üü2Èò­È_ñaäÛ9r•Õ9—»˜x
+ízcß¾wnb2tñcÖÖ©êʉ¦¼xŽËˆç¸…O†OM‡=S/í&Ó–cmáóÈ\MŽ¾~º™ÔÇÓ^|+„s0¹˜x�•˜Õ.a‘ÊàlÐ�ÒÙÙ—…s¼_(—gˆèžwèFAŽÞ�æ$Nõ¤e)„)Ü‹ÐJ¦’dšT–ô.•ÄãØ�ㄘS¢óz#õ´j€†'R¦K=âÅŠâÊŠ,q¨ª*‹˜LVe)ù:CtyV:@
 !*aâQ yB2}ͼ»äýfýRyšq;üDA‘­Æ£êwºå¯˜}šÔûVÌ<¾>úwãþÔ,—ŽOï±JtE•ë
++çÖ»?½z†¯ôàü®.ce_Ñ\R[ØIìÖ†Ú\Å
­n…±}oïâ×yÐ඄sÓs;v­{î$�»Í)Ö
^=à½È•"ëRg˧ž·&{ˆ¥\—ç‰Oyx¹½ÍRc'†B½M!yz�Þ)Ì.°©”¶�–�?á�%´�x|ÔOSáV—TêjnÜHXyÿp…ÒUž{2&P8)½Í§Dég5“ÝÙØUqðzFNŒ
ž|ð«‹¿fý°÷Æä [ûŠxýVp²O´½D÷¶Ÿì«oÚÿêXÿcC>Eh¸•Ù@±ƒr§ïömnJ23}Ç¥…ûÞ?qú£}Ama‹][âRûzk­Ö‘³{~ó?2ía}š'ËÜZf
]õ@HAWNT¶uËö‹£QxLva¼T€V¤GmÍr†Á„3ÁtE¨©·hà©ñ@`ì‰þÂÍ
…2!Ea’Ä*{‘N„ÿ´øu¸-_*Ío{êì²õε v2¯Ü™Yqðߎ»|¸*ÓZdºe6³:i[žGÉ�^Û¶¤³@ôÄh�`tF…@g|”ÇÌî\ž–Ï—ñfc-3‚Îä¬Êz#ƒ¼UbgÞóö¾ÊÊ{þi~òüå‹}¤¹ª¿Ô·±. 	¸%?~áTóÇBjã‘‹ûŽ|ðp]ɯÞ>:|¬×ÁèL]mk)206ƒÊ@~È53óÈR¢÷y–MÇ]²à¸Ù0›ír�5û•Wò‡ŸŽößÛ¬Ýu§ Ãœ�iP°’¾šmõÈ{ÙlEüêPã–G†ý
+‹_SUšYèÖªB=•S‡½‰î‹D-¥¶Q�¡´mOx8+‘»bžgçxyßÜÓ01Sr<ý³~�[®ˆoz°1íg3
+ N_»c¸M¨
æ¥Ê³ÒÄæd™A%Êzj<Y§Ë᧪d©>ë7CÇúµG?~ìË?=°?ËŸ§T¹*ríM
ÍÅ+u»b‹·ÔlÓöîÜþò©öŽ?ç”útÒtþ\XaªPë·äúµBJ¯°jÒey²�¯UÖ™šöôú1&1O¦ÔHtkë\¨%ðС‰¹äd�½Ð +ô9¢`ëPñËo•‹Nž®É»vm]ÛÈ`™7Y&ïñ¯/ÖiK6‚›Ë�¦Ê6Þ ¶p´àïPÍÙ}eo÷Wò¹2·‘Å滧Ò"‘™:îâAJ_hÍȶyäñÜ É©j^ïjÙ½Þ!Öyõ\âÙòáj£wýL	=oõf3%I]à ò-ù*~”~1·Ûì°–k“½�ŒÐFWâ�͹€“8˵@f‹ïܬÜ0#WÃL€?§r–õ¥®ìlW©ÞXâTÍ)Àãв­^yÆâ縹@/ë̦ƒDb(¸¶È:݃'¶p&^5qãô÷"�/gcLÌ6a«Ô³A5ø§maÁú�Zi/Òr\‡ª¿~úþÇw:�’›´�×àY²‘lT6Š÷U<Ùß°.ÆÌ6#TIf[«qsÙS�M´æ¾ÒžXwÆ
+U�I`B'xªæ@ÛÝXäŸÈç	u%8'|zEßd�´ð‡¬:­9kMö4eöðpǦ£ôX[s'ØHŠ2 3¼¥EBß6ÀJÎ×>J¨xY`&99­ã»ýRÁº¤\±Æ3á5ÓªQó–ž*3ûu\|V%`ÝtÛI£$§®cÓ’¿ê¸t°n£«Ò*ýÎK0çÃVm›˜ÿW8/ñì½Gœ­ã!:¶äËìÚ8ZX[Áumßn«ñ±Fô°ç¯
š¨#û
W»Ã!BZ¦„ÀÈÿÖ·&ûéÿ ÿ²óÍu8
ów^8P·¨PxÚC¡6�œýlwË	ý1ý¿kxÿÖbeõ—ŽÄNOƒS§cß›&¾ÇîÉCîþ9Õ=ô¼é·\z<[›õr…gã%5a6AßÜa<KfôdñCÆ$9”ÝÐЉ±€ôñ�¹‡mPtISRì‹}Äùá
ÃíLŸÒJßͺ_m¼îæ–»”‡ßäØ¥CœvSDs8þõÅ_}?18vbÄÃàî¡¥;àö£jÐUâ;¦”øßj«GfÌî¼.i“è5êŠì*¦)€FJVØ°¹°ÿ‰±@`ü©�"è·é|‚¯;³˜–Á¸h^¿~8Ñ4ÐÒô…yÇ“Ôf«,¿P_dͬ8ôþ±£ÿv°"ÓYžo»®ŸgÚ†ç¥__|ç=ÿè“Cñ$ü�Q[Q>Bk791µ\»©zâ½ÅN®¾0O÷¹§-©«bSÉüô}w$)ÌÙ¯A‘JÉM>u9ûµÑn¨“b'Uź¶ž‘¼Ò<¹!X[WžA?md%-ÍhäqÀQö_˜Ñ�iÍ„†/Ožè·›Cå*Ma›Û×”Ÿ‘YØWÛqçz{Éì³ý}÷Erû¦6mІíªÌ’hgåL‡#4}Zj(íò¸ÃºäÒ¡“ÜìÉÒùœöÌ첎ñªöÛÛr™ïKªj‡¶‰4N�Öëteg„[ËÖíëμVÀ+åÔ"5³ÿêÈö†¦®ü
�ŒíräÄžÜ:�(P×í¯šjÎ{¢|$§$çÌ¥¯•<”ÌßË—¤	´M;7ŽzuåèC‹û6GâvñAª§ê™~*ÑzšVåRÏ-’+yÐ.È©mßä:ù}‘Îg¤ðÛi†"{~�]–‘ëWsñE™Á­?ä+Ó§¼õküK{�&%¶8U>Ö`±¶ÍÔâv¯Š[8e÷(y±ÄìE]Ö›³—f/=;zqã“ŽO^81yQ—-2mŽZB_¢¿¤Ï%g›=:bg$ǘÊ=�ip$’4ò  Õ®á7È9¡ü…WÉ�0µBxi5™.1}GٽތҰ[€ŸÌ
+fé27®!Ľ8˜o¥‘žU2e‰±0yådÈ]a”	¤“_ý,SÎãr’RE)ùÉUBüžRmÓ©Eô7þþ�ÓIVêlj.Ñ¥*'sQ*ÅMÊQ^¤JOÕ›”wÈ„­Ê"±×‹¥èK܈3‹]ä6M^† Ó{Ä.ýµ±¹¾\é‰55¬
àËÙ€›É+±’l=fÓ<ãÛÎø×!òåoC’°¯qsp “;ƒ..¾,Q;�ní»Øîl1©g“wrE9™s¦gVq¿‘òÝ9˜ ikÄ©"îåéíJ�<sº/CEž4fÄbÉÙž\š¦ïåÇb)«ú�ó™^¥N‹¥ªÝ&Àõ~?	‘<EnÉ94—S÷G9úYXKó­)³!Ér$ûíMÜ+âZ¥¯Èõ>êÙ§I#24·´
¥5‘éGõãÇG*2éSÔº\Q[T%äJÌF]jš4•O)B!¹ŸâqÉæª>&Ô­CÿúÞ»CýÇ'j­’ÞÞ}mäÞl�„3˱‹�iÖÁÁƒ¹Äc•É<N#?$€I=É©�Åó
+"¡±3SQb'Ãìdb¯ŸÝ¢bs2—'ƒI2FÄ�Èž.;³7ã^_j|é‡ZmÚÔ±ÛÇSµ¶Ö(¯eª÷„êòÄÄ.B”WĽGžŒ*Ý
.úÔæ*qöm›ég]
eliÿé&†ô¥ëøx)€™,ËW@‰oº„Y™ãÛwŒ±2/üð¥%<ö®=‘(¦ô4¸pÏæ۲Ū›q·«Á­Œ>y„>ÉþTa!ΫÑÏVOµä%~q¡A4�žF¿ÇEx;þ¡#Šˆ3Ä7d=y’¼Jé¨nêaêrŠ8cœÇ8?ãʹîcÜ�x~Þ1Þ/øR~/ÿÕ$aRsÒ™¤ÿ#ȼ•¬LÞ˜üXò)’”»R~•ÊMÝšú¦�/ìþ6Mž6�ö¾È+Ú.z…Ï´íR86¢½D3d“yT
GŽZ8‚p¨àh‡£Ž�p„™{\.âszQ�Ó…¶qõð„g¿AA˜/·q£ éCAâËç8!ä=
ôf8Ñ6Ž
+ž=ÏžCaxGʹ†´œã ÷—¨›“�ôTõÂgõê%Ë‘™Ú‰(N鉋p\¸q‰£ˆŸóþ²ÝB}Ï[�Šã„wœÈB~†ÂdYáž�ºYéò�k+RPÏÂzîÁÁÄ
+ÿðâ„;éFºY0³æ=(þü‰Ð›ˆ³ö?pMqBÄkpqžà@¡Æêø'ù4„¿$‘Ì'(óÅïa,)E·Ý€÷,ÌË5--5`k
}#Ž�˜èÒ üÌÇ—@õœWXOÀ ƒý»1„†nùû˜a¦#	ÌZR$ƒ‰G
}&R"ÊBdD&˜øsAfTx¶¹ ‡p#òA?€¾6ˆ*Qä¾T‹êP=j@�¨	5£ÔŠÚP;tõ�hŠ õ¨m@Ñ&Ô�zP/HÎÆ[oêÄÉ"ÁÓ%ôÀNü~H€'èÌé£	:�(ôý�ùÎùÅ�D:ôã�\—t
+¥áì�BjlKÐ9@¯OÐ9@ß� s‘ïHœó�J<ÃC•øl‚·g¾LÐù(�à%èIHJä'èI(—¨JÐÈIÄt
ê!žJГ‘š¸– '£"2ãæ¯ÈÔdg‚žôé=9ȳ	z*ê&— QU� Q'µµbrj~ztxdVãvå»55““ÃÑAMÝD¿CS�jÚ™[3šöÁ™ÁéíƒT�&ÑšGÓh
£4.äN˜[æ�„Ã(Šáª’L?¤
Š(üÓ€¡—Þša¯ásxm‡ÿ�£yrvRÓ18=:®1	OMÂSì£h¨|2:CÁ$phšœ˜œ�Ÿ¤±¾áщa�]³ü²†}²	žœ`¹Ìâ8žêù£@†k;·�ç	)kYþ͇#ƒÓ3£“š|‡Ë«™
gf™�‡Ð�ôä…³94RÆü•[
,;ß7:£éÓÌN÷
Æú¦Ç5“C+m²Á(«Â>8fAL¨o�]Þ4Ú$‹ì–æø–êXÆß­­µ¯WÎŒOhfûb·x»’µ-cí	â ðŠUöÍöiæ&FF'fÁ—4[ç57Ù¬`[	/Ͳkœ6#,”Ù¸«¬ÁÐ4h+ˆ×ÜÌÀ­ÀŒÌÎN:�ý“ƒŽaVÅŽþɘsÊ	@&�¬“ÎÂû…�gœ°ðI–‹x,ëÔÁÒcp
+Ž‰„mœ	Î;vìpÄËbYÏÌÎ
ŒN®á¼ƒýç.«Q/óž
ÚHGj휘
�ÍMNkfG5eS}ýð‘¸cÓ,¹¡Ûá‚;
+\�ïLBCŒXÇdô0Âj§äõÁsñ«ÕïØ€²Ö‘ÝŒ#¯Xc‹À19=ìŒÆQÌ8ë*ªš;ªìŠ[¯·o…Tpž�:A«+¥Ï¥¯jG3Ä\„,+�ÍfXîÿÍü–´¢ÿ„Ȧ·‹W—-}B½E‚>“¡ùK¥ìÿ
—(\(
 endstream
 endobj
-477 0 obj
+758 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAB+NotoSerif-Bold
-/FontFile2 476 0 R
+/FontFile2 757 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -34664,7 +50316,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-478 0 obj
+759 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -34674,10 +50326,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-479 0 obj
-[259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 1000 1000 1000 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 1000 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
+760 0 obj
+[259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 1000 1000 1000 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-480 0 obj
+761 0 obj
 << /Length1 5116
 /Length 3170
 /Filter [/FlateDecode]
@@ -34697,10 +50349,10 @@ a
 ÿ:´2õ]Û^Ô5 w,¥Âº*›Ó‹Œ58«mÖg·±nkÞÄ7cÙÞB4èÆa¯ÅÊD[NaéU‹<V¥Éó`ØÉ@V�΋š{KÙÀ—r¿­�ËS«¯ ðêó3³§e'ó(�×ÚÏ«-{�S}`-õy÷¢¦/²±ò‹ð79à]èp$xrë’¤ÏÊÃ'ý›"ZÞé³/izïþ›]’Wâ~ ïÝ–þ&ÌÁT
 endstream
 endobj
-481 0 obj
+762 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAC+NotoSerif-Italic
-/FontFile2 480 0 R
+/FontFile2 761 0 R
 /FontBBox [-254 -250 1238 1047]
 /Flags 70
 /StemV 0
@@ -34711,7 +50363,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-482 0 obj
+763 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -34721,10 +50373,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-483 0 obj
+764 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-484 0 obj
+765 0 obj
 << /Length1 3280
 /Length 2112
 /Filter [/FlateDecode]
@@ -34739,10 +50391,10 @@ x
 ˆ‡¶�€$W´¦ö"k8À
Vš­Ûi<êí!‹§–N..ðͶ&W+uXœ¶—¨:‹’j³†Z;Ù×cžOÎ-/²UFN¤ÓÉ6»][§)å%ÛÒâr*Ÿf©Ûf“R�ÓTó6°Óß<Qsäz‰B�–Ó^"KD/“çùŸÞ)ƒ�~™’¹T¾^õ‡i9šít-Ñ£\î‚céúìw='4‡î‚9÷F|ðÂBìßëV�bCAÿWAþö}½‚[Ï‹¸
1?¾ˆøbä¢Oe›Dm$ BD<yBT™'ÂÑ`Á"BY@Ü‹þS„ÃU´n�H²g#ü‡"–Ùª¬"Zø›b±Ù*r–@(Ü+DLVQa9YÅ‹Þ Áz#VQia¦&ÁôLøOÆßDŒ¤~`ü{Ä(˜Ä<sXô�ŠH‘áåYJ&Ƭ¢Êr±WÉ;¿:1a�`Ô–‹
’È»#Ê·èuü
»U,°ðÏ2'W	†»^T6úE†3ñL”gD«ÑdŠ3ÊqÌaa.:­Qk"Ä"CJ§ØÂÛE5„çû_t–óS“9¦WÂ<“k>Ã÷e|Q!ÃgÉ�ÀÀE/iR~L zãŒ!›RÉSûz•Édä×3T2 hŽÊ±™$5�Eà×eçŒM"FÂJh@È|f #D™A΄-VQËŽAOqëXŒÐÿG¶ÑÙ§΄™–Y(‰Ì÷YÙüSBF-òÁð!ãû´c°¼^ôvuaàŠ–Ú[š™òÑ0›Caa’¢ºŒ´ ÐE•÷†Â—¨¯»c]—�GZD>&VÇk·}•[D’R]h²²ß‘zÖóé?+wú_½î“ä
 endstream
 endobj
-485 0 obj
+766 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAD+mplus1mn-regular
-/FontFile2 484 0 R
+/FontFile2 765 0 R
 /FontBBox [0 -230 1000 860]
 /Flags 4
 /StemV 0
@@ -34753,7 +50405,7 @@ endobj
 /XHeight 0
 >>
 endobj
-486 0 obj
+767 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -34763,504 +50415,785 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-487 0 obj
+768 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 500 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
 xref
-0 488
+0 769
 0000000000 65535 f 
 0000000015 00000 n 
 0000000264 00000 n 
 0000000467 00000 n 
-0000000699 00000 n 
-0000000750 00000 n 
-0000000904 00000 n 
-0000001148 00000 n 
-0000001326 00000 n 
-0000001493 00000 n 
-0000032711 00000 n 
-0000033489 00000 n 
-0000066074 00000 n 
-0000066872 00000 n 
-0000076303 00000 n 
-0000076669 00000 n 
-0000079101 00000 n 
-0000079338 00000 n 
-0000079381 00000 n 
-0000079430 00000 n 
-0000079512 00000 n 
-0000079685 00000 n 
-0000079740 00000 n 
-0000079915 00000 n 
-0000079959 00000 n 
-0000092161 00000 n 
-0000092422 00000 n 
-0000092465 00000 n 
-0000092520 00000 n 
-0000092563 00000 n 
-0000092728 00000 n 
-0000092783 00000 n 
-0000092958 00000 n 
-0000093014 00000 n 
-0000093069 00000 n 
-0000093242 00000 n 
-0000093297 00000 n 
-0000093352 00000 n 
-0000093408 00000 n 
-0000093464 00000 n 
-0000093519 00000 n 
-0000111268 00000 n 
-0000111535 00000 n 
-0000111578 00000 n 
-0000111633 00000 n 
-0000111688 00000 n 
-0000111743 00000 n 
-0000111798 00000 n 
-0000111959 00000 n 
-0000112015 00000 n 
-0000112071 00000 n 
-0000112380 00000 n 
-0000112730 00000 n 
-0000112786 00000 n 
-0000112842 00000 n 
-0000128987 00000 n 
-0000129261 00000 n 
-0000129304 00000 n 
-0000129348 00000 n 
-0000129403 00000 n 
-0000129564 00000 n 
-0000129619 00000 n 
-0000129675 00000 n 
-0000129730 00000 n 
-0000129785 00000 n 
-0000129946 00000 n 
-0000130002 00000 n 
-0000130058 00000 n 
-0000130114 00000 n 
-0000149098 00000 n 
-0000149372 00000 n 
-0000149427 00000 n 
-0000149588 00000 n 
-0000149643 00000 n 
-0000149698 00000 n 
-0000149754 00000 n 
-0000149810 00000 n 
-0000149971 00000 n 
-0000150026 00000 n 
-0000150082 00000 n 
-0000150138 00000 n 
-0000150448 00000 n 
-0000168190 00000 n 
-0000168464 00000 n 
-0000168507 00000 n 
-0000168562 00000 n 
-0000168617 00000 n 
-0000168961 00000 n 
-0000169016 00000 n 
-0000169071 00000 n 
-0000169234 00000 n 
-0000169289 00000 n 
-0000169344 00000 n 
-0000169400 00000 n 
-0000169556 00000 n 
-0000169612 00000 n 
-0000185212 00000 n 
-0000185495 00000 n 
-0000185646 00000 n 
-0000185701 00000 n 
-0000185756 00000 n 
-0000185812 00000 n 
-0000185868 00000 n 
-0000186032 00000 n 
-0000186088 00000 n 
-0000186266 00000 n 
-0000186323 00000 n 
-0000186379 00000 n 
-0000186436 00000 n 
-0000204215 00000 n 
-0000204501 00000 n 
-0000204546 00000 n 
-0000204704 00000 n 
-0000204750 00000 n 
-0000204912 00000 n 
-0000204970 00000 n 
-0000205027 00000 n 
-0000205367 00000 n 
-0000205424 00000 n 
-0000205482 00000 n 
-0000205540 00000 n 
-0000205704 00000 n 
-0000205762 00000 n 
-0000221602 00000 n 
-0000221841 00000 n 
-0000221886 00000 n 
-0000221943 00000 n 
-0000221989 00000 n 
-0000222327 00000 n 
-0000222385 00000 n 
-0000242651 00000 n 
-0000242916 00000 n 
-0000243077 00000 n 
-0000243134 00000 n 
-0000243180 00000 n 
-0000243348 00000 n 
-0000265015 00000 n 
-0000265296 00000 n 
-0000265463 00000 n 
-0000265632 00000 n 
-0000265803 00000 n 
-0000265962 00000 n 
-0000266020 00000 n 
-0000287683 00000 n 
-0000287972 00000 n 
-0000288120 00000 n 
-0000288267 00000 n 
-0000288436 00000 n 
-0000288587 00000 n 
-0000288726 00000 n 
-0000288784 00000 n 
-0000311442 00000 n 
-0000311731 00000 n 
-0000311879 00000 n 
-0000312026 00000 n 
-0000312175 00000 n 
-0000312326 00000 n 
-0000312465 00000 n 
-0000334435 00000 n 
-0000334724 00000 n 
-0000334781 00000 n 
-0000334949 00000 n 
-0000335116 00000 n 
-0000335286 00000 n 
-0000335458 00000 n 
-0000335618 00000 n 
-0000357126 00000 n 
-0000357391 00000 n 
-0000357448 00000 n 
-0000357619 00000 n 
-0000357788 00000 n 
-0000380679 00000 n 
-0000380976 00000 n 
-0000381122 00000 n 
-0000381293 00000 n 
-0000381450 00000 n 
-0000381590 00000 n 
-0000381767 00000 n 
-0000381825 00000 n 
-0000381990 00000 n 
-0000402536 00000 n 
-0000402809 00000 n 
-0000402854 00000 n 
-0000403036 00000 n 
-0000403176 00000 n 
-0000403222 00000 n 
-0000403386 00000 n 
-0000425253 00000 n 
-0000425534 00000 n 
-0000425696 00000 n 
-0000425742 00000 n 
-0000426117 00000 n 
-0000426286 00000 n 
-0000426453 00000 n 
-0000426624 00000 n 
-0000445811 00000 n 
-0000446100 00000 n 
-0000446243 00000 n 
-0000446300 00000 n 
-0000446346 00000 n 
-0000446515 00000 n 
-0000446675 00000 n 
-0000446838 00000 n 
-0000447003 00000 n 
-0000447060 00000 n 
-0000463034 00000 n 
-0000463315 00000 n 
-0000463361 00000 n 
-0000463530 00000 n 
-0000463690 00000 n 
-0000463747 00000 n 
-0000463918 00000 n 
-0000464094 00000 n 
-0000464238 00000 n 
-0000464383 00000 n 
-0000464548 00000 n 
-0000464704 00000 n 
-0000464862 00000 n 
-0000465009 00000 n 
-0000465171 00000 n 
-0000465313 00000 n 
-0000465478 00000 n 
-0000465622 00000 n 
-0000465779 00000 n 
-0000465925 00000 n 
-0000466081 00000 n 
-0000466226 00000 n 
-0000466391 00000 n 
-0000466535 00000 n 
-0000466694 00000 n 
-0000466842 00000 n 
-0000467000 00000 n 
-0000467147 00000 n 
-0000467303 00000 n 
-0000467448 00000 n 
-0000467608 00000 n 
-0000467757 00000 n 
-0000467915 00000 n 
-0000468062 00000 n 
-0000468228 00000 n 
-0000468373 00000 n 
-0000468542 00000 n 
-0000468690 00000 n 
-0000468851 00000 n 
-0000469001 00000 n 
-0000469167 00000 n 
-0000469312 00000 n 
-0000469482 00000 n 
-0000469631 00000 n 
-0000469790 00000 n 
-0000469938 00000 n 
-0000470097 00000 n 
-0000470245 00000 n 
-0000470412 00000 n 
-0000470558 00000 n 
-0000470718 00000 n 
-0000470867 00000 n 
-0000471026 00000 n 
-0000471174 00000 n 
-0000471339 00000 n 
-0000471483 00000 n 
-0000471655 00000 n 
-0000471806 00000 n 
-0000471967 00000 n 
-0000472117 00000 n 
-0000472275 00000 n 
-0000472422 00000 n 
-0000472587 00000 n 
-0000472731 00000 n 
-0000472901 00000 n 
-0000473050 00000 n 
-0000473211 00000 n 
-0000473361 00000 n 
-0000473521 00000 n 
-0000473670 00000 n 
-0000473837 00000 n 
-0000473983 00000 n 
-0000474155 00000 n 
-0000474306 00000 n 
-0000474466 00000 n 
-0000474615 00000 n 
-0000474773 00000 n 
-0000474920 00000 n 
-0000475085 00000 n 
-0000475229 00000 n 
-0000475387 00000 n 
-0000475524 00000 n 
-0000475672 00000 n 
-0000475810 00000 n 
-0000475967 00000 n 
-0000476103 00000 n 
-0000476246 00000 n 
-0000476379 00000 n 
-0000476549 00000 n 
-0000476698 00000 n 
-0000476857 00000 n 
-0000477006 00000 n 
-0000477175 00000 n 
-0000477323 00000 n 
-0000477486 00000 n 
-0000477630 00000 n 
-0000477800 00000 n 
-0000477949 00000 n 
-0000478108 00000 n 
-0000478257 00000 n 
-0000478426 00000 n 
-0000478574 00000 n 
-0000478737 00000 n 
-0000478881 00000 n 
-0000479051 00000 n 
-0000479200 00000 n 
-0000479359 00000 n 
-0000479508 00000 n 
-0000479665 00000 n 
-0000479811 00000 n 
-0000479981 00000 n 
-0000480130 00000 n 
-0000480296 00000 n 
-0000480441 00000 n 
-0000480612 00000 n 
-0000480762 00000 n 
-0000480921 00000 n 
-0000481070 00000 n 
-0000481229 00000 n 
-0000481377 00000 n 
-0000481548 00000 n 
-0000481698 00000 n 
-0000481861 00000 n 
-0000482006 00000 n 
-0000482177 00000 n 
-0000482327 00000 n 
-0000482486 00000 n 
-0000482635 00000 n 
-0000482794 00000 n 
-0000482942 00000 n 
-0000483112 00000 n 
-0000483261 00000 n 
-0000483417 00000 n 
-0000483562 00000 n 
-0000483733 00000 n 
-0000483883 00000 n 
-0000484044 00000 n 
-0000484195 00000 n 
-0000484366 00000 n 
-0000484516 00000 n 
-0000484687 00000 n 
-0000484837 00000 n 
-0000485012 00000 n 
-0000485166 00000 n 
-0000485334 00000 n 
-0000485481 00000 n 
-0000485647 00000 n 
-0000485803 00000 n 
-0000485985 00000 n 
-0000486145 00000 n 
-0000486313 00000 n 
-0000486459 00000 n 
-0000486623 00000 n 
-0000486765 00000 n 
-0000486933 00000 n 
-0000487079 00000 n 
-0000487215 00000 n 
-0000487352 00000 n 
-0000487503 00000 n 
-0000487632 00000 n 
-0000487786 00000 n 
-0000487918 00000 n 
-0000488077 00000 n 
-0000488214 00000 n 
-0000488389 00000 n 
-0000488542 00000 n 
-0000488718 00000 n 
-0000488872 00000 n 
-0000489036 00000 n 
-0000489178 00000 n 
-0000489353 00000 n 
-0000489506 00000 n 
-0000489675 00000 n 
-0000489822 00000 n 
-0000489987 00000 n 
-0000490130 00000 n 
-0000490313 00000 n 
-0000490474 00000 n 
-0000490759 00000 n 
-0000490837 00000 n 
-0000491001 00000 n 
-0000491192 00000 n 
-0000491420 00000 n 
-0000491637 00000 n 
-0000491807 00000 n 
-0000492024 00000 n 
-0000492278 00000 n 
-0000492451 00000 n 
-0000492632 00000 n 
-0000492893 00000 n 
-0000493078 00000 n 
-0000493259 00000 n 
-0000493523 00000 n 
-0000493709 00000 n 
-0000493891 00000 n 
-0000494195 00000 n 
-0000494372 00000 n 
-0000494557 00000 n 
-0000494861 00000 n 
-0000495050 00000 n 
-0000495249 00000 n 
-0000495431 00000 n 
-0000495712 00000 n 
-0000495898 00000 n 
-0000496080 00000 n 
-0000496384 00000 n 
-0000496562 00000 n 
-0000496761 00000 n 
-0000496942 00000 n 
-0000497251 00000 n 
-0000497440 00000 n 
-0000497639 00000 n 
-0000497821 00000 n 
-0000498118 00000 n 
-0000498308 00000 n 
-0000498507 00000 n 
-0000498688 00000 n 
-0000498996 00000 n 
-0000499190 00000 n 
-0000499394 00000 n 
-0000499579 00000 n 
-0000499932 00000 n 
-0000500126 00000 n 
-0000500317 00000 n 
-0000500502 00000 n 
-0000500818 00000 n 
-0000501011 00000 n 
-0000501214 00000 n 
-0000501399 00000 n 
-0000501775 00000 n 
-0000501969 00000 n 
-0000502173 00000 n 
-0000502372 00000 n 
-0000502557 00000 n 
-0000502941 00000 n 
-0000503134 00000 n 
-0000503337 00000 n 
-0000503537 00000 n 
-0000503722 00000 n 
-0000504111 00000 n 
-0000504293 00000 n 
-0000504486 00000 n 
-0000504687 00000 n 
-0000504873 00000 n 
-0000505140 00000 n 
-0000505335 00000 n 
-0000505540 00000 n 
-0000505727 00000 n 
-0000505955 00000 n 
-0000506157 00000 n 
-0000506334 00000 n 
-0000506559 00000 n 
-0000506803 00000 n 
-0000506984 00000 n 
-0000507173 00000 n 
-0000507370 00000 n 
-0000507578 00000 n 
-0000507750 00000 n 
-0000507939 00000 n 
-0000508135 00000 n 
-0000508352 00000 n 
-0000508573 00000 n 
-0000508757 00000 n 
-0000508974 00000 n 
-0000509178 00000 n 
-0000509355 00000 n 
-0000509601 00000 n 
-0000510004 00000 n 
-0000517872 00000 n 
-0000518088 00000 n 
-0000519451 00000 n 
-0000520520 00000 n 
-0000527992 00000 n 
-0000528213 00000 n 
-0000529576 00000 n 
-0000530656 00000 n 
-0000533917 00000 n 
-0000534143 00000 n 
-0000535506 00000 n 
-0000536622 00000 n 
-0000538825 00000 n 
-0000539039 00000 n 
-0000540402 00000 n 
+0000000778 00000 n 
+0000000829 00000 n 
+0000000983 00000 n 
+0000001227 00000 n 
+0000001405 00000 n 
+0000001572 00000 n 
+0000032826 00000 n 
+0000033604 00000 n 
+0000066044 00000 n 
+0000066842 00000 n 
+0000098961 00000 n 
+0000099759 00000 n 
+0000127913 00000 n 
+0000128631 00000 n 
+0000131063 00000 n 
+0000131300 00000 n 
+0000131343 00000 n 
+0000131392 00000 n 
+0000131514 00000 n 
+0000131687 00000 n 
+0000131742 00000 n 
+0000131917 00000 n 
+0000131961 00000 n 
+0000144139 00000 n 
+0000144400 00000 n 
+0000144443 00000 n 
+0000144498 00000 n 
+0000144541 00000 n 
+0000144706 00000 n 
+0000144761 00000 n 
+0000144936 00000 n 
+0000144992 00000 n 
+0000145047 00000 n 
+0000145220 00000 n 
+0000145275 00000 n 
+0000145330 00000 n 
+0000145386 00000 n 
+0000145442 00000 n 
+0000145497 00000 n 
+0000161972 00000 n 
+0000162253 00000 n 
+0000162296 00000 n 
+0000162452 00000 n 
+0000162507 00000 n 
+0000162562 00000 n 
+0000162617 00000 n 
+0000162772 00000 n 
+0000162827 00000 n 
+0000162985 00000 n 
+0000163040 00000 n 
+0000163095 00000 n 
+0000163389 00000 n 
+0000163698 00000 n 
+0000163754 00000 n 
+0000163810 00000 n 
+0000182095 00000 n 
+0000182376 00000 n 
+0000182419 00000 n 
+0000182474 00000 n 
+0000182529 00000 n 
+0000182584 00000 n 
+0000182741 00000 n 
+0000182796 00000 n 
+0000182851 00000 n 
+0000182907 00000 n 
+0000183063 00000 n 
+0000183119 00000 n 
+0000183277 00000 n 
+0000183333 00000 n 
+0000199061 00000 n 
+0000199311 00000 n 
+0000199354 00000 n 
+0000199409 00000 n 
+0000199464 00000 n 
+0000199519 00000 n 
+0000199574 00000 n 
+0000199630 00000 n 
+0000199686 00000 n 
+0000199741 00000 n 
+0000200020 00000 n 
+0000200076 00000 n 
+0000217524 00000 n 
+0000217791 00000 n 
+0000217834 00000 n 
+0000217878 00000 n 
+0000218195 00000 n 
+0000218250 00000 n 
+0000218305 00000 n 
+0000218360 00000 n 
+0000218415 00000 n 
+0000218578 00000 n 
+0000218633 00000 n 
+0000218689 00000 n 
+0000218744 00000 n 
+0000235350 00000 n 
+0000235626 00000 n 
+0000235669 00000 n 
+0000235725 00000 n 
+0000235781 00000 n 
+0000235837 00000 n 
+0000236000 00000 n 
+0000236056 00000 n 
+0000236112 00000 n 
+0000236169 00000 n 
+0000236225 00000 n 
+0000236389 00000 n 
+0000236446 00000 n 
+0000252606 00000 n 
+0000252884 00000 n 
+0000252929 00000 n 
+0000252975 00000 n 
+0000253032 00000 n 
+0000253194 00000 n 
+0000253251 00000 n 
+0000253309 00000 n 
+0000253366 00000 n 
+0000253423 00000 n 
+0000253803 00000 n 
+0000253965 00000 n 
+0000254023 00000 n 
+0000254081 00000 n 
+0000254139 00000 n 
+0000272975 00000 n 
+0000273245 00000 n 
+0000273302 00000 n 
+0000273464 00000 n 
+0000273521 00000 n 
+0000273578 00000 n 
+0000273636 00000 n 
+0000273694 00000 n 
+0000273751 00000 n 
+0000273809 00000 n 
+0000273867 00000 n 
+0000289067 00000 n 
+0000289353 00000 n 
+0000289398 00000 n 
+0000289560 00000 n 
+0000289617 00000 n 
+0000289674 00000 n 
+0000289731 00000 n 
+0000289886 00000 n 
+0000289943 00000 n 
+0000290105 00000 n 
+0000290163 00000 n 
+0000290221 00000 n 
+0000290521 00000 n 
+0000290578 00000 n 
+0000290636 00000 n 
+0000291106 00000 n 
+0000310918 00000 n 
+0000311212 00000 n 
+0000311355 00000 n 
+0000311412 00000 n 
+0000311568 00000 n 
+0000311614 00000 n 
+0000311672 00000 n 
+0000311730 00000 n 
+0000311787 00000 n 
+0000311945 00000 n 
+0000312002 00000 n 
+0000312166 00000 n 
+0000312224 00000 n 
+0000325802 00000 n 
+0000326080 00000 n 
+0000326125 00000 n 
+0000326182 00000 n 
+0000326239 00000 n 
+0000326296 00000 n 
+0000326459 00000 n 
+0000326516 00000 n 
+0000326573 00000 n 
+0000326631 00000 n 
+0000326790 00000 n 
+0000326848 00000 n 
+0000326906 00000 n 
+0000327481 00000 n 
+0000327539 00000 n 
+0000346468 00000 n 
+0000346738 00000 n 
+0000346795 00000 n 
+0000346852 00000 n 
+0000346909 00000 n 
+0000346967 00000 n 
+0000347025 00000 n 
+0000347184 00000 n 
+0000347241 00000 n 
+0000347299 00000 n 
+0000347357 00000 n 
+0000363917 00000 n 
+0000364195 00000 n 
+0000364252 00000 n 
+0000364608 00000 n 
+0000364767 00000 n 
+0000364824 00000 n 
+0000364881 00000 n 
+0000364939 00000 n 
+0000364996 00000 n 
+0000365167 00000 n 
+0000365224 00000 n 
+0000365281 00000 n 
+0000365338 00000 n 
+0000365396 00000 n 
+0000373381 00000 n 
+0000373651 00000 n 
+0000373696 00000 n 
+0000373742 00000 n 
+0000373799 00000 n 
+0000373969 00000 n 
+0000374026 00000 n 
+0000374332 00000 n 
+0000390148 00000 n 
+0000390387 00000 n 
+0000390432 00000 n 
+0000390489 00000 n 
+0000390535 00000 n 
+0000390593 00000 n 
+0000411864 00000 n 
+0000412121 00000 n 
+0000412277 00000 n 
+0000412335 00000 n 
+0000431719 00000 n 
+0000431984 00000 n 
+0000432127 00000 n 
+0000432184 00000 n 
+0000432345 00000 n 
+0000432403 00000 n 
+0000432461 00000 n 
+0000432778 00000 n 
+0000454439 00000 n 
+0000454728 00000 n 
+0000454876 00000 n 
+0000455023 00000 n 
+0000455192 00000 n 
+0000455343 00000 n 
+0000455482 00000 n 
+0000455540 00000 n 
+0000478196 00000 n 
+0000478485 00000 n 
+0000478633 00000 n 
+0000478780 00000 n 
+0000478929 00000 n 
+0000479080 00000 n 
+0000479219 00000 n 
+0000501185 00000 n 
+0000501474 00000 n 
+0000501531 00000 n 
+0000501699 00000 n 
+0000501866 00000 n 
+0000502036 00000 n 
+0000502208 00000 n 
+0000502368 00000 n 
+0000523947 00000 n 
+0000524220 00000 n 
+0000524277 00000 n 
+0000524446 00000 n 
+0000524615 00000 n 
+0000524784 00000 n 
+0000546317 00000 n 
+0000546590 00000 n 
+0000546741 00000 n 
+0000546880 00000 n 
+0000546937 00000 n 
+0000547109 00000 n 
+0000570140 00000 n 
+0000570437 00000 n 
+0000570586 00000 n 
+0000570732 00000 n 
+0000570883 00000 n 
+0000571040 00000 n 
+0000571201 00000 n 
+0000571378 00000 n 
+0000571436 00000 n 
+0000592277 00000 n 
+0000592550 00000 n 
+0000592699 00000 n 
+0000592887 00000 n 
+0000592945 00000 n 
+0000593110 00000 n 
+0000593167 00000 n 
+0000613767 00000 n 
+0000614048 00000 n 
+0000614215 00000 n 
+0000614355 00000 n 
+0000614400 00000 n 
+0000614577 00000 n 
+0000614750 00000 n 
+0000636082 00000 n 
+0000636355 00000 n 
+0000636400 00000 n 
+0000636569 00000 n 
+0000636729 00000 n 
+0000636895 00000 n 
+0000655255 00000 n 
+0000655552 00000 n 
+0000655695 00000 n 
+0000655752 00000 n 
+0000656133 00000 n 
+0000656190 00000 n 
+0000656359 00000 n 
+0000656528 00000 n 
+0000656693 00000 n 
+0000656868 00000 n 
+0000657033 00000 n 
+0000657090 00000 n 
+0000676480 00000 n 
+0000676753 00000 n 
+0000676929 00000 n 
+0000676987 00000 n 
+0000677157 00000 n 
+0000677328 00000 n 
+0000677472 00000 n 
+0000677617 00000 n 
+0000677782 00000 n 
+0000677938 00000 n 
+0000678096 00000 n 
+0000678243 00000 n 
+0000678405 00000 n 
+0000678547 00000 n 
+0000678712 00000 n 
+0000678856 00000 n 
+0000679013 00000 n 
+0000679159 00000 n 
+0000679315 00000 n 
+0000679460 00000 n 
+0000679625 00000 n 
+0000679769 00000 n 
+0000679928 00000 n 
+0000680076 00000 n 
+0000680234 00000 n 
+0000680381 00000 n 
+0000680537 00000 n 
+0000680682 00000 n 
+0000680842 00000 n 
+0000680991 00000 n 
+0000681149 00000 n 
+0000681296 00000 n 
+0000681451 00000 n 
+0000681596 00000 n 
+0000681756 00000 n 
+0000681905 00000 n 
+0000682065 00000 n 
+0000682214 00000 n 
+0000682369 00000 n 
+0000682514 00000 n 
+0000682682 00000 n 
+0000682829 00000 n 
+0000682988 00000 n 
+0000683136 00000 n 
+0000683292 00000 n 
+0000683438 00000 n 
+0000683598 00000 n 
+0000683747 00000 n 
+0000683939 00000 n 
+0000684110 00000 n 
+0000684270 00000 n 
+0000684419 00000 n 
+0000684577 00000 n 
+0000684724 00000 n 
+0000684916 00000 n 
+0000685087 00000 n 
+0000685259 00000 n 
+0000685410 00000 n 
+0000685569 00000 n 
+0000685717 00000 n 
+0000685875 00000 n 
+0000686022 00000 n 
+0000686191 00000 n 
+0000686350 00000 n 
+0000686522 00000 n 
+0000686673 00000 n 
+0000686834 00000 n 
+0000686984 00000 n 
+0000687143 00000 n 
+0000687292 00000 n 
+0000687452 00000 n 
+0000687601 00000 n 
+0000687767 00000 n 
+0000687912 00000 n 
+0000688082 00000 n 
+0000688231 00000 n 
+0000688390 00000 n 
+0000688538 00000 n 
+0000688684 00000 n 
+0000688819 00000 n 
+0000689010 00000 n 
+0000689180 00000 n 
+0000689339 00000 n 
+0000689477 00000 n 
+0000689625 00000 n 
+0000689763 00000 n 
+0000689932 00000 n 
+0000690080 00000 n 
+0000690245 00000 n 
+0000690389 00000 n 
+0000690559 00000 n 
+0000690708 00000 n 
+0000690867 00000 n 
+0000691016 00000 n 
+0000691178 00000 n 
+0000691321 00000 n 
+0000691491 00000 n 
+0000691640 00000 n 
+0000691799 00000 n 
+0000691948 00000 n 
+0000692117 00000 n 
+0000692265 00000 n 
+0000692419 00000 n 
+0000692562 00000 n 
+0000692721 00000 n 
+0000692870 00000 n 
+0000693040 00000 n 
+0000693189 00000 n 
+0000693344 00000 n 
+0000693489 00000 n 
+0000693660 00000 n 
+0000693810 00000 n 
+0000693969 00000 n 
+0000694118 00000 n 
+0000694287 00000 n 
+0000694435 00000 n 
+0000694590 00000 n 
+0000694734 00000 n 
+0000694906 00000 n 
+0000695057 00000 n 
+0000695217 00000 n 
+0000695367 00000 n 
+0000695536 00000 n 
+0000695684 00000 n 
+0000695849 00000 n 
+0000695993 00000 n 
+0000696165 00000 n 
+0000696316 00000 n 
+0000696476 00000 n 
+0000696626 00000 n 
+0000696796 00000 n 
+0000696945 00000 n 
+0000697099 00000 n 
+0000697243 00000 n 
+0000697416 00000 n 
+0000697568 00000 n 
+0000697729 00000 n 
+0000697880 00000 n 
+0000698051 00000 n 
+0000698201 00000 n 
+0000698368 00000 n 
+0000698514 00000 n 
+0000698687 00000 n 
+0000698839 00000 n 
+0000699000 00000 n 
+0000699151 00000 n 
+0000699322 00000 n 
+0000699472 00000 n 
+0000699626 00000 n 
+0000699770 00000 n 
+0000699939 00000 n 
+0000700087 00000 n 
+0000700246 00000 n 
+0000700395 00000 n 
+0000700552 00000 n 
+0000700688 00000 n 
+0000700840 00000 n 
+0000700973 00000 n 
+0000701133 00000 n 
+0000701272 00000 n 
+0000701420 00000 n 
+0000701557 00000 n 
+0000701726 00000 n 
+0000701873 00000 n 
+0000702035 00000 n 
+0000702177 00000 n 
+0000702348 00000 n 
+0000702497 00000 n 
+0000702656 00000 n 
+0000702804 00000 n 
+0000702962 00000 n 
+0000703108 00000 n 
+0000703277 00000 n 
+0000703424 00000 n 
+0000703588 00000 n 
+0000703730 00000 n 
+0000703901 00000 n 
+0000704050 00000 n 
+0000704209 00000 n 
+0000704357 00000 n 
+0000704515 00000 n 
+0000704661 00000 n 
+0000704831 00000 n 
+0000704979 00000 n 
+0000705141 00000 n 
+0000705284 00000 n 
+0000705456 00000 n 
+0000705606 00000 n 
+0000705765 00000 n 
+0000705913 00000 n 
+0000706071 00000 n 
+0000706217 00000 n 
+0000706387 00000 n 
+0000706535 00000 n 
+0000706691 00000 n 
+0000706835 00000 n 
+0000707007 00000 n 
+0000707157 00000 n 
+0000707316 00000 n 
+0000707464 00000 n 
+0000707633 00000 n 
+0000707780 00000 n 
+0000707944 00000 n 
+0000708088 00000 n 
+0000708248 00000 n 
+0000708397 00000 n 
+0000708567 00000 n 
+0000708715 00000 n 
+0000708916 00000 n 
+0000709097 00000 n 
+0000709270 00000 n 
+0000709421 00000 n 
+0000709582 00000 n 
+0000709732 00000 n 
+0000709903 00000 n 
+0000710052 00000 n 
+0000710252 00000 n 
+0000710430 00000 n 
+0000710603 00000 n 
+0000710754 00000 n 
+0000710915 00000 n 
+0000711065 00000 n 
+0000711236 00000 n 
+0000711385 00000 n 
+0000711551 00000 n 
+0000711695 00000 n 
+0000711864 00000 n 
+0000712011 00000 n 
+0000712170 00000 n 
+0000712318 00000 n 
+0000712464 00000 n 
+0000712598 00000 n 
+0000712756 00000 n 
+0000712892 00000 n 
+0000713036 00000 n 
+0000713168 00000 n 
+0000713316 00000 n 
+0000713453 00000 n 
+0000713622 00000 n 
+0000713769 00000 n 
+0000713938 00000 n 
+0000714096 00000 n 
+0000714255 00000 n 
+0000714403 00000 n 
+0000714572 00000 n 
+0000714719 00000 n 
+0000714906 00000 n 
+0000715071 00000 n 
+0000715242 00000 n 
+0000715391 00000 n 
+0000715550 00000 n 
+0000715698 00000 n 
+0000715867 00000 n 
+0000716014 00000 n 
+0000716183 00000 n 
+0000716330 00000 n 
+0000716503 00000 n 
+0000716654 00000 n 
+0000716821 00000 n 
+0000716966 00000 n 
+0000717125 00000 n 
+0000717272 00000 n 
+0000717438 00000 n 
+0000717592 00000 n 
+0000717756 00000 n 
+0000717909 00000 n 
+0000718089 00000 n 
+0000718247 00000 n 
+0000718415 00000 n 
+0000718561 00000 n 
+0000718729 00000 n 
+0000718875 00000 n 
+0000719044 00000 n 
+0000719191 00000 n 
+0000719362 00000 n 
+0000719511 00000 n 
+0000719673 00000 n 
+0000719813 00000 n 
+0000719977 00000 n 
+0000720130 00000 n 
+0000720296 00000 n 
+0000720440 00000 n 
+0000720611 00000 n 
+0000720760 00000 n 
+0000720944 00000 n 
+0000721108 00000 n 
+0000721286 00000 n 
+0000721442 00000 n 
+0000721608 00000 n 
+0000721752 00000 n 
+0000721929 00000 n 
+0000722084 00000 n 
+0000722255 00000 n 
+0000722404 00000 n 
+0000722571 00000 n 
+0000722716 00000 n 
+0000723001 00000 n 
+0000723080 00000 n 
+0000723244 00000 n 
+0000723435 00000 n 
+0000723663 00000 n 
+0000723880 00000 n 
+0000724050 00000 n 
+0000724268 00000 n 
+0000724522 00000 n 
+0000724695 00000 n 
+0000724876 00000 n 
+0000725137 00000 n 
+0000725322 00000 n 
+0000725503 00000 n 
+0000725767 00000 n 
+0000725953 00000 n 
+0000726135 00000 n 
+0000726391 00000 n 
+0000726564 00000 n 
+0000726745 00000 n 
+0000727001 00000 n 
+0000727190 00000 n 
+0000727389 00000 n 
+0000727584 00000 n 
+0000727765 00000 n 
+0000728086 00000 n 
+0000728272 00000 n 
+0000728441 00000 n 
+0000728765 00000 n 
+0000728954 00000 n 
+0000729153 00000 n 
+0000729334 00000 n 
+0000729618 00000 n 
+0000729808 00000 n 
+0000730008 00000 n 
+0000730204 00000 n 
+0000730373 00000 n 
+0000730669 00000 n 
+0000730858 00000 n 
+0000731057 00000 n 
+0000731238 00000 n 
+0000731623 00000 n 
+0000731817 00000 n 
+0000732020 00000 n 
+0000732206 00000 n 
+0000732502 00000 n 
+0000732684 00000 n 
+0000732873 00000 n 
+0000733181 00000 n 
+0000733374 00000 n 
+0000733577 00000 n 
+0000733762 00000 n 
+0000734047 00000 n 
+0000734236 00000 n 
+0000734409 00000 n 
+0000734729 00000 n 
+0000734922 00000 n 
+0000735125 00000 n 
+0000735310 00000 n 
+0000735694 00000 n 
+0000735888 00000 n 
+0000736091 00000 n 
+0000736277 00000 n 
+0000736578 00000 n 
+0000736761 00000 n 
+0000736965 00000 n 
+0000737151 00000 n 
+0000737453 00000 n 
+0000737647 00000 n 
+0000737851 00000 n 
+0000738038 00000 n 
+0000738348 00000 n 
+0000738543 00000 n 
+0000738747 00000 n 
+0000738933 00000 n 
+0000739286 00000 n 
+0000739481 00000 n 
+0000739686 00000 n 
+0000739872 00000 n 
+0000740190 00000 n 
+0000740385 00000 n 
+0000740577 00000 n 
+0000740763 00000 n 
+0000741140 00000 n 
+0000741334 00000 n 
+0000741538 00000 n 
+0000741739 00000 n 
+0000741926 00000 n 
+0000742311 00000 n 
+0000742506 00000 n 
+0000742710 00000 n 
+0000742899 00000 n 
+0000743086 00000 n 
+0000743476 00000 n 
+0000743670 00000 n 
+0000743874 00000 n 
+0000744075 00000 n 
+0000744249 00000 n 
+0000744530 00000 n 
+0000744724 00000 n 
+0000744928 00000 n 
+0000745114 00000 n 
+0000745403 00000 n 
+0000745594 00000 n 
+0000745781 00000 n 
+0000746163 00000 n 
+0000746358 00000 n 
+0000746562 00000 n 
+0000746748 00000 n 
+0000747109 00000 n 
+0000747304 00000 n 
+0000747509 00000 n 
+0000747695 00000 n 
+0000748057 00000 n 
+0000748252 00000 n 
+0000748456 00000 n 
+0000748656 00000 n 
+0000748842 00000 n 
+0000749100 00000 n 
+0000749290 00000 n 
+0000749476 00000 n 
+0000749757 00000 n 
+0000749947 00000 n 
+0000750134 00000 n 
+0000750425 00000 n 
+0000750608 00000 n 
+0000750812 00000 n 
+0000750998 00000 n 
+0000751226 00000 n 
+0000751428 00000 n 
+0000751605 00000 n 
+0000751802 00000 n 
+0000752027 00000 n 
+0000752251 00000 n 
+0000752496 00000 n 
+0000752689 00000 n 
+0000752878 00000 n 
+0000753074 00000 n 
+0000753286 00000 n 
+0000753462 00000 n 
+0000753687 00000 n 
+0000753876 00000 n 
+0000754084 00000 n 
+0000754344 00000 n 
+0000754564 00000 n 
+0000754748 00000 n 
+0000754976 00000 n 
+0000755180 00000 n 
+0000755355 00000 n 
+0000755927 00000 n 
+0000763795 00000 n 
+0000764011 00000 n 
+0000765374 00000 n 
+0000766443 00000 n 
+0000774049 00000 n 
+0000774270 00000 n 
+0000775633 00000 n 
+0000776712 00000 n 
+0000779973 00000 n 
+0000780199 00000 n 
+0000781562 00000 n 
+0000782678 00000 n 
+0000784881 00000 n 
+0000785095 00000 n 
+0000786458 00000 n 
 trailer
-<< /Size 488
+<< /Size 769
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-541527
+787583
 %%EOF
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index 629ce6527..711b40915 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -38,13 +38,22 @@ LOCK TABLES `dictionary_elements` WRITE;
 /*!40000 ALTER TABLE `dictionary_elements` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Dumping data for table `dictionary_to_dictionaryelements`
+--
+
+LOCK TABLES `dictionary_to_dictionaryelements` WRITE;
+/*!40000 ALTER TABLE `dictionary_to_dictionaryelements` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dictionary_to_dictionaryelements` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Dumping data for table `hibernate_sequence`
 --
 
 LOCK TABLES `hibernate_sequence` WRITE;
 /*!40000 ALTER TABLE `hibernate_sequence` DISABLE KEYS */;
-INSERT INTO `hibernate_sequence` VALUES (10);
+INSERT INTO `hibernate_sequence` VALUES (11);
 /*!40000 ALTER TABLE `hibernate_sequence` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -54,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-10 17:03:33.661538','','2020-02-10 17:03:34.923034',NULL,NULL,'CONFIG_POLICY');
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-17 01:28:17.591501','','2020-02-17 01:28:18.213276',NULL,NULL,'CONFIG_POLICY',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -73,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_GDC6j_v1_0_ResourceInstanceName1_tca','','2020-02-10 17:03:34.815508','','2020-02-10 17:03:34.815508','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-a733c5f2-9113-4747-a2d2-4f9a9da9901b',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-d1bb10f9-42f5-4fef-b597-9f737ee8d832\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"176.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4bf9ad3e-84b9-46f0-b3e5-ec82e1f23ba8\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"380.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">tca_tca</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3f0968ad-658a-4283-b90e-1cde635fec34\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"OperationalPolicy\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"557\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"557\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"564.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">OperationalPolicy</text><line y2=\"1\" fill=\"none\" x1=\"557\" x2=\"618\" y1=\"42\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-83a2296d-f738-4015-9565-77a5091908f8\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"680\" x2=\"768\" y1=\"41\"/><polygon fill=\"none\" points=\" 766 39 766 43 770 41\"/><polygon points=\" 766 39 766 43 770 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"789\" cy=\"41\"/></g></g></g></svg>','63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_GDC6j_v1_0_ResourceInstanceName1_tca_3','','2020-02-10 17:03:34.343090','','2020-02-10 17:03:34.343090','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-8003bdb0-7171-404d-8ea4-fbe3cfd34589',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-94660e4f-91a6-4ffb-8fff-c19f29467423\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"176.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-f0f44886-e805-4b05-b5ce-9b33ae5d781c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"379.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">tca_k8s</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-bfbb1c94-868f-4da5-b7fe-a4d2d9051e02\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"OperationalPolicy\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"557\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"557\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"564.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">OperationalPolicy</text><line y2=\"1\" fill=\"none\" x1=\"557\" x2=\"618\" y1=\"42\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-5e16ceab-e71b-4423-9095-5d188289be24\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"680\" x2=\"768\" y1=\"41\"/><polygon fill=\"none\" points=\" 766 39 766 43 770 41\"/><polygon points=\" 766 39 766 43 770 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"789\" cy=\"41\"/></g></g></g></svg>','63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_GDC6j_v1_0_ResourceInstanceName2_tca_2','','2020-02-10 17:03:33.619163','','2020-02-10 17:03:33.619163','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-d7711567-0d72-4206-8705-c4258f2dc4c6',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-29d16576-88f2-4537-a5a5-781a6bbb5c57\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"176.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-08babc23-4c16-4288-b7cc-c3825caa5a19\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"379.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">tca_k8s</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3701e293-a2bb-48d7-b66f-b6e1e041804a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"OperationalPolicy\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"557\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"557\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"564.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">OperationalPolicy</text><line y2=\"1\" fill=\"none\" x1=\"557\" x2=\"618\" y1=\"42\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a9630a89-3fbd-43b2-b3ae-0beb84e989f4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"680\" x2=\"768\" y1=\"41\"/><polygon fill=\"none\" points=\" 766 39 766 43 770 41\"/><polygon points=\" 766 39 766 43 770 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"789\" cy=\"41\"/></g></g></g></svg>','63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_mrun2_v1_0_ResourceInstanceName1_tca','','2020-02-17 01:28:18.089349','','2020-02-17 01:28:18.089349','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-1158b029-696f-445f-ab39-240c366a7082',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4c432782-f871-473d-9547-470fe5dbaa89\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-16c5dae3-8360-4767-a2b9-ae940cc6546a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"383.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">tca_tca</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-9f8c55b9-0fb4-4d2a-a19d-88726bba03f6\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"OperationalPolicy\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"557\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"557\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"569.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">OperationalPolicy</text><line y2=\"1\" fill=\"none\" x1=\"557\" x2=\"618\" y1=\"42\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-dcd24657-e760-4378-9f40-a82540ee725a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"680\" x2=\"768\" y1=\"41\"/><polygon fill=\"none\" points=\" 766 39 766 43 770 41\"/><polygon points=\" 766 39 766 43 770 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"789\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_mrun2_v1_0_ResourceInstanceName1_tca_3','','2020-02-17 01:28:17.881069','','2020-02-17 01:28:17.881069','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-ad0016dc-8fa1-44d3-be1f-38e646d7fc6e',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-307b7e33-2a07-4567-8acf-08bfd899360a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-d23f574c-8f5f-4156-a9ad-e0fe872ac361\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"382.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">tca_k8s</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-0df0f798-1cce-455d-9a02-cf074208e13e\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"OperationalPolicy\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"557\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"557\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"569.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">OperationalPolicy</text><line y2=\"1\" fill=\"none\" x1=\"557\" x2=\"618\" y1=\"42\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-53bcf3ee-d242-4b9d-9eec-da84f5afe416\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"680\" x2=\"768\" y1=\"41\"/><polygon fill=\"none\" points=\" 766 39 766 43 770 41\"/><polygon points=\" 766 39 766 43 770 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"789\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_mrun2_v1_0_ResourceInstanceName2_tca_2','','2020-02-17 01:28:17.503778','','2020-02-17 01:28:17.503778','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-b68b1479-deab-49ce-b782-6bcd92e7f339',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-0307a925-c3ed-4f07-8029-fbb958e0b953\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-64e12ff6-d108-408f-827e-d18c6abe3f0d\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"382.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">tca_k8s</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-2271388b-e1f4-4593-8b02-de09b8752cce\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"OperationalPolicy\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"557\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"557\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"569.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">OperationalPolicy</text><line y2=\"1\" fill=\"none\" x1=\"557\" x2=\"618\" y1=\"42\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-8381b10b-acdf-4e10-9ff8-043f124b8f6d\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"680\" x2=\"768\" y1=\"41\"/><polygon fill=\"none\" points=\" 766 39 766 43 770 41\"/><polygon points=\" 766 39 766 43 770 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"789\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -113,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_GDC6j_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_GDC6j_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_GDC6j_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_mrun2_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_mrun2_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_mrun2_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -143,7 +152,15 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','','2020-02-10 17:03:33.698994','','2020-02-10 17:03:33.698994','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','','2020-02-17 01:28:32.023344','','2020-02-17 01:28:32.023344','Guard','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','','2020-02-17 01:28:31.924684','','2020-02-17 01:28:31.924684','Blacklist','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','','2020-02-17 01:28:31.916091','','2020-02-17 01:28:31.916091','FrequencyLimiter','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','','2020-02-17 01:28:31.930419','','2020-02-17 01:28:31.930419','MinMax','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','','2020-02-17 01:28:32.007254','','2020-02-17 01:28:32.007254','Operational','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','','2020-02-17 01:28:32.020428','','2020-02-17 01:28:32.020428','Apex','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','','2020-02-17 01:28:31.916299','','2020-02-17 01:28:31.916299','Drools','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','','2020-02-17 01:28:32.090217','','2020-02-17 01:28:32.090217','Monitoring','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','','2020-02-17 01:28:17.629390','','2020-02-17 01:28:17.629390','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -165,4 +182,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-10 16:04:53
+-- Dump completed on 2020-02-17  9:29:33
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 66024470a..4d351126f 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,138 +444,243 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route32">2.1. GET /v1/clds/cldsInfo</a>
+<li><a href="#_route30">2.1. GET /v1/clds/cldsInfo</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route33">2.2. GET /v1/healthcheck</a>
+<li><a href="#_route31">2.2. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route34">2.3. GET /v1/user/getUser</a>
+<li><a href="#_route32">2.3. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route30">2.4. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route18">2.4. GET /v2/dictionary</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters">2.4.1. Parameters</a></li>
-<li><a href="#_responses_4">2.4.2. Responses</a></li>
+<li><a href="#_responses_4">2.4.1. Responses</a></li>
+<li><a href="#_produces_4">2.4.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route25">2.5. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route20">2.5. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_2">2.5.1. Parameters</a></li>
+<li><a href="#_parameters">2.5.1. Parameters</a></li>
 <li><a href="#_responses_5">2.5.2. Responses</a></li>
-<li><a href="#_produces_4">2.5.3. Produces</a></li>
+<li><a href="#_consumes">2.5.3. Consumes</a></li>
+<li><a href="#_produces_5">2.5.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route19">2.6. GET /v2/loop/getAllNames</a>
+<li><a href="#_v2_dictionary_secondary_names_get">2.6. GET /v2/dictionary/secondary/names</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_6">2.6.1. Responses</a></li>
-<li><a href="#_produces_5">2.6.2. Produces</a></li>
+<li><a href="#_produces_6">2.6.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route31">2.7. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_v2_dictionary_dictionaryname_get">2.7. GET /v2/dictionary/{dictionaryName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_3">2.7.1. Parameters</a></li>
+<li><a href="#_parameters_2">2.7.1. Parameters</a></li>
 <li><a href="#_responses_7">2.7.2. Responses</a></li>
-<li><a href="#_produces_6">2.7.3. Produces</a></li>
+<li><a href="#_produces_7">2.7.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route28">2.8. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_v2_dictionary_name_put">2.8. PUT /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_4">2.8.1. Parameters</a></li>
+<li><a href="#_parameters_3">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
-<li><a href="#_produces_7">2.8.3. Produces</a></li>
+<li><a href="#_consumes_2">2.8.3. Consumes</a></li>
+<li><a href="#_produces_8">2.8.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route27">2.9. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route22">2.9. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_5">2.9.1. Parameters</a></li>
+<li><a href="#_parameters_4">2.9.1. Parameters</a></li>
 <li><a href="#_responses_9">2.9.2. Responses</a></li>
-<li><a href="#_produces_8">2.9.3. Produces</a></li>
+<li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route29">2.10. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_v2_dictionary_name_elements_shortname_delete">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_6">2.10.1. Parameters</a></li>
+<li><a href="#_parameters_5">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
-<li><a href="#_produces_9">2.10.3. Produces</a></li>
+<li><a href="#_produces_10">2.10.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route21">2.11. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route14">2.11. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_7">2.11.1. Parameters</a></li>
+<li><a href="#_parameters_6">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
-<li><a href="#_produces_10">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route26">2.12. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route8">2.12. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_8">2.12.1. Parameters</a></li>
+<li><a href="#_parameters_7">2.12.1. Parameters</a></li>
 <li><a href="#_responses_12">2.12.2. Responses</a></li>
 <li><a href="#_produces_11">2.12.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route22">2.13. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route2">2.13. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_9">2.13.1. Parameters</a></li>
-<li><a href="#_responses_13">2.13.2. Responses</a></li>
-<li><a href="#_consumes">2.13.3. Consumes</a></li>
-<li><a href="#_produces_12">2.13.4. Produces</a></li>
+<li><a href="#_responses_13">2.13.1. Responses</a></li>
+<li><a href="#_produces_12">2.13.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route24">2.14. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route15">2.14. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_10">2.14.1. Parameters</a></li>
+<li><a href="#_parameters_8">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
-<li><a href="#_consumes_2">2.14.3. Consumes</a></li>
-<li><a href="#_produces_13">2.14.4. Produces</a></li>
+<li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route23">2.15. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route9">2.15. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_11">2.15.1. Parameters</a></li>
+<li><a href="#_parameters_9">2.15.1. Parameters</a></li>
 <li><a href="#_responses_15">2.15.2. Responses</a></li>
-<li><a href="#_consumes_3">2.15.3. Consumes</a></li>
-<li><a href="#_produces_14">2.15.4. Produces</a></li>
+<li><a href="#_produces_14">2.15.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route20">2.16. GET /v2/loop/{loopName}</a>
+<li><a href="#_route12">2.16. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_12">2.16.1. Parameters</a></li>
+<li><a href="#_parameters_10">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
+<li><a href="#_route11">2.17. PUT /v2/loop/stop/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_11">2.17.1. Parameters</a></li>
+<li><a href="#_responses_17">2.17.2. Responses</a></li>
+<li><a href="#_produces_16">2.17.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route13">2.18. PUT /v2/loop/submit/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_12">2.18.1. Parameters</a></li>
+<li><a href="#_responses_18">2.18.2. Responses</a></li>
+<li><a href="#_produces_17">2.18.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route4">2.19. GET /v2/loop/svgRepresentation/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_13">2.19.1. Parameters</a></li>
+<li><a href="#_responses_19">2.19.2. Responses</a></li>
+<li><a href="#_produces_18">2.19.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route10">2.20. PUT /v2/loop/undeploy/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_14">2.20.1. Parameters</a></li>
+<li><a href="#_responses_20">2.20.2. Responses</a></li>
+<li><a href="#_produces_19">2.20.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route5">2.21. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_15">2.21.1. Parameters</a></li>
+<li><a href="#_responses_21">2.21.2. Responses</a></li>
+<li><a href="#_consumes_3">2.21.3. Consumes</a></li>
+<li><a href="#_produces_20">2.21.4. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route7">2.22. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_16">2.22.1. Parameters</a></li>
+<li><a href="#_responses_22">2.22.2. Responses</a></li>
+<li><a href="#_consumes_4">2.22.3. Consumes</a></li>
+<li><a href="#_produces_21">2.22.4. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route6">2.23. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_17">2.23.1. Parameters</a></li>
+<li><a href="#_responses_23">2.23.2. Responses</a></li>
+<li><a href="#_consumes_5">2.23.3. Consumes</a></li>
+<li><a href="#_produces_22">2.23.4. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route3">2.24. GET /v2/loop/{loopName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_18">2.24.1. Parameters</a></li>
+<li><a href="#_responses_24">2.24.2. Responses</a></li>
+<li><a href="#_produces_23">2.24.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route25">2.25. GET /v2/policyToscaModels</a>
+<ul class="sectlevel3">
+<li><a href="#_responses_25">2.25.1. Responses</a></li>
+<li><a href="#_produces_24">2.25.2. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_v2_policytoscamodels_yaml_policymodeltype_get">2.26. GET /v2/policyToscaModels/yaml/{policyModelType}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_19">2.26.1. Parameters</a></li>
+<li><a href="#_responses_26">2.26.2. Responses</a></li>
+<li><a href="#_produces_25">2.26.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_v2_policytoscamodels_policymodeltype_get">2.27. GET /v2/policyToscaModels/{policyModelType}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_20">2.27.1. Parameters</a></li>
+<li><a href="#_responses_27">2.27.2. Responses</a></li>
+<li><a href="#_produces_26">2.27.3. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route26">2.28. PUT /v2/policyToscaModels/{policyModelType}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_21">2.28.1. Parameters</a></li>
+<li><a href="#_responses_28">2.28.2. Responses</a></li>
+<li><a href="#_consumes_6">2.28.3. Consumes</a></li>
+<li><a href="#_produces_27">2.28.4. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_route29">2.29. GET /v2/templates</a>
+<ul class="sectlevel3">
+<li><a href="#_responses_29">2.29.1. Responses</a></li>
+<li><a href="#_produces_28">2.29.2. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_v2_templates_names_get">2.30. GET /v2/templates/names</a>
+<ul class="sectlevel3">
+<li><a href="#_responses_30">2.30.1. Responses</a></li>
+<li><a href="#_produces_29">2.30.2. Produces</a></li>
+</ul>
+</li>
+<li><a href="#_v2_templates_templatename_get">2.31. GET /v2/templates/{templateName}</a>
+<ul class="sectlevel3">
+<li><a href="#_parameters_22">2.31.1. Parameters</a></li>
+<li><a href="#_responses_31">2.31.2. Responses</a></li>
+<li><a href="#_produces_30">2.31.3. Produces</a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li><a href="#_definitions">3. Definitions</a>
 <ul class="sectlevel2">
 <li><a href="#_cldshealthcheck">3.1. CldsHealthCheck</a></li>
 <li><a href="#_cldsinfo">3.2. CldsInfo</a></li>
-<li><a href="#_externalcomponent">3.3. ExternalComponent</a></li>
-<li><a href="#_externalcomponentstate">3.4. ExternalComponentState</a></li>
-<li><a href="#_jsonarray">3.5. JsonArray</a></li>
-<li><a href="#_jsonnull">3.6. JsonNull</a></li>
-<li><a href="#_jsonobject">3.7. JsonObject</a></li>
-<li><a href="#_jsonprimitive">3.8. JsonPrimitive</a></li>
-<li><a href="#_loop">3.9. Loop</a></li>
-<li><a href="#_looplog">3.10. LoopLog</a></li>
-<li><a href="#_looptemplate">3.11. LoopTemplate</a></li>
-<li><a href="#_microservicemodel">3.12. MicroServiceModel</a></li>
-<li><a href="#_microservicepolicy">3.13. MicroServicePolicy</a></li>
-<li><a href="#_number">3.14. Number</a></li>
-<li><a href="#_operationalpolicy">3.15. OperationalPolicy</a></li>
-<li><a href="#_policymodel">3.16. PolicyModel</a></li>
-<li><a href="#_service">3.17. Service</a></li>
-<li><a href="#_templatemicroservicemodel">3.18. TemplateMicroServiceModel</a></li>
+<li><a href="#_dictionary">3.3. Dictionary</a></li>
+<li><a href="#_dictionaryelement">3.4. DictionaryElement</a></li>
+<li><a href="#_externalcomponent">3.5. ExternalComponent</a></li>
+<li><a href="#_externalcomponentstate">3.6. ExternalComponentState</a></li>
+<li><a href="#_jsonarray">3.7. JsonArray</a></li>
+<li><a href="#_jsonnull">3.8. JsonNull</a></li>
+<li><a href="#_jsonobject">3.9. JsonObject</a></li>
+<li><a href="#_jsonprimitive">3.10. JsonPrimitive</a></li>
+<li><a href="#_loop">3.11. Loop</a></li>
+<li><a href="#_loopelementmodel">3.12. LoopElementModel</a></li>
+<li><a href="#_looplog">3.13. LoopLog</a></li>
+<li><a href="#_looptemplate">3.14. LoopTemplate</a></li>
+<li><a href="#_looptemplateloopelementmodel">3.15. LoopTemplateLoopElementModel</a></li>
+<li><a href="#_microservicepolicy">3.16. MicroServicePolicy</a></li>
+<li><a href="#_number">3.17. Number</a></li>
+<li><a href="#_operationalpolicy">3.18. OperationalPolicy</a></li>
+<li><a href="#_policymodel">3.19. PolicyModel</a></li>
+<li><a href="#_service">3.20. Service</a></li>
 </ul>
 </li>
 </ul>
@@ -588,13 +693,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_version_information"><a class="anchor" href="#_version_information"></a><a class="link" href="#_version_information">1.1. Version information</a></h3>
 <div class="paragraph">
-<p><em>Version</em> : 4.2.0-SNAPSHOT</p>
+<p><em>Version</em> : 5.0.0-SNAPSHOT</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:33953<br>
+<p><em>Host</em> : localhost:33699<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -605,7 +710,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route32"><a class="anchor" href="#_route32"></a><a class="link" href="#_route32">2.1. GET /v1/clds/cldsInfo</a></h3>
+<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.1. GET /v1/clds/cldsInfo</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -642,7 +747,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route33"><a class="anchor" href="#_route33"></a><a class="link" href="#_route33">2.2. GET /v1/healthcheck</a></h3>
+<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.2. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -679,7 +784,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route34"><a class="anchor" href="#_route34"></a><a class="link" href="#_route34">2.3. GET /v1/user/getUser</a></h3>
+<h3 id="_route32"><a class="anchor" href="#_route32"></a><a class="link" href="#_route32">2.3. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -713,58 +818,46 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.4. PUT /v2/loop/delete/{loopName}</a></h3>
-<div class="sect3">
-<h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.4.1. Parameters</a></h4>
-<table class="tableblock frame-all grid-all stretch">
-<colgroup>
-<col style="width: 22.2222%;">
-<col style="width: 33.3333%;">
-<col style="width: 44.4445%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-middle">Type</th>
-<th class="tableblock halign-left valign-middle">Name</th>
-<th class="tableblock halign-left valign-middle">Schema</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
-<em>required</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-</tbody>
-</table>
-</div>
+<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.4. GET /v2/dictionary</a></h3>
 <div class="sect3">
-<h4 id="_responses_4"><a class="anchor" href="#_responses_4"></a><a class="link" href="#_responses_4">2.4.2. Responses</a></h4>
+<h4 id="_responses_4"><a class="anchor" href="#_responses_4"></a><a class="link" href="#_responses_4">2.4.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 66.6667%;">
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
 </colgroup>
 <thead>
 <tr>
 <th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
 <th class="tableblock halign-left valign-middle">Schema</th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">No Content</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_dictionary">Dictionary</a></p></td>
 </tr>
 </tbody>
 </table>
 </div>
+<div class="sect3">
+<h4 id="_produces_4"><a class="anchor" href="#_produces_4"></a><a class="link" href="#_produces_4">2.4.2. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
 </div>
 <div class="sect2">
-<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.5. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.5. PUT /v2/dictionary</a></h3>
 <div class="sect3">
-<h4 id="_parameters_2"><a class="anchor" href="#_parameters_2"></a><a class="link" href="#_parameters_2">2.5.1. Parameters</a></h4>
+<h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.5.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -780,10 +873,10 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
 <em>required</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_dictionary">Dictionary</a></p></td>
 </tr>
 </tbody>
 </table>
@@ -807,13 +900,23 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_dictionary">Dictionary</a></p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_4"><a class="anchor" href="#_produces_4"></a><a class="link" href="#_produces_4">2.5.3. Produces</a></h4>
+<h4 id="_consumes"><a class="anchor" href="#_consumes"></a><a class="link" href="#_consumes">2.5.3. Consumes</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_produces_5"><a class="anchor" href="#_produces_5"></a><a class="link" href="#_produces_5">2.5.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -824,7 +927,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route19"><a class="anchor" href="#_route19"></a><a class="link" href="#_route19">2.6. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_v2_dictionary_secondary_names_get"><a class="anchor" href="#_v2_dictionary_secondary_names_get"></a><a class="link" href="#_v2_dictionary_secondary_names_get">2.6. GET /v2/dictionary/secondary/names</a></h3>
 <div class="sect3">
 <h4 id="_responses_6"><a class="anchor" href="#_responses_6"></a><a class="link" href="#_responses_6">2.6.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -850,7 +953,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_5"><a class="anchor" href="#_produces_5"></a><a class="link" href="#_produces_5">2.6.2. Produces</a></h4>
+<h4 id="_produces_6"><a class="anchor" href="#_produces_6"></a><a class="link" href="#_produces_6">2.6.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -861,9 +964,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.7. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_v2_dictionary_dictionaryname_get"><a class="anchor" href="#_v2_dictionary_dictionaryname_get"></a><a class="link" href="#_v2_dictionary_dictionaryname_get">2.7. GET /v2/dictionary/{dictionaryName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_3"><a class="anchor" href="#_parameters_3"></a><a class="link" href="#_parameters_3">2.7.1. Parameters</a></h4>
+<h4 id="_parameters_2"><a class="anchor" href="#_parameters_2"></a><a class="link" href="#_parameters_2">2.7.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -880,7 +983,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dictionaryName</strong><br>
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
@@ -906,13 +1009,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_dictionary">Dictionary</a></p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_6"><a class="anchor" href="#_produces_6"></a><a class="link" href="#_produces_6">2.7.3. Produces</a></h4>
+<h4 id="_produces_7"><a class="anchor" href="#_produces_7"></a><a class="link" href="#_produces_7">2.7.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -923,9 +1026,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route28"><a class="anchor" href="#_route28"></a><a class="link" href="#_route28">2.8. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_v2_dictionary_name_put"><a class="anchor" href="#_v2_dictionary_name_put"></a><a class="link" href="#_v2_dictionary_name_put">2.8. PUT /v2/dictionary/{name}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.8.1. Parameters</a></h4>
+<h4 id="_parameters_3"><a class="anchor" href="#_parameters_3"></a><a class="link" href="#_parameters_3">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -942,10 +1045,16 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_dictionary">Dictionary</a></p></td>
+</tr>
 </tbody>
 </table>
 </div>
@@ -968,13 +1077,23 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_dictionary">Dictionary</a></p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_7"><a class="anchor" href="#_produces_7"></a><a class="link" href="#_produces_7">2.8.3. Produces</a></h4>
+<h4 id="_consumes_2"><a class="anchor" href="#_consumes_2"></a><a class="link" href="#_consumes_2">2.8.3. Consumes</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_produces_8"><a class="anchor" href="#_produces_8"></a><a class="link" href="#_produces_8">2.8.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -985,9 +1104,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route27"><a class="anchor" href="#_route27"></a><a class="link" href="#_route27">2.9. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.9. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_5"><a class="anchor" href="#_parameters_5"></a><a class="link" href="#_parameters_5">2.9.1. Parameters</a></h4>
+<h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.9.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1004,7 +1123,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
@@ -1015,28 +1134,25 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h4 id="_responses_9"><a class="anchor" href="#_responses_9"></a><a class="link" href="#_responses_9">2.9.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 10%;">
-<col style="width: 70%;">
-<col style="width: 20%;">
+<col style="width: 33.3333%;">
+<col style="width: 66.6667%;">
 </colgroup>
 <thead>
 <tr>
 <th class="tableblock halign-left valign-middle">HTTP Code</th>
-<th class="tableblock halign-left valign-middle">Description</th>
 <th class="tableblock halign-left valign-middle">Schema</th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">No Content</p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_8"><a class="anchor" href="#_produces_8"></a><a class="link" href="#_produces_8">2.9.3. Produces</a></h4>
+<h4 id="_produces_9"><a class="anchor" href="#_produces_9"></a><a class="link" href="#_produces_9">2.9.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1047,9 +1163,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.10. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_v2_dictionary_name_elements_shortname_delete"><a class="anchor" href="#_v2_dictionary_name_elements_shortname_delete"></a><a class="link" href="#_v2_dictionary_name_elements_shortname_delete">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.10.1. Parameters</a></h4>
+<h4 id="_parameters_5"><a class="anchor" href="#_parameters_5"></a><a class="link" href="#_parameters_5">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1066,7 +1182,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>shortName</strong><br>
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
@@ -1077,28 +1199,25 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h4 id="_responses_10"><a class="anchor" href="#_responses_10"></a><a class="link" href="#_responses_10">2.10.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 10%;">
-<col style="width: 70%;">
-<col style="width: 20%;">
+<col style="width: 33.3333%;">
+<col style="width: 66.6667%;">
 </colgroup>
 <thead>
 <tr>
 <th class="tableblock halign-left valign-middle">HTTP Code</th>
-<th class="tableblock halign-left valign-middle">Description</th>
 <th class="tableblock halign-left valign-middle">Schema</th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">No Content</p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_9"><a class="anchor" href="#_produces_9"></a><a class="link" href="#_produces_9">2.10.3. Produces</a></h4>
+<h4 id="_produces_10"><a class="anchor" href="#_produces_10"></a><a class="link" href="#_produces_10">2.10.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1109,9 +1228,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route21"><a class="anchor" href="#_route21"></a><a class="link" href="#_route21">2.11. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.11. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.11.1. Parameters</a></h4>
+<h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1139,41 +1258,28 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h4 id="_responses_11"><a class="anchor" href="#_responses_11"></a><a class="link" href="#_responses_11">2.11.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 10%;">
-<col style="width: 70%;">
-<col style="width: 20%;">
+<col style="width: 33.3333%;">
+<col style="width: 66.6667%;">
 </colgroup>
 <thead>
 <tr>
 <th class="tableblock halign-left valign-middle">HTTP Code</th>
-<th class="tableblock halign-left valign-middle">Description</th>
 <th class="tableblock halign-left valign-middle">Schema</th>
 </tr>
 </thead>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">No Content</p></td>
 </tr>
 </tbody>
 </table>
 </div>
-<div class="sect3">
-<h4 id="_produces_10"><a class="anchor" href="#_produces_10"></a><a class="link" href="#_produces_10">2.11.3. Produces</a></h4>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/xml</code></p>
-</li>
-</ul>
-</div>
-</div>
 </div>
 <div class="sect2">
-<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.12. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.12. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.12.1. Parameters</a></h4>
+<h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.12.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1233,9 +1339,46 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.13. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.13. GET /v2/loop/getAllNames</a></h3>
+<div class="sect3">
+<h4 id="_responses_13"><a class="anchor" href="#_responses_13"></a><a class="link" href="#_responses_13">2.13.1. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; string &gt; array</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_12"><a class="anchor" href="#_produces_12"></a><a class="link" href="#_produces_12">2.13.2. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.14. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.13.1. Parameters</a></h4>
+<h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1256,17 +1399,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
-<em>required</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
-</tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_13"><a class="anchor" href="#_responses_13"></a><a class="link" href="#_responses_13">2.13.2. Responses</a></h4>
+<h4 id="_responses_14"><a class="anchor" href="#_responses_14"></a><a class="link" href="#_responses_14">2.14.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1290,17 +1427,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes"><a class="anchor" href="#_consumes"></a><a class="link" href="#_consumes">2.13.3. Consumes</a></h4>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/json</code></p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_produces_12"><a class="anchor" href="#_produces_12"></a><a class="link" href="#_produces_12">2.13.4. Produces</a></h4>
+<h4 id="_produces_13"><a class="anchor" href="#_produces_13"></a><a class="link" href="#_produces_13">2.14.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1311,9 +1438,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route24"><a class="anchor" href="#_route24"></a><a class="link" href="#_route24">2.14. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.15. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.14.1. Parameters</a></h4>
+<h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.15.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1334,17 +1461,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
-<em>required</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_microservicepolicy">MicroServicePolicy</a></p></td>
-</tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_14"><a class="anchor" href="#_responses_14"></a><a class="link" href="#_responses_14">2.14.2. Responses</a></h4>
+<h4 id="_responses_15"><a class="anchor" href="#_responses_15"></a><a class="link" href="#_responses_15">2.15.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1362,23 +1483,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_microservicepolicy">MicroServicePolicy</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_2"><a class="anchor" href="#_consumes_2"></a><a class="link" href="#_consumes_2">2.14.3. Consumes</a></h4>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/json</code></p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_produces_13"><a class="anchor" href="#_produces_13"></a><a class="link" href="#_produces_13">2.14.4. Produces</a></h4>
+<h4 id="_produces_14"><a class="anchor" href="#_produces_14"></a><a class="link" href="#_produces_14">2.15.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1389,9 +1500,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route23"><a class="anchor" href="#_route23"></a><a class="link" href="#_route23">2.15. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.16. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.15.1. Parameters</a></h4>
+<h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1412,17 +1523,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <em>required</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
-<em>required</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonarray">JsonArray</a></p></td>
-</tr>
 </tbody>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_15"><a class="anchor" href="#_responses_15"></a><a class="link" href="#_responses_15">2.15.2. Responses</a></h4>
+<h4 id="_responses_16"><a class="anchor" href="#_responses_16"></a><a class="link" href="#_responses_16">2.16.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1446,17 +1551,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_3"><a class="anchor" href="#_consumes_3"></a><a class="link" href="#_consumes_3">2.15.3. Consumes</a></h4>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/json</code></p>
-</li>
-</ul>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_produces_14"><a class="anchor" href="#_produces_14"></a><a class="link" href="#_produces_14">2.15.4. Produces</a></h4>
+<h4 id="_produces_15"><a class="anchor" href="#_produces_15"></a><a class="link" href="#_produces_15">2.16.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1467,9 +1562,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.16. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.17. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.16.1. Parameters</a></h4>
+<h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1494,7 +1589,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_16"><a class="anchor" href="#_responses_16"></a><a class="link" href="#_responses_16">2.16.2. Responses</a></h4>
+<h4 id="_responses_17"><a class="anchor" href="#_responses_17"></a><a class="link" href="#_responses_17">2.17.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1518,7 +1613,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_15"><a class="anchor" href="#_produces_15"></a><a class="link" href="#_produces_15">2.16.3. Produces</a></h4>
+<h4 id="_produces_16"><a class="anchor" href="#_produces_16"></a><a class="link" href="#_produces_16">2.17.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1528,8 +1623,865 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 </div>
-</div>
-</div>
+<div class="sect2">
+<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.18. PUT /v2/loop/submit/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.18.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_18"><a class="anchor" href="#_responses_18"></a><a class="link" href="#_responses_18">2.18.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_17"><a class="anchor" href="#_produces_17"></a><a class="link" href="#_produces_17">2.18.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.19. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.19.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_19"><a class="anchor" href="#_responses_19"></a><a class="link" href="#_responses_19">2.19.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_18"><a class="anchor" href="#_produces_18"></a><a class="link" href="#_produces_18">2.19.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/xml</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.20. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.20.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_20"><a class="anchor" href="#_responses_20"></a><a class="link" href="#_responses_20">2.20.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_19"><a class="anchor" href="#_produces_19"></a><a class="link" href="#_produces_19">2.20.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.21. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.21.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_21"><a class="anchor" href="#_responses_21"></a><a class="link" href="#_responses_21">2.21.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_consumes_3"><a class="anchor" href="#_consumes_3"></a><a class="link" href="#_consumes_3">2.21.3. Consumes</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_produces_20"><a class="anchor" href="#_produces_20"></a><a class="link" href="#_produces_20">2.21.4. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.22. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.22.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_microservicepolicy">MicroServicePolicy</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_22"><a class="anchor" href="#_responses_22"></a><a class="link" href="#_responses_22">2.22.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_microservicepolicy">MicroServicePolicy</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_consumes_4"><a class="anchor" href="#_consumes_4"></a><a class="link" href="#_consumes_4">2.22.3. Consumes</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_produces_21"><a class="anchor" href="#_produces_21"></a><a class="link" href="#_produces_21">2.22.4. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.23. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.23.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonarray">JsonArray</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_23"><a class="anchor" href="#_responses_23"></a><a class="link" href="#_responses_23">2.23.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_consumes_5"><a class="anchor" href="#_consumes_5"></a><a class="link" href="#_consumes_5">2.23.3. Consumes</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_produces_22"><a class="anchor" href="#_produces_22"></a><a class="link" href="#_produces_22">2.23.4. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.24. GET /v2/loop/{loopName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.24.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_24"><a class="anchor" href="#_responses_24"></a><a class="link" href="#_responses_24">2.24.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_23"><a class="anchor" href="#_produces_23"></a><a class="link" href="#_produces_23">2.24.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.25. GET /v2/policyToscaModels</a></h3>
+<div class="sect3">
+<h4 id="_responses_25"><a class="anchor" href="#_responses_25"></a><a class="link" href="#_responses_25">2.25.1. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_24"><a class="anchor" href="#_produces_24"></a><a class="link" href="#_produces_24">2.25.2. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_v2_policytoscamodels_yaml_policymodeltype_get"><a class="anchor" href="#_v2_policytoscamodels_yaml_policymodeltype_get"></a><a class="link" href="#_v2_policytoscamodels_yaml_policymodeltype_get">2.26. GET /v2/policyToscaModels/yaml/{policyModelType}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_19"><a class="anchor" href="#_parameters_19"></a><a class="link" href="#_parameters_19">2.26.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModelType</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_26"><a class="anchor" href="#_responses_26"></a><a class="link" href="#_responses_26">2.26.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_25"><a class="anchor" href="#_produces_25"></a><a class="link" href="#_produces_25">2.26.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_v2_policytoscamodels_policymodeltype_get"><a class="anchor" href="#_v2_policytoscamodels_policymodeltype_get"></a><a class="link" href="#_v2_policytoscamodels_policymodeltype_get">2.27. GET /v2/policyToscaModels/{policyModelType}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_20"><a class="anchor" href="#_parameters_20"></a><a class="link" href="#_parameters_20">2.27.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModelType</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_27"><a class="anchor" href="#_responses_27"></a><a class="link" href="#_responses_27">2.27.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_26"><a class="anchor" href="#_produces_26"></a><a class="link" href="#_produces_26">2.27.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.28. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.28.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModelType</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Body</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>body</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_28"><a class="anchor" href="#_responses_28"></a><a class="link" href="#_responses_28">2.28.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_consumes_6"><a class="anchor" href="#_consumes_6"></a><a class="link" href="#_consumes_6">2.28.3. Consumes</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>plain/text</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_produces_27"><a class="anchor" href="#_produces_27"></a><a class="link" href="#_produces_27">2.28.4. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.29. GET /v2/templates</a></h3>
+<div class="sect3">
+<h4 id="_responses_29"><a class="anchor" href="#_responses_29"></a><a class="link" href="#_responses_29">2.29.1. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_looptemplate">LoopTemplate</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_28"><a class="anchor" href="#_produces_28"></a><a class="link" href="#_produces_28">2.29.2. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_v2_templates_names_get"><a class="anchor" href="#_v2_templates_names_get"></a><a class="link" href="#_v2_templates_names_get">2.30. GET /v2/templates/names</a></h3>
+<div class="sect3">
+<h4 id="_responses_30"><a class="anchor" href="#_responses_30"></a><a class="link" href="#_responses_30">2.30.1. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; string &gt; array</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_29"><a class="anchor" href="#_produces_29"></a><a class="link" href="#_produces_29">2.30.2. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_v2_templates_templatename_get"><a class="anchor" href="#_v2_templates_templatename_get"></a><a class="link" href="#_v2_templates_templatename_get">2.31. GET /v2/templates/{templateName}</a></h3>
+<div class="sect3">
+<h4 id="_parameters_22"><a class="anchor" href="#_parameters_22"></a><a class="link" href="#_parameters_22">2.31.1. Parameters</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 22.2222%;">
+<col style="width: 33.3333%;">
+<col style="width: 44.4445%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Type</th>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>Path</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>templateName</strong><br>
+<em>required</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_responses_31"><a class="anchor" href="#_responses_31"></a><a class="link" href="#_responses_31">2.31.2. Responses</a></h4>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 10%;">
+<col style="width: 70%;">
+<col style="width: 20%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">HTTP Code</th>
+<th class="tableblock halign-left valign-middle">Description</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_looptemplate">LoopTemplate</a></p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect3">
+<h4 id="_produces_30"><a class="anchor" href="#_produces_30"></a><a class="link" href="#_produces_30">2.31.3. Produces</a></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><code>application/json</code></p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+</div>
 <div class="sect1">
 <h2 id="_definitions"><a class="anchor" href="#_definitions"></a><a class="link" href="#_definitions">3. Definitions</a></h2>
 <div class="sectionbody">
@@ -1566,7 +2518,121 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_cldsinfo"><a class="anchor" href="#_cldsinfo"></a><a class="link" href="#_cldsinfo">3.2. CldsInfo</a></h3>
+<h3 id="_cldsinfo"><a class="anchor" href="#_cldsinfo"></a><a class="link" href="#_cldsinfo">3.2. CldsInfo</a></h3>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 42.8571%;">
+<col style="width: 57.1429%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>cldsVersion</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadCl</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadTemplate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadTosca</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateCl</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateTemplate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateTosca</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>userName</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_dictionary"><a class="anchor" href="#_dictionary"></a><a class="link" href="#_dictionary">3.3. Dictionary</a></h3>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 42.8571%;">
+<col style="width: 57.1429%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdBy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dictionaryElements</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_dictionaryelement">DictionaryElement</a> &gt; array</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>secondLevelDictionary</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int32)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>subDictionaryType</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_dictionaryelement"><a class="anchor" href="#_dictionaryelement"></a><a class="link" href="#_dictionaryelement">3.4. DictionaryElement</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -1580,50 +2646,60 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>cldsVersion</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdBy</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadCl</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdDate</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadTemplate</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>description</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadTosca</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateCl</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>shortName</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateTemplate</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>subDictionary</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateTosca</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>type</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>userName</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>usedByDictionaries</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_dictionary">Dictionary</a> &gt; array</p></td>
+</tr>
 </tbody>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_externalcomponent"><a class="anchor" href="#_externalcomponent"></a><a class="link" href="#_externalcomponent">3.3. ExternalComponent</a></h3>
+<h3 id="_externalcomponent"><a class="anchor" href="#_externalcomponent"></a><a class="link" href="#_externalcomponent">3.5. ExternalComponent</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -1650,7 +2726,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_externalcomponentstate"><a class="anchor" href="#_externalcomponentstate"></a><a class="link" href="#_externalcomponentstate">3.4. ExternalComponentState</a></h3>
+<h3 id="_externalcomponentstate"><a class="anchor" href="#_externalcomponentstate"></a><a class="link" href="#_externalcomponentstate">3.6. ExternalComponentState</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -1682,7 +2758,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonarray"><a class="anchor" href="#_jsonarray"></a><a class="link" href="#_jsonarray">3.5. JsonArray</a></h3>
+<h3 id="_jsonarray"><a class="anchor" href="#_jsonarray"></a><a class="link" href="#_jsonarray">3.7. JsonArray</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -1799,7 +2875,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonnull"><a class="anchor" href="#_jsonnull"></a><a class="link" href="#_jsonnull">3.6. JsonNull</a></h3>
+<h3 id="_jsonnull"><a class="anchor" href="#_jsonnull"></a><a class="link" href="#_jsonnull">3.8. JsonNull</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -1916,7 +2992,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonobject"><a class="anchor" href="#_jsonobject"></a><a class="link" href="#_jsonobject">3.7. JsonObject</a></h3>
+<h3 id="_jsonobject"><a class="anchor" href="#_jsonobject"></a><a class="link" href="#_jsonobject">3.9. JsonObject</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2033,7 +3109,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonprimitive"><a class="anchor" href="#_jsonprimitive"></a><a class="link" href="#_jsonprimitive">3.8. JsonPrimitive</a></h3>
+<h3 id="_jsonprimitive"><a class="anchor" href="#_jsonprimitive"></a><a class="link" href="#_jsonprimitive">3.10. JsonPrimitive</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2165,7 +3241,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_loop"><a class="anchor" href="#_loop"></a><a class="link" href="#_loop">3.9. Loop</a></h3>
+<h3 id="_loop"><a class="anchor" href="#_loop"></a><a class="link" href="#_loop">3.11. Loop</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2179,11 +3255,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>blueprint</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>components</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; string, <a href="#_externalcomponent">ExternalComponent</a> &gt; map</p></td>
@@ -2199,11 +3270,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeBlueprintId</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeDeploymentId</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2272,7 +3338,79 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_looplog"><a class="anchor" href="#_looplog"></a><a class="link" href="#_looplog">3.10. LoopLog</a></h3>
+<h3 id="_loopelementmodel"><a class="anchor" href="#_loopelementmodel"></a><a class="link" href="#_loopelementmodel">3.12. LoopElementModel</a></h3>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 42.8571%;">
+<col style="width: 57.1429%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-middle">Name</th>
+<th class="tableblock halign-left valign-middle">Schema</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>blueprint</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdBy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeBlueprintId</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopElementType</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModels</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_policymodel">PolicyModel</a> &gt; array</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>shortName</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>usedByLoopTemplates</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_looptemplateloopelementmodel">LoopTemplateLoopElementModel</a> &gt; array</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_looplog"><a class="anchor" href="#_looplog"></a><a class="link" href="#_looplog">3.13. LoopLog</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2319,7 +3457,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_looptemplate"><a class="anchor" href="#_looptemplate"></a><a class="link" href="#_looptemplate">3.11. LoopTemplate</a></h3>
+<h3 id="_looptemplate"><a class="anchor" href="#_looptemplate"></a><a class="link" href="#_looptemplate">3.14. LoopTemplate</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2333,6 +3471,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>allowedLoopType</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">enum (OPEN, CLOSED, HYBRID)</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>blueprint</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2348,14 +3491,19 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>maximumInstancesAllowed</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeBlueprintId</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int32)</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopElementModelsUsed</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_looptemplateloopelementmodel">LoopTemplateLoopElementModel</a> &gt; array</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>microServiceModelUsed</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>maximumInstancesAllowed</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_templatemicroservicemodel">TemplateMicroServiceModel</a> &gt; array</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int32)</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>modelService</strong><br>
@@ -2373,6 +3521,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>uniqueBlueprint</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2386,7 +3539,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_microservicemodel"><a class="anchor" href="#_microservicemodel"></a><a class="link" href="#_microservicemodel">3.12. MicroServiceModel</a></h3>
+<h3 id="_looptemplateloopelementmodel"><a class="anchor" href="#_looptemplateloopelementmodel"></a><a class="link" href="#_looptemplateloopelementmodel">3.15. LoopTemplateLoopElementModel</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2400,55 +3553,25 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>blueprint</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdBy</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdDate</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModel</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyType</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>flowOrder</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int32)</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedDate</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopElementModel</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loopelementmodel">LoopElementModel</a></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>usedByLoopTemplates</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopTemplate</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_templatemicroservicemodel">TemplateMicroServiceModel</a> &gt; array</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_looptemplate">LoopTemplate</a></p></td>
 </tr>
 </tbody>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_microservicepolicy"><a class="anchor" href="#_microservicepolicy"></a><a class="link" href="#_microservicepolicy">3.13. MicroServicePolicy</a></h3>
+<h3 id="_microservicepolicy"><a class="anchor" href="#_microservicepolicy"></a><a class="link" href="#_microservicepolicy">3.16. MicroServicePolicy</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2462,6 +3585,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>configurationsJson</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>context</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2477,6 +3605,21 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeBlueprintId</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeDeploymentId</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>dcaeDeploymentStatusUrl</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>deviceTypeScope</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2487,9 +3630,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>microServiceModel</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopElementModel</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_microservicemodel">MicroServiceModel</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loopelementmodel">LoopElementModel</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>modelType</strong><br>
@@ -2502,14 +3645,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyTosca</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpGroup</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>properties</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyTosca</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>shared</strong><br>
@@ -2535,13 +3678,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_number"><a class="anchor" href="#_number"></a><a class="link" href="#_number">3.14. Number</a></h3>
+<h3 id="_number"><a class="anchor" href="#_number"></a><a class="link" href="#_number">3.17. Number</a></h3>
 <div class="paragraph">
 <p><em>Type</em> : object</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_operationalpolicy"><a class="anchor" href="#_operationalpolicy"></a><a class="link" href="#_operationalpolicy">3.15. OperationalPolicy</a></h3>
+<h3 id="_operationalpolicy"><a class="anchor" href="#_operationalpolicy"></a><a class="link" href="#_operationalpolicy">3.18. OperationalPolicy</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2560,6 +3703,16 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdBy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>createdDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>jsonRepresentation</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
@@ -2570,20 +3723,40 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopElementModel</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loopelementmodel">LoopElementModel</a></p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpGroup</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModel</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedDate</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
+</tr>
 </tbody>
 </table>
 </div>
 <div class="sect2">
-<h3 id="_policymodel"><a class="anchor" href="#_policymodel"></a><a class="link" href="#_policymodel">3.16. PolicyModel</a></h3>
+<h3 id="_policymodel"><a class="anchor" href="#_policymodel"></a><a class="link" href="#_policymodel">3.19. PolicyModel</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2622,11 +3795,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyVariant</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2637,6 +3805,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int64)</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>usedByElementModels</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">&lt; <a href="#_loopelementmodel">LoopElementModel</a> &gt; array</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>version</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -2645,7 +3818,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_service"><a class="anchor" href="#_service"></a><a class="link" href="#_service">3.17. Service</a></h3>
+<h3 id="_service"><a class="anchor" href="#_service"></a><a class="link" href="#_service">3.20. Service</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2659,6 +3832,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </thead>
 <tbody>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>resourceDetails</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
@@ -2673,37 +3851,10 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_templatemicroservicemodel"><a class="anchor" href="#_templatemicroservicemodel"></a><a class="link" href="#_templatemicroservicemodel">3.18. TemplateMicroServiceModel</a></h3>
-<table class="tableblock frame-all grid-all stretch">
-<colgroup>
-<col style="width: 42.8571%;">
-<col style="width: 57.1429%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-middle">Name</th>
-<th class="tableblock halign-left valign-middle">Schema</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>flowOrder</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">integer (int32)</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loopTemplate</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_looptemplate">LoopTemplate</a></p></td>
-</tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>microServiceModel</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>version</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_microservicemodel">MicroServiceModel</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 </tbody>
 </table>
@@ -2713,7 +3864,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2019-10-29 10:41:43 CET
+Last updated 2020-02-12 02:20:53 PST
 </div>
 </div>
 </body>
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 19b0814db..b76f26400 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -45,7 +45,7 @@ import UserInfoModal from './components/dialogs/UserInfoModal';
 import LoopService from './api/LoopService';
 import UploadToscaPolicyModal from './components/dialogs/Tosca/UploadToscaPolicyModal';
 import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal';
-import ViewBlueprintMicroServiceTemplatesModal from './components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal';
+import ViewLoopTemplatesModal from './components/dialogs/Tosca/ViewLoopTemplatesModal';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoopModal from './components/dialogs/Loop/DeployLoopModal';
@@ -251,7 +251,7 @@ export default class LoopUI extends React.Component {
 				<StyledMainDiv id="main_div">
 				<Route path="/uploadToscaPolicyModal" render={(routeProps) => (<UploadToscaPolicyModal {...routeProps} />)} />
 				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
-				<Route path="/viewBlueprintMicroServiceTemplatesModal" render={(routeProps) => (<ViewBlueprintMicroServiceTemplatesModal {...routeProps} />)} />
+				<Route path="/ViewLoopTemplatesModal" render={(routeProps) => (<ViewLoopTemplatesModal {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 5f7611bbc..98f1a460b 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -13,7 +13,7 @@ exports[`Verify LoopUI Test the render method 1`] = `
     render={[Function]}
   />
   <Route
-    path="/viewBlueprintMicroServiceTemplatesModal"
+    path="/ViewLoopTemplatesModal"
     render={[Function]}
   />
   <Route
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 5961cd2fc..59a6fd45e 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -38,7 +38,7 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       render={[Function]}
     />
     <Route
-      path="/viewBlueprintMicroServiceTemplatesModal"
+      path="/ViewLoopTemplatesModal"
       render={[Function]}
     />
     <Route
diff --git a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js
deleted file mode 100644
index adacbc8c6..000000000
--- a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React, { forwardRef } from 'react'
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateMenuService';
-import ArrowUpward from '@material-ui/icons/ArrowUpward';
-import ChevronLeft from '@material-ui/icons/ChevronLeft';
-import ChevronRight from '@material-ui/icons/ChevronRight';
-import Clear from '@material-ui/icons/Clear';
-import FirstPage from '@material-ui/icons/FirstPage';
-import LastPage from '@material-ui/icons/LastPage';
-import Search from '@material-ui/icons/Search';
-import MaterialTable from "material-table";
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-const TextModal = styled.textarea`
-margin-top: 20px;
-white-space:pre;
-background-color: ${props => props.theme.toscaTextareaBackgroundColor};;
-text-align: justify;
-font-size: ${props => props.theme.toscaTextareaFontSize};;
-width: 100%;
-height: 300px;
-`
-const cellStyle = { border: '1px solid black' };
-const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
-const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
-
-export default class ViewBlueprintMicroServiceTemplatesModal extends React.Component {
-  state = {
-    show: true,
-		content: 'Please select Blue print template to view the details',
-		selectedRow: -1,
-		bpTemplNames: [],
-		bpTemplColumns: [
-			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
-				cellStyle: cellStyle,
-				headerStyle: headerStyle
-			},
-			{ title: "Template Name", field: "templateName",
-				cellStyle: cellStyle,
-				headerStyle: headerStyle
-			},
-			{ title: "Policy Model", field: "templatePolicy[0].policyModelId",
-				cellStyle: cellStyle,
-				headerStyle: headerStyle
-			},
-			{ title: "Template ID", field: "templateId",
-				cellStyle: cellStyle,
-				headerStyle: headerStyle
-			},
-			{ title: "Uploaded By", field: "updatedBy",
-				cellStyle: cellStyle,
-				headerStyle: headerStyle
-			},
-			{ title: "Uploaded Date", field: "timestamp", editable: 'never',
-				cellStyle: cellStyle,
-				headerStyle: headerStyle
-			}
-		],
-		tableIcons: {
-			FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
-			LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
-			NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-			PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
-			ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-			Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
-			SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
-		}
-	};
-
-	constructor(props, context) {
-		super(props, context);
-		this.handleClose = this.handleClose.bind(this);
-		this.getBlueprintMicroServiceTemplates = this.getBlueprintMicroServiceTemplates.bind(this);
-		this.handleYamlContent = this.handleYamlContent.bind(this);
-	}
-
-	componentWillMount() {
-		this.getBlueprintMicroServiceTemplates();
-	}
-
-	getBlueprintMicroServiceTemplates() {
-		TemplateMenuService.getBlueprintMicroServiceTemplates().then(bpTemplNames => {
-		this.setState({ bpTemplNames: bpTemplNames })
-		});
-	}
-
-	handleYamlContent = event => {
-		this.setState({
-			content: event.target.value
-		});
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/')
-	}
-
-	render() {
-    return (
-      <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
-        <Modal.Header closeButton>
-				</Modal.Header>
-				<Modal.Body>
-          <MaterialTable
-            title={"View Blueprint MicroService Templates"}
-            data={this.state.bpTemplNames}
-					  columns={this.state.bpTemplColumns}
-					  icons={this.state.tableIcons}
-					  onRowClick={(event, rowData) => {this.setState({content: rowData.templateYaml, selectedRow: rowData.tableData.id})}}
-					  options={{
-					  headerStyle:rowHeaderStyle,
-					  rowStyle: rowData => ({
-					  backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
-            })
-          }}
-          />
-          <div>
-            <TextModal value={this.state.content} onChange={this.handleYamlContent} />
-          </div>
-        </Modal.Body>
-        <Modal.Footer>
-          <Button variant="secondary" onClick={this.handleClose}>Close</Button>
-        </Modal.Footer>
-      </ModalStyled>
-      );
-    }
-  }
diff --git a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js
deleted file mode 100644
index 4a8d9c3ff..000000000
--- a/ui-react/src/components/dialogs/Tosca/ViewBlueprintMicroServiceTemplatesModal.test.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import ViewBlueprintMicroServiceTemplatesModal from './ViewBlueprintMicroServiceTemplatesModal';
-import { mount } from 'enzyme';
-
-describe('Verify ViewBlueprintMicroServiceTemplatesModal', () => {
-	beforeEach(() => {
-		fetch.resetMocks();
-		}
-	);
-
-	it('Test API Successful', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"index": "1",
-						"content": "MTCA version 1",
-						"templateName": "MTCA",
-						"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-						"updatedBy":"tester",
-						"templateId":"aaaa_bbbb_cccc",
-						"timestamp":"2019-09-06 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
-	});
-  	
-	it('Test API Exception', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: false,
-				status: 500,
-				json: () => {
-					return Promise.resolve({
-						"index": "1",
-						"content": "MTCA version 1",
-						"templateName": "MTCA",
-						"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-						"updatedBy":"tester",
-						"templateId":"aaaa_bbbb_cccc",
-						"timestamp":"2019-09-06 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
-	});
-
-	it('Test API Rejection', () => {
-		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
-		setTimeout( () => myMockFunc().catch(e => {
-			console.log(e);
-		}),
-		100
-		);
-		new Promise(resolve => setTimeout(resolve, 200));
-		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
-		expect(myMockFunc.mock.calls.length).toBe(1);
-	});
-
-	it('Test the tosca model view render method', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"index": "1",
-						"content": "MTCA version 1",
-						"templateName": "MTCA",
-						"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-						"updatedBy":"tester",
-						"templateId":"aaaa_bbbb_cccc",
-						"timestamp":"2019-09-06 19:09:42"
-					});
-				}
-			});
-		});
-		const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
-		component.setState({ bpTemplNames: {
-			"index": "1",
-			"content": "MTCA version 1",
-			"templateName": "MTCA",
-			"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-			"updatedBy":"tester",
-			"templateId":"aaaa_bbbb_cccc",
-			"timestamp":"2019-09-06 19:09:42"
-		  }
-		});
-		expect(component).toMatchSnapshot();
-	});
-
-	it('Test Table icons', () => {
-			fetch.mockImplementationOnce(() => {
-				return Promise.resolve({
-					ok: true,
-					status: 200,
-					json: () => {
-						return Promise.resolve({
-							"index": "1",
-							"content": "MTCA version 1",
-							"templateName": "MTCA",
-							"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-							"updatedBy":"tester",
-							"templateId":"aaaa_bbbb_cccc",
-							"timestamp":"2019-09-06 19:09:42"
-						});
-					}
-				});
-			});
-			const component = mount(<ViewBlueprintMicroServiceTemplatesModal/>);
-			expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
-		});
-
-		it('Test handleYamlContent', () => {
-			fetch.mockImplementationOnce(() => {
-				return Promise.resolve({
-					ok: true,
-					status: 200,
-					json: () => {
-						return Promise.resolve({
-							"index": "1",
-							"content": "MTCA version 1",
-							"templateName": "MTCA",
-							"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-							"updatedBy":"tester",
-							"templateId":"aaaa_bbbb_cccc",
-							"timestamp":"2019-09-06 19:09:42"
-						});
-					}
-				});
-			});
-			const yamlContent = 'MTCA Tosca model details';
-			const component = shallow(<ViewBlueprintMicroServiceTemplatesModal/>);
-			component.find('[value="Please select Blue print template to view the details"]').prop('onChange')({ target: { value: yamlContent }});
-			expect(component.state('content')).toEqual(yamlContent);
-		});
-		
-		it('Test handleClose', () => {
-			fetch.mockImplementationOnce(() => {
-				return Promise.resolve({
-					ok: true,
-					status: 200,
-					json: () => {
-						return Promise.resolve({
-							"index": "1",
-							"content": "MTCA version 1",
-							"templateName": "MTCA",
-							"templatePolicy.policyModelId" : "onap.policies.monitoring.docker.mtca.app",
-							"updatedBy":"tester",
-							"templateId":"aaaa_bbbb_cccc",
-							"timestamp":"2019-09-06 19:09:42"
-						});
-					}
-				});
-			});
-			const historyMock = { push: jest.fn() };
-			const handleClose = jest.spyOn(ViewBlueprintMicroServiceTemplatesModal.prototype,'handleClose');
-			const component = shallow(<ViewBlueprintMicroServiceTemplatesModal history={historyMock} />)
-			component.find('[variant="secondary"]').prop('onClick')();
-			expect(handleClose).toHaveBeenCalledTimes(1);
-			expect(component.state('show')).toEqual(false);
-			expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-			handleClose.mockClear();
-		});
-	});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
new file mode 100644
index 000000000..a78d454ff
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -0,0 +1,151 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import TemplateMenuService from '../../../api/TemplateMenuService';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+import MaterialTable from "material-table";
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const TextModal = styled.textarea`
+margin-top: 20px;
+white-space:pre;
+background-color: ${props => props.theme.toscaTextareaBackgroundColor};;
+text-align: justify;
+font-size: ${props => props.theme.toscaTextareaFontSize};;
+width: 100%;
+height: 300px;
+`
+const cellStyle = { border: '1px solid black' };
+const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ViewLoopTemplatesModal extends React.Component {
+  state = {
+    show: true,
+		content: 'Please select a loop template to display it',
+		selectedRow: -1,
+		loopTemplateData: [],
+		loopTemplateColumnsDefinition: [
+			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Template Name", field: "name",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Service Model Name", field: "modelService.serviceDetails.name",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Loop Type Allowed", field: "allowedLoopType",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "# Instances Allowed", field: "maximumInstancesAllowed",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Modified Date", field: "updatedDate", editable: 'never',
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			}
+		],
+		tableIcons: {
+			FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+			LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+			NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+			PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+			ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+			Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+			SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
+		}
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getBlueprintMicroServiceTemplates = this.getBlueprintMicroServiceTemplates.bind(this);
+		this.handleYamlContent = this.handleYamlContent.bind(this);
+		this.getBlueprintMicroServiceTemplates();
+	}
+
+	getBlueprintMicroServiceTemplates() {
+		TemplateMenuService.getBlueprintMicroServiceTemplates().then(loopTemplateData => {
+		this.setState({ loopTemplateData: loopTemplateData })
+		});
+	}
+
+	handleYamlContent = event => {
+		this.setState({
+			content: event.target.value
+		});
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/')
+	}
+
+	render() {
+    return (
+      <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+        <Modal.Header closeButton>
+				</Modal.Header>
+				<Modal.Body>
+          <MaterialTable
+            title={"View Blueprint MicroService Templates"}
+            data={this.state.loopTemplateData}
+					  columns={this.state.loopTemplateColumnsDefinition}
+					  icons={this.state.tableIcons}
+					  onRowClick={(event, rowData) => {this.setState({content: rowData.name, selectedRow: rowData.tableData.id})}}
+					  options={{
+					  headerStyle:rowHeaderStyle,
+					  rowStyle: rowData => ({
+					  backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
+            })
+          }}
+          />
+          <div>
+            <TextModal value={this.state.content} onChange={this.handleYamlContent} />
+          </div>
+        </Modal.Body>
+        <Modal.Footer>
+          <Button variant="secondary" onClick={this.handleClose}>Close</Button>
+        </Modal.Footer>
+      </ModalStyled>
+      );
+    }
+  }
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
new file mode 100644
index 000000000..94d4acdc8
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
@@ -0,0 +1,186 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import ViewLoopTemplatesModal from './ViewLoopTemplatesModal';
+import { mount } from 'enzyme';
+
+describe('Verify ViewLoopTemplatesModal', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+		}
+	);
+
+	it('Test API Successful', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewLoopTemplatesModal/>);
+	});
+  	
+	it('Test API Exception', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: false,
+				status: 500,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewLoopTemplatesModal/>);
+	});
+
+	it('Test API Rejection', () => {
+		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
+		setTimeout( () => myMockFunc().catch(e => {
+			console.log(e);
+		}),
+		100
+		);
+		new Promise(resolve => setTimeout(resolve, 200));
+		const component = shallow(<ViewLoopTemplatesModal/>);
+		expect(myMockFunc.mock.calls.length).toBe(1);
+	});
+
+	it('Test the tosca model view render method', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ViewLoopTemplatesModal/>);
+		component.setState({ loopTemplateData: {
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+		  }
+		});
+		expect(component).toMatchSnapshot();
+	});
+
+	it('Test Table icons', () => {
+			fetch.mockImplementationOnce(() => {
+				return Promise.resolve({
+					ok: true,
+					status: 200,
+					json: () => {
+						return Promise.resolve({
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+						});
+					}
+				});
+			});
+			const component = mount(<ViewLoopTemplatesModal/>);
+			expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+		});
+
+		it('Test handleYamlContent', () => {
+			fetch.mockImplementationOnce(() => {
+				return Promise.resolve({
+					ok: true,
+					status: 200,
+					json: () => {
+						return Promise.resolve({
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+						});
+					}
+				});
+			});
+			const yamlContent = 'MTCA version 1';
+			const component = shallow(<ViewLoopTemplatesModal/>);
+			component.find('[value="Please select a loop template to display it"]').prop('onChange')({ target: { value: yamlContent }});
+			expect(component.state('content')).toEqual(yamlContent);
+		});
+		
+		it('Test handleClose', () => {
+			fetch.mockImplementationOnce(() => {
+				return Promise.resolve({
+					ok: true,
+					status: 200,
+					json: () => {
+						return Promise.resolve({
+						"index": "1",
+						"name": "MTCA version 1",
+						"modelService.serviceDetails.name": "MTCA",
+						"allowedLoopType" : "CLOSED",
+						"maximumInstancesAllowed":1,
+						"updatedDate":"2019-09-06 19:09:42"
+						});
+					}
+				});
+			});
+			const historyMock = { push: jest.fn() };
+			const handleClose = jest.spyOn(ViewLoopTemplatesModal.prototype,'handleClose');
+			const component = shallow(<ViewLoopTemplatesModal history={historyMock} />)
+			component.find('[variant="secondary"]').prop('onClick')();
+			expect(handleClose).toHaveBeenCalledTimes(1);
+			expect(component.state('show')).toEqual(false);
+			expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+			handleClose.mockClear();
+		});
+	});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap
deleted file mode 100644
index 7dd4ee0d9..000000000
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewBlueprintMicroServiceTemplatesModal.test.js.snap
+++ /dev/null
@@ -1,163 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify ViewBlueprintMicroServiceTemplatesModal Test the tosca model view render method 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="xl"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  />
-  <ModalBody>
-    <WithStyles(Component)
-      columns={
-        Array [
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "index",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "render": [Function],
-            "title": "#",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "templateName",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Template Name",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "templatePolicy[0].policyModelId",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Policy Model",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "templateId",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Template ID",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "field": "updatedBy",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Uploaded By",
-          },
-          Object {
-            "cellStyle": Object {
-              "border": "1px solid black",
-            },
-            "editable": "never",
-            "field": "timestamp",
-            "headerStyle": Object {
-              "backgroundColor": "#ddd",
-              "border": "2px solid black",
-            },
-            "title": "Uploaded Date",
-          },
-        ]
-      }
-      data={
-        Object {
-          "content": "MTCA version 1",
-          "index": "1",
-          "templateId": "aaaa_bbbb_cccc",
-          "templateName": "MTCA",
-          "templatePolicy.policyModelId": "onap.policies.monitoring.docker.mtca.app",
-          "timestamp": "2019-09-06 19:09:42",
-          "updatedBy": "tester",
-        }
-      }
-      icons={
-        Object {
-          "FirstPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "LastPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "NextPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "PreviousPage": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "ResetSearch": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "Search": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-          "SortArrow": Object {
-            "$$typeof": Symbol(react.forward_ref),
-            "render": [Function],
-          },
-        }
-      }
-      onRowClick={[Function]}
-      options={
-        Object {
-          "headerStyle": Object {
-            "backgroundColor": "#ddd",
-            "border": "1px solid black",
-            "fontSize": "15pt",
-            "text": "bold",
-          },
-          "rowStyle": [Function],
-        }
-      }
-      title="View Blueprint MicroService Templates"
-    />
-    <div>
-      <styled.textarea
-        onChange={[Function]}
-        value="Please select Blue print template to view the details"
-      />
-    </div>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="button"
-      variant="secondary"
-    >
-      Close
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
new file mode 100644
index 000000000..efec96e94
--- /dev/null
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
@@ -0,0 +1,162 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  />
+  <ModalBody>
+    <WithStyles(Component)
+      columns={
+        Array [
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "index",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "render": [Function],
+            "title": "#",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "name",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Template Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "modelService.serviceDetails.name",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Service Model Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "allowedLoopType",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Loop Type Allowed",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "maximumInstancesAllowed",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "# Instances Allowed",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "updatedDate",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Modified Date",
+          },
+        ]
+      }
+      data={
+        Object {
+          "allowedLoopType": "CLOSED",
+          "index": "1",
+          "maximumInstancesAllowed": 1,
+          "modelService.serviceDetails.name": "MTCA",
+          "name": "MTCA version 1",
+          "updatedDate": "2019-09-06 19:09:42",
+        }
+      }
+      icons={
+        Object {
+          "FirstPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "LastPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "NextPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "PreviousPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ResetSearch": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Search": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "SortArrow": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+        }
+      }
+      onRowClick={[Function]}
+      options={
+        Object {
+          "headerStyle": Object {
+            "backgroundColor": "#ddd",
+            "border": "1px solid black",
+            "fontSize": "15pt",
+            "text": "bold",
+          },
+          "rowStyle": [Function],
+        }
+      }
+      title="View Blueprint MicroService Templates"
+    />
+    <div>
+      <styled.textarea
+        onChange={[Function]}
+        value="Please select a loop template to display it"
+      />
+    </div>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="button"
+      variant="secondary"
+    >
+      Close
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 6fae008ef..98c7bffcf 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -90,7 +90,7 @@ export default class MenuBar extends React.Component {
 					<StyledNavDropdown title="Template">
 					<NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Policy Model</NavDropdown.Item>
 					<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Policy Models</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/viewBlueprintMicroServiceTemplatesModal">View Blueprint MicroService Templates</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View Loop Templates</NavDropdown.Item>
 					</StyledNavDropdown>
 					<StyledNavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 7ed386ff2..14030f012 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -154,9 +154,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={false}
-      to="/viewBlueprintMicroServiceTemplatesModal"
+      to="/ViewLoopTemplatesModal"
     >
-      View Blueprint MicroService Templates
+      View Loop Templates
     </DropdownItem>
   </Styled(NavDropdown)>
   <Styled(NavDropdown)
-- 
cgit 1.2.3-korg


From aa486be66b1c29ad2e953cb44d105ca1bde40b1c Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 18 Feb 2020 02:00:11 -0800
Subject: Modify the Ui

Modify the Ui to have a modify option in the menu so that the user can tune the loop instance

Issue-ID: CLAMP-648

Change-Id: I57523bc1c3afaf5ca5a2acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 docs/swagger/swagger.json                          |   396 +-
 docs/swagger/swagger.pdf                           | 34381 +++++++++----------
 extra/sql/dump/test-data.sql                       |    36 +-
 .../org/onap/clamp/loop/template/PolicyModel.java  |     9 +-
 .../clamp/loop/template/PolicyModelsService.java   |    78 +-
 src/main/resources/META-INF/resources/swagger.html |   578 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |   103 +-
 ui-react/src/LoopUI.js                             |     3 +
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |     4 +
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |     4 +
 ui-react/src/api/LoopService.js                    |    23 +
 ui-react/src/api/PolicyToscaService.js             |   136 +
 ui-react/src/api/TemplateMenuService.js            |   105 -
 ui-react/src/api/TemplateService.js                |    41 +
 ui-react/src/api/example.json                      |   417 -
 .../src/components/dialogs/Loop/ModifyLoopModal.js |   187 +
 .../src/components/dialogs/Loop/OpenLoopModal.js   |     9 +-
 .../dialogs/Tosca/UploadToscaPolicyModal.js        |    26 +-
 .../dialogs/Tosca/ViewLoopTemplatesModal.js        |     4 +-
 .../dialogs/Tosca/ViewToscaPolicyModal.js          |    10 +-
 .../UploadToscaPolicyModal.test.js.snap            |     6 +-
 ui-react/src/components/menu/MenuBar.js            |    37 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        |   117 +-
 23 files changed, 17490 insertions(+), 19220 deletions(-)
 create mode 100644 ui-react/src/api/PolicyToscaService.js
 delete mode 100644 ui-react/src/api/TemplateMenuService.js
 create mode 100644 ui-react/src/api/TemplateService.js
 delete mode 100644 ui-react/src/api/example.json
 create mode 100644 ui-react/src/components/dialogs/Loop/ModifyLoopModal.js

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 5206784f2..a52fe8c10 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,13 +4,13 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:33699",
+  "host" : "localhost:33631",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route18",
+        "operationId" : "route80",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,11 +20,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route18"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route80"
       },
       "put" : {
-        "operationId" : "route20",
+        "operationId" : "route82",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -43,8 +43,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route82"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
@@ -64,7 +64,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -93,11 +93,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       },
       "delete" : {
-        "operationId" : "route22",
+        "operationId" : "route84",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -108,8 +108,8 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route84"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
@@ -129,7 +129,7 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -147,13 +147,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route3",
+        "operationId" : "route65",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -169,13 +169,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route3"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route65"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route14",
+        "operationId" : "route76",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -185,13 +185,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route14"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route76"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route8",
+        "operationId" : "route70",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -207,13 +207,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route8"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route70"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route2",
+        "operationId" : "route64",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -226,13 +226,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route2"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route64"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route15",
+        "operationId" : "route77",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -248,13 +248,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route15"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route77"
       }
     },
     "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : {
       "put" : {
-        "operationId" : "route9",
+        "operationId" : "route71",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -270,13 +270,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route9"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route71"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route12",
+        "operationId" : "route74",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -292,13 +292,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route12"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route74"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route11",
+        "operationId" : "route73",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -314,13 +314,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route11"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route73"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route13",
+        "operationId" : "route75",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -336,13 +336,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route13"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route75"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route4",
+        "operationId" : "route66",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -358,13 +358,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route4"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route66"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route10",
+        "operationId" : "route72",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -380,13 +380,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route10"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route72"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route5",
+        "operationId" : "route67",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -410,13 +410,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route5"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route67"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route7",
+        "operationId" : "route69",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -440,13 +440,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route7"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route69"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route6",
+        "operationId" : "route68",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -470,13 +470,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route6"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route68"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route25",
+        "operationId" : "route87",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -486,8 +486,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route87"
       }
     },
     "/v2/policyToscaModels/{policyModelType}" : {
@@ -507,11 +507,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       },
       "put" : {
-        "operationId" : "route26",
+        "operationId" : "route88",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -535,8 +535,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route88"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}" : {
@@ -556,13 +556,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route29",
+        "operationId" : "route91",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -572,8 +572,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route91"
       }
     },
     "/v2/templates/{templateName}" : {
@@ -593,7 +593,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -611,29 +611,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
-    "/v1/clds/cldsInfo" : {
-      "get" : {
-        "operationId" : "route30",
-        "produces" : [ "application/json" ],
-        "responses" : {
-          "200" : {
-            "description" : "Output type",
-            "schema" : {
-              "$ref" : "#/definitions/CldsInfo"
-            }
-          }
-        },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route30"
-      }
-    },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route31",
+        "operationId" : "route92",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -643,19 +627,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route31"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route92"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route32",
+        "operationId" : "route93",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route32"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route93"
       }
     }
   },
@@ -825,33 +809,19 @@
         "number" : {
           "type" : "boolean"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "boolean" : {
+        "string" : {
           "type" : "boolean"
         },
-        "string" : {
+        "boolean" : {
           "type" : "boolean"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "asString" : {
+          "type" : "string"
         },
         "asDouble" : {
           "type" : "number",
           "format" : "double"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
@@ -860,6 +830,13 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -870,19 +847,20 @@
         "asBigDecimal" : {
           "type" : "number"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "asBigInteger" : {
+          "type" : "integer"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonObject" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
@@ -891,6 +869,12 @@
         "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }
@@ -928,9 +912,6 @@
         "name" : {
           "type" : "string"
         },
-        "modelType" : {
-          "type" : "string"
-        },
         "context" : {
           "type" : "string"
         },
@@ -940,9 +921,6 @@
         "shared" : {
           "type" : "boolean"
         },
-        "policyTosca" : {
-          "type" : "string"
-        },
         "usedByLoops" : {
           "type" : "array",
           "uniqueItems" : true,
@@ -958,6 +936,9 @@
         },
         "dcaeBlueprintId" : {
           "type" : "string"
+        },
+        "policyModel" : {
+          "$ref" : "#/definitions/PolicyModel"
         }
       },
       "x-className" : {
@@ -974,56 +955,49 @@
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "asShort" : {
+        "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
         "jsonArray" : {
           "type" : "boolean"
         },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1033,6 +1007,13 @@
         },
         "asBigDecimal" : {
           "type" : "number"
+        },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         }
       },
       "x-className" : {
@@ -1166,56 +1147,49 @@
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
         },
-        "asBigInteger" : {
-          "type" : "integer"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "asShort" : {
+        "asInt" : {
           "type" : "integer",
           "format" : "int32"
         },
         "jsonArray" : {
           "type" : "boolean"
         },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
         "jsonPrimitive" : {
           "type" : "boolean"
         },
         "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1225,6 +1199,13 @@
         },
         "asBigDecimal" : {
           "type" : "number"
+        },
+        "asBigInteger" : {
+          "type" : "integer"
+        },
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         }
       }
     },
@@ -1237,24 +1218,10 @@
         "asString" : {
           "type" : "string"
         },
-        "asBigInteger" : {
-          "type" : "integer"
-        },
-        "asShort" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
         "asDouble" : {
           "type" : "number",
           "format" : "double"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
@@ -1263,6 +1230,13 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1273,19 +1247,20 @@
         "asBigDecimal" : {
           "type" : "number"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
+        "asBigInteger" : {
+          "type" : "integer"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
+        "asShort" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
+        "jsonObject" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
@@ -1294,6 +1269,12 @@
         "jsonNull" : {
           "type" : "boolean"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }
@@ -1462,39 +1443,6 @@
         }
       }
     },
-    "CldsInfo" : {
-      "type" : "object",
-      "properties" : {
-        "userName" : {
-          "type" : "string"
-        },
-        "cldsVersion" : {
-          "type" : "string"
-        },
-        "permissionReadCl" : {
-          "type" : "boolean"
-        },
-        "permissionUpdateCl" : {
-          "type" : "boolean"
-        },
-        "permissionReadTemplate" : {
-          "type" : "boolean"
-        },
-        "permissionUpdateTemplate" : {
-          "type" : "boolean"
-        },
-        "permissionReadTosca" : {
-          "type" : "boolean"
-        },
-        "permissionUpdateTosca" : {
-          "type" : "boolean"
-        }
-      },
-      "x-className" : {
-        "type" : "string",
-        "format" : "org.onap.clamp.clds.model.CldsInfo"
-      }
-    },
     "CldsHealthCheck" : {
       "type" : "object",
       "properties" : {
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index baa8dcbb9..6c7c87772 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,16 +4,16 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200217012904-08'00')
-/ModDate (D:20200217012904-08'00')
+/CreationDate (D:20200223153151-08'00')
+/ModDate (D:20200223153151-08'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 20 0 R
-/Outlines 604 0 R
-/PageLabels 752 0 R
+/Outlines 588 0 R
+/PageLabels 732 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 793.0]
 /ViewerPreferences << /DisplayDocTitle true
@@ -22,8 +22,8 @@ endobj
 endobj
 3 0 obj
 << /Type /Pages
-/Count 34
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 59 0 R 73 0 R 85 0 R 98 0 R 111 0 R 126 0 R 137 0 R 153 0 R 166 0 R 181 0 R 192 0 R 206 0 R 214 0 R 220 0 R 224 0 R 232 0 R 240 0 R 247 0 R 255 0 R 261 0 R 267 0 R 276 0 R 283 0 R 290 0 R 296 0 R 308 0 R]
+/Count 33
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 58 0 R 72 0 R 84 0 R 97 0 R 110 0 R 124 0 R 137 0 R 151 0 R 165 0 R 178 0 R 192 0 R 207 0 R 214 0 R 220 0 R 228 0 R 234 0 R 239 0 R 248 0 R 255 0 R 265 0 R 271 0 R 277 0 R 285 0 R 296 0 R 302 0 R]
 >>
 endobj
 4 0 obj
@@ -80,15 +80,15 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 754 0 R
+/FontDescriptor 734 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 756 0 R
-/ToUnicode 755 0 R
+/Widths 736 0 R
+/ToUnicode 735 0 R
 >>
 endobj
 9 0 obj
-<< /Length 31201
+<< /Length 31130
 >>
 stream
 q
@@ -271,7 +271,7 @@ ET
 BT
 60.24000000000001 624.8459999999998 Td
 /F1.0 10.5 Tf
-<322e312e20474554202f76312f636c64732f636c6473496e666f> Tj
+<322e312e20474554202f76312f6865616c7468636865636b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -280,9 +280,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-187.76024999999993 624.8459999999998 Td
+182.41574999999995 624.8459999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -391,7 +391,7 @@ ET
 BT
 60.24000000000001 569.4059999999997 Td
 /F1.0 10.5 Tf
-<322e322e20474554202f76312f6865616c7468636865636b> Tj
+<322e322e20474554202f76312f757365722f67657455736572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -400,9 +400,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-182.41574999999995 569.4059999999997 Td
+187.76024999999993 569.4059999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -511,7 +511,7 @@ ET
 BT
 60.24000000000001 513.9659999999997 Td
 /F1.0 10.5 Tf
-<322e332e20474554202f76312f757365722f67657455736572> Tj
+<322e332e20474554202f76322f64696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -520,9 +520,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-187.76024999999993 513.9659999999997 Td
+177.0712499999999 513.9659999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -631,7 +631,7 @@ ET
 BT
 60.24000000000001 458.52599999999967 Td
 /F1.0 10.5 Tf
-<322e342e20474554202f76322f64696374696f6e617279> Tj
+<322e342e20505554202f76322f64696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -671,7 +671,7 @@ ET
 BT
 72.24000000000001 440.04599999999965 Td
 /F1.0 10.5 Tf
-<322e342e312e20526573706f6e736573> Tj
+[<322e342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -680,9 +680,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 440.04599999999965 Td
+161.0377499999999 440.04599999999965 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -711,7 +711,7 @@ ET
 BT
 72.24000000000001 421.56599999999963 Td
 /F1.0 10.5 Tf
-<322e342e322e2050726f6475636573> Tj
+<322e342e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -720,9 +720,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 421.56599999999963 Td
+155.69324999999992 421.56599999999963 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -749,9 +749,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 403.0859999999996 Td
+72.24000000000001 403.0859999999996 Td
 /F1.0 10.5 Tf
-<322e352e20505554202f76322f64696374696f6e617279> Tj
+<322e342e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -760,9 +760,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-177.0712499999999 403.0859999999996 Td
+155.69324999999992 403.0859999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -791,7 +791,7 @@ ET
 BT
 72.24000000000001 384.6059999999996 Td
 /F1.0 10.5 Tf
-[<322e352e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e342e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -800,9 +800,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 384.6059999999996 Td
+150.34874999999994 384.6059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -829,9 +829,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 366.1259999999996 Td
+60.24000000000001 366.1259999999996 Td
 /F1.0 10.5 Tf
-<322e352e322e20526573706f6e736573> Tj
+<322e352e20474554202f76322f64696374696f6e6172792f7365636f6e646172792f6e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -840,9 +840,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 366.1259999999996 Td
+267.92774999999995 366.1259999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -871,7 +871,7 @@ ET
 BT
 72.24000000000001 347.64599999999956 Td
 /F1.0 10.5 Tf
-<322e352e332e20436f6e73756d6573> Tj
+<322e352e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -911,7 +911,7 @@ ET
 BT
 72.24000000000001 329.16599999999954 Td
 /F1.0 10.5 Tf
-<322e352e342e2050726f6475636573> Tj
+<322e352e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -951,7 +951,7 @@ ET
 BT
 60.24000000000001 310.6859999999995 Td
 /F1.0 10.5 Tf
-<322e362e20474554202f76322f64696374696f6e6172792f7365636f6e646172792f6e616d6573> Tj
+<322e362e20474554202f76322f64696374696f6e6172792f7b64696374696f6e6172794e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -991,7 +991,7 @@ ET
 BT
 72.24000000000001 292.2059999999995 Td
 /F1.0 10.5 Tf
-<322e362e312e20526573706f6e736573> Tj
+[<322e362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1000,9 +1000,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 292.2059999999995 Td
+161.0377499999999 292.2059999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1031,7 +1031,7 @@ ET
 BT
 72.24000000000001 273.7259999999995 Td
 /F1.0 10.5 Tf
-<322e362e322e2050726f6475636573> Tj
+<322e362e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1040,9 +1040,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 273.7259999999995 Td
+155.69324999999992 273.7259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1069,9 +1069,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 255.24599999999947 Td
+72.24000000000001 255.24599999999947 Td
 /F1.0 10.5 Tf
-<322e372e20474554202f76322f64696374696f6e6172792f7b64696374696f6e6172794e616d657d> Tj
+<322e362e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1080,9 +1080,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-267.92774999999995 255.24599999999947 Td
+150.34874999999994 255.24599999999947 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1109,9 +1109,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 236.76599999999948 Td
+60.24000000000001 236.76599999999948 Td
 /F1.0 10.5 Tf
-[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e372e20505554202f76322f64696374696f6e6172792f7b6e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1120,9 +1120,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 236.76599999999948 Td
+214.48274999999995 236.76599999999948 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1151,7 +1151,7 @@ ET
 BT
 72.24000000000001 218.2859999999995 Td
 /F1.0 10.5 Tf
-<322e372e322e20526573706f6e736573> Tj
+[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1160,9 +1160,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 218.2859999999995 Td
+161.0377499999999 218.2859999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1191,7 +1191,7 @@ ET
 BT
 72.24000000000001 199.8059999999995 Td
 /F1.0 10.5 Tf
-<322e372e332e2050726f6475636573> Tj
+<322e372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1200,9 +1200,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 199.8059999999995 Td
+155.69324999999992 199.8059999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1229,9 +1229,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 181.3259999999995 Td
+72.24000000000001 181.3259999999995 Td
 /F1.0 10.5 Tf
-<322e382e20505554202f76322f64696374696f6e6172792f7b6e616d657d> Tj
+<322e372e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1240,9 +1240,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-214.48274999999995 181.3259999999995 Td
+155.69324999999992 181.3259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1271,7 +1271,7 @@ ET
 BT
 72.24000000000001 162.84599999999952 Td
 /F1.0 10.5 Tf
-[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e372e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1280,9 +1280,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 162.84599999999952 Td
+150.34874999999994 162.84599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1309,9 +1309,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 144.36599999999953 Td
+60.24000000000001 144.36599999999953 Td
 /F1.0 10.5 Tf
-<322e382e322e20526573706f6e736573> Tj
+<322e382e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1320,9 +1320,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 144.36599999999953 Td
+235.86074999999994 144.36599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1351,7 +1351,7 @@ ET
 BT
 72.24000000000001 125.88599999999954 Td
 /F1.0 10.5 Tf
-<322e382e332e20436f6e73756d6573> Tj
+[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1360,9 +1360,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 125.88599999999954 Td
+161.0377499999999 125.88599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1391,7 +1391,7 @@ ET
 BT
 72.24000000000001 107.40599999999955 Td
 /F1.0 10.5 Tf
-<322e382e342e2050726f6475636573> Tj
+<322e382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1400,9 +1400,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 107.40599999999955 Td
+155.69324999999992 107.40599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1429,9 +1429,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 88.92599999999956 Td
+72.24000000000001 88.92599999999956 Td
 /F1.0 10.5 Tf
-<322e392e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d> Tj
+<322e382e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1440,9 +1440,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-235.86074999999994 88.92599999999956 Td
+150.34874999999994 88.92599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1469,9 +1469,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 70.44599999999957 Td
+60.24000000000001 70.44599999999957 Td
 /F1.0 10.5 Tf
-[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e392e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d2f656c656d656e74732f7b73686f72744e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1480,16 +1480,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 70.44599999999957 Td
+353.43975 70.44599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.5307499999999 70.44599999999957 Td
+556.53075 70.44599999999957 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1511,7 +1511,7 @@ ET
 BT
 72.24000000000001 51.965999999999575 Td
 /F1.0 10.5 Tf
-<322e392e322e20526573706f6e736573> Tj
+[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1520,9 +1520,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 51.965999999999575 Td
+161.0377499999999 51.965999999999575 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1559,11 +1559,11 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R]
+/Annots [305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R]
 >>
 endobj
 11 0 obj
-<< /Length 32386
+<< /Length 32457
 >>
 stream
 q
@@ -1575,7 +1575,7 @@ q
 BT
 72.24000000000001 744.786 Td
 /F1.0 10.5 Tf
-<322e392e332e2050726f6475636573> Tj
+<322e392e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1584,9 +1584,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-150.34874999999994 744.786 Td
+155.69324999999992 744.786 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1613,9 +1613,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 726.3059999999999 Td
+72.24000000000001 726.3059999999999 Td
 /F1.0 10.5 Tf
-<322e31302e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d2f656c656d656e74732f7b73686f72744e616d657d> Tj
+<322e392e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1624,16 +1624,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-358.78425 726.3059999999999 Td
+150.34874999999994 726.3059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 726.3059999999999 Td
+556.5307499999999 726.3059999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -1653,9 +1653,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 707.8259999999999 Td
+60.24000000000001 707.8259999999999 Td
 /F1.0 10.5 Tf
-[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31302e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1664,9 +1664,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 707.8259999999999 Td
+246.54974999999996 707.8259999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1695,7 +1695,7 @@ ET
 BT
 72.24000000000001 689.3459999999999 Td
 /F1.0 10.5 Tf
-<322e31302e322e20526573706f6e736573> Tj
+[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1704,9 +1704,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 689.3459999999999 Td
+166.38224999999994 689.3459999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1735,7 +1735,7 @@ ET
 BT
 72.24000000000001 670.8659999999999 Td
 /F1.0 10.5 Tf
-<322e31302e332e2050726f6475636573> Tj
+<322e31302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1744,9 +1744,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 670.8659999999999 Td
+161.0377499999999 670.8659999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1775,7 +1775,7 @@ ET
 BT
 60.24000000000001 652.3859999999999 Td
 /F1.0 10.5 Tf
-<322e31312e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
+[<322e31312e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -1784,9 +1784,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-246.54974999999996 652.3859999999999 Td
+251.89424999999994 652.3859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1893,9 +1893,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 596.9459999999998 Td
+72.24000000000001 596.9459999999998 Td
 /F1.0 10.5 Tf
-[<322e31322e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+<322e31312e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1904,9 +1904,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-251.89424999999994 596.9459999999998 Td
+155.69324999999992 596.9459999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1933,9 +1933,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 578.4659999999998 Td
+60.24000000000001 578.4659999999998 Td
 /F1.0 10.5 Tf
-[<322e31322e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31322e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1944,9 +1944,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 578.4659999999998 Td
+219.82724999999994 578.4659999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -1975,7 +1975,7 @@ ET
 BT
 72.24000000000001 559.9859999999999 Td
 /F1.0 10.5 Tf
-<322e31322e322e20526573706f6e736573> Tj
+<322e31322e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2015,7 +2015,7 @@ ET
 BT
 72.24000000000001 541.5059999999999 Td
 /F1.0 10.5 Tf
-<322e31322e332e2050726f6475636573> Tj
+<322e31322e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2055,7 +2055,7 @@ ET
 BT
 60.24000000000001 523.0259999999998 Td
 /F1.0 10.5 Tf
-<322e31332e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
+<322e31332e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2064,9 +2064,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-219.82724999999994 523.0259999999998 Td
+262.58324999999996 523.0259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2095,7 +2095,7 @@ ET
 BT
 72.24000000000001 504.54599999999976 Td
 /F1.0 10.5 Tf
-<322e31332e312e20526573706f6e736573> Tj
+[<322e31332e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2104,9 +2104,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 504.54599999999976 Td
+166.38224999999994 504.54599999999976 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2135,7 +2135,7 @@ ET
 BT
 72.24000000000001 486.06599999999975 Td
 /F1.0 10.5 Tf
-<322e31332e322e2050726f6475636573> Tj
+<322e31332e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2144,9 +2144,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 486.06599999999975 Td
+161.0377499999999 486.06599999999975 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2173,9 +2173,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 467.58599999999973 Td
+72.24000000000001 467.58599999999973 Td
 /F1.0 10.5 Tf
-<322e31342e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
+<322e31332e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2184,9 +2184,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-262.58324999999996 467.58599999999973 Td
+155.69324999999992 467.58599999999973 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2213,9 +2213,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 449.1059999999997 Td
+60.24000000000001 449.1059999999997 Td
 /F1.0 10.5 Tf
-[<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31342e20505554202f76322f6c6f6f702f726566726573684f70506f6c6963794a736f6e536368656d612f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2224,16 +2224,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 449.1059999999997 Td
+358.78425 449.1059999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.5307499999999 449.1059999999997 Td
+556.53075 449.1059999999997 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2255,7 +2255,7 @@ ET
 BT
 72.24000000000001 430.6259999999997 Td
 /F1.0 10.5 Tf
-<322e31342e322e20526573706f6e736573> Tj
+[<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2264,9 +2264,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 430.6259999999997 Td
+166.38224999999994 430.6259999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2295,7 +2295,7 @@ ET
 BT
 72.24000000000001 412.1459999999997 Td
 /F1.0 10.5 Tf
-<322e31342e332e2050726f6475636573> Tj
+<322e31342e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2304,9 +2304,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 412.1459999999997 Td
+161.0377499999999 412.1459999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2333,9 +2333,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 393.66599999999966 Td
+72.24000000000001 393.66599999999966 Td
 /F1.0 10.5 Tf
-<322e31352e20505554202f76322f6c6f6f702f726566726573684f70506f6c6963794a736f6e536368656d612f7b6c6f6f704e616d657d> Tj
+<322e31342e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2344,16 +2344,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-358.78425 393.66599999999966 Td
+155.69324999999992 393.66599999999966 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 393.66599999999966 Td
+556.5307499999999 393.66599999999966 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2373,9 +2373,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 375.18599999999964 Td
+60.24000000000001 375.18599999999964 Td
 /F1.0 10.5 Tf
-[<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31352e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2384,9 +2384,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 375.18599999999964 Td
+251.89424999999994 375.18599999999964 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2415,7 +2415,7 @@ ET
 BT
 72.24000000000001 356.7059999999996 Td
 /F1.0 10.5 Tf
-<322e31352e322e20526573706f6e736573> Tj
+[<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2424,9 +2424,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 356.7059999999996 Td
+166.38224999999994 356.7059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2455,7 +2455,7 @@ ET
 BT
 72.24000000000001 338.2259999999996 Td
 /F1.0 10.5 Tf
-<322e31352e332e2050726f6475636573> Tj
+<322e31352e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2464,9 +2464,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 338.2259999999996 Td
+161.0377499999999 338.2259999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2493,9 +2493,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 319.7459999999996 Td
+72.24000000000001 319.7459999999996 Td
 /F1.0 10.5 Tf
-<322e31362e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
+<322e31352e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2504,9 +2504,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-251.89424999999994 319.7459999999996 Td
+155.69324999999992 319.7459999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2533,9 +2533,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 301.26599999999956 Td
+60.24000000000001 301.26599999999956 Td
 /F1.0 10.5 Tf
-[<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31362e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2544,9 +2544,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 301.26599999999956 Td
+241.20524999999992 301.26599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2575,7 +2575,7 @@ ET
 BT
 72.24000000000001 282.78599999999955 Td
 /F1.0 10.5 Tf
-<322e31362e322e20526573706f6e736573> Tj
+[<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2584,9 +2584,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 282.78599999999955 Td
+166.38224999999994 282.78599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2615,7 +2615,7 @@ ET
 BT
 72.24000000000001 264.30599999999953 Td
 /F1.0 10.5 Tf
-<322e31362e332e2050726f6475636573> Tj
+<322e31362e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2624,9 +2624,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 264.30599999999953 Td
+161.0377499999999 264.30599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2653,9 +2653,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 245.8259999999995 Td
+72.24000000000001 245.8259999999995 Td
 /F1.0 10.5 Tf
-<322e31372e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
+<322e31362e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2664,9 +2664,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-241.20524999999992 245.8259999999995 Td
+155.69324999999992 245.8259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2693,9 +2693,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 227.34599999999952 Td
+60.24000000000001 227.34599999999952 Td
 /F1.0 10.5 Tf
-[<322e31372e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31372e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2704,9 +2704,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 227.34599999999952 Td
+251.89424999999994 227.34599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2735,7 +2735,7 @@ ET
 BT
 72.24000000000001 208.86599999999953 Td
 /F1.0 10.5 Tf
-<322e31372e322e20526573706f6e736573> Tj
+[<322e31372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2744,9 +2744,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 208.86599999999953 Td
+166.38224999999994 208.86599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2775,7 +2775,7 @@ ET
 BT
 72.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-<322e31372e332e2050726f6475636573> Tj
+<322e31372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2784,9 +2784,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 190.38599999999954 Td
+161.0377499999999 190.38599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2813,9 +2813,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 171.90599999999955 Td
+72.24000000000001 171.90599999999955 Td
 /F1.0 10.5 Tf
-<322e31382e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
+<322e31372e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2824,9 +2824,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-251.89424999999994 171.90599999999955 Td
+155.69324999999992 171.90599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2844,7 +2844,7 @@ ET
 BT
 557.8905 171.90599999999955 Td
 /F1.0 10.5 Tf
-<38> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2853,9 +2853,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 153.42599999999956 Td
+60.24000000000001 153.42599999999956 Td
 /F1.0 10.5 Tf
-[<322e31382e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e31382e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2864,16 +2864,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 153.42599999999956 Td
+310.68375000000003 153.42599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.5307499999999 153.42599999999956 Td
+556.53075 153.42599999999956 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -2884,7 +2884,7 @@ ET
 BT
 557.8905 153.42599999999956 Td
 /F1.0 10.5 Tf
-<38> Tj
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2895,7 +2895,7 @@ ET
 BT
 72.24000000000001 134.94599999999957 Td
 /F1.0 10.5 Tf
-<322e31382e322e20526573706f6e736573> Tj
+[<322e31382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -2904,9 +2904,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 134.94599999999957 Td
+166.38224999999994 134.94599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2935,7 +2935,7 @@ ET
 BT
 72.24000000000001 116.46599999999958 Td
 /F1.0 10.5 Tf
-<322e31382e332e2050726f6475636573> Tj
+<322e31382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2944,9 +2944,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 116.46599999999958 Td
+161.0377499999999 116.46599999999958 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2973,9 +2973,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 97.98599999999959 Td
+72.24000000000001 97.98599999999959 Td
 /F1.0 10.5 Tf
-<322e31392e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
+<322e31382e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -2984,16 +2984,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-310.68375000000003 97.98599999999959 Td
+155.69324999999992 97.98599999999959 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.53075 97.98599999999959 Td
+556.5307499999999 97.98599999999959 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3013,9 +3013,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 79.5059999999996 Td
+60.24000000000001 79.5059999999996 Td
 /F1.0 10.5 Tf
-[<322e31392e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e31392e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3024,9 +3024,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 79.5059999999996 Td
+267.92774999999995 79.5059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3055,7 +3055,7 @@ ET
 BT
 72.24000000000001 61.02599999999961 Td
 /F1.0 10.5 Tf
-<322e31392e322e20526573706f6e736573> Tj
+[<322e31392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3064,9 +3064,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-161.0377499999999 61.02599999999961 Td
+166.38224999999994 61.02599999999961 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3102,11 +3102,11 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R]
+/Annots [377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R]
 >>
 endobj
 13 0 obj
-<< /Length 32065
+<< /Length 32048
 >>
 stream
 q
@@ -3118,7 +3118,7 @@ q
 BT
 72.24000000000001 744.786 Td
 /F1.0 10.5 Tf
-<322e31392e332e2050726f6475636573> Tj
+<322e31392e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3127,9 +3127,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.69324999999992 744.786 Td
+161.0377499999999 744.786 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3156,9 +3156,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 726.3059999999999 Td
+72.24000000000001 726.3059999999999 Td
 /F1.0 10.5 Tf
-[<322e32302e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+<322e31392e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3167,9 +3167,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-267.92774999999995 726.3059999999999 Td
+155.69324999999992 726.3059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3196,9 +3196,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 707.8259999999999 Td
+60.24000000000001 707.8259999999999 Td
 /F1.0 10.5 Tf
-[<322e32302e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e32302e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3207,16 +3207,16 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-166.38224999999994 707.8259999999999 Td
+342.22574999999995 707.8259999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 
 BT
-556.5307499999999 707.8259999999999 Td
+550.66125 707.8259999999999 Td
 /F1.0 5.25 Tf
 <ca> Tj
 ET
@@ -3225,9 +3225,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-557.8905 707.8259999999999 Td
+552.021 707.8259999999999 Td
 /F1.0 10.5 Tf
-<39> Tj
+<3130> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3238,7 +3238,7 @@ ET
 BT
 72.24000000000001 689.3459999999999 Td
 /F1.0 10.5 Tf
-<322e32302e322e20526573706f6e736573> Tj
+[<322e32302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3247,9 +3247,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 689.3459999999999 Td
+165.85724999999996 689.3459999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3278,7 +3278,7 @@ ET
 BT
 72.24000000000001 670.8659999999999 Td
 /F1.0 10.5 Tf
-<322e32302e332e2050726f6475636573> Tj
+<322e32302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3287,9 +3287,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 670.8659999999999 Td
+160.51274999999998 670.8659999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3316,9 +3316,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 652.3859999999999 Td
+72.24000000000001 652.3859999999999 Td
 /F1.0 10.5 Tf
-[<322e32312e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
+<322e32302e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3327,9 +3327,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-342.22574999999995 652.3859999999999 Td
+160.51274999999998 652.3859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3358,7 +3358,7 @@ ET
 BT
 72.24000000000001 633.9059999999998 Td
 /F1.0 10.5 Tf
-[<322e32312e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e32302e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3367,9 +3367,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 633.9059999999998 Td
+155.16824999999994 633.9059999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3396,9 +3396,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 615.4259999999998 Td
+60.24000000000001 615.4259999999998 Td
 /F1.0 10.5 Tf
-<322e32312e322e20526573706f6e736573> Tj
+[<322e32312e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3407,9 +3407,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 615.4259999999998 Td
+352.91474999999997 615.4259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3438,7 +3438,7 @@ ET
 BT
 72.24000000000001 596.9459999999998 Td
 /F1.0 10.5 Tf
-<322e32312e332e20436f6e73756d6573> Tj
+[<322e32312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3447,9 +3447,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 596.9459999999998 Td
+165.85724999999996 596.9459999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3478,7 +3478,7 @@ ET
 BT
 72.24000000000001 578.4659999999998 Td
 /F1.0 10.5 Tf
-<322e32312e342e2050726f6475636573> Tj
+<322e32312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3487,9 +3487,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 578.4659999999998 Td
+160.51274999999998 578.4659999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3516,9 +3516,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 559.9859999999999 Td
+72.24000000000001 559.9859999999999 Td
 /F1.0 10.5 Tf
-[<322e32322e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d>] TJ
+<322e32312e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3527,9 +3527,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-352.91474999999997 559.9859999999999 Td
+160.51274999999998 559.9859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3547,7 +3547,7 @@ ET
 BT
 552.021 559.9859999999999 Td
 /F1.0 10.5 Tf
-<3130> Tj
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3558,7 +3558,7 @@ ET
 BT
 72.24000000000001 541.5059999999999 Td
 /F1.0 10.5 Tf
-[<322e32322e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e32312e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3567,9 +3567,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 541.5059999999999 Td
+155.16824999999994 541.5059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3587,7 +3587,7 @@ ET
 BT
 552.021 541.5059999999999 Td
 /F1.0 10.5 Tf
-<3130> Tj
+<3131> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3596,9 +3596,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 523.0259999999998 Td
+60.24000000000001 523.0259999999998 Td
 /F1.0 10.5 Tf
-<322e32322e322e20526573706f6e736573> Tj
+[<322e32322e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3607,9 +3607,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 523.0259999999998 Td
+358.25924999999995 523.0259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3638,7 +3638,7 @@ ET
 BT
 72.24000000000001 504.54599999999976 Td
 /F1.0 10.5 Tf
-<322e32322e332e20436f6e73756d6573> Tj
+[<322e32322e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3647,9 +3647,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 504.54599999999976 Td
+165.85724999999996 504.54599999999976 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3678,7 +3678,7 @@ ET
 BT
 72.24000000000001 486.06599999999975 Td
 /F1.0 10.5 Tf
-<322e32322e342e2050726f6475636573> Tj
+<322e32322e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3687,9 +3687,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 486.06599999999975 Td
+160.51274999999998 486.06599999999975 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3716,9 +3716,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 467.58599999999973 Td
+72.24000000000001 467.58599999999973 Td
 /F1.0 10.5 Tf
-[<322e32332e20504f53> 20.01953125 <54202f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
+<322e32322e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3727,9 +3727,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-358.25924999999995 467.58599999999973 Td
+160.51274999999998 467.58599999999973 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3758,7 +3758,7 @@ ET
 BT
 72.24000000000001 449.1059999999997 Td
 /F1.0 10.5 Tf
-[<322e32332e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e32322e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3767,9 +3767,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 449.1059999999997 Td
+155.16824999999994 449.1059999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3796,9 +3796,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 430.6259999999997 Td
+60.24000000000001 430.6259999999997 Td
 /F1.0 10.5 Tf
-<322e32332e322e20526573706f6e736573> Tj
+<322e32332e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3807,9 +3807,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 430.6259999999997 Td
+213.95774999999998 430.6259999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3838,7 +3838,7 @@ ET
 BT
 72.24000000000001 412.1459999999997 Td
 /F1.0 10.5 Tf
-<322e32332e332e20436f6e73756d6573> Tj
+[<322e32332e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3847,9 +3847,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 412.1459999999997 Td
+165.85724999999996 412.1459999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3878,7 +3878,7 @@ ET
 BT
 72.24000000000001 393.66599999999966 Td
 /F1.0 10.5 Tf
-<322e32332e342e2050726f6475636573> Tj
+<322e32332e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3887,9 +3887,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 393.66599999999966 Td
+160.51274999999998 393.66599999999966 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3916,9 +3916,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 375.18599999999964 Td
+72.24000000000001 375.18599999999964 Td
 /F1.0 10.5 Tf
-<322e32342e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
+<322e32332e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3927,9 +3927,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.95774999999998 375.18599999999964 Td
+155.16824999999994 375.18599999999964 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3956,9 +3956,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 356.7059999999996 Td
+60.24000000000001 356.7059999999996 Td
 /F1.0 10.5 Tf
-[<322e32342e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e32342e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c73>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -3967,9 +3967,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 356.7059999999996 Td
+224.64675 356.7059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -3998,7 +3998,7 @@ ET
 BT
 72.24000000000001 338.2259999999996 Td
 /F1.0 10.5 Tf
-<322e32342e322e20526573706f6e736573> Tj
+<322e32342e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4038,7 +4038,7 @@ ET
 BT
 72.24000000000001 319.7459999999996 Td
 /F1.0 10.5 Tf
-<322e32342e332e2050726f6475636573> Tj
+<322e32342e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4078,7 +4078,7 @@ ET
 BT
 60.24000000000001 301.26599999999956 Td
 /F1.0 10.5 Tf
-[<322e32352e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c73>] TJ
+[<322e32352e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f79616d6c2f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4087,9 +4087,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-224.64675 301.26599999999956 Td
+352.91474999999997 301.26599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4118,7 +4118,7 @@ ET
 BT
 72.24000000000001 282.78599999999955 Td
 /F1.0 10.5 Tf
-<322e32352e312e20526573706f6e736573> Tj
+[<322e32352e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4127,9 +4127,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 282.78599999999955 Td
+165.85724999999996 282.78599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4158,7 +4158,7 @@ ET
 BT
 72.24000000000001 264.30599999999953 Td
 /F1.0 10.5 Tf
-<322e32352e322e2050726f6475636573> Tj
+<322e32352e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4167,9 +4167,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 264.30599999999953 Td
+160.51274999999998 264.30599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4196,9 +4196,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 245.8259999999995 Td
+72.24000000000001 245.8259999999995 Td
 /F1.0 10.5 Tf
-[<322e32362e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f79616d6c2f7b706f6c6963794d6f64656c547970657d>] TJ
+<322e32352e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4207,9 +4207,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-352.91474999999997 245.8259999999995 Td
+155.16824999999994 245.8259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4236,9 +4236,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 227.34599999999952 Td
+60.24000000000001 227.34599999999952 Td
 /F1.0 10.5 Tf
-[<322e32362e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e32362e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4247,9 +4247,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 227.34599999999952 Td
+320.84775 227.34599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4267,7 +4267,7 @@ ET
 BT
 552.021 227.34599999999952 Td
 /F1.0 10.5 Tf
-<3132> Tj
+<3133> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4278,7 +4278,7 @@ ET
 BT
 72.24000000000001 208.86599999999953 Td
 /F1.0 10.5 Tf
-<322e32362e322e20526573706f6e736573> Tj
+[<322e32362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4287,9 +4287,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 208.86599999999953 Td
+165.85724999999996 208.86599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4318,7 +4318,7 @@ ET
 BT
 72.24000000000001 190.38599999999954 Td
 /F1.0 10.5 Tf
-<322e32362e332e2050726f6475636573> Tj
+<322e32362e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4327,9 +4327,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 190.38599999999954 Td
+160.51274999999998 190.38599999999954 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4356,9 +4356,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 171.90599999999955 Td
+72.24000000000001 171.90599999999955 Td
 /F1.0 10.5 Tf
-[<322e32372e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
+<322e32362e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4367,9 +4367,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-320.84775 171.90599999999955 Td
+155.16824999999994 171.90599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4396,9 +4396,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 153.42599999999956 Td
+60.24000000000001 153.42599999999956 Td
 /F1.0 10.5 Tf
-[<322e32372e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e32372e20505554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4407,9 +4407,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 153.42599999999956 Td
+320.84775 153.42599999999956 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4438,7 +4438,7 @@ ET
 BT
 72.24000000000001 134.94599999999957 Td
 /F1.0 10.5 Tf
-<322e32372e322e20526573706f6e736573> Tj
+[<322e32372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4447,9 +4447,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 134.94599999999957 Td
+165.85724999999996 134.94599999999957 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4478,7 +4478,7 @@ ET
 BT
 72.24000000000001 116.46599999999958 Td
 /F1.0 10.5 Tf
-<322e32372e332e2050726f6475636573> Tj
+<322e32372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4487,9 +4487,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 116.46599999999958 Td
+160.51274999999998 116.46599999999958 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4516,9 +4516,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 97.98599999999959 Td
+72.24000000000001 97.98599999999959 Td
 /F1.0 10.5 Tf
-[<322e32382e20505554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
+<322e32372e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4527,9 +4527,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-320.84775 97.98599999999959 Td
+160.51274999999998 97.98599999999959 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4558,7 +4558,7 @@ ET
 BT
 72.24000000000001 79.5059999999996 Td
 /F1.0 10.5 Tf
-[<322e32382e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e32372e342e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4567,9 +4567,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 79.5059999999996 Td
+155.16824999999994 79.5059999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4596,9 +4596,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 61.02599999999961 Td
+60.24000000000001 61.02599999999961 Td
 /F1.0 10.5 Tf
-<322e32382e322e20526573706f6e736573> Tj
+<322e32382e20474554202f76322f74656d706c61746573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4607,9 +4607,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 61.02599999999961 Td
+176.54625 61.02599999999961 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4645,11 +4645,11 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R]
+/Annots [453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R]
 >>
 endobj
 15 0 obj
-<< /Length 28100
+<< /Length 24696
 >>
 stream
 q
@@ -4661,7 +4661,7 @@ q
 BT
 72.24000000000001 744.786 Td
 /F1.0 10.5 Tf
-<322e32382e332e20436f6e73756d6573> Tj
+<322e32382e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4701,7 +4701,7 @@ ET
 BT
 72.24000000000001 726.3059999999999 Td
 /F1.0 10.5 Tf
-<322e32382e342e2050726f6475636573> Tj
+<322e32382e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4741,7 +4741,7 @@ ET
 BT
 60.24000000000001 707.8259999999999 Td
 /F1.0 10.5 Tf
-<322e32392e20474554202f76322f74656d706c61746573> Tj
+<322e32392e20474554202f76322f74656d706c617465732f6e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4750,9 +4750,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-176.54625 707.8259999999999 Td
+213.95774999999998 707.8259999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4861,7 +4861,7 @@ ET
 BT
 60.24000000000001 652.3859999999999 Td
 /F1.0 10.5 Tf
-<322e33302e20474554202f76322f74656d706c617465732f6e616d6573> Tj
+<322e33302e20474554202f76322f74656d706c617465732f7b74656d706c6174654e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4870,9 +4870,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-213.95774999999998 652.3859999999999 Td
+267.40274999999997 652.3859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4901,7 +4901,7 @@ ET
 BT
 72.24000000000001 633.9059999999998 Td
 /F1.0 10.5 Tf
-<322e33302e312e20526573706f6e736573> Tj
+[<322e33302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -4910,9 +4910,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 633.9059999999998 Td
+165.85724999999996 633.9059999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4941,7 +4941,7 @@ ET
 BT
 72.24000000000001 615.4259999999998 Td
 /F1.0 10.5 Tf
-<322e33302e322e2050726f6475636573> Tj
+<322e33302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4950,9 +4950,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 615.4259999999998 Td
+160.51274999999998 615.4259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4979,9 +4979,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-60.24000000000001 596.9459999999998 Td
+72.24000000000001 596.9459999999998 Td
 /F1.0 10.5 Tf
-<322e33312e20474554202f76322f74656d706c617465732f7b74656d706c6174654e616d657d> Tj
+<322e33302e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -4990,9 +4990,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-267.40274999999997 596.9459999999998 Td
+155.16824999999994 596.9459999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5010,7 +5010,7 @@ ET
 BT
 552.021 596.9459999999998 Td
 /F1.0 10.5 Tf
-<3135> Tj
+<3134> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5019,9 +5019,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 578.4659999999998 Td
+48.24000000000001 578.4659999999998 Td
 /F1.0 10.5 Tf
-[<322e33312e312e20506172> 20.01953125 <616d6574657273>] TJ
+<332e20446566696e6974696f6e73> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5030,9 +5030,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 578.4659999999998 Td
+117.75674999999995 578.4659999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5059,9 +5059,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 559.9859999999999 Td
+60.24000000000001 559.9859999999999 Td
 /F1.0 10.5 Tf
-<322e33312e322e20526573706f6e736573> Tj
+<332e312e20436c64734865616c7468436865636b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5070,9 +5070,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 559.9859999999999 Td
+165.85724999999996 559.9859999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5099,9 +5099,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-72.24000000000001 541.5059999999999 Td
+60.24000000000001 541.5059999999999 Td
 /F1.0 10.5 Tf
-<322e33312e332e2050726f6475636573> Tj
+<332e322e2044696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5110,9 +5110,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 541.5059999999999 Td
+133.79024999999996 541.5059999999999 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5139,9 +5139,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 523.0259999999998 Td
+60.24000000000001 523.0259999999998 Td
 /F1.0 10.5 Tf
-<332e20446566696e6974696f6e73> Tj
+<332e332e2044696374696f6e617279456c656d656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5150,9 +5150,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-117.75674999999995 523.0259999999998 Td
+176.54625 523.0259999999998 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5170,7 +5170,7 @@ ET
 BT
 552.021 523.0259999999998 Td
 /F1.0 10.5 Tf
-<3136> Tj
+<3135> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5181,7 +5181,7 @@ ET
 BT
 60.24000000000001 504.54599999999976 Td
 /F1.0 10.5 Tf
-<332e312e20436c64734865616c7468436865636b> Tj
+<332e342e2045787465726e616c436f6d706f6e656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5190,9 +5190,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-165.85724999999996 504.54599999999976 Td
+181.89074999999997 504.54599999999976 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5221,7 +5221,7 @@ ET
 BT
 60.24000000000001 486.06599999999975 Td
 /F1.0 10.5 Tf
-<332e322e20436c6473496e666f> Tj
+<332e352e2045787465726e616c436f6d706f6e656e745374617465> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5230,9 +5230,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-123.10125 486.06599999999975 Td
+208.61325 486.06599999999975 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5261,7 +5261,7 @@ ET
 BT
 60.24000000000001 467.58599999999973 Td
 /F1.0 10.5 Tf
-<332e332e2044696374696f6e617279> Tj
+[<332e362e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -5290,7 +5290,7 @@ ET
 BT
 552.021 467.58599999999973 Td
 /F1.0 10.5 Tf
-<3136> Tj
+<3137> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5301,7 +5301,7 @@ ET
 BT
 60.24000000000001 449.1059999999997 Td
 /F1.0 10.5 Tf
-<332e342e2044696374696f6e617279456c656d656e74> Tj
+<332e372e204a736f6e4e756c6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5310,9 +5310,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-176.54625 449.1059999999997 Td
+128.44574999999998 449.1059999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5330,7 +5330,7 @@ ET
 BT
 552.021 449.1059999999997 Td
 /F1.0 10.5 Tf
-<3137> Tj
+<3138> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5341,7 +5341,7 @@ ET
 BT
 60.24000000000001 430.6259999999997 Td
 /F1.0 10.5 Tf
-<332e352e2045787465726e616c436f6d706f6e656e74> Tj
+<332e382e204a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5350,9 +5350,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-181.89074999999997 430.6259999999997 Td
+133.79024999999996 430.6259999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5370,7 +5370,7 @@ ET
 BT
 552.021 430.6259999999997 Td
 /F1.0 10.5 Tf
-<3138> Tj
+<3139> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5381,7 +5381,7 @@ ET
 BT
 60.24000000000001 412.1459999999997 Td
 /F1.0 10.5 Tf
-<332e362e2045787465726e616c436f6d706f6e656e745374617465> Tj
+<332e392e204a736f6e5072696d6974697665> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5390,9 +5390,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-208.61325 412.1459999999997 Td
+149.82374999999996 412.1459999999997 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5410,7 +5410,7 @@ ET
 BT
 552.021 412.1459999999997 Td
 /F1.0 10.5 Tf
-<3138> Tj
+<3230> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5421,7 +5421,7 @@ ET
 BT
 60.24000000000001 393.66599999999966 Td
 /F1.0 10.5 Tf
-[<332e372e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<332e31302e204c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5430,9 +5430,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 393.66599999999966 Td
+112.41224999999997 393.66599999999966 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5450,7 +5450,7 @@ ET
 BT
 552.021 393.66599999999966 Td
 /F1.0 10.5 Tf
-<3138> Tj
+<3232> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5461,7 +5461,7 @@ ET
 BT
 60.24000000000001 375.18599999999964 Td
 /F1.0 10.5 Tf
-<332e382e204a736f6e4e756c6c> Tj
+<332e31312e204c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5470,9 +5470,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-128.44574999999998 375.18599999999964 Td
+187.23524999999995 375.18599999999964 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5490,7 +5490,7 @@ ET
 BT
 552.021 375.18599999999964 Td
 /F1.0 10.5 Tf
-<3139> Tj
+<3233> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5501,7 +5501,7 @@ ET
 BT
 60.24000000000001 356.7059999999996 Td
 /F1.0 10.5 Tf
-<332e392e204a736f6e4f626a656374> Tj
+<332e31322e204c6f6f704c6f67> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5530,7 +5530,7 @@ ET
 BT
 552.021 356.7059999999996 Td
 /F1.0 10.5 Tf
-<3231> Tj
+<3233> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5541,7 +5541,7 @@ ET
 BT
 60.24000000000001 338.2259999999996 Td
 /F1.0 10.5 Tf
-<332e31302e204a736f6e5072696d6974697665> Tj
+[<332e31332e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -5550,9 +5550,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-155.16824999999994 338.2259999999996 Td
+160.51274999999998 338.2259999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5570,7 +5570,7 @@ ET
 BT
 552.021 338.2259999999996 Td
 /F1.0 10.5 Tf
-<3232> Tj
+<3234> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5581,7 +5581,7 @@ ET
 BT
 60.24000000000001 319.7459999999996 Td
 /F1.0 10.5 Tf
-<332e31312e204c6f6f70> Tj
+[<332e31342e204c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -5590,9 +5590,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-112.41224999999997 319.7459999999996 Td
+256.71375 319.7459999999996 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5610,7 +5610,7 @@ ET
 BT
 552.021 319.7459999999996 Td
 /F1.0 10.5 Tf
-<3233> Tj
+<3235> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5621,7 +5621,7 @@ ET
 BT
 60.24000000000001 301.26599999999956 Td
 /F1.0 10.5 Tf
-<332e31322e204c6f6f70456c656d656e744d6f64656c> Tj
+<332e31352e204d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5650,7 +5650,7 @@ ET
 BT
 552.021 301.26599999999956 Td
 /F1.0 10.5 Tf
-<3234> Tj
+<3235> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5661,7 +5661,7 @@ ET
 BT
 60.24000000000001 282.78599999999955 Td
 /F1.0 10.5 Tf
-<332e31332e204c6f6f704c6f67> Tj
+<332e31362e204e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5670,9 +5670,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-133.79024999999996 282.78599999999955 Td
+128.44574999999998 282.78599999999955 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5690,7 +5690,7 @@ ET
 BT
 552.021 282.78599999999955 Td
 /F1.0 10.5 Tf
-<3235> Tj
+<3236> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5701,7 +5701,7 @@ ET
 BT
 60.24000000000001 264.30599999999953 Td
 /F1.0 10.5 Tf
-[<332e31342e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
+[<332e31372e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -5710,9 +5710,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-160.51274999999998 264.30599999999953 Td
+176.54625 264.30599999999953 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5730,7 +5730,7 @@ ET
 BT
 552.021 264.30599999999953 Td
 /F1.0 10.5 Tf
-<3235> Tj
+<3236> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5741,7 +5741,7 @@ ET
 BT
 60.24000000000001 245.8259999999995 Td
 /F1.0 10.5 Tf
-[<332e31352e204c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
+<332e31382e20506f6c6963794d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5750,9 +5750,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-256.71375 245.8259999999995 Td
+149.82374999999996 245.8259999999995 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5770,7 +5770,7 @@ ET
 BT
 552.021 245.8259999999995 Td
 /F1.0 10.5 Tf
-<3236> Tj
+<3237> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5781,7 +5781,7 @@ ET
 BT
 60.24000000000001 227.34599999999952 Td
 /F1.0 10.5 Tf
-<332e31362e204d6963726f53657276696365506f6c696379> Tj
+<332e31392e2053657276696365> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5790,9 +5790,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-187.23524999999995 227.34599999999952 Td
+123.10125 227.34599999999952 Td
 /F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
+<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5813,166 +5813,6 @@ BT
 <3237> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24000000000001 208.86599999999953 Td
-/F1.0 10.5 Tf
-<332e31372e204e756d626572> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-128.44574999999998 208.86599999999953 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-550.66125 208.86599999999953 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.021 208.86599999999953 Td
-/F1.0 10.5 Tf
-<3238> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24000000000001 190.38599999999954 Td
-/F1.0 10.5 Tf
-[<332e31382e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-176.54625 190.38599999999954 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-550.66125 190.38599999999954 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.021 190.38599999999954 Td
-/F1.0 10.5 Tf
-<3238> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24000000000001 171.90599999999955 Td
-/F1.0 10.5 Tf
-<332e31392e20506f6c6963794d6f64656c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-149.82374999999996 171.90599999999955 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-550.66125 171.90599999999955 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.021 171.90599999999955 Td
-/F1.0 10.5 Tf
-<3238> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-60.24000000000001 153.42599999999956 Td
-/F1.0 10.5 Tf
-<332e32302e2053657276696365> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-123.10125 153.42599999999956 Td
-/F1.0 10.5 Tf
-<2e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e202e20> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-BT
-550.66125 153.42599999999956 Td
-/F1.0 5.25 Tf
-<ca> Tj
-ET
-
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.021 153.42599999999956 Td
-/F1.0 10.5 Tf
-<3239> Tj
-ET
-
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 Q
@@ -5988,7 +5828,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R 589 0 R 590 0 R 591 0 R 592 0 R 593 0 R 594 0 R 595 0 R 596 0 R 597 0 R 598 0 R 599 0 R 600 0 R 601 0 R 602 0 R]
+/Annots [529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R]
 >>
 endobj
 17 0 obj
@@ -6070,7 +5910,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3333363939> Tj
+<203a206c6f63616c686f73743a3333363331> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6171,7 +6011,7 @@ endobj
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
 >>
@@ -6185,18 +6025,18 @@ endobj
 >>
 endobj
 21 0 obj
-<< /Kids [54 0 R 230 0 R 299 0 R 151 0 R 88 0 R 148 0 R 212 0 R 55 0 R 194 0 R 120 0 R 82 0 R 178 0 R]
+<< /Kids [53 0 R 246 0 R 160 0 R 87 0 R 130 0 R 197 0 R 54 0 R 187 0 R 116 0 R 82 0 R]
 >>
 endobj
 22 0 obj
 << /Type /Font
 /BaseFont /AAAAAB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 758 0 R
+/FontDescriptor 738 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 760 0 R
-/ToUnicode 759 0 R
+/Widths 740 0 R
+/ToUnicode 739 0 R
 >>
 endobj
 23 0 obj
@@ -6206,18 +6046,18 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAC+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 762 0 R
+/FontDescriptor 742 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 764 0 R
-/ToUnicode 763 0 R
+/Widths 744 0 R
+/ToUnicode 743 0 R
 >>
 endobj
 25 0 obj
 [18 0 R /XYZ 0 644.22 null]
 endobj
 26 0 obj
-<< /Length 12124
+<< /Length 12127
 >>
 stream
 q
@@ -6240,7 +6080,7 @@ ET
 BT
 48.24 688.656 Td
 /F2.0 18 Tf
-<322e312e20474554202f76312f636c64732f636c6473496e666f> Tj
+<322e312e20474554202f76312f6865616c7468636865636b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6499,7 +6339,7 @@ S
 BT
 463.65600000000006 585.913 Td
 /F1.0 10.5 Tf
-<436c6473496e666f> Tj
+<436c64734865616c7468436865636b> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6548,7 +6388,7 @@ ET
 BT
 48.24000000000001 487.1760000000003 Td
 /F2.0 18 Tf
-<322e322e20474554202f76312f6865616c7468636865636b> Tj
+<322e322e20474554202f76312f757365722f67657455736572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6565,51 +6405,43 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 400.680 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 400.680 360.864 37.560 re
+48.240 414.960 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 400.680 103.104 37.560 re
+220.080 414.960 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 377.400 51.552 23.280 re
+48.240 391.680 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 377.400 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 377.400 103.104 23.280 re
+220.080 391.680 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 438.240 m
-99.792 438.240 l
+220.080 438.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 400.680 m
-99.792 400.680 l
+48.240 414.960 m
+220.080 414.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 438.490 m
-48.240 399.930 l
+48.240 414.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 438.490 m
-99.792 399.930 l
+220.080 438.490 m
+220.080 414.210 l
 S
 [ ] 0 d
 1 w
@@ -6619,74 +6451,32 @@ S
 BT
 51.24000000000001 422.49300000000017 Td
 /F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 408.2130000000002 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 438.240 m
-460.656 438.240 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 400.680 m
-460.656 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 438.490 m
-99.792 399.930 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 438.490 m
-460.656 399.930 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-102.792 422.49300000000017 Td
-/F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4854545020436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 438.240 m
+220.080 438.240 m
 563.760 438.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 400.680 m
-563.760 400.680 l
+220.080 414.960 m
+563.760 414.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 438.490 m
-460.656 399.930 l
+220.080 438.490 m
+220.080 414.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 563.760 438.490 m
-563.760 399.930 l
+563.760 414.210 l
 S
 [ ] 0 d
 1 w
@@ -6694,7 +6484,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 422.49300000000017 Td
+223.07982816 422.49300000000017 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -6702,26 +6492,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 400.680 m
-99.792 400.680 l
+48.240 414.960 m
+220.080 414.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 377.400 m
-99.792 377.400 l
+48.240 391.680 m
+220.080 391.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 400.930 m
-48.240 377.150 l
+48.240 415.210 m
+48.240 391.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 400.930 m
-99.792 377.150 l
+220.080 415.210 m
+220.080 391.430 l
 S
 [ ] 0 d
 1 w
@@ -6729,7 +6519,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 384.43300000000016 Td
+51.24000000000001 398.71300000000014 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -6737,26 +6527,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 400.680 m
-460.656 400.680 l
+220.080 414.960 m
+563.760 414.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 377.400 m
-460.656 377.400 l
+220.080 391.680 m
+563.760 391.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 400.930 m
-99.792 377.150 l
+220.080 415.210 m
+220.080 391.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 400.930 m
-460.656 377.150 l
+563.760 415.210 m
+563.760 391.430 l
 S
 [ ] 0 d
 1 w
@@ -6764,60 +6554,17 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 384.43300000000016 Td
+223.07982816 398.71300000000014 Td
 /F1.0 10.5 Tf
-<4f75747075742074797065> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 400.680 m
-563.760 400.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 377.400 m
-563.760 377.400 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 400.930 m
-460.656 377.150 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 400.930 m
-563.760 377.150 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-463.65600000000006 384.43300000000016 Td
-/F1.0 10.5 Tf
-<436c64734865616c7468436865636b> Tj
+<4e6f20436f6e74656e74> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 347.8160000000002 Td
+48.24000000000001 362.0960000000002 Td
 /F2.0 13 Tf
 <322e322e322e2050726f6475636573> Tj
 ET
@@ -6830,7 +6577,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 321.1560000000002 Td
+56.88050000000001 335.43600000000015 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -6843,9 +6590,9 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 323.3400000000002 Td
+66.24000000000001 337.6200000000002 Td
 /F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+<746578742f706c61696e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6854,9 +6601,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 285.6960000000002 Td
+48.24000000000001 299.97600000000017 Td
 /F2.0 18 Tf
-<322e332e20474554202f76312f757365722f67657455736572> Tj
+<322e332e20474554202f76322f64696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6865,7 +6612,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 251.45600000000013 Td
+48.24000000000001 265.7360000000001 Td
 /F2.0 13 Tf
 <322e332e312e20526573706f6e736573> Tj
 ET
@@ -6873,43 +6620,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 213.480 171.840 23.280 re
+48.240 213.480 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 213.480 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 213.480 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 213.480 343.680 23.280 re
+48.240 190.200 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 190.200 171.840 23.280 re
+99.792 190.200 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 190.200 343.680 23.280 re
+460.656 190.200 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 236.760 m
-220.080 236.760 l
+48.240 251.040 m
+99.792 251.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
 48.240 213.480 m
-220.080 213.480 l
+99.792 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 237.010 m
+48.240 251.290 m
 48.240 212.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 237.010 m
-220.080 212.730 l
+99.792 251.290 m
+99.792 212.730 l
 S
 [ ] 0 d
 1 w
@@ -6917,33 +6672,75 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 221.01300000000015 Td
+51.24000000000001 235.29300000000012 Td
 /F2.0 10.5 Tf
-<4854545020436f6465> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 221.01300000000012 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 236.760 m
-563.760 236.760 l
+99.792 251.040 m
+460.656 251.040 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 213.480 m
+460.656 213.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 251.290 m
+99.792 212.730 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 251.290 m
+460.656 212.730 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+102.792 235.29300000000012 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 251.040 m
+563.760 251.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-220.080 213.480 m
+460.656 213.480 m
 563.760 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 237.010 m
-220.080 212.730 l
+460.656 251.290 m
+460.656 212.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 237.010 m
+563.760 251.290 m
 563.760 212.730 l
 S
 [ ] 0 d
@@ -6952,7 +6749,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 221.01300000000015 Td
+463.65600000000006 235.29300000000012 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -6961,13 +6758,13 @@ ET
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 213.480 m
-220.080 213.480 l
+99.792 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 190.200 m
-220.080 190.200 l
+99.792 190.200 l
 S
 [ ] 0 d
 0.5 w
@@ -6978,8 +6775,8 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 213.730 m
-220.080 189.950 l
+99.792 213.730 m
+99.792 189.950 l
 S
 [ ] 0 d
 1 w
@@ -6987,7 +6784,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 197.23300000000015 Td
+51.24000000000001 197.23300000000012 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -6995,20 +6792,55 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 213.480 m
+99.792 213.480 m
+460.656 213.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 190.200 m
+460.656 190.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 213.730 m
+99.792 189.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 213.730 m
+460.656 189.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+102.792 197.23300000000012 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 213.480 m
 563.760 213.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 190.200 m
+460.656 190.200 m
 563.760 190.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 213.730 m
-220.080 189.950 l
+460.656 213.730 m
+460.656 189.950 l
 S
 [ ] 0 d
 0.5 w
@@ -7020,13 +6852,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-223.07982816 197.23300000000015 Td
+463.65600000000006 197.23300000000012 Td
 /F1.0 10.5 Tf
-<4e6f20436f6e74656e74> Tj
+<44696374696f6e617279> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
@@ -7045,7 +6885,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 133.9560000000001 Td
+56.88050000000001 133.95600000000007 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -7058,9 +6898,9 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 136.1400000000001 Td
+66.24000000000001 136.14000000000007 Td
 /F4.0 10.5 Tf
-<746578742f706c61696e> Tj
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7069,9 +6909,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 98.4960000000001 Td
+48.24000000000001 98.49600000000007 Td
 /F2.0 18 Tf
-<322e342e20474554202f76322f64696374696f6e617279> Tj
+<322e342e20505554202f76322f64696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -7110,10 +6950,10 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [31 0 R 36 0 R]
+/Annots [31 0 R 39 0 R]
 >>
 endobj
 28 0 obj
@@ -7127,9 +6967,9 @@ endobj
 endobj
 31 0 obj
 << /Border [0 0 0]
-/Dest (_cldsinfo)
+/Dest (_cldshealthcheck)
 /Subtype /Link
-/Rect [463.65600000000006 582.8470000000001 505.0785000000001 597.1270000000001]
+/Rect [463.65600000000006 582.8470000000001 547.9710000000001 597.1270000000001]
 /Type /Annot
 >>
 endobj
@@ -7140,11 +6980,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 766 0 R
+/FontDescriptor 746 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 768 0 R
-/ToUnicode 767 0 R
+/Widths 748 0 R
+/ToUnicode 747 0 R
 >>
 endobj
 34 0 obj
@@ -7154,30 +6994,30 @@ endobj
 [27 0 R /XYZ 0 470.5200000000002 null]
 endobj
 36 0 obj
-<< /Border [0 0 0]
-/Dest (_cldshealthcheck)
-/Subtype /Link
-/Rect [463.65600000000006 381.3670000000002 547.9710000000001 395.64700000000016]
-/Type /Annot
->>
+[27 0 R /XYZ 0 379.6800000000002 null]
 endobj
 37 0 obj
-[27 0 R /XYZ 0 365.4000000000002 null]
+[27 0 R /XYZ 0 323.40000000000015 null]
 endobj
 38 0 obj
-[27 0 R /XYZ 0 309.1200000000002 null]
+[27 0 R /XYZ 0 283.3200000000001 null]
 endobj
 39 0 obj
-[27 0 R /XYZ 0 269.04000000000013 null]
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [463.65600000000006 194.16700000000012 516.45 208.44700000000012]
+/Type /Annot
+>>
 endobj
 40 0 obj
-[27 0 R /XYZ 0 178.20000000000013 null]
+[27 0 R /XYZ 0 178.2000000000001 null]
 endobj
 41 0 obj
-[27 0 R /XYZ 0 121.9200000000001 null]
+[27 0 R /XYZ 0 121.92000000000007 null]
 endobj
 42 0 obj
-<< /Length 16421
+<< /Length 16306
 >>
 stream
 q
@@ -7189,57 +7029,57 @@ q
 BT
 48.24 740.816 Td
 /F2.0 13 Tf
-<322e342e312e20526573706f6e736573> Tj
+[<322e342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 688.560 51.552 37.560 re
+48.240 702.840 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 688.560 360.864 37.560 re
+162.800 702.840 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 688.560 103.104 37.560 re
+334.640 702.840 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 665.280 51.552 23.280 re
+48.240 665.280 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 665.280 360.864 23.280 re
+162.800 665.280 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 665.280 103.104 23.280 re
+334.640 665.280 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 726.120 m
-99.792 726.120 l
+162.800 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 688.560 m
-99.792 688.560 l
+48.240 702.840 m
+162.800 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 726.370 m
-48.240 687.810 l
+48.240 702.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.370 m
-99.792 687.810 l
+162.800 726.370 m
+162.800 702.090 l
 S
 [ ] 0 d
 1 w
@@ -7249,39 +7089,32 @@ S
 BT
 51.24 710.373 Td
 /F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24 696.0930000000001 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.120 m
-460.656 726.120 l
+162.800 726.120 m
+334.640 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 688.560 m
-460.656 688.560 l
+162.800 702.840 m
+334.640 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.370 m
-99.792 687.810 l
+162.800 726.370 m
+162.800 702.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.370 m
-460.656 687.810 l
+334.640 726.370 m
+334.640 702.090 l
 S
 [ ] 0 d
 1 w
@@ -7289,34 +7122,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 710.373 Td
+165.79988544 710.373 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.120 m
+334.640 726.120 m
 563.760 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 688.560 m
-563.760 688.560 l
+334.640 702.840 m
+563.760 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.370 m
-460.656 687.810 l
+334.640 726.370 m
+334.640 702.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 563.760 726.370 m
-563.760 687.810 l
+563.760 702.090 l
 S
 [ ] 0 d
 1 w
@@ -7324,7 +7157,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 710.373 Td
+337.6397136 710.373 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -7332,26 +7165,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 688.560 m
-99.792 688.560 l
+48.240 702.840 m
+162.800 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 665.280 m
-99.792 665.280 l
+162.800 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 688.810 m
+48.240 703.090 m
 48.240 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.810 m
-99.792 665.030 l
+162.800 703.090 m
+162.800 665.030 l
 S
 [ ] 0 d
 1 w
@@ -7359,34 +7192,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 672.3130000000001 Td
+51.24 679.4530000000001 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<426f6479> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.560 m
-460.656 688.560 l
+162.800 702.840 m
+334.640 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 665.280 m
-460.656 665.280 l
+162.800 665.280 m
+334.640 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.810 m
-99.792 665.030 l
+162.800 703.090 m
+162.800 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.810 m
-460.656 665.030 l
+334.640 703.090 m
+334.640 665.030 l
 S
 [ ] 0 d
 1 w
@@ -7394,33 +7227,45 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 672.3130000000001 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+165.79988544 686.5930000000001 Td
+/F2.0 10.5 Tf
+<626f6479> Tj
+ET
+
+
+BT
+165.79988544 672.3130000000001 Td
+ET
+
+
+BT
+165.79988544 672.3130000000001 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.560 m
-563.760 688.560 l
+334.640 702.840 m
+563.760 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 665.280 m
+334.640 665.280 m
 563.760 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.810 m
-460.656 665.030 l
+334.640 703.090 m
+334.640 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 688.810 m
+563.760 703.090 m
 563.760 665.030 l
 S
 [ ] 0 d
@@ -7435,7 +7280,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 672.3130000000001 Td
+337.6397136 679.4530000000001 Td
 /F1.0 10.5 Tf
 <44696374696f6e617279> Tj
 ET
@@ -7449,105 +7294,57 @@ ET
 BT
 48.24 635.6960000000003 Td
 /F2.0 13 Tf
-<322e342e322e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 609.0360000000003 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 611.2200000000004 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 573.5760000000004 Td
-/F2.0 18 Tf
-<322e352e20505554202f76322f64696374696f6e617279> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 539.3360000000005 Td
-/F2.0 13 Tf
-[<322e352e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e342e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 501.360 114.560 23.280 re
+48.240 583.440 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 501.360 171.840 23.280 re
+99.792 583.440 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 501.360 229.120 23.280 re
+460.656 583.440 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 463.800 114.560 37.560 re
+48.240 560.160 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 463.800 171.840 37.560 re
+99.792 560.160 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 463.800 229.120 37.560 re
+460.656 560.160 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.640 m
-162.800 524.640 l
+48.240 621.000 m
+99.792 621.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-162.800 501.360 l
+48.240 583.440 m
+99.792 583.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.890 m
-48.240 500.610 l
+48.240 621.250 m
+48.240 582.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.890 m
-162.800 500.610 l
+99.792 621.250 m
+99.792 582.690 l
 S
 [ ] 0 d
 1 w
@@ -7555,34 +7352,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.89300000000054 Td
+51.24 605.2530000000004 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24 590.9730000000003 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.640 m
-334.640 524.640 l
+99.792 621.000 m
+460.656 621.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 501.360 m
-334.640 501.360 l
+99.792 583.440 m
+460.656 583.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.890 m
-162.800 500.610 l
+99.792 621.250 m
+99.792 582.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.890 m
-334.640 500.610 l
+460.656 621.250 m
+460.656 582.690 l
 S
 [ ] 0 d
 1 w
@@ -7590,34 +7394,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 508.89300000000054 Td
+102.792 605.2530000000004 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.640 m
-563.760 524.640 l
+460.656 621.000 m
+563.760 621.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 501.360 m
-563.760 501.360 l
+460.656 583.440 m
+563.760 583.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.890 m
-334.640 500.610 l
+460.656 621.250 m
+460.656 582.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 524.890 m
-563.760 500.610 l
+563.760 621.250 m
+563.760 582.690 l
 S
 [ ] 0 d
 1 w
@@ -7625,7 +7429,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 508.89300000000054 Td
+463.65600000000006 605.2530000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -7633,26 +7437,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-162.800 501.360 l
+48.240 583.440 m
+99.792 583.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 463.800 m
-162.800 463.800 l
+48.240 560.160 m
+99.792 560.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.610 m
-48.240 463.550 l
+48.240 583.690 m
+48.240 559.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.610 m
-162.800 463.550 l
+99.792 583.690 m
+99.792 559.910 l
 S
 [ ] 0 d
 1 w
@@ -7660,34 +7464,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 477.9730000000006 Td
+51.24 567.1930000000002 Td
 /F2.0 10.5 Tf
-<426f6479> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.360 m
-334.640 501.360 l
+99.792 583.440 m
+460.656 583.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 463.800 m
-334.640 463.800 l
+99.792 560.160 m
+460.656 560.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.610 m
-162.800 463.550 l
+99.792 583.690 m
+99.792 559.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.610 m
-334.640 463.550 l
+460.656 583.690 m
+460.656 559.910 l
 S
 [ ] 0 d
 1 w
@@ -7695,46 +7499,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 485.11300000000057 Td
-/F2.0 10.5 Tf
-<626f6479> Tj
-ET
-
-
-BT
-165.79988544000003 470.83300000000054 Td
-ET
-
-
-BT
-165.79988544000003 470.83300000000054 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 567.1930000000002 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.360 m
-563.760 501.360 l
+460.656 583.440 m
+563.760 583.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 463.800 m
-563.760 463.800 l
+460.656 560.160 m
+563.760 560.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.610 m
-334.640 463.550 l
+460.656 583.690 m
+460.656 559.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 501.610 m
-563.760 463.550 l
+563.760 583.690 m
+563.760 559.910 l
 S
 [ ] 0 d
 1 w
@@ -7748,7 +7540,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-337.6397136 477.9730000000006 Td
+463.65600000000006 567.1930000000002 Td
 /F1.0 10.5 Tf
 <44696374696f6e617279> Tj
 ET
@@ -7760,59 +7552,144 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 434.2160000000006 Td
+48.24 530.5760000000004 Td
+/F2.0 13 Tf
+<322e342e332e20436f6e73756d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 503.91600000000045 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 506.1000000000005 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 474.29600000000045 Td
+/F2.0 13 Tf
+<322e342e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 447.6360000000004 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 449.82000000000045 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 412.17600000000044 Td
+/F2.0 18 Tf
+<322e352e20474554202f76322f64696374696f6e6172792f7365636f6e646172792f6e616d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 377.9360000000004 Td
 /F2.0 13 Tf
-<322e352e322e20526573706f6e736573> Tj
+<322e352e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 381.960 51.552 37.560 re
+48.240 325.680 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 381.960 360.864 37.560 re
+99.792 325.680 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 381.960 103.104 37.560 re
+460.656 325.680 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 358.680 51.552 23.280 re
+48.240 302.400 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 358.680 360.864 23.280 re
+99.792 302.400 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 358.680 103.104 23.280 re
+460.656 302.400 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 419.520 m
-99.792 419.520 l
+48.240 363.240 m
+99.792 363.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 381.960 m
-99.792 381.960 l
+48.240 325.680 m
+99.792 325.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 419.770 m
-48.240 381.210 l
+48.240 363.490 m
+48.240 324.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 419.770 m
-99.792 381.210 l
+99.792 363.490 m
+99.792 324.930 l
 S
 [ ] 0 d
 1 w
@@ -7820,14 +7697,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 403.77300000000054 Td
+51.24000000000001 347.49300000000034 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 389.4930000000005 Td
+51.24000000000001 333.2130000000003 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -7835,26 +7712,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 419.520 m
-460.656 419.520 l
+99.792 363.240 m
+460.656 363.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 381.960 m
-460.656 381.960 l
+99.792 325.680 m
+460.656 325.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 419.770 m
-99.792 381.210 l
+99.792 363.490 m
+99.792 324.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 419.770 m
-460.656 381.210 l
+460.656 363.490 m
+460.656 324.930 l
 S
 [ ] 0 d
 1 w
@@ -7862,7 +7739,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 403.77300000000054 Td
+102.792 347.49300000000034 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -7870,26 +7747,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 419.520 m
-563.760 419.520 l
+460.656 363.240 m
+563.760 363.240 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 381.960 m
-563.760 381.960 l
+460.656 325.680 m
+563.760 325.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 419.770 m
-460.656 381.210 l
+460.656 363.490 m
+460.656 324.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 419.770 m
-563.760 381.210 l
+563.760 363.490 m
+563.760 324.930 l
 S
 [ ] 0 d
 1 w
@@ -7897,7 +7774,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 403.77300000000054 Td
+463.65600000000006 347.49300000000034 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -7905,26 +7782,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 381.960 m
-99.792 381.960 l
+48.240 325.680 m
+99.792 325.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 358.680 m
-99.792 358.680 l
+48.240 302.400 m
+99.792 302.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 382.210 m
-48.240 358.430 l
+48.240 325.930 m
+48.240 302.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 382.210 m
-99.792 358.430 l
+99.792 325.930 m
+99.792 302.150 l
 S
 [ ] 0 d
 1 w
@@ -7932,7 +7809,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 365.71300000000053 Td
+51.24000000000001 309.43300000000033 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -7940,26 +7817,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 381.960 m
-460.656 381.960 l
+99.792 325.680 m
+460.656 325.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 358.680 m
-460.656 358.680 l
+99.792 302.400 m
+460.656 302.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 382.210 m
-99.792 358.430 l
+99.792 325.930 m
+99.792 302.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 382.210 m
-460.656 358.430 l
+460.656 325.930 m
+460.656 302.150 l
 S
 [ ] 0 d
 1 w
@@ -7967,7 +7844,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 365.71300000000053 Td
+102.792 309.43300000000033 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -7975,91 +7852,46 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 381.960 m
-563.760 381.960 l
+460.656 325.680 m
+563.760 325.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 358.680 m
-563.760 358.680 l
+460.656 302.400 m
+563.760 302.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 382.210 m
-460.656 358.430 l
+460.656 325.930 m
+460.656 302.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 382.210 m
-563.760 358.430 l
+563.760 325.930 m
+563.760 302.150 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-463.65600000000006 365.71300000000053 Td
-/F1.0 10.5 Tf
-<44696374696f6e617279> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 329.0960000000005 Td
-/F2.0 13 Tf
-<322e352e332e20436f6e73756d6573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 302.4360000000005 Td
+463.65600000000006 309.43300000000033 Td
 /F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 304.6200000000005 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 272.8160000000005 Td
+48.24000000000001 272.8160000000003 Td
 /F2.0 13 Tf
-<322e352e342e2050726f6475636573> Tj
+<322e352e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8070,7 +7902,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 246.15600000000046 Td
+56.88050000000001 246.1560000000003 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -8083,7 +7915,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 248.34000000000046 Td
+66.24000000000001 248.3400000000003 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -8094,9 +7926,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 210.69600000000045 Td
+48.24000000000001 210.69600000000028 Td
 /F2.0 18 Tf
-<322e362e20474554202f76322f64696374696f6e6172792f7365636f6e646172792f6e616d6573> Tj
+<322e362e20474554202f76322f64696374696f6e6172792f7b64696374696f6e6172794e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -8105,59 +7937,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 176.45600000000042 Td
+48.24000000000001 176.45600000000024 Td
 /F2.0 13 Tf
-<322e362e312e20526573706f6e736573> Tj
+[<322e362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 124.200 51.552 37.560 re
+48.240 138.480 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 124.200 360.864 37.560 re
+162.800 138.480 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 124.200 103.104 37.560 re
+334.640 138.480 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 100.920 51.552 23.280 re
+48.240 100.920 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 100.920 360.864 23.280 re
+162.800 100.920 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 100.920 103.104 23.280 re
+334.640 100.920 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 161.760 m
-99.792 161.760 l
+162.800 161.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 124.200 m
-99.792 124.200 l
+48.240 138.480 m
+162.800 138.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 162.010 m
-48.240 123.450 l
+48.240 137.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 162.010 m
-99.792 123.450 l
+162.800 162.010 m
+162.800 137.730 l
 S
 [ ] 0 d
 1 w
@@ -8165,41 +7997,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 146.01300000000043 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 131.73300000000043 Td
+51.24000000000001 146.01300000000026 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 161.760 m
-460.656 161.760 l
+162.800 161.760 m
+334.640 161.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 124.200 m
-460.656 124.200 l
+162.800 138.480 m
+334.640 138.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 162.010 m
-99.792 123.450 l
+162.800 162.010 m
+162.800 137.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 162.010 m
-460.656 123.450 l
+334.640 162.010 m
+334.640 137.730 l
 S
 [ ] 0 d
 1 w
@@ -8207,34 +8032,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 146.01300000000043 Td
+165.79988544000003 146.01300000000026 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 161.760 m
+334.640 161.760 m
 563.760 161.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 124.200 m
-563.760 124.200 l
+334.640 138.480 m
+563.760 138.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 162.010 m
-460.656 123.450 l
+334.640 162.010 m
+334.640 137.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 563.760 162.010 m
-563.760 123.450 l
+563.760 137.730 l
 S
 [ ] 0 d
 1 w
@@ -8242,7 +8067,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 146.01300000000043 Td
+337.6397136 146.01300000000026 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -8250,26 +8075,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 124.200 m
-99.792 124.200 l
+48.240 138.480 m
+162.800 138.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 100.920 m
-99.792 100.920 l
+162.800 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 124.450 m
+48.240 138.730 m
 48.240 100.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 124.450 m
-99.792 100.670 l
+162.800 138.730 m
+162.800 100.670 l
 S
 [ ] 0 d
 1 w
@@ -8277,34 +8102,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 107.95300000000042 Td
+51.24000000000001 115.09300000000026 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 124.200 m
-460.656 124.200 l
+162.800 138.480 m
+334.640 138.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 100.920 m
-460.656 100.920 l
+162.800 100.920 m
+334.640 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 124.450 m
-99.792 100.670 l
+162.800 138.730 m
+162.800 100.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 124.450 m
-460.656 100.670 l
+334.640 138.730 m
+334.640 100.670 l
 S
 [ ] 0 d
 1 w
@@ -8312,33 +8137,45 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 107.95300000000042 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+165.79988544000003 122.23300000000026 Td
+/F2.0 10.5 Tf
+<64696374696f6e6172794e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 107.95300000000026 Td
+ET
+
+
+BT
+165.79988544000003 107.95300000000026 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 124.200 m
-563.760 124.200 l
+334.640 138.480 m
+563.760 138.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 100.920 m
+334.640 100.920 m
 563.760 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 124.450 m
-460.656 100.670 l
+334.640 138.730 m
+334.640 100.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 124.450 m
+563.760 138.730 m
 563.760 100.670 l
 S
 [ ] 0 d
@@ -8347,9 +8184,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 107.95300000000042 Td
+337.6397136 115.09300000000026 Td
 /F1.0 10.5 Tf
-[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -8384,14 +8221,14 @@ endobj
 /Contents 42 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
+/F3.0 24 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
-/F3.0 24 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [45 0 R 49 0 R 51 0 R]
+/Annots [45 0 R 47 0 R]
 >>
 endobj
 44 0 obj
@@ -8401,7 +8238,7 @@ endobj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
-/Rect [463.65600000000006 669.2470000000002 516.45 683.5270000000002]
+/Rect [337.6397136 676.3870000000002 390.4337136 690.6670000000001]
 /Type /Annot
 >>
 endobj
@@ -8409,54 +8246,46 @@ endobj
 [43 0 R /XYZ 0 653.2800000000002 null]
 endobj
 47 0 obj
-[43 0 R /XYZ 0 597.0000000000003 null]
-endobj
-48 0 obj
-[43 0 R /XYZ 0 556.9200000000004 null]
-endobj
-49 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
-/Rect [337.6397136 474.90700000000055 390.4337136 489.1870000000006]
+/Rect [463.65600000000006 564.1270000000003 516.45 578.4070000000003]
 /Type /Annot
 >>
 endobj
+48 0 obj
+[43 0 R /XYZ 0 548.1600000000003 null]
+endobj
+49 0 obj
+[43 0 R /XYZ 0 491.88000000000045 null]
+endobj
 50 0 obj
-[43 0 R /XYZ 0 451.8000000000006 null]
+[43 0 R /XYZ 0 435.6000000000004 null]
 endobj
 51 0 obj
-<< /Border [0 0 0]
-/Dest (_dictionary)
-/Subtype /Link
-/Rect [463.65600000000006 362.64700000000056 516.45 376.92700000000053]
-/Type /Annot
->>
+[43 0 R /XYZ 0 395.5200000000004 null]
 endobj
 52 0 obj
-[43 0 R /XYZ 0 346.6800000000005 null]
+[43 0 R /XYZ 0 290.4000000000003 null]
 endobj
 53 0 obj
-[43 0 R /XYZ 0 290.4000000000005 null]
+<< /Limits [(_cldshealthcheck) (_dictionaryelement)]
+/Names [(_cldshealthcheck) 209 0 R (_consumes) 48 0 R (_consumes_2) 67 0 R (_consumes_3) 143 0 R (_consumes_4) 152 0 R (_consumes_5) 159 0 R (_consumes_6) 189 0 R (_definitions) 208 0 R (_dictionary) 210 0 R (_dictionaryelement) 212 0 R]
+>>
 endobj
 54 0 obj
-<< /Limits [(_cldshealthcheck) (_dictionary)]
-/Names [(_cldshealthcheck) 216 0 R (_cldsinfo) 217 0 R (_consumes) 52 0 R (_consumes_2) 71 0 R (_consumes_3) 146 0 R (_consumes_4) 157 0 R (_consumes_5) 164 0 R (_consumes_6) 196 0 R (_definitions) 215 0 R (_dictionary) 218 0 R]
+<< /Limits [(_responses_10) (_responses_19)]
+/Names [(_responses_10) 81 0 R (_responses_11) 88 0 R (_responses_12) 92 0 R (_responses_13) 98 0 R (_responses_14) 103 0 R (_responses_15) 108 0 R (_responses_16) 115 0 R (_responses_17) 121 0 R (_responses_18) 128 0 R (_responses_19) 133 0 R]
 >>
 endobj
 55 0 obj
-<< /Limits [(_responses_10) (_responses_19)]
-/Names [(_responses_10) 81 0 R (_responses_11) 89 0 R (_responses_12) 92 0 R (_responses_13) 96 0 R (_responses_14) 102 0 R (_responses_15) 107 0 R (_responses_16) 114 0 R (_responses_17) 119 0 R (_responses_18) 127 0 R (_responses_19) 132 0 R]
->>
+[43 0 R /XYZ 0 234.1200000000003 null]
 endobj
 56 0 obj
-[43 0 R /XYZ 0 234.12000000000046 null]
+[43 0 R /XYZ 0 194.04000000000028 null]
 endobj
 57 0 obj
-[43 0 R /XYZ 0 194.04000000000045 null]
-endobj
-58 0 obj
-<< /Length 18231
+<< /Length 18103
 >>
 stream
 q
@@ -8468,105 +8297,57 @@ q
 BT
 48.24 740.816 Td
 /F2.0 13 Tf
-<322e362e322e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 714.1560000000001 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 716.3400000000001 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 678.6960000000001 Td
-/F2.0 18 Tf
-<322e372e20474554202f76322f64696374696f6e6172792f7b64696374696f6e6172794e616d657d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 644.4560000000002 Td
-/F2.0 13 Tf
-[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e362e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 606.480 114.560 23.280 re
+48.240 688.560 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 606.480 171.840 23.280 re
+99.792 688.560 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 606.480 229.120 23.280 re
+460.656 688.560 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 568.920 114.560 37.560 re
+48.240 665.280 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 568.920 171.840 37.560 re
+99.792 665.280 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 568.920 229.120 37.560 re
+460.656 665.280 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 629.760 m
-162.800 629.760 l
+48.240 726.120 m
+99.792 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 630.010 m
-48.240 605.730 l
+48.240 726.370 m
+48.240 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 1 w
@@ -8574,34 +8355,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 614.0130000000003 Td
+51.24 710.373 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24 696.0930000000001 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 629.760 m
-334.640 629.760 l
+99.792 726.120 m
+460.656 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
 1 w
@@ -8609,34 +8397,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 614.0130000000003 Td
+102.792 710.373 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 629.760 m
-563.760 629.760 l
+460.656 726.120 m
+563.760 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 630.010 m
-563.760 605.730 l
+563.760 726.370 m
+563.760 687.810 l
 S
 [ ] 0 d
 1 w
@@ -8644,7 +8432,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 614.0130000000003 Td
+463.65600000000006 710.373 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -8652,26 +8440,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 568.920 m
-162.800 568.920 l
+48.240 665.280 m
+99.792 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 606.730 m
-48.240 568.670 l
+48.240 688.810 m
+48.240 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
+99.792 688.810 m
+99.792 665.030 l
 S
 [ ] 0 d
 1 w
@@ -8679,34 +8467,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 583.0930000000003 Td
+51.24 672.3130000000001 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 568.920 m
-334.640 568.920 l
+99.792 665.280 m
+460.656 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
+99.792 688.810 m
+99.792 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 1 w
@@ -8714,116 +8502,172 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 590.2330000000004 Td
-/F2.0 10.5 Tf
-<64696374696f6e6172794e616d65> Tj
-ET
-
-
-BT
-165.79988544000003 575.9530000000003 Td
-ET
-
-
-BT
-165.79988544000003 575.9530000000003 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 672.3130000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 568.920 m
-563.760 568.920 l
+460.656 665.280 m
+563.760 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 606.730 m
-563.760 568.670 l
+563.760 688.810 m
+563.760 665.030 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-337.6397136 583.0930000000003 Td
+463.65600000000006 672.3130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<44696374696f6e617279> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 539.3360000000004 Td
+48.24 635.6960000000003 Td
 /F2.0 13 Tf
-<322e372e322e20526573706f6e736573> Tj
+<322e362e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 609.0360000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 611.2200000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 573.5760000000004 Td
+/F2.0 18 Tf
+<322e372e20505554202f76322f64696374696f6e6172792f7b6e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000005 Td
+/F2.0 13 Tf
+[<322e372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 487.080 51.552 37.560 re
+48.240 501.360 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 487.080 360.864 37.560 re
+162.800 501.360 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 487.080 103.104 37.560 re
+334.640 501.360 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 463.800 51.552 23.280 re
+48.240 463.800 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 463.800 360.864 23.280 re
+162.800 463.800 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 463.800 103.104 23.280 re
+334.640 463.800 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 426.240 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+162.800 426.240 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+334.640 426.240 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 524.640 m
-99.792 524.640 l
+162.800 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 487.080 m
-99.792 487.080 l
+48.240 501.360 m
+162.800 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 524.890 m
-48.240 486.330 l
+48.240 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.890 m
-99.792 486.330 l
+162.800 524.890 m
+162.800 500.610 l
 S
 [ ] 0 d
 1 w
@@ -8831,41 +8675,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.8930000000004 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 494.6130000000004 Td
+51.24000000000001 508.89300000000054 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.640 m
-460.656 524.640 l
+162.800 524.640 m
+334.640 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 487.080 m
-460.656 487.080 l
+162.800 501.360 m
+334.640 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.890 m
-99.792 486.330 l
+162.800 524.890 m
+162.800 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.890 m
-460.656 486.330 l
+334.640 524.890 m
+334.640 500.610 l
 S
 [ ] 0 d
 1 w
@@ -8873,34 +8710,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 508.8930000000004 Td
+165.79988544000003 508.89300000000054 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.640 m
+334.640 524.640 m
 563.760 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 487.080 m
-563.760 487.080 l
+334.640 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.890 m
-460.656 486.330 l
+334.640 524.890 m
+334.640 500.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 563.760 524.890 m
-563.760 486.330 l
+563.760 500.610 l
 S
 [ ] 0 d
 1 w
@@ -8908,7 +8745,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 508.8930000000004 Td
+337.6397136 508.89300000000054 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -8916,26 +8753,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 487.080 m
-99.792 487.080 l
+48.240 501.360 m
+162.800 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
 48.240 463.800 m
-99.792 463.800 l
+162.800 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 487.330 m
+48.240 501.610 m
 48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.330 m
-99.792 463.550 l
+162.800 501.610 m
+162.800 463.550 l
 S
 [ ] 0 d
 1 w
@@ -8943,34 +8780,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 470.8330000000004 Td
+51.24000000000001 477.9730000000006 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.080 m
-460.656 487.080 l
+162.800 501.360 m
+334.640 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 463.800 m
-460.656 463.800 l
+162.800 463.800 m
+334.640 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.330 m
-99.792 463.550 l
+162.800 501.610 m
+162.800 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.330 m
-460.656 463.550 l
+334.640 501.610 m
+334.640 463.550 l
 S
 [ ] 0 d
 1 w
@@ -8978,172 +8815,241 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 470.8330000000004 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+165.79988544000003 485.11300000000057 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 470.83300000000054 Td
+ET
+
+
+BT
+165.79988544000003 470.83300000000054 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.080 m
-563.760 487.080 l
+334.640 501.360 m
+563.760 501.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 463.800 m
+334.640 463.800 m
 563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.330 m
-460.656 463.550 l
+334.640 501.610 m
+334.640 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 487.330 m
+563.760 501.610 m
 563.760 463.550 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 470.8330000000004 Td
+337.6397136 477.9730000000006 Td
 /F1.0 10.5 Tf
-<44696374696f6e617279> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 463.800 m
+162.800 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 426.240 m
+162.800 426.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 464.050 m
+48.240 425.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 464.050 m
+162.800 425.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 434.2160000000004 Td
-/F2.0 13 Tf
-<322e372e332e2050726f6475636573> Tj
+51.24000000000001 440.4130000000005 Td
+/F2.0 10.5 Tf
+<426f6479> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 463.800 m
+334.640 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 426.240 m
+334.640 426.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 464.050 m
+162.800 425.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 464.050 m
+334.640 425.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 407.5560000000004 Td
-/F1.0 10.5 Tf
-<a5> Tj
+165.79988544000003 447.5530000000005 Td
+/F2.0 10.5 Tf
+<626f6479> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
 
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
+BT
+165.79988544000003 433.2730000000005 Td
+ET
+
 
 BT
-66.24000000000001 409.7400000000004 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+165.79988544000003 433.2730000000005 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 463.800 m
+563.760 463.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 426.240 m
+563.760 426.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 464.050 m
+334.640 425.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 464.050 m
+563.760 425.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-48.24000000000001 372.0960000000004 Td
-/F2.0 18 Tf
-<322e382e20505554202f76322f64696374696f6e6172792f7b6e616d657d> Tj
+337.6397136 440.4130000000005 Td
+/F1.0 10.5 Tf
+<44696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 337.85600000000034 Td
+48.24000000000001 396.6560000000005 Td
 /F2.0 13 Tf
-[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 299.880 114.560 23.280 re
+48.240 344.400 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 299.880 171.840 23.280 re
+99.792 344.400 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 299.880 229.120 23.280 re
+460.656 344.400 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 262.320 114.560 37.560 re
+48.240 321.120 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 262.320 171.840 37.560 re
+99.792 321.120 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 262.320 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 224.760 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-162.800 224.760 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-334.640 224.760 229.120 37.560 re
+460.656 321.120 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 323.160 m
-162.800 323.160 l
+48.240 381.960 m
+99.792 381.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 299.880 m
-162.800 299.880 l
+48.240 344.400 m
+99.792 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 323.410 m
-48.240 299.130 l
+48.240 382.210 m
+48.240 343.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 323.410 m
-162.800 299.130 l
+99.792 382.210 m
+99.792 343.650 l
 S
 [ ] 0 d
 1 w
@@ -9151,34 +9057,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 307.4130000000003 Td
+51.24000000000001 366.2130000000005 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 351.93300000000045 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 323.160 m
-334.640 323.160 l
+99.792 381.960 m
+460.656 381.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 299.880 m
-334.640 299.880 l
+99.792 344.400 m
+460.656 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 323.410 m
-162.800 299.130 l
+99.792 382.210 m
+99.792 343.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 323.410 m
-334.640 299.130 l
+460.656 382.210 m
+460.656 343.650 l
 S
 [ ] 0 d
 1 w
@@ -9186,34 +9099,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 307.4130000000003 Td
+102.792 366.2130000000005 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 323.160 m
-563.760 323.160 l
+460.656 381.960 m
+563.760 381.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 299.880 m
-563.760 299.880 l
+460.656 344.400 m
+563.760 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 323.410 m
-334.640 299.130 l
+460.656 382.210 m
+460.656 343.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 323.410 m
-563.760 299.130 l
+563.760 382.210 m
+563.760 343.650 l
 S
 [ ] 0 d
 1 w
@@ -9221,7 +9134,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 307.4130000000003 Td
+463.65600000000006 366.2130000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -9229,26 +9142,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 299.880 m
-162.800 299.880 l
+48.240 344.400 m
+99.792 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 262.320 m
-162.800 262.320 l
+48.240 321.120 m
+99.792 321.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 300.130 m
-48.240 262.070 l
+48.240 344.650 m
+48.240 320.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 300.130 m
-162.800 262.070 l
+99.792 344.650 m
+99.792 320.870 l
 S
 [ ] 0 d
 1 w
@@ -9256,34 +9169,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 276.49300000000034 Td
+51.24000000000001 328.1530000000005 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 299.880 m
-334.640 299.880 l
+99.792 344.400 m
+460.656 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 262.320 m
-334.640 262.320 l
+99.792 321.120 m
+460.656 321.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 300.130 m
-162.800 262.070 l
+99.792 344.650 m
+99.792 320.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 300.130 m
-334.640 262.070 l
+460.656 344.650 m
+460.656 320.870 l
 S
 [ ] 0 d
 1 w
@@ -9291,241 +9204,197 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 283.6330000000003 Td
-/F2.0 10.5 Tf
-<6e616d65> Tj
-ET
-
-
-BT
-165.79988544000003 269.3530000000003 Td
-ET
-
-
-BT
-165.79988544000003 269.3530000000003 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 328.1530000000005 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 299.880 m
-563.760 299.880 l
+460.656 344.400 m
+563.760 344.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 262.320 m
-563.760 262.320 l
+460.656 321.120 m
+563.760 321.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 300.130 m
-334.640 262.070 l
+460.656 344.650 m
+460.656 320.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 300.130 m
-563.760 262.070 l
+563.760 344.650 m
+563.760 320.870 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-337.6397136 276.49300000000034 Td
+463.65600000000006 328.1530000000005 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<44696374696f6e617279> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 262.320 m
-162.800 262.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 224.760 m
-162.800 224.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 262.570 m
-48.240 224.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 262.570 m
-162.800 224.510 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24000000000001 238.93300000000025 Td
-/F2.0 10.5 Tf
-<426f6479> Tj
+48.24000000000001 291.53600000000046 Td
+/F2.0 13 Tf
+<322e372e332e20436f6e73756d6573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 262.320 m
-334.640 262.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 224.760 m
-334.640 224.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 262.570 m
-162.800 224.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 262.570 m
-334.640 224.510 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 246.07300000000026 Td
-/F2.0 10.5 Tf
-<626f6479> Tj
+56.88050000000001 264.87600000000043 Td
+/F1.0 10.5 Tf
+<a5> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
 
 BT
-165.79988544000003 231.79300000000026 Td
+66.24000000000001 267.0600000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-165.79988544000003 231.79300000000026 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+48.24000000000001 235.25600000000043 Td
+/F2.0 13 Tf
+<322e372e342e2050726f6475636573> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 262.320 m
-563.760 262.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 224.760 m
-563.760 224.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 262.570 m
-334.640 224.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 262.570 m
-563.760 224.510 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
+0.200 0.200 0.200 SCN
 
 BT
-337.6397136 238.93300000000025 Td
+56.88050000000001 208.5960000000004 Td
 /F1.0 10.5 Tf
-<44696374696f6e617279> Tj
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 210.7800000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 173.13600000000037 Td
+/F2.0 18 Tf
+<322e382e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 195.17600000000027 Td
+48.24000000000001 138.89600000000036 Td
 /F2.0 13 Tf
-<322e382e322e20526573706f6e736573> Tj
+[<322e382e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 142.920 51.552 37.560 re
+48.240 100.920 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 142.920 360.864 37.560 re
+162.800 100.920 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 142.920 103.104 37.560 re
+334.640 100.920 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 119.640 51.552 23.280 re
+48.240 63.360 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 119.640 360.864 23.280 re
+162.800 63.360 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 119.640 103.104 23.280 re
+334.640 63.360 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 180.480 m
-99.792 180.480 l
+48.240 124.200 m
+162.800 124.200 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 142.920 m
-99.792 142.920 l
+48.240 100.920 m
+162.800 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 180.730 m
-48.240 142.170 l
+48.240 124.450 m
+48.240 100.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 180.730 m
-99.792 142.170 l
+162.800 124.450 m
+162.800 100.170 l
 S
 [ ] 0 d
 1 w
@@ -9533,41 +9402,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 164.73300000000026 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 150.45300000000026 Td
+51.24000000000001 108.45300000000036 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 180.480 m
-460.656 180.480 l
+162.800 124.200 m
+334.640 124.200 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 142.920 m
-460.656 142.920 l
+162.800 100.920 m
+334.640 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 180.730 m
-99.792 142.170 l
+162.800 124.450 m
+162.800 100.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 180.730 m
-460.656 142.170 l
+334.640 124.450 m
+334.640 100.170 l
 S
 [ ] 0 d
 1 w
@@ -9575,34 +9437,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 164.73300000000026 Td
+165.79988544000003 108.45300000000036 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 180.480 m
-563.760 180.480 l
+334.640 124.200 m
+563.760 124.200 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 142.920 m
-563.760 142.920 l
+334.640 100.920 m
+563.760 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 180.730 m
-460.656 142.170 l
+334.640 124.450 m
+334.640 100.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 180.730 m
-563.760 142.170 l
+563.760 124.450 m
+563.760 100.170 l
 S
 [ ] 0 d
 1 w
@@ -9610,7 +9472,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 164.73300000000026 Td
+337.6397136 108.45300000000036 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -9618,26 +9480,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 142.920 m
-99.792 142.920 l
+48.240 100.920 m
+162.800 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 119.640 m
-99.792 119.640 l
+48.240 63.360 m
+162.800 63.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.170 m
-48.240 119.390 l
+48.240 101.170 m
+48.240 63.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 143.170 m
-99.792 119.390 l
+162.800 101.170 m
+162.800 63.110 l
 S
 [ ] 0 d
 1 w
@@ -9645,34 +9507,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 126.67300000000026 Td
+51.24000000000001 77.53300000000036 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 142.920 m
-460.656 142.920 l
+162.800 100.920 m
+334.640 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 119.640 m
-460.656 119.640 l
+162.800 63.360 m
+334.640 63.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 143.170 m
-99.792 119.390 l
+162.800 101.170 m
+162.800 63.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 143.170 m
-460.656 119.390 l
+334.640 101.170 m
+334.640 63.110 l
 S
 [ ] 0 d
 1 w
@@ -9680,186 +9542,153 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 126.67300000000026 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+165.79988544000003 84.67300000000036 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 70.39300000000036 Td
+ET
+
+
+BT
+165.79988544000003 70.39300000000036 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 142.920 m
-563.760 142.920 l
+334.640 100.920 m
+563.760 100.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 119.640 m
-563.760 119.640 l
+334.640 63.360 m
+563.760 63.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 143.170 m
-460.656 119.390 l
+334.640 101.170 m
+334.640 63.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 143.170 m
-563.760 119.390 l
+563.760 101.170 m
+563.760 63.110 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 126.67300000000026 Td
+337.6397136 77.53300000000036 Td
 /F1.0 10.5 Tf
-<44696374696f6e617279> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 90.05600000000024 Td
-/F2.0 13 Tf
-<322e382e332e20436f6e73756d6573> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<34> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 63.39600000000024 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 65.58000000000024 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<34> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
+Q
+Q
 
 endstream
 endobj
-59 0 obj
+58 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 58 0 R
+/Contents 57 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [64 0 R 68 0 R 70 0 R]
+/Annots [60 0 R 64 0 R 66 0 R]
 >>
 endobj
+59 0 obj
+[58 0 R /XYZ 0 792.0 null]
+endobj
 60 0 obj
-[59 0 R /XYZ 0 792.0 null]
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [463.65600000000006 669.2470000000002 516.45 683.5270000000002]
+/Type /Annot
+>>
 endobj
 61 0 obj
-[59 0 R /XYZ 0 702.1200000000001 null]
+[58 0 R /XYZ 0 653.2800000000002 null]
 endobj
 62 0 obj
-[59 0 R /XYZ 0 662.0400000000002 null]
+[58 0 R /XYZ 0 597.0000000000003 null]
 endobj
 63 0 obj
-[59 0 R /XYZ 0 556.9200000000003 null]
+[58 0 R /XYZ 0 556.9200000000004 null]
 endobj
 64 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
-/Rect [463.65600000000006 467.76700000000045 516.45 482.0470000000004]
+/Rect [337.6397136 437.3470000000005 390.4337136 451.6270000000005]
 /Type /Annot
 >>
 endobj
 65 0 obj
-[59 0 R /XYZ 0 451.8000000000004 null]
+[58 0 R /XYZ 0 414.2400000000005 null]
 endobj
 66 0 obj
-[59 0 R /XYZ 0 395.5200000000004 null]
-endobj
-67 0 obj
-[59 0 R /XYZ 0 355.44000000000034 null]
-endobj
-68 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
-/Rect [337.6397136 235.86700000000027 390.4337136 250.14700000000028]
+/Rect [463.65600000000006 325.0870000000005 516.45 339.3670000000005]
 /Type /Annot
 >>
 endobj
+67 0 obj
+[58 0 R /XYZ 0 309.12000000000046 null]
+endobj
+68 0 obj
+[58 0 R /XYZ 0 252.84000000000043 null]
+endobj
 69 0 obj
-[59 0 R /XYZ 0 212.76000000000028 null]
+[58 0 R /XYZ 0 196.5600000000004 null]
 endobj
 70 0 obj
-<< /Border [0 0 0]
-/Dest (_dictionary)
-/Subtype /Link
-/Rect [463.65600000000006 123.60700000000026 516.45 137.88700000000026]
-/Type /Annot
->>
+[58 0 R /XYZ 0 156.4800000000004 null]
 endobj
 71 0 obj
-[59 0 R /XYZ 0 107.64000000000024 null]
-endobj
-72 0 obj
-<< /Length 15674
+<< /Length 15269
 >>
 stream
 q
@@ -9871,354 +9700,49 @@ q
 BT
 48.24 740.816 Td
 /F2.0 13 Tf
-<322e382e342e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 714.1560000000001 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 716.3400000000001 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 678.6960000000001 Td
-/F2.0 18 Tf
-<322e392e2044454c455445202f76322f64696374696f6e6172792f7b6e616d657d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 644.4560000000002 Td
-/F2.0 13 Tf
-[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 606.480 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 606.480 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 606.480 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 568.920 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 568.920 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 568.920 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 629.760 m
-162.800 629.760 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 630.010 m
-48.240 605.730 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24000000000001 614.0130000000003 Td
-/F2.0 10.5 Tf
-<54797065> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 629.760 m
-334.640 629.760 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-165.79988544000003 614.0130000000003 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 629.760 m
-563.760 629.760 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 630.010 m
-563.760 605.730 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-337.6397136 614.0130000000003 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 568.920 m
-162.800 568.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 606.730 m
-48.240 568.670 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24000000000001 583.0930000000003 Td
-/F2.0 10.5 Tf
-<50617468> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 568.920 m
-334.640 568.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-165.79988544000003 590.2330000000004 Td
-/F2.0 10.5 Tf
-<6e616d65> Tj
-ET
-
-
-BT
-165.79988544000003 575.9530000000003 Td
-ET
-
-
-BT
-165.79988544000003 575.9530000000003 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 568.920 m
-563.760 568.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 606.730 m
-563.760 568.670 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-337.6397136 583.0930000000003 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 539.3360000000004 Td
-/F2.0 13 Tf
-<322e392e322e20526573706f6e736573> Tj
+<322e382e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 501.360 171.840 23.280 re
+48.240 702.840 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 501.360 343.680 23.280 re
+220.080 702.840 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 478.080 171.840 23.280 re
+48.240 679.560 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 478.080 343.680 23.280 re
+220.080 679.560 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.640 m
-220.080 524.640 l
+48.240 726.120 m
+220.080 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-220.080 501.360 l
+48.240 702.840 m
+220.080 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.890 m
-48.240 500.610 l
+48.240 726.370 m
+48.240 702.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 524.890 m
-220.080 500.610 l
+220.080 726.370 m
+220.080 702.090 l
 S
 [ ] 0 d
 1 w
@@ -10226,7 +9750,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.8930000000004 Td
+51.24 710.373 Td
 /F2.0 10.5 Tf
 <4854545020436f6465> Tj
 ET
@@ -10234,26 +9758,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 524.640 m
-563.760 524.640 l
+220.080 726.120 m
+563.760 726.120 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-220.080 501.360 m
-563.760 501.360 l
+220.080 702.840 m
+563.760 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 524.890 m
-220.080 500.610 l
+220.080 726.370 m
+220.080 702.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 524.890 m
-563.760 500.610 l
+563.760 726.370 m
+563.760 702.090 l
 S
 [ ] 0 d
 1 w
@@ -10261,7 +9785,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 508.8930000000004 Td
+223.07982816 710.373 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -10269,26 +9793,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-220.080 501.360 l
+48.240 702.840 m
+220.080 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 478.080 m
-220.080 478.080 l
+48.240 679.560 m
+220.080 679.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.610 m
-48.240 477.830 l
+48.240 703.090 m
+48.240 679.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 501.610 m
-220.080 477.830 l
+220.080 703.090 m
+220.080 679.310 l
 S
 [ ] 0 d
 1 w
@@ -10296,7 +9820,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 485.11300000000045 Td
+51.24 686.5930000000001 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -10304,26 +9828,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 501.360 m
-563.760 501.360 l
+220.080 702.840 m
+563.760 702.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 478.080 m
-563.760 478.080 l
+220.080 679.560 m
+563.760 679.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 501.610 m
-220.080 477.830 l
+220.080 703.090 m
+220.080 679.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 501.610 m
-563.760 477.830 l
+563.760 703.090 m
+563.760 679.310 l
 S
 [ ] 0 d
 1 w
@@ -10331,7 +9855,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 485.11300000000045 Td
+223.07982816 686.5930000000001 Td
 /F1.0 10.5 Tf
 <4e6f20436f6e74656e74> Tj
 ET
@@ -10341,9 +9865,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 448.4960000000005 Td
+48.24 649.9760000000002 Td
 /F2.0 13 Tf
-<322e392e332e2050726f6475636573> Tj
+<322e382e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10354,7 +9878,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 421.83600000000047 Td
+56.88050000000001 623.3160000000003 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -10367,7 +9891,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 424.0200000000005 Td
+66.24000000000001 625.5000000000003 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -10378,9 +9902,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 386.3760000000005 Td
+48.24000000000001 587.8560000000003 Td
 /F2.0 18 Tf
-<322e31302e2044454c455445> Tj
+<322e392e2044454c455445> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10389,7 +9913,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 358.2960000000005 Td
+48.24000000000001 559.7760000000004 Td
 /F2.0 18 Tf
 <2f76322f64696374696f6e6172792f7b6e616d657d2f656c656d656e74732f7b73686f72744e616d657d> Tj
 ET
@@ -10400,71 +9924,71 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 324.05600000000044 Td
+48.24000000000001 525.5360000000005 Td
 /F2.0 13 Tf
-[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 286.080 114.560 23.280 re
+48.240 487.560 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 286.080 171.840 23.280 re
+162.800 487.560 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 286.080 229.120 23.280 re
+334.640 487.560 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 248.520 114.560 37.560 re
+48.240 450.000 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 248.520 171.840 37.560 re
+162.800 450.000 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 248.520 229.120 37.560 re
+334.640 450.000 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 210.960 114.560 37.560 re
+48.240 412.440 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-162.800 210.960 171.840 37.560 re
+162.800 412.440 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-334.640 210.960 229.120 37.560 re
+334.640 412.440 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 309.360 m
-162.800 309.360 l
+48.240 510.840 m
+162.800 510.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 286.080 m
-162.800 286.080 l
+48.240 487.560 m
+162.800 487.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 309.610 m
-48.240 285.330 l
+48.240 511.090 m
+48.240 486.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 309.610 m
-162.800 285.330 l
+162.800 511.090 m
+162.800 486.810 l
 S
 [ ] 0 d
 1 w
@@ -10472,7 +9996,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 293.6130000000004 Td
+51.24000000000001 495.0930000000006 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -10480,26 +10004,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 309.360 m
-334.640 309.360 l
+162.800 510.840 m
+334.640 510.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 286.080 m
-334.640 286.080 l
+162.800 487.560 m
+334.640 487.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 309.610 m
-162.800 285.330 l
+162.800 511.090 m
+162.800 486.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 309.610 m
-334.640 285.330 l
+334.640 511.090 m
+334.640 486.810 l
 S
 [ ] 0 d
 1 w
@@ -10507,7 +10031,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 293.6130000000004 Td
+165.79988544000003 495.0930000000006 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -10515,26 +10039,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 309.360 m
-563.760 309.360 l
+334.640 510.840 m
+563.760 510.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 286.080 m
-563.760 286.080 l
+334.640 487.560 m
+563.760 487.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 309.610 m
-334.640 285.330 l
+334.640 511.090 m
+334.640 486.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 309.610 m
-563.760 285.330 l
+563.760 511.090 m
+563.760 486.810 l
 S
 [ ] 0 d
 1 w
@@ -10542,7 +10066,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 293.6130000000004 Td
+337.6397136 495.0930000000006 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -10550,26 +10074,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 286.080 m
-162.800 286.080 l
+48.240 487.560 m
+162.800 487.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 248.520 m
-162.800 248.520 l
+48.240 450.000 m
+162.800 450.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 286.330 m
-48.240 248.270 l
+48.240 487.810 m
+48.240 449.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 286.330 m
-162.800 248.270 l
+162.800 487.810 m
+162.800 449.750 l
 S
 [ ] 0 d
 1 w
@@ -10577,7 +10101,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 262.6930000000004 Td
+51.24000000000001 464.1730000000006 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -10585,26 +10109,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 286.080 m
-334.640 286.080 l
+162.800 487.560 m
+334.640 487.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 248.520 m
-334.640 248.520 l
+162.800 450.000 m
+334.640 450.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 286.330 m
-162.800 248.270 l
+162.800 487.810 m
+162.800 449.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 286.330 m
-334.640 248.270 l
+334.640 487.810 m
+334.640 449.750 l
 S
 [ ] 0 d
 1 w
@@ -10612,19 +10136,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 269.83300000000037 Td
+165.79988544000003 471.3130000000006 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 255.55300000000037 Td
+165.79988544000003 457.0330000000006 Td
 ET
 
 
 BT
-165.79988544000003 255.55300000000037 Td
+165.79988544000003 457.0330000000006 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -10632,26 +10156,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 286.080 m
-563.760 286.080 l
+334.640 487.560 m
+563.760 487.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 248.520 m
-563.760 248.520 l
+334.640 450.000 m
+563.760 450.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 286.330 m
-334.640 248.270 l
+334.640 487.810 m
+334.640 449.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 286.330 m
-563.760 248.270 l
+563.760 487.810 m
+563.760 449.750 l
 S
 [ ] 0 d
 1 w
@@ -10659,7 +10183,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 262.6930000000004 Td
+337.6397136 464.1730000000006 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -10667,26 +10191,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 248.520 m
-162.800 248.520 l
+48.240 450.000 m
+162.800 450.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 210.960 m
-162.800 210.960 l
+48.240 412.440 m
+162.800 412.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 248.770 m
-48.240 210.710 l
+48.240 450.250 m
+48.240 412.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 248.770 m
-162.800 210.710 l
+162.800 450.250 m
+162.800 412.190 l
 S
 [ ] 0 d
 1 w
@@ -10694,7 +10218,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 225.1330000000004 Td
+51.24000000000001 426.61300000000057 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -10702,26 +10226,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 248.520 m
-334.640 248.520 l
+162.800 450.000 m
+334.640 450.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 210.960 m
-334.640 210.960 l
+162.800 412.440 m
+334.640 412.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 248.770 m
-162.800 210.710 l
+162.800 450.250 m
+162.800 412.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 248.770 m
-334.640 210.710 l
+334.640 450.250 m
+334.640 412.190 l
 S
 [ ] 0 d
 1 w
@@ -10729,19 +10253,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 232.27300000000042 Td
+165.79988544000003 433.75300000000055 Td
 /F2.0 10.5 Tf
 <73686f72744e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 217.99300000000042 Td
+165.79988544000003 419.4730000000005 Td
 ET
 
 
 BT
-165.79988544000003 217.99300000000042 Td
+165.79988544000003 419.4730000000005 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -10749,26 +10273,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 248.520 m
-563.760 248.520 l
+334.640 450.000 m
+563.760 450.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 210.960 m
-563.760 210.960 l
+334.640 412.440 m
+563.760 412.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 248.770 m
-334.640 210.710 l
+334.640 450.250 m
+334.640 412.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 248.770 m
-563.760 210.710 l
+563.760 450.250 m
+563.760 412.190 l
 S
 [ ] 0 d
 1 w
@@ -10776,7 +10300,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 225.1330000000004 Td
+337.6397136 426.61300000000057 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -10786,51 +10310,51 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 181.37600000000037 Td
+48.24000000000001 382.85600000000056 Td
 /F2.0 13 Tf
-<322e31302e322e20526573706f6e736573> Tj
+<322e392e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 143.400 171.840 23.280 re
+48.240 344.880 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 143.400 343.680 23.280 re
+220.080 344.880 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 120.120 171.840 23.280 re
+48.240 321.600 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 120.120 343.680 23.280 re
+220.080 321.600 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 166.680 m
-220.080 166.680 l
+48.240 368.160 m
+220.080 368.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 143.400 m
-220.080 143.400 l
+48.240 344.880 m
+220.080 344.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 166.930 m
-48.240 142.650 l
+48.240 368.410 m
+48.240 344.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 166.930 m
-220.080 142.650 l
+220.080 368.410 m
+220.080 344.130 l
 S
 [ ] 0 d
 1 w
@@ -10838,7 +10362,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 150.9330000000004 Td
+51.24000000000001 352.4130000000005 Td
 /F2.0 10.5 Tf
 <4854545020436f6465> Tj
 ET
@@ -10846,26 +10370,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 166.680 m
-563.760 166.680 l
+220.080 368.160 m
+563.760 368.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-220.080 143.400 m
-563.760 143.400 l
+220.080 344.880 m
+563.760 344.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 166.930 m
-220.080 142.650 l
+220.080 368.410 m
+220.080 344.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 166.930 m
-563.760 142.650 l
+563.760 368.410 m
+563.760 344.130 l
 S
 [ ] 0 d
 1 w
@@ -10873,7 +10397,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 150.9330000000004 Td
+223.07982816 352.4130000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -10881,26 +10405,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.400 m
-220.080 143.400 l
+48.240 344.880 m
+220.080 344.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 120.120 m
-220.080 120.120 l
+48.240 321.600 m
+220.080 321.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.650 m
-48.240 119.870 l
+48.240 345.130 m
+48.240 321.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 143.650 m
-220.080 119.870 l
+220.080 345.130 m
+220.080 321.350 l
 S
 [ ] 0 d
 1 w
@@ -10908,7 +10432,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 127.15300000000039 Td
+51.24000000000001 328.63300000000055 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -10916,26 +10440,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 143.400 m
-563.760 143.400 l
+220.080 344.880 m
+563.760 344.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 120.120 m
-563.760 120.120 l
+220.080 321.600 m
+563.760 321.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 143.650 m
-220.080 119.870 l
+220.080 345.130 m
+220.080 321.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 143.650 m
-563.760 119.870 l
+563.760 345.130 m
+563.760 321.350 l
 S
 [ ] 0 d
 1 w
@@ -10943,7 +10467,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 127.15300000000039 Td
+223.07982816 328.63300000000055 Td
 /F1.0 10.5 Tf
 <4e6f20436f6e74656e74> Tj
 ET
@@ -10953,9 +10477,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 90.53600000000037 Td
+48.24000000000001 292.0160000000006 Td
 /F2.0 13 Tf
-<322e31302e332e2050726f6475636573> Tj
+<322e392e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10966,7 +10490,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 63.876000000000374 Td
+56.88050000000001 265.35600000000056 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -10979,99 +10503,20 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 66.06000000000037 Td
+66.24000000000001 267.54000000000053 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<35> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-73 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 72 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
-/F3.0 24 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
->>
-endobj
-74 0 obj
-[73 0 R /XYZ 0 792.0 null]
-endobj
-75 0 obj
-[73 0 R /XYZ 0 702.1200000000001 null]
-endobj
-76 0 obj
-[73 0 R /XYZ 0 662.0400000000002 null]
-endobj
-77 0 obj
-[73 0 R /XYZ 0 556.9200000000003 null]
-endobj
-78 0 obj
-[73 0 R /XYZ 0 466.0800000000005 null]
-endobj
-79 0 obj
-[73 0 R /XYZ 0 409.80000000000047 null]
-endobj
-80 0 obj
-[73 0 R /XYZ 0 341.64000000000044 null]
-endobj
-81 0 obj
-[73 0 R /XYZ 0 198.9600000000004 null]
-endobj
-82 0 obj
-<< /Limits [(_route2) (_route5)]
-/Names [(_route2) 95 0 R (_route20) 47 0 R (_route22) 75 0 R (_route25) 173 0 R (_route26) 189 0 R (_route29) 198 0 R (_route3) 168 0 R (_route30) 29 0 R (_route31) 34 0 R (_route32) 38 0 R (_route4) 130 0 R (_route5) 141 0 R]
->>
-endobj
-83 0 obj
-[73 0 R /XYZ 0 108.12000000000037 null]
-endobj
-84 0 obj
-<< /Length 17394
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 734.976 Td
+48.24000000000001 229.89600000000056 Td
 /F2.0 18 Tf
-<322e31312e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
+<322e31302e20505554202f76322f6c6f6f702f64656c6574652f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -11080,59 +10525,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 700.7360000000001 Td
+48.24000000000001 195.65600000000052 Td
 /F2.0 13 Tf
-[<322e31312e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e31302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 662.760 114.560 23.280 re
+48.240 157.680 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 662.760 171.840 23.280 re
+162.800 157.680 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 662.760 229.120 23.280 re
+334.640 157.680 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 625.200 114.560 37.560 re
+48.240 120.120 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 625.200 171.840 37.560 re
+162.800 120.120 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 625.200 229.120 37.560 re
+334.640 120.120 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 686.040 m
-162.800 686.040 l
+48.240 180.960 m
+162.800 180.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
+48.240 157.680 m
+162.800 157.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 686.290 m
-48.240 662.010 l
+48.240 181.210 m
+48.240 156.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
+162.800 181.210 m
+162.800 156.930 l
 S
 [ ] 0 d
 1 w
@@ -11140,7 +10585,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 670.2930000000001 Td
+51.24000000000001 165.21300000000053 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -11148,26 +10593,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.040 m
-334.640 686.040 l
+162.800 180.960 m
+334.640 180.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
+162.800 157.680 m
+334.640 157.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
+162.800 181.210 m
+162.800 156.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
+334.640 181.210 m
+334.640 156.930 l
 S
 [ ] 0 d
 1 w
@@ -11175,7 +10620,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 670.2930000000001 Td
+165.79988544000003 165.21300000000053 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -11183,26 +10628,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.040 m
-563.760 686.040 l
+334.640 180.960 m
+563.760 180.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
+334.640 157.680 m
+563.760 157.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
+334.640 181.210 m
+334.640 156.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 686.290 m
-563.760 662.010 l
+563.760 181.210 m
+563.760 156.930 l
 S
 [ ] 0 d
 1 w
@@ -11210,7 +10655,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 670.2930000000001 Td
+337.6397136 165.21300000000053 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -11218,26 +10663,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
+48.240 157.680 m
+162.800 157.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 625.200 m
-162.800 625.200 l
+48.240 120.120 m
+162.800 120.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 663.010 m
-48.240 624.950 l
+48.240 157.930 m
+48.240 119.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
+162.800 157.930 m
+162.800 119.870 l
 S
 [ ] 0 d
 1 w
@@ -11245,7 +10690,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 639.3730000000002 Td
+51.24000000000001 134.29300000000052 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -11253,26 +10698,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
+162.800 157.680 m
+334.640 157.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 625.200 m
-334.640 625.200 l
+162.800 120.120 m
+334.640 120.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
+162.800 157.930 m
+162.800 119.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
+334.640 157.930 m
+334.640 119.870 l
 S
 [ ] 0 d
 1 w
@@ -11280,19 +10725,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 646.5130000000001 Td
+165.79988544000003 141.43300000000053 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544 632.2330000000002 Td
+165.79988544000003 127.15300000000053 Td
 ET
 
 
 BT
-165.79988544 632.2330000000002 Td
+165.79988544000003 127.15300000000053 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -11300,26 +10745,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
+334.640 157.680 m
+563.760 157.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 625.200 m
-563.760 625.200 l
+334.640 120.120 m
+563.760 120.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
+334.640 157.930 m
+334.640 119.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 663.010 m
-563.760 624.950 l
+563.760 157.930 m
+563.760 119.870 l
 S
 [ ] 0 d
 1 w
@@ -11327,7 +10772,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 639.3730000000002 Td
+337.6397136 134.29300000000052 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -11337,51 +10782,130 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 595.6160000000003 Td
+48.24000000000001 90.53600000000051 Td
 /F2.0 13 Tf
-<322e31312e322e20526573706f6e736573> Tj
+<322e31302e322e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+557.7289999999999 14.388 Td
+/F1.0 9 Tf
+<35> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+72 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 71 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+>>
+endobj
+73 0 obj
+[72 0 R /XYZ 0 792.0 null]
+endobj
+74 0 obj
+[72 0 R /XYZ 0 667.5600000000002 null]
+endobj
+75 0 obj
+[72 0 R /XYZ 0 611.2800000000003 null]
+endobj
+76 0 obj
+[72 0 R /XYZ 0 543.1200000000005 null]
+endobj
+77 0 obj
+[72 0 R /XYZ 0 400.44000000000057 null]
+endobj
+78 0 obj
+[72 0 R /XYZ 0 309.6000000000006 null]
+endobj
+79 0 obj
+[72 0 R /XYZ 0 253.32000000000056 null]
+endobj
+80 0 obj
+[72 0 R /XYZ 0 213.24000000000055 null]
+endobj
+81 0 obj
+[72 0 R /XYZ 0 108.12000000000052 null]
+endobj
+82 0 obj
+<< /Limits [(_route77) (_version_information)]
+/Names [(_route77) 94 0 R (_route80) 37 0 R (_route82) 41 0 R (_route84) 69 0 R (_route87) 169 0 R (_route88) 184 0 R (_route91) 193 0 R (_route92) 29 0 R (_route93) 34 0 R (_service) 300 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R]
+>>
+endobj
+83 0 obj
+<< /Length 17813
+>>
+stream
+q
+/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 557.640 171.840 23.280 re
+48.240 732.720 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 557.640 343.680 23.280 re
+220.080 732.720 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 534.360 171.840 23.280 re
+48.240 709.440 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-220.080 534.360 343.680 23.280 re
+220.080 709.440 343.680 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 580.920 m
-220.080 580.920 l
+48.240 756.000 m
+220.080 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 557.640 m
-220.080 557.640 l
+48.240 732.720 m
+220.080 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 581.170 m
-48.240 556.890 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 581.170 m
-220.080 556.890 l
+220.080 756.250 m
+220.080 731.970 l
 S
 [ ] 0 d
 1 w
@@ -11389,7 +10913,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.1730000000003 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4854545020436f6465> Tj
 ET
@@ -11397,26 +10921,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 580.920 m
-563.760 580.920 l
+220.080 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-220.080 557.640 m
-563.760 557.640 l
+220.080 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 581.170 m
-220.080 556.890 l
+220.080 756.250 m
+220.080 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 581.170 m
-563.760 556.890 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -11424,7 +10948,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 565.1730000000003 Td
+223.07982816 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -11432,26 +10956,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 557.640 m
-220.080 557.640 l
+48.240 732.720 m
+220.080 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 534.360 m
-220.080 534.360 l
+48.240 709.440 m
+220.080 709.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 557.890 m
-48.240 534.110 l
+48.240 732.970 m
+48.240 709.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 557.890 m
-220.080 534.110 l
+220.080 732.970 m
+220.080 709.190 l
 S
 [ ] 0 d
 1 w
@@ -11459,7 +10983,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 541.3930000000004 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -11467,26 +10991,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 557.640 m
-563.760 557.640 l
+220.080 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 534.360 m
-563.760 534.360 l
+220.080 709.440 m
+563.760 709.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-220.080 557.890 m
-220.080 534.110 l
+220.080 732.970 m
+220.080 709.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 557.890 m
-563.760 534.110 l
+563.760 732.970 m
+563.760 709.190 l
 S
 [ ] 0 d
 1 w
@@ -11494,7 +11018,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-223.07982816 541.3930000000004 Td
+223.07982816 716.473 Td
 /F1.0 10.5 Tf
 <4e6f20436f6e74656e74> Tj
 ET
@@ -11504,9 +11028,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 498.93600000000055 Td
+48.24 674.0160000000001 Td
 /F2.0 18 Tf
-[<322e31322e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+[<322e31312e20505554202f76322f6c6f6f702f6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -11515,59 +11039,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 464.6960000000005 Td
+48.24 639.7760000000002 Td
 /F2.0 13 Tf
-[<322e31322e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e31312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 426.720 114.560 23.280 re
+48.240 601.800 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 426.720 171.840 23.280 re
+162.800 601.800 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 426.720 229.120 23.280 re
+334.640 601.800 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 389.160 114.560 37.560 re
+48.240 564.240 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 389.160 171.840 37.560 re
+162.800 564.240 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 389.160 229.120 37.560 re
+334.640 564.240 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 450.000 m
-162.800 450.000 l
+48.240 625.080 m
+162.800 625.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 426.720 m
-162.800 426.720 l
+48.240 601.800 m
+162.800 601.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 450.250 m
-48.240 425.970 l
+48.240 625.330 m
+48.240 601.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 450.250 m
-162.800 425.970 l
+162.800 625.330 m
+162.800 601.050 l
 S
 [ ] 0 d
 1 w
@@ -11575,7 +11099,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 434.25300000000044 Td
+51.24 609.3330000000002 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -11583,26 +11107,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 450.000 m
-334.640 450.000 l
+162.800 625.080 m
+334.640 625.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 426.720 m
-334.640 426.720 l
+162.800 601.800 m
+334.640 601.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 450.250 m
-162.800 425.970 l
+162.800 625.330 m
+162.800 601.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 450.250 m
-334.640 425.970 l
+334.640 625.330 m
+334.640 601.050 l
 S
 [ ] 0 d
 1 w
@@ -11610,7 +11134,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 434.25300000000044 Td
+165.79988544 609.3330000000002 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -11618,26 +11142,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 450.000 m
-563.760 450.000 l
+334.640 625.080 m
+563.760 625.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 426.720 m
-563.760 426.720 l
+334.640 601.800 m
+563.760 601.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 450.250 m
-334.640 425.970 l
+334.640 625.330 m
+334.640 601.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 450.250 m
-563.760 425.970 l
+563.760 625.330 m
+563.760 601.050 l
 S
 [ ] 0 d
 1 w
@@ -11645,7 +11169,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 434.25300000000044 Td
+337.6397136 609.3330000000002 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -11653,26 +11177,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.720 m
-162.800 426.720 l
+48.240 601.800 m
+162.800 601.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 389.160 m
-162.800 389.160 l
+48.240 564.240 m
+162.800 564.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.970 m
-48.240 388.910 l
+48.240 602.050 m
+48.240 563.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.970 m
-162.800 388.910 l
+162.800 602.050 m
+162.800 563.990 l
 S
 [ ] 0 d
 1 w
@@ -11680,7 +11204,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 403.3330000000005 Td
+51.24 578.4130000000002 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -11688,26 +11212,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.720 m
-334.640 426.720 l
+162.800 601.800 m
+334.640 601.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 389.160 m
-334.640 389.160 l
+162.800 564.240 m
+334.640 564.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.970 m
-162.800 388.910 l
+162.800 602.050 m
+162.800 563.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.970 m
-334.640 388.910 l
+334.640 602.050 m
+334.640 563.990 l
 S
 [ ] 0 d
 1 w
@@ -11715,19 +11239,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 410.47300000000047 Td
+165.79988544 585.5530000000003 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544 396.19300000000044 Td
+165.79988544 571.2730000000003 Td
 ET
 
 
 BT
-165.79988544 396.19300000000044 Td
+165.79988544 571.2730000000003 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -11735,26 +11259,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.720 m
-563.760 426.720 l
+334.640 601.800 m
+563.760 601.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 389.160 m
-563.760 389.160 l
+334.640 564.240 m
+563.760 564.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.970 m
-334.640 388.910 l
+334.640 602.050 m
+334.640 563.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 426.970 m
-563.760 388.910 l
+563.760 602.050 m
+563.760 563.990 l
 S
 [ ] 0 d
 1 w
@@ -11762,7 +11286,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 403.3330000000005 Td
+337.6397136 578.4130000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -11772,59 +11296,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 359.5760000000005 Td
+48.24 534.6560000000003 Td
 /F2.0 13 Tf
-<322e31322e322e20526573706f6e736573> Tj
+<322e31312e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 307.320 51.552 37.560 re
+48.240 482.400 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 307.320 360.864 37.560 re
+99.792 482.400 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 307.320 103.104 37.560 re
+460.656 482.400 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 284.040 51.552 23.280 re
+48.240 459.120 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 284.040 360.864 23.280 re
+99.792 459.120 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 284.040 103.104 23.280 re
+460.656 459.120 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 344.880 m
-99.792 344.880 l
+48.240 519.960 m
+99.792 519.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 307.320 m
-99.792 307.320 l
+48.240 482.400 m
+99.792 482.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 345.130 m
-48.240 306.570 l
+48.240 520.210 m
+48.240 481.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 345.130 m
-99.792 306.570 l
+99.792 520.210 m
+99.792 481.650 l
 S
 [ ] 0 d
 1 w
@@ -11832,14 +11356,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 329.13300000000044 Td
+51.24 504.21300000000036 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 314.8530000000004 Td
+51.24 489.93300000000033 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -11847,26 +11371,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.880 m
-460.656 344.880 l
+99.792 519.960 m
+460.656 519.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 307.320 m
-460.656 307.320 l
+99.792 482.400 m
+460.656 482.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 345.130 m
-99.792 306.570 l
+99.792 520.210 m
+99.792 481.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 345.130 m
-460.656 306.570 l
+460.656 520.210 m
+460.656 481.650 l
 S
 [ ] 0 d
 1 w
@@ -11874,7 +11398,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 329.13300000000044 Td
+102.792 504.21300000000036 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -11882,26 +11406,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.880 m
-563.760 344.880 l
+460.656 519.960 m
+563.760 519.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 307.320 m
-563.760 307.320 l
+460.656 482.400 m
+563.760 482.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 345.130 m
-460.656 306.570 l
+460.656 520.210 m
+460.656 481.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 345.130 m
-563.760 306.570 l
+563.760 520.210 m
+563.760 481.650 l
 S
 [ ] 0 d
 1 w
@@ -11909,7 +11433,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 329.13300000000044 Td
+463.65600000000006 504.21300000000036 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -11917,26 +11441,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 307.320 m
-99.792 307.320 l
+48.240 482.400 m
+99.792 482.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 284.040 m
-99.792 284.040 l
+48.240 459.120 m
+99.792 459.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 307.570 m
-48.240 283.790 l
+48.240 482.650 m
+48.240 458.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 307.570 m
-99.792 283.790 l
+99.792 482.650 m
+99.792 458.870 l
 S
 [ ] 0 d
 1 w
@@ -11944,7 +11468,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 291.07300000000043 Td
+51.24 466.15300000000036 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -11952,26 +11476,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 307.320 m
-460.656 307.320 l
+99.792 482.400 m
+460.656 482.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 284.040 m
-460.656 284.040 l
+99.792 459.120 m
+460.656 459.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 307.570 m
-99.792 283.790 l
+99.792 482.650 m
+99.792 458.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 307.570 m
-460.656 283.790 l
+460.656 482.650 m
+460.656 458.870 l
 S
 [ ] 0 d
 1 w
@@ -11979,7 +11503,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 291.07300000000043 Td
+102.792 466.15300000000036 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -11987,26 +11511,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 307.320 m
-563.760 307.320 l
+460.656 482.400 m
+563.760 482.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 284.040 m
-563.760 284.040 l
+460.656 459.120 m
+563.760 459.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 307.570 m
-460.656 283.790 l
+460.656 482.650 m
+460.656 458.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 307.570 m
-563.760 283.790 l
+563.760 482.650 m
+563.760 458.870 l
 S
 [ ] 0 d
 1 w
@@ -12020,7 +11544,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 291.07300000000043 Td
+463.65600000000006 466.15300000000036 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -12032,9 +11556,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 254.45600000000042 Td
+48.24 429.53600000000034 Td
 /F2.0 13 Tf
-<322e31322e332e2050726f6475636573> Tj
+<322e31312e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12045,7 +11569,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 227.79600000000042 Td
+56.88050000000001 402.8760000000003 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -12058,7 +11582,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 229.98000000000042 Td
+66.24000000000001 405.06000000000034 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -12069,9 +11593,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 192.3360000000004 Td
+48.24000000000001 367.41600000000034 Td
 /F2.0 18 Tf
-<322e31332e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
+<322e31322e20474554202f76322f6c6f6f702f676574416c6c4e616d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12080,59 +11604,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 158.0960000000004 Td
+48.24000000000001 333.1760000000003 Td
 /F2.0 13 Tf
-<322e31332e312e20526573706f6e736573> Tj
+<322e31322e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 105.840 51.552 37.560 re
+48.240 280.920 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 105.840 360.864 37.560 re
+99.792 280.920 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 105.840 103.104 37.560 re
+460.656 280.920 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 82.560 51.552 23.280 re
+48.240 257.640 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 82.560 360.864 23.280 re
+99.792 257.640 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 82.560 103.104 23.280 re
+460.656 257.640 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.400 m
-99.792 143.400 l
+48.240 318.480 m
+99.792 318.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 105.840 m
-99.792 105.840 l
+48.240 280.920 m
+99.792 280.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.650 m
-48.240 105.090 l
+48.240 318.730 m
+48.240 280.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 143.650 m
-99.792 105.090 l
+99.792 318.730 m
+99.792 280.170 l
 S
 [ ] 0 d
 1 w
@@ -12140,14 +11664,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 127.65300000000039 Td
+51.24000000000001 302.73300000000023 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 113.37300000000039 Td
+51.24000000000001 288.4530000000002 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -12155,26 +11679,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 143.400 m
-460.656 143.400 l
+99.792 318.480 m
+460.656 318.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 105.840 m
-460.656 105.840 l
+99.792 280.920 m
+460.656 280.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 143.650 m
-99.792 105.090 l
+99.792 318.730 m
+99.792 280.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 143.650 m
-460.656 105.090 l
+460.656 318.730 m
+460.656 280.170 l
 S
 [ ] 0 d
 1 w
@@ -12182,7 +11706,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 127.65300000000039 Td
+102.792 302.73300000000023 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -12190,26 +11714,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 143.400 m
-563.760 143.400 l
+460.656 318.480 m
+563.760 318.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 105.840 m
-563.760 105.840 l
+460.656 280.920 m
+563.760 280.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 143.650 m
-460.656 105.090 l
+460.656 318.730 m
+460.656 280.170 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 143.650 m
-563.760 105.090 l
+563.760 318.730 m
+563.760 280.170 l
 S
 [ ] 0 d
 1 w
@@ -12217,7 +11741,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 127.65300000000039 Td
+463.65600000000006 302.73300000000023 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -12225,26 +11749,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 105.840 m
-99.792 105.840 l
+48.240 280.920 m
+99.792 280.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 82.560 m
-99.792 82.560 l
+48.240 257.640 m
+99.792 257.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 106.090 m
-48.240 82.310 l
+48.240 281.170 m
+48.240 257.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 106.090 m
-99.792 82.310 l
+99.792 281.170 m
+99.792 257.390 l
 S
 [ ] 0 d
 1 w
@@ -12252,7 +11776,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 89.59300000000037 Td
+51.24000000000001 264.67300000000023 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -12260,26 +11784,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 105.840 m
-460.656 105.840 l
+99.792 280.920 m
+460.656 280.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 82.560 m
-460.656 82.560 l
+99.792 257.640 m
+460.656 257.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 106.090 m
-99.792 82.310 l
+99.792 281.170 m
+99.792 257.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 106.090 m
-460.656 82.310 l
+460.656 281.170 m
+460.656 257.390 l
 S
 [ ] 0 d
 1 w
@@ -12287,7 +11811,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 89.59300000000037 Td
+102.792 264.67300000000023 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -12295,26 +11819,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 105.840 m
-563.760 105.840 l
+460.656 280.920 m
+563.760 280.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 82.560 m
-563.760 82.560 l
+460.656 257.640 m
+563.760 257.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 106.090 m
-460.656 82.310 l
+460.656 281.170 m
+460.656 257.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 106.090 m
-563.760 82.310 l
+563.760 281.170 m
+563.760 257.390 l
 S
 [ ] 0 d
 1 w
@@ -12322,11 +11846,316 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 89.59300000000037 Td
+463.65600000000006 264.67300000000023 Td
 /F1.0 10.5 Tf
 [<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 228.0560000000002 Td
+/F2.0 13 Tf
+<322e31322e322e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 201.39600000000019 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 203.58000000000018 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 165.93600000000015 Td
+/F2.0 18 Tf
+<322e31332e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 131.69600000000014 Td
+/F2.0 13 Tf
+[<322e31332e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.720 114.560 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 93.720 171.840 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 93.720 229.120 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.160 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+162.800 56.160 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+334.640 56.160 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 117.000 m
+162.800 117.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 93.720 m
+162.800 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 117.250 m
+48.240 92.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 117.250 m
+162.800 92.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24000000000001 101.25300000000014 Td
+/F2.0 10.5 Tf
+<54797065> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 117.000 m
+334.640 117.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+162.800 93.720 m
+334.640 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 117.250 m
+162.800 92.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 117.250 m
+334.640 92.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544000003 101.25300000000014 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 117.000 m
+563.760 117.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+334.640 93.720 m
+563.760 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 117.250 m
+334.640 92.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 117.250 m
+563.760 92.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+337.6397136 101.25300000000014 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.720 m
+162.800 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.160 m
+162.800 56.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.970 m
+48.240 55.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 93.970 m
+162.800 55.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24000000000001 70.33300000000014 Td
+/F2.0 10.5 Tf
+<50617468> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 93.720 m
+334.640 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 56.160 m
+334.640 56.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 93.970 m
+162.800 55.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 93.970 m
+334.640 55.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544000003 77.47300000000014 Td
+/F2.0 10.5 Tf
+<6c6f6f704e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 63.19300000000014 Td
+ET
+
+
+BT
+165.79988544000003 63.19300000000014 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 93.720 m
+563.760 93.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 56.160 m
+563.760 56.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 93.970 m
+334.640 55.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 93.970 m
+563.760 55.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+337.6397136 70.33300000000014 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -12352,65 +12181,65 @@ Q
 
 endstream
 endobj
-85 0 obj
+84 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 84 0 R
+/Contents 83 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
-/F3.0 24 0 R
 /F1.0 8 0 R
+/F3.0 24 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [93 0 R]
+/Annots [89 0 R]
 >>
 endobj
+85 0 obj
+[84 0 R /XYZ 0 697.44 null]
+endobj
 86 0 obj
-[85 0 R /XYZ 0 792.0 null]
+[84 0 R /XYZ 0 657.3600000000001 null]
 endobj
 87 0 obj
-[85 0 R /XYZ 0 718.32 null]
+<< /Limits [(_parameters_8) (_produces_15)]
+/Names [(_parameters_8) 95 0 R (_parameters_9) 102 0 R (_paths) 28 0 R (_policymodel) 298 0 R (_produces) 32 0 R (_produces_10) 90 0 R (_produces_11) 93 0 R (_produces_12) 100 0 R (_produces_13) 105 0 R (_produces_14) 112 0 R (_produces_15) 118 0 R]
+>>
 endobj
 88 0 obj
-<< /Limits [(_policymodel) (_produces_18)]
-/Names [(_policymodel) 306 0 R (_produces) 32 0 R (_produces_10) 83 0 R (_produces_11) 94 0 R (_produces_12) 99 0 R (_produces_13) 104 0 R (_produces_14) 109 0 R (_produces_15) 116 0 R (_produces_16) 122 0 R (_produces_17) 129 0 R (_produces_18) 133 0 R]
->>
+[84 0 R /XYZ 0 552.2400000000002 null]
 endobj
 89 0 obj
-[85 0 R /XYZ 0 613.2000000000003 null]
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 463.0870000000004 488.7510000000001 477.36700000000036]
+/Type /Annot
+>>
 endobj
 90 0 obj
-[85 0 R /XYZ 0 522.3600000000005 null]
+[84 0 R /XYZ 0 447.12000000000035 null]
 endobj
 91 0 obj
-[85 0 R /XYZ 0 482.2800000000005 null]
+[84 0 R /XYZ 0 390.8400000000003 null]
 endobj
 92 0 obj
-[85 0 R /XYZ 0 377.1600000000005 null]
+[84 0 R /XYZ 0 350.7600000000003 null]
 endobj
 93 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 288.00700000000046 488.7510000000001 302.28700000000043]
-/Type /Annot
->>
+[84 0 R /XYZ 0 245.6400000000002 null]
 endobj
 94 0 obj
-[85 0 R /XYZ 0 272.0400000000004 null]
+[84 0 R /XYZ 0 189.36000000000018 null]
 endobj
 95 0 obj
-[85 0 R /XYZ 0 215.76000000000042 null]
+[84 0 R /XYZ 0 149.28000000000017 null]
 endobj
 96 0 obj
-[85 0 R /XYZ 0 175.6800000000004 null]
-endobj
-97 0 obj
-<< /Length 16552
+<< /Length 16110
 >>
 stream
 q
@@ -12422,7 +12251,267 @@ q
 BT
 48.24 740.816 Td
 /F2.0 13 Tf
-<322e31332e322e2050726f6475636573> Tj
+<322e31332e322e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 688.560 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 688.560 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 688.560 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 665.280 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 665.280 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 665.280 103.104 23.280 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 726.120 m
+99.792 726.120 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 688.560 m
+99.792 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 726.370 m
+48.240 687.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 726.370 m
+99.792 687.810 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 710.373 Td
+/F2.0 10.5 Tf
+<48545450> Tj
+ET
+
+
+BT
+51.24 696.0930000000001 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 726.120 m
+460.656 726.120 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 688.560 m
+460.656 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 726.370 m
+99.792 687.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 726.370 m
+460.656 687.810 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+102.792 710.373 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 726.120 m
+563.760 726.120 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+460.656 688.560 m
+563.760 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 726.370 m
+460.656 687.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 726.370 m
+563.760 687.810 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+463.65600000000006 710.373 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 688.560 m
+99.792 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 665.280 m
+99.792 665.280 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 688.810 m
+48.240 665.030 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 688.810 m
+99.792 665.030 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 672.3130000000001 Td
+/F2.0 10.5 Tf
+<323030> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 688.560 m
+460.656 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 665.280 m
+460.656 665.280 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 688.810 m
+99.792 665.030 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 688.810 m
+460.656 665.030 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+102.792 672.3130000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 688.560 m
+563.760 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 665.280 m
+563.760 665.280 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 688.810 m
+460.656 665.030 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 688.810 m
+563.760 665.030 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+463.65600000000006 672.3130000000001 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 635.6960000000003 Td
+/F2.0 13 Tf
+<322e31332e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12433,7 +12522,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 714.1560000000001 Td
+56.88050000000001 609.0360000000003 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -12446,7 +12535,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 716.3400000000001 Td
+66.24000000000001 611.2200000000004 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -12457,9 +12546,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 678.6960000000001 Td
+48.24000000000001 573.5760000000004 Td
 /F2.0 18 Tf
-<322e31342e20474554202f76322f6c6f6f702f6765747374617475732f7b6c6f6f704e616d657d> Tj
+<322e31342e20505554> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -12468,7 +12557,18 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 644.4560000000002 Td
+48.24000000000001 545.4960000000004 Td
+/F2.0 18 Tf
+<2f76322f6c6f6f702f726566726573684f70506f6c6963794a736f6e536368656d612f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 511.25600000000054 Td
 /F2.0 13 Tf
 [<322e31342e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -12476,51 +12576,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 606.480 114.560 23.280 re
+48.240 473.280 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 606.480 171.840 23.280 re
+162.800 473.280 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 606.480 229.120 23.280 re
+334.640 473.280 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 568.920 114.560 37.560 re
+48.240 435.720 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 568.920 171.840 37.560 re
+162.800 435.720 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 568.920 229.120 37.560 re
+334.640 435.720 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 629.760 m
-162.800 629.760 l
+48.240 496.560 m
+162.800 496.560 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
+48.240 473.280 m
+162.800 473.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 630.010 m
-48.240 605.730 l
+48.240 496.810 m
+48.240 472.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
+162.800 496.810 m
+162.800 472.530 l
 S
 [ ] 0 d
 1 w
@@ -12528,7 +12628,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 614.0130000000003 Td
+51.24000000000001 480.8130000000005 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -12536,26 +12636,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 629.760 m
-334.640 629.760 l
+162.800 496.560 m
+334.640 496.560 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
+162.800 473.280 m
+334.640 473.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
+162.800 496.810 m
+162.800 472.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
+334.640 496.810 m
+334.640 472.530 l
 S
 [ ] 0 d
 1 w
@@ -12563,7 +12663,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 614.0130000000003 Td
+165.79988544000003 480.8130000000005 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -12571,26 +12671,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 629.760 m
-563.760 629.760 l
+334.640 496.560 m
+563.760 496.560 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
+334.640 473.280 m
+563.760 473.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
+334.640 496.810 m
+334.640 472.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 630.010 m
-563.760 605.730 l
+563.760 496.810 m
+563.760 472.530 l
 S
 [ ] 0 d
 1 w
@@ -12598,7 +12698,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 614.0130000000003 Td
+337.6397136 480.8130000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -12606,26 +12706,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
+48.240 473.280 m
+162.800 473.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 568.920 m
-162.800 568.920 l
+48.240 435.720 m
+162.800 435.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 606.730 m
-48.240 568.670 l
+48.240 473.530 m
+48.240 435.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
+162.800 473.530 m
+162.800 435.470 l
 S
 [ ] 0 d
 1 w
@@ -12633,7 +12733,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 583.0930000000003 Td
+51.24000000000001 449.89300000000054 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -12641,26 +12741,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
+162.800 473.280 m
+334.640 473.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 568.920 m
-334.640 568.920 l
+162.800 435.720 m
+334.640 435.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
+162.800 473.530 m
+162.800 435.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
+334.640 473.530 m
+334.640 435.470 l
 S
 [ ] 0 d
 1 w
@@ -12668,19 +12768,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 590.2330000000004 Td
+165.79988544000003 457.0330000000005 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 575.9530000000003 Td
+165.79988544000003 442.7530000000005 Td
 ET
 
 
 BT
-165.79988544000003 575.9530000000003 Td
+165.79988544000003 442.7530000000005 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -12688,26 +12788,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
+334.640 473.280 m
+563.760 473.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 568.920 m
-563.760 568.920 l
+334.640 435.720 m
+563.760 435.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
+334.640 473.530 m
+334.640 435.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 606.730 m
-563.760 568.670 l
+563.760 473.530 m
+563.760 435.470 l
 S
 [ ] 0 d
 1 w
@@ -12715,7 +12815,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 583.0930000000003 Td
+337.6397136 449.89300000000054 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -12725,7 +12825,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 539.3360000000004 Td
+48.24000000000001 406.13600000000054 Td
 /F2.0 13 Tf
 <322e31342e322e20526573706f6e736573> Tj
 ET
@@ -12733,51 +12833,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 487.080 51.552 37.560 re
+48.240 353.880 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 487.080 360.864 37.560 re
+99.792 353.880 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 487.080 103.104 37.560 re
+460.656 353.880 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 463.800 51.552 23.280 re
+48.240 330.600 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 463.800 360.864 23.280 re
+99.792 330.600 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 463.800 103.104 23.280 re
+460.656 330.600 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.640 m
-99.792 524.640 l
+48.240 391.440 m
+99.792 391.440 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 487.080 m
-99.792 487.080 l
+48.240 353.880 m
+99.792 353.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.890 m
-48.240 486.330 l
+48.240 391.690 m
+48.240 353.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.890 m
-99.792 486.330 l
+99.792 391.690 m
+99.792 353.130 l
 S
 [ ] 0 d
 1 w
@@ -12785,14 +12885,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.8930000000004 Td
+51.24000000000001 375.6930000000005 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 494.6130000000004 Td
+51.24000000000001 361.41300000000047 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -12800,26 +12900,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.640 m
-460.656 524.640 l
+99.792 391.440 m
+460.656 391.440 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 487.080 m
-460.656 487.080 l
+99.792 353.880 m
+460.656 353.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.890 m
-99.792 486.330 l
+99.792 391.690 m
+99.792 353.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.890 m
-460.656 486.330 l
+460.656 391.690 m
+460.656 353.130 l
 S
 [ ] 0 d
 1 w
@@ -12827,7 +12927,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 508.8930000000004 Td
+102.792 375.6930000000005 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -12835,26 +12935,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.640 m
-563.760 524.640 l
+460.656 391.440 m
+563.760 391.440 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 487.080 m
-563.760 487.080 l
+460.656 353.880 m
+563.760 353.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.890 m
-460.656 486.330 l
+460.656 391.690 m
+460.656 353.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 524.890 m
-563.760 486.330 l
+563.760 391.690 m
+563.760 353.130 l
 S
 [ ] 0 d
 1 w
@@ -12862,7 +12962,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 508.8930000000004 Td
+463.65600000000006 375.6930000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -12870,26 +12970,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 487.080 m
-99.792 487.080 l
+48.240 353.880 m
+99.792 353.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 463.800 m
-99.792 463.800 l
+48.240 330.600 m
+99.792 330.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 487.330 m
-48.240 463.550 l
+48.240 354.130 m
+48.240 330.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.330 m
-99.792 463.550 l
+99.792 354.130 m
+99.792 330.350 l
 S
 [ ] 0 d
 1 w
@@ -12897,7 +12997,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 470.8330000000004 Td
+51.24000000000001 337.6330000000005 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -12905,26 +13005,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.080 m
-460.656 487.080 l
+99.792 353.880 m
+460.656 353.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 463.800 m
-460.656 463.800 l
+99.792 330.600 m
+460.656 330.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.330 m
-99.792 463.550 l
+99.792 354.130 m
+99.792 330.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.330 m
-460.656 463.550 l
+460.656 354.130 m
+460.656 330.350 l
 S
 [ ] 0 d
 1 w
@@ -12932,7 +13032,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 470.8330000000004 Td
+102.792 337.6330000000005 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -12940,26 +13040,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.080 m
-563.760 487.080 l
+460.656 353.880 m
+563.760 353.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 463.800 m
-563.760 463.800 l
+460.656 330.600 m
+563.760 330.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.330 m
-460.656 463.550 l
+460.656 354.130 m
+460.656 330.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 487.330 m
-563.760 463.550 l
+563.760 354.130 m
+563.760 330.350 l
 S
 [ ] 0 d
 1 w
@@ -12973,7 +13073,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 470.8330000000004 Td
+463.65600000000006 337.6330000000005 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -12985,7 +13085,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 434.2160000000004 Td
+48.24000000000001 301.0160000000005 Td
 /F2.0 13 Tf
 <322e31342e332e2050726f6475636573> Tj
 ET
@@ -12998,7 +13098,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 407.5560000000004 Td
+56.88050000000001 274.35600000000045 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -13011,7 +13111,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 409.7400000000004 Td
+66.24000000000001 276.5400000000004 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -13022,20 +13122,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 372.0960000000004 Td
-/F2.0 18 Tf
-<322e31352e20505554> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 344.0160000000004 Td
+48.24000000000001 238.89600000000047 Td
 /F2.0 18 Tf
-<2f76322f6c6f6f702f726566726573684f70506f6c6963794a736f6e536368656d612f7b6c6f6f704e616d657d> Tj
+<322e31352e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13044,7 +13133,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 309.77600000000035 Td
+48.24000000000001 204.65600000000046 Td
 /F2.0 13 Tf
 [<322e31352e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -13052,51 +13141,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 271.800 114.560 23.280 re
+48.240 166.680 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 271.800 171.840 23.280 re
+162.800 166.680 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 271.800 229.120 23.280 re
+334.640 166.680 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 234.240 114.560 37.560 re
+48.240 129.120 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 234.240 171.840 37.560 re
+162.800 129.120 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 234.240 229.120 37.560 re
+334.640 129.120 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 295.080 m
-162.800 295.080 l
+48.240 189.960 m
+162.800 189.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 271.800 m
-162.800 271.800 l
+48.240 166.680 m
+162.800 166.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 295.330 m
-48.240 271.050 l
+48.240 190.210 m
+48.240 165.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 295.330 m
-162.800 271.050 l
+162.800 190.210 m
+162.800 165.930 l
 S
 [ ] 0 d
 1 w
@@ -13104,7 +13193,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 279.3330000000003 Td
+51.24000000000001 174.21300000000045 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -13112,26 +13201,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 295.080 m
-334.640 295.080 l
+162.800 189.960 m
+334.640 189.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 271.800 m
-334.640 271.800 l
+162.800 166.680 m
+334.640 166.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 295.330 m
-162.800 271.050 l
+162.800 190.210 m
+162.800 165.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 295.330 m
-334.640 271.050 l
+334.640 190.210 m
+334.640 165.930 l
 S
 [ ] 0 d
 1 w
@@ -13139,7 +13228,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 279.3330000000003 Td
+165.79988544000003 174.21300000000045 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -13147,26 +13236,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 295.080 m
-563.760 295.080 l
+334.640 189.960 m
+563.760 189.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 271.800 m
-563.760 271.800 l
+334.640 166.680 m
+563.760 166.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 295.330 m
-334.640 271.050 l
+334.640 190.210 m
+334.640 165.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 295.330 m
-563.760 271.050 l
+563.760 190.210 m
+563.760 165.930 l
 S
 [ ] 0 d
 1 w
@@ -13174,7 +13263,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 279.3330000000003 Td
+337.6397136 174.21300000000045 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -13182,26 +13271,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 271.800 m
-162.800 271.800 l
+48.240 166.680 m
+162.800 166.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 234.240 m
-162.800 234.240 l
+48.240 129.120 m
+162.800 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 272.050 m
-48.240 233.990 l
+48.240 166.930 m
+48.240 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 272.050 m
-162.800 233.990 l
+162.800 166.930 m
+162.800 128.870 l
 S
 [ ] 0 d
 1 w
@@ -13209,7 +13298,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 248.41300000000027 Td
+51.24000000000001 143.29300000000043 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -13217,26 +13306,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 271.800 m
-334.640 271.800 l
+162.800 166.680 m
+334.640 166.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 234.240 m
-334.640 234.240 l
+162.800 129.120 m
+334.640 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 272.050 m
-162.800 233.990 l
+162.800 166.930 m
+162.800 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 272.050 m
-334.640 233.990 l
+334.640 166.930 m
+334.640 128.870 l
 S
 [ ] 0 d
 1 w
@@ -13244,19 +13333,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 255.55300000000028 Td
+165.79988544000003 150.43300000000045 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 241.27300000000028 Td
+165.79988544000003 136.15300000000045 Td
 ET
 
 
 BT
-165.79988544000003 241.27300000000028 Td
+165.79988544000003 136.15300000000045 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -13264,26 +13353,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 271.800 m
-563.760 271.800 l
+334.640 166.680 m
+563.760 166.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 234.240 m
-563.760 234.240 l
+334.640 129.120 m
+563.760 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 272.050 m
-334.640 233.990 l
+334.640 166.930 m
+334.640 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 272.050 m
-563.760 233.990 l
+563.760 166.930 m
+563.760 128.870 l
 S
 [ ] 0 d
 1 w
@@ -13291,7 +13380,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 248.41300000000027 Td
+337.6397136 143.29300000000043 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -13301,59 +13390,150 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 204.6560000000003 Td
+48.24000000000001 99.53600000000043 Td
 /F2.0 13 Tf
 <322e31352e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 152.400 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 152.400 360.864 37.560 re
-f
+q
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 152.400 103.104 37.560 re
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+557.7289999999999 14.388 Td
+/F1.0 9 Tf
+<37> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+97 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 96 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [99 0 R 104 0 R]
+>>
+endobj
+98 0 obj
+[97 0 R /XYZ 0 792.0 null]
+endobj
+99 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 669.2470000000002 488.7510000000001 683.5270000000002]
+/Type /Annot
+>>
+endobj
+100 0 obj
+[97 0 R /XYZ 0 653.2800000000002 null]
+endobj
+101 0 obj
+[97 0 R /XYZ 0 597.0000000000003 null]
+endobj
+102 0 obj
+[97 0 R /XYZ 0 528.8400000000005 null]
+endobj
+103 0 obj
+[97 0 R /XYZ 0 423.72000000000054 null]
+endobj
+104 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 334.5670000000005 488.7510000000001 348.8470000000005]
+/Type /Annot
+>>
+endobj
+105 0 obj
+[97 0 R /XYZ 0 318.6000000000005 null]
+endobj
+106 0 obj
+[97 0 R /XYZ 0 262.32000000000045 null]
+endobj
+107 0 obj
+[97 0 R /XYZ 0 222.24000000000046 null]
+endobj
+108 0 obj
+[97 0 R /XYZ 0 117.12000000000043 null]
+endobj
+109 0 obj
+<< /Length 19069
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 718.440 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 129.120 51.552 23.280 re
+99.792 718.440 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 129.120 360.864 23.280 re
+460.656 718.440 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 129.120 103.104 23.280 re
+48.240 695.160 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 695.160 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 695.160 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 189.960 m
-99.792 189.960 l
+48.240 756.000 m
+99.792 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 152.400 m
-99.792 152.400 l
+48.240 718.440 m
+99.792 718.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 190.210 m
-48.240 151.650 l
+48.240 756.250 m
+48.240 717.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 190.210 m
-99.792 151.650 l
+99.792 756.250 m
+99.792 717.690 l
 S
 [ ] 0 d
 1 w
@@ -13361,14 +13541,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 174.21300000000028 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 159.93300000000028 Td
+51.24 725.973 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -13376,26 +13556,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 189.960 m
-460.656 189.960 l
+99.792 756.000 m
+460.656 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 152.400 m
-460.656 152.400 l
+99.792 718.440 m
+460.656 718.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 190.210 m
-99.792 151.650 l
+99.792 756.250 m
+99.792 717.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 190.210 m
-460.656 151.650 l
+460.656 756.250 m
+460.656 717.690 l
 S
 [ ] 0 d
 1 w
@@ -13403,7 +13583,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 174.21300000000028 Td
+102.792 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -13411,26 +13591,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 189.960 m
-563.760 189.960 l
+460.656 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 152.400 m
-563.760 152.400 l
+460.656 718.440 m
+563.760 718.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 190.210 m
-460.656 151.650 l
+460.656 756.250 m
+460.656 717.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 190.210 m
-563.760 151.650 l
+563.760 756.250 m
+563.760 717.690 l
 S
 [ ] 0 d
 1 w
@@ -13438,7 +13618,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 174.21300000000028 Td
+463.65600000000006 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -13446,26 +13626,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 152.400 m
-99.792 152.400 l
+48.240 718.440 m
+99.792 718.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 129.120 m
-99.792 129.120 l
+48.240 695.160 m
+99.792 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 152.650 m
-48.240 128.870 l
+48.240 718.690 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 152.650 m
-99.792 128.870 l
+99.792 718.690 m
+99.792 694.910 l
 S
 [ ] 0 d
 1 w
@@ -13473,7 +13653,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 136.15300000000028 Td
+51.24 702.193 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -13481,26 +13661,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 152.400 m
-460.656 152.400 l
+99.792 718.440 m
+460.656 718.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 129.120 m
-460.656 129.120 l
+99.792 695.160 m
+460.656 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 152.650 m
-99.792 128.870 l
+99.792 718.690 m
+99.792 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 152.650 m
-460.656 128.870 l
+460.656 718.690 m
+460.656 694.910 l
 S
 [ ] 0 d
 1 w
@@ -13508,7 +13688,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 136.15300000000028 Td
+102.792 702.193 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -13516,26 +13696,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 152.400 m
-563.760 152.400 l
+460.656 718.440 m
+563.760 718.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 129.120 m
-563.760 129.120 l
+460.656 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 152.650 m
-460.656 128.870 l
+460.656 718.690 m
+460.656 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 152.650 m
-563.760 128.870 l
+563.760 718.690 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -13549,7 +13729,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 136.15300000000028 Td
+463.65600000000006 702.193 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -13561,7 +13741,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 99.53600000000026 Td
+48.24 665.5760000000001 Td
 /F2.0 13 Tf
 <322e31352e332e2050726f6475636573> Tj
 ET
@@ -13574,7 +13754,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 72.87600000000026 Td
+56.88050000000001 638.9160000000002 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -13587,111 +13767,20 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 75.06000000000026 Td
+66.24000000000001 641.1000000000003 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<37> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-98 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 97 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
-/F3.0 24 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [103 0 R 108 0 R]
->>
-endobj
-99 0 obj
-[98 0 R /XYZ 0 792.0 null]
-endobj
-100 0 obj
-[98 0 R /XYZ 0 702.1200000000001 null]
-endobj
-101 0 obj
-[98 0 R /XYZ 0 662.0400000000002 null]
-endobj
-102 0 obj
-[98 0 R /XYZ 0 556.9200000000003 null]
-endobj
-103 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 467.76700000000045 488.7510000000001 482.0470000000004]
-/Type /Annot
->>
-endobj
-104 0 obj
-[98 0 R /XYZ 0 451.8000000000004 null]
-endobj
-105 0 obj
-[98 0 R /XYZ 0 395.5200000000004 null]
-endobj
-106 0 obj
-[98 0 R /XYZ 0 327.36000000000035 null]
-endobj
-107 0 obj
-[98 0 R /XYZ 0 222.2400000000003 null]
-endobj
-108 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 133.08700000000027 488.7510000000001 147.36700000000027]
-/Type /Annot
->>
-endobj
-109 0 obj
-[98 0 R /XYZ 0 117.12000000000026 null]
-endobj
-110 0 obj
-<< /Length 16105
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 734.976 Td
+48.24000000000001 603.4560000000002 Td
 /F2.0 18 Tf
-<322e31362e20505554202f76322f6c6f6f702f726573746172742f7b6c6f6f704e616d657d> Tj
+<322e31362e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -13700,7 +13789,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 700.7360000000001 Td
+48.24000000000001 569.2160000000003 Td
 /F2.0 13 Tf
 [<322e31362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -13708,51 +13797,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 662.760 114.560 23.280 re
+48.240 531.240 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 662.760 171.840 23.280 re
+162.800 531.240 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 662.760 229.120 23.280 re
+334.640 531.240 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 625.200 114.560 37.560 re
+48.240 493.680 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 625.200 171.840 37.560 re
+162.800 493.680 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 625.200 229.120 37.560 re
+334.640 493.680 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 686.040 m
-162.800 686.040 l
+48.240 554.520 m
+162.800 554.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
+48.240 531.240 m
+162.800 531.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 686.290 m
-48.240 662.010 l
+48.240 554.770 m
+48.240 530.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
+162.800 554.770 m
+162.800 530.490 l
 S
 [ ] 0 d
 1 w
@@ -13760,7 +13849,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 670.2930000000001 Td
+51.24000000000001 538.7730000000004 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -13768,26 +13857,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.040 m
-334.640 686.040 l
+162.800 554.520 m
+334.640 554.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
+162.800 531.240 m
+334.640 531.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
+162.800 554.770 m
+162.800 530.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
+334.640 554.770 m
+334.640 530.490 l
 S
 [ ] 0 d
 1 w
@@ -13795,7 +13884,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 670.2930000000001 Td
+165.79988544000003 538.7730000000004 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -13803,26 +13892,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.040 m
-563.760 686.040 l
+334.640 554.520 m
+563.760 554.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
+334.640 531.240 m
+563.760 531.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
+334.640 554.770 m
+334.640 530.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 686.290 m
-563.760 662.010 l
+563.760 554.770 m
+563.760 530.490 l
 S
 [ ] 0 d
 1 w
@@ -13830,7 +13919,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 670.2930000000001 Td
+337.6397136 538.7730000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -13838,26 +13927,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
+48.240 531.240 m
+162.800 531.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 625.200 m
-162.800 625.200 l
+48.240 493.680 m
+162.800 493.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 663.010 m
-48.240 624.950 l
+48.240 531.490 m
+48.240 493.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
+162.800 531.490 m
+162.800 493.430 l
 S
 [ ] 0 d
 1 w
@@ -13865,7 +13954,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 639.3730000000002 Td
+51.24000000000001 507.85300000000046 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -13873,26 +13962,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
+162.800 531.240 m
+334.640 531.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 625.200 m
-334.640 625.200 l
+162.800 493.680 m
+334.640 493.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
+162.800 531.490 m
+162.800 493.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
+334.640 531.490 m
+334.640 493.430 l
 S
 [ ] 0 d
 1 w
@@ -13900,19 +13989,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 646.5130000000001 Td
+165.79988544000003 514.9930000000004 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544 632.2330000000002 Td
+165.79988544000003 500.7130000000004 Td
 ET
 
 
 BT
-165.79988544 632.2330000000002 Td
+165.79988544000003 500.7130000000004 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -13920,26 +14009,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
+334.640 531.240 m
+563.760 531.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 625.200 m
-563.760 625.200 l
+334.640 493.680 m
+563.760 493.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
+334.640 531.490 m
+334.640 493.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 663.010 m
-563.760 624.950 l
+563.760 531.490 m
+563.760 493.430 l
 S
 [ ] 0 d
 1 w
@@ -13947,7 +14036,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 639.3730000000002 Td
+337.6397136 507.85300000000046 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -13957,7 +14046,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 595.6160000000003 Td
+48.24000000000001 464.09600000000046 Td
 /F2.0 13 Tf
 <322e31362e322e20526573706f6e736573> Tj
 ET
@@ -13965,51 +14054,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 543.360 51.552 37.560 re
+48.240 411.840 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 543.360 360.864 37.560 re
+99.792 411.840 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 543.360 103.104 37.560 re
+460.656 411.840 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 520.080 51.552 23.280 re
+48.240 388.560 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 520.080 360.864 23.280 re
+99.792 388.560 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 520.080 103.104 23.280 re
+460.656 388.560 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 580.920 m
-99.792 580.920 l
+48.240 449.400 m
+99.792 449.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 543.360 m
-99.792 543.360 l
+48.240 411.840 m
+99.792 411.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 581.170 m
-48.240 542.610 l
+48.240 449.650 m
+48.240 411.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 581.170 m
-99.792 542.610 l
+99.792 449.650 m
+99.792 411.090 l
 S
 [ ] 0 d
 1 w
@@ -14017,14 +14106,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.1730000000005 Td
+51.24000000000001 433.6530000000004 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 550.8930000000004 Td
+51.24000000000001 419.3730000000004 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -14032,26 +14121,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 580.920 m
-460.656 580.920 l
+99.792 449.400 m
+460.656 449.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 543.360 m
-460.656 543.360 l
+99.792 411.840 m
+460.656 411.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 581.170 m
-99.792 542.610 l
+99.792 449.650 m
+99.792 411.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 581.170 m
-460.656 542.610 l
+460.656 449.650 m
+460.656 411.090 l
 S
 [ ] 0 d
 1 w
@@ -14059,7 +14148,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 565.1730000000005 Td
+102.792 433.6530000000004 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -14067,26 +14156,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 580.920 m
-563.760 580.920 l
+460.656 449.400 m
+563.760 449.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 543.360 m
-563.760 543.360 l
+460.656 411.840 m
+563.760 411.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 581.170 m
-460.656 542.610 l
+460.656 449.650 m
+460.656 411.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 581.170 m
-563.760 542.610 l
+563.760 449.650 m
+563.760 411.090 l
 S
 [ ] 0 d
 1 w
@@ -14094,7 +14183,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 565.1730000000005 Td
+463.65600000000006 433.6530000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -14102,26 +14191,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 543.360 m
-99.792 543.360 l
+48.240 411.840 m
+99.792 411.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 520.080 m
-99.792 520.080 l
+48.240 388.560 m
+99.792 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 543.610 m
-48.240 519.830 l
+48.240 412.090 m
+48.240 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 543.610 m
-99.792 519.830 l
+99.792 412.090 m
+99.792 388.310 l
 S
 [ ] 0 d
 1 w
@@ -14129,7 +14218,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 527.1130000000003 Td
+51.24000000000001 395.5930000000004 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -14137,26 +14226,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 543.360 m
-460.656 543.360 l
+99.792 411.840 m
+460.656 411.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 520.080 m
-460.656 520.080 l
+99.792 388.560 m
+460.656 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 543.610 m
-99.792 519.830 l
+99.792 412.090 m
+99.792 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.610 m
-460.656 519.830 l
+460.656 412.090 m
+460.656 388.310 l
 S
 [ ] 0 d
 1 w
@@ -14164,7 +14253,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 527.1130000000003 Td
+102.792 395.5930000000004 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -14172,26 +14261,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.360 m
-563.760 543.360 l
+460.656 411.840 m
+563.760 411.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 520.080 m
-563.760 520.080 l
+460.656 388.560 m
+563.760 388.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.610 m
-460.656 519.830 l
+460.656 412.090 m
+460.656 388.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 543.610 m
-563.760 519.830 l
+563.760 412.090 m
+563.760 388.310 l
 S
 [ ] 0 d
 1 w
@@ -14205,7 +14294,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 527.1130000000003 Td
+463.65600000000006 395.5930000000004 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -14217,7 +14306,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 490.4960000000004 Td
+48.24000000000001 358.9760000000004 Td
 /F2.0 13 Tf
 <322e31362e332e2050726f6475636573> Tj
 ET
@@ -14230,7 +14319,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 463.83600000000035 Td
+56.88050000000001 332.3160000000004 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -14243,7 +14332,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 466.0200000000004 Td
+66.24000000000001 334.5000000000004 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -14254,9 +14343,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 428.3760000000004 Td
+48.24000000000001 296.8560000000004 Td
 /F2.0 18 Tf
-<322e31372e20505554202f76322f6c6f6f702f73746f702f7b6c6f6f704e616d657d> Tj
+<322e31372e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -14265,7 +14354,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 394.1360000000003 Td
+48.24000000000001 262.6160000000003 Td
 /F2.0 13 Tf
 [<322e31372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -14273,51 +14362,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 356.160 114.560 23.280 re
+48.240 224.640 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 356.160 171.840 23.280 re
+162.800 224.640 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 356.160 229.120 23.280 re
+334.640 224.640 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 318.600 114.560 37.560 re
+48.240 187.080 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 318.600 171.840 37.560 re
+162.800 187.080 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 318.600 229.120 37.560 re
+334.640 187.080 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 379.440 m
-162.800 379.440 l
+48.240 247.920 m
+162.800 247.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.160 m
-162.800 356.160 l
+48.240 224.640 m
+162.800 224.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 379.690 m
-48.240 355.410 l
+48.240 248.170 m
+48.240 223.890 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 379.690 m
-162.800 355.410 l
+162.800 248.170 m
+162.800 223.890 l
 S
 [ ] 0 d
 1 w
@@ -14325,7 +14414,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 363.69300000000027 Td
+51.24000000000001 232.17300000000034 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -14333,26 +14422,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 379.440 m
-334.640 379.440 l
+162.800 247.920 m
+334.640 247.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 356.160 m
-334.640 356.160 l
+162.800 224.640 m
+334.640 224.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 379.690 m
-162.800 355.410 l
+162.800 248.170 m
+162.800 223.890 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 379.690 m
-334.640 355.410 l
+334.640 248.170 m
+334.640 223.890 l
 S
 [ ] 0 d
 1 w
@@ -14360,7 +14449,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 363.69300000000027 Td
+165.79988544000003 232.17300000000034 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -14368,26 +14457,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 379.440 m
-563.760 379.440 l
+334.640 247.920 m
+563.760 247.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 356.160 m
-563.760 356.160 l
+334.640 224.640 m
+563.760 224.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 379.690 m
-334.640 355.410 l
+334.640 248.170 m
+334.640 223.890 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 379.690 m
-563.760 355.410 l
+563.760 248.170 m
+563.760 223.890 l
 S
 [ ] 0 d
 1 w
@@ -14395,7 +14484,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 363.69300000000027 Td
+337.6397136 232.17300000000034 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -14403,26 +14492,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.160 m
-162.800 356.160 l
+48.240 224.640 m
+162.800 224.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 318.600 m
-162.800 318.600 l
+48.240 187.080 m
+162.800 187.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.410 m
-48.240 318.350 l
+48.240 224.890 m
+48.240 186.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 356.410 m
-162.800 318.350 l
+162.800 224.890 m
+162.800 186.830 l
 S
 [ ] 0 d
 1 w
@@ -14430,7 +14519,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 332.7730000000003 Td
+51.24000000000001 201.25300000000033 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -14438,26 +14527,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 356.160 m
-334.640 356.160 l
+162.800 224.640 m
+334.640 224.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 318.600 m
-334.640 318.600 l
+162.800 187.080 m
+334.640 187.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 356.410 m
-162.800 318.350 l
+162.800 224.890 m
+162.800 186.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 356.410 m
-334.640 318.350 l
+334.640 224.890 m
+334.640 186.830 l
 S
 [ ] 0 d
 1 w
@@ -14465,19 +14554,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 339.9130000000003 Td
+165.79988544000003 208.39300000000034 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 325.63300000000027 Td
+165.79988544000003 194.11300000000034 Td
 ET
 
 
 BT
-165.79988544000003 325.63300000000027 Td
+165.79988544000003 194.11300000000034 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -14485,26 +14574,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 356.160 m
-563.760 356.160 l
+334.640 224.640 m
+563.760 224.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 318.600 m
-563.760 318.600 l
+334.640 187.080 m
+563.760 187.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 356.410 m
-334.640 318.350 l
+334.640 224.890 m
+334.640 186.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 356.410 m
-563.760 318.350 l
+563.760 224.890 m
+563.760 186.830 l
 S
 [ ] 0 d
 1 w
@@ -14512,7 +14601,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 332.7730000000003 Td
+337.6397136 201.25300000000033 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -14522,7 +14611,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 289.0160000000003 Td
+48.24000000000001 157.49600000000032 Td
 /F2.0 13 Tf
 <322e31372e322e20526573706f6e736573> Tj
 ET
@@ -14530,51 +14619,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 236.760 51.552 37.560 re
+48.240 105.240 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 236.760 360.864 37.560 re
+99.792 105.240 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 236.760 103.104 37.560 re
+460.656 105.240 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 213.480 51.552 23.280 re
+48.240 81.960 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 213.480 360.864 23.280 re
+99.792 81.960 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 213.480 103.104 23.280 re
+460.656 81.960 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 274.320 m
-99.792 274.320 l
+48.240 142.800 m
+99.792 142.800 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 236.760 m
-99.792 236.760 l
+48.240 105.240 m
+99.792 105.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 274.570 m
-48.240 236.010 l
+48.240 143.050 m
+48.240 104.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 274.570 m
-99.792 236.010 l
+99.792 143.050 m
+99.792 104.490 l
 S
 [ ] 0 d
 1 w
@@ -14582,14 +14671,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 258.57300000000026 Td
+51.24000000000001 127.05300000000031 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 244.29300000000026 Td
+51.24000000000001 112.77300000000031 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -14597,26 +14686,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 274.320 m
-460.656 274.320 l
+99.792 142.800 m
+460.656 142.800 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 236.760 m
-460.656 236.760 l
+99.792 105.240 m
+460.656 105.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 274.570 m
-99.792 236.010 l
+99.792 143.050 m
+99.792 104.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 274.570 m
-460.656 236.010 l
+460.656 143.050 m
+460.656 104.490 l
 S
 [ ] 0 d
 1 w
@@ -14624,7 +14713,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 258.57300000000026 Td
+102.792 127.05300000000031 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -14632,26 +14721,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 274.320 m
-563.760 274.320 l
+460.656 142.800 m
+563.760 142.800 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 236.760 m
-563.760 236.760 l
+460.656 105.240 m
+563.760 105.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 274.570 m
-460.656 236.010 l
+460.656 143.050 m
+460.656 104.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 274.570 m
-563.760 236.010 l
+563.760 143.050 m
+563.760 104.490 l
 S
 [ ] 0 d
 1 w
@@ -14659,7 +14748,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 258.57300000000026 Td
+463.65600000000006 127.05300000000031 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -14667,26 +14756,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 236.760 m
-99.792 236.760 l
+48.240 105.240 m
+99.792 105.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 213.480 m
-99.792 213.480 l
+48.240 81.960 m
+99.792 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 237.010 m
-48.240 213.230 l
+48.240 105.490 m
+48.240 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 237.010 m
-99.792 213.230 l
+99.792 105.490 m
+99.792 81.710 l
 S
 [ ] 0 d
 1 w
@@ -14694,7 +14783,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 220.5130000000003 Td
+51.24000000000001 88.9930000000003 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -14702,26 +14791,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 236.760 m
-460.656 236.760 l
+99.792 105.240 m
+460.656 105.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 213.480 m
-460.656 213.480 l
+99.792 81.960 m
+460.656 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 237.010 m
-99.792 213.230 l
+99.792 105.490 m
+99.792 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 237.010 m
-460.656 213.230 l
+460.656 105.490 m
+460.656 81.710 l
 S
 [ ] 0 d
 1 w
@@ -14729,7 +14818,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 220.5130000000003 Td
+102.792 88.9930000000003 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -14737,26 +14826,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 236.760 m
-563.760 236.760 l
+460.656 105.240 m
+563.760 105.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 213.480 m
-563.760 213.480 l
+460.656 81.960 m
+563.760 81.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 237.010 m
-460.656 213.230 l
+460.656 105.490 m
+460.656 81.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 237.010 m
-563.760 213.230 l
+563.760 105.490 m
+563.760 81.710 l
 S
 [ ] 0 d
 1 w
@@ -14770,7 +14859,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 220.5130000000003 Td
+463.65600000000006 88.9930000000003 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -14778,65 +14867,6 @@ ET
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 183.89600000000024 Td
-/F2.0 13 Tf
-<322e31372e332e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 157.23600000000025 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 159.42000000000024 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 121.77600000000022 Td
-/F2.0 18 Tf
-<322e31382e20505554202f76322f6c6f6f702f7375626d69742f7b6c6f6f704e616d657d> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 87.53600000000023 Td
-/F2.0 13 Tf
-[<322e31382e312e20506172> 20.01953125 <616d6574657273>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
@@ -14861,127 +14891,188 @@ Q
 
 endstream
 endobj
-111 0 obj
+110 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 110 0 R
+/Contents 109 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
-/F3.0 24 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
+/F3.0 24 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [115 0 R 121 0 R]
+/Annots [111 0 R 117 0 R 122 0 R]
+>>
+endobj
+111 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 699.1270000000001 488.7510000000001 713.407]
+/Type /Annot
 >>
 endobj
 112 0 obj
-[111 0 R /XYZ 0 792.0 null]
+[110 0 R /XYZ 0 683.1600000000001 null]
 endobj
 113 0 obj
-[111 0 R /XYZ 0 718.32 null]
+[110 0 R /XYZ 0 626.8800000000002 null]
 endobj
 114 0 obj
-[111 0 R /XYZ 0 613.2000000000003 null]
+[110 0 R /XYZ 0 586.8000000000003 null]
 endobj
 115 0 obj
+[110 0 R /XYZ 0 481.68000000000046 null]
+endobj
+116 0 obj
+<< /Limits [(_responses_5) (_route76)]
+/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route64) 91 0 R (_route65) 162 0 R (_route66) 126 0 R (_route67) 138 0 R (_route68) 154 0 R (_route69) 145 0 R (_route70) 85 0 R (_route71) 101 0 R (_route72) 131 0 R (_route73) 113 0 R (_route74) 106 0 R (_route75) 119 0 R (_route76) 79 0 R]
+>>
+endobj
+117 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [463.65600000000006 524.0470000000004 488.7510000000001 538.3270000000003]
+/Rect [463.65600000000006 392.52700000000044 488.7510000000001 406.8070000000004]
 /Type /Annot
 >>
 endobj
-116 0 obj
-[111 0 R /XYZ 0 508.0800000000004 null]
-endobj
-117 0 obj
-[111 0 R /XYZ 0 451.80000000000035 null]
-endobj
 118 0 obj
-[111 0 R /XYZ 0 411.7200000000003 null]
+[110 0 R /XYZ 0 376.5600000000004 null]
 endobj
 119 0 obj
-[111 0 R /XYZ 0 306.6000000000003 null]
+[110 0 R /XYZ 0 320.28000000000037 null]
 endobj
 120 0 obj
-<< /Limits [(_responses_30) (_route18)]
-/Names [(_responses_30) 203 0 R (_responses_31) 209 0 R (_responses_4) 44 0 R (_responses_5) 50 0 R (_responses_6) 57 0 R (_responses_7) 63 0 R (_responses_8) 69 0 R (_responses_9) 77 0 R (_route10) 134 0 R (_route11) 117 0 R (_route12) 112 0 R (_route13) 123 0 R (_route14) 86 0 R (_route15) 100 0 R (_route18) 41 0 R]
->>
+[110 0 R /XYZ 0 280.20000000000033 null]
 endobj
 121 0 obj
+[110 0 R /XYZ 0 175.08000000000033 null]
+endobj
+122 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [463.65600000000006 217.4470000000003 488.7510000000001 231.7270000000003]
+/Rect [463.65600000000006 85.92700000000029 488.7510000000001 100.20700000000029]
 /Type /Annot
 >>
 endobj
-122 0 obj
-[111 0 R /XYZ 0 201.48000000000027 null]
-endobj
 123 0 obj
-[111 0 R /XYZ 0 145.20000000000024 null]
-endobj
-124 0 obj
-[111 0 R /XYZ 0 105.12000000000023 null]
-endobj
-125 0 obj
-<< /Length 18781
+<< /Length 16227
 >>
 stream
 q
 /DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 740.816 Td
+/F2.0 13 Tf
+<322e31372e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 714.1560000000001 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 716.3400000000001 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 678.6960000000001 Td
+/F2.0 18 Tf
+<322e31382e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 644.4560000000002 Td
+/F2.0 13 Tf
+[<322e31382e312e20506172> 20.01953125 <616d6574657273>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 732.720 114.560 23.280 re
+48.240 606.480 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 732.720 171.840 23.280 re
+162.800 606.480 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 732.720 229.120 23.280 re
+334.640 606.480 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 114.560 37.560 re
+48.240 568.920 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 695.160 171.840 37.560 re
+162.800 568.920 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 695.160 229.120 37.560 re
+334.640 568.920 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-162.800 756.000 l
+48.240 629.760 m
+162.800 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 630.010 m
+48.240 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 1 w
@@ -14989,7 +15080,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24000000000001 614.0130000000003 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -14997,26 +15088,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.000 m
-334.640 756.000 l
+162.800 629.760 m
+334.640 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
+162.800 630.010 m
+162.800 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 1 w
@@ -15024,7 +15115,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 740.2529999999999 Td
+165.79988544000003 614.0130000000003 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -15032,26 +15123,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.000 m
-563.760 756.000 l
+334.640 629.760 m
+563.760 629.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
+334.640 630.010 m
+334.640 605.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 630.010 m
+563.760 605.730 l
 S
 [ ] 0 d
 1 w
@@ -15059,7 +15150,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 740.2529999999999 Td
+337.6397136 614.0130000000003 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -15067,26 +15158,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
+48.240 606.480 m
+162.800 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-162.800 695.160 l
+48.240 568.920 m
+162.800 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 606.730 m
+48.240 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 1 w
@@ -15094,7 +15185,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 709.333 Td
+51.24000000000001 583.0930000000003 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -15102,26 +15193,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
+162.800 606.480 m
+334.640 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 695.160 m
-334.640 695.160 l
+162.800 568.920 m
+334.640 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+162.800 606.730 m
+162.800 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 1 w
@@ -15129,19 +15220,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 716.473 Td
+165.79988544000003 590.2330000000004 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544 702.193 Td
+165.79988544000003 575.9530000000003 Td
 ET
 
 
 BT
-165.79988544 702.193 Td
+165.79988544000003 575.9530000000003 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -15149,26 +15240,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+334.640 606.480 m
+563.760 606.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.160 m
-563.760 695.160 l
+334.640 568.920 m
+563.760 568.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+334.640 606.730 m
+334.640 568.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 606.730 m
+563.760 568.670 l
 S
 [ ] 0 d
 1 w
@@ -15176,7 +15267,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 709.333 Td
+337.6397136 583.0930000000003 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -15186,7 +15277,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 665.5760000000001 Td
+48.24000000000001 539.3360000000004 Td
 /F2.0 13 Tf
 <322e31382e322e20526573706f6e736573> Tj
 ET
@@ -15194,51 +15285,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 613.320 51.552 37.560 re
+48.240 487.080 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 613.320 360.864 37.560 re
+99.792 487.080 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 613.320 103.104 37.560 re
+460.656 487.080 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 590.040 51.552 23.280 re
+48.240 463.800 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 590.040 360.864 23.280 re
+99.792 463.800 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 590.040 103.104 23.280 re
+460.656 463.800 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 650.880 m
-99.792 650.880 l
+48.240 524.640 m
+99.792 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 651.130 m
-48.240 612.570 l
+48.240 524.890 m
+48.240 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 1 w
@@ -15246,14 +15337,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 635.1330000000003 Td
+51.24000000000001 508.8930000000004 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 620.8530000000002 Td
+51.24000000000001 494.6130000000004 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -15261,26 +15352,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 650.880 m
-460.656 650.880 l
+99.792 524.640 m
+460.656 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 1 w
@@ -15288,7 +15379,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 635.1330000000003 Td
+102.792 508.8930000000004 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -15296,26 +15387,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 650.880 m
-563.760 650.880 l
+460.656 524.640 m
+563.760 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 651.130 m
-563.760 612.570 l
+563.760 524.890 m
+563.760 486.330 l
 S
 [ ] 0 d
 1 w
@@ -15323,7 +15414,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 635.1330000000003 Td
+463.65600000000006 508.8930000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -15331,26 +15422,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 590.040 m
-99.792 590.040 l
+48.240 463.800 m
+99.792 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.570 m
-48.240 589.790 l
+48.240 487.330 m
+48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 1 w
@@ -15358,7 +15449,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 597.0730000000001 Td
+51.24000000000001 470.8330000000004 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -15366,26 +15457,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 590.040 m
-460.656 590.040 l
+99.792 463.800 m
+460.656 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 1 w
@@ -15393,7 +15484,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 597.0730000000001 Td
+102.792 470.8330000000004 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -15401,52 +15492,44 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 590.040 m
-563.760 590.040 l
+460.656 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 613.570 m
-563.760 589.790 l
+563.760 487.330 m
+563.760 463.550 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 597.0730000000001 Td
+463.65600000000006 470.8330000000004 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 560.4560000000002 Td
+48.24000000000001 434.2160000000004 Td
 /F2.0 13 Tf
 <322e31382e332e2050726f6475636573> Tj
 ET
@@ -15459,7 +15542,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 533.7960000000003 Td
+56.88050000000001 407.5560000000004 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -15472,9 +15555,9 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 535.9800000000004 Td
+66.24000000000001 409.7400000000004 Td
 /F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+<6170706c69636174696f6e2f786d6c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -15483,9 +15566,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 498.3360000000004 Td
+48.24000000000001 372.0960000000004 Td
 /F2.0 18 Tf
-<322e31392e20474554202f76322f6c6f6f702f737667526570726573656e746174696f6e2f7b6c6f6f704e616d657d> Tj
+[<322e31392e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -15494,7 +15577,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 464.09600000000034 Td
+48.24000000000001 337.85600000000034 Td
 /F2.0 13 Tf
 [<322e31392e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -15502,51 +15585,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 426.120 114.560 23.280 re
+48.240 299.880 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 426.120 171.840 23.280 re
+162.800 299.880 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 426.120 229.120 23.280 re
+334.640 299.880 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 388.560 114.560 37.560 re
+48.240 262.320 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 388.560 171.840 37.560 re
+162.800 262.320 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 388.560 229.120 37.560 re
+334.640 262.320 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 449.400 m
-162.800 449.400 l
+48.240 323.160 m
+162.800 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 426.120 m
-162.800 426.120 l
+48.240 299.880 m
+162.800 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 449.650 m
-48.240 425.370 l
+48.240 323.410 m
+48.240 299.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 449.650 m
-162.800 425.370 l
+162.800 323.410 m
+162.800 299.130 l
 S
 [ ] 0 d
 1 w
@@ -15554,7 +15637,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 433.6530000000003 Td
+51.24000000000001 307.4130000000003 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -15562,26 +15645,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 449.400 m
-334.640 449.400 l
+162.800 323.160 m
+334.640 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 426.120 m
-334.640 426.120 l
+162.800 299.880 m
+334.640 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 449.650 m
-162.800 425.370 l
+162.800 323.410 m
+162.800 299.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 449.650 m
-334.640 425.370 l
+334.640 323.410 m
+334.640 299.130 l
 S
 [ ] 0 d
 1 w
@@ -15589,7 +15672,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 433.6530000000003 Td
+165.79988544000003 307.4130000000003 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -15597,26 +15680,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 449.400 m
-563.760 449.400 l
+334.640 323.160 m
+563.760 323.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 426.120 m
-563.760 426.120 l
+334.640 299.880 m
+563.760 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 449.650 m
-334.640 425.370 l
+334.640 323.410 m
+334.640 299.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 449.650 m
-563.760 425.370 l
+563.760 323.410 m
+563.760 299.130 l
 S
 [ ] 0 d
 1 w
@@ -15624,7 +15707,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 433.6530000000003 Td
+337.6397136 307.4130000000003 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -15632,26 +15715,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.120 m
-162.800 426.120 l
+48.240 299.880 m
+162.800 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 388.560 m
-162.800 388.560 l
+48.240 262.320 m
+162.800 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.370 m
-48.240 388.310 l
+48.240 300.130 m
+48.240 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.370 m
-162.800 388.310 l
+162.800 300.130 m
+162.800 262.070 l
 S
 [ ] 0 d
 1 w
@@ -15659,7 +15742,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 402.73300000000035 Td
+51.24000000000001 276.49300000000034 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -15667,26 +15750,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.120 m
-334.640 426.120 l
+162.800 299.880 m
+334.640 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 388.560 m
-334.640 388.560 l
+162.800 262.320 m
+334.640 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.370 m
-162.800 388.310 l
+162.800 300.130 m
+162.800 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.370 m
-334.640 388.310 l
+334.640 300.130 m
+334.640 262.070 l
 S
 [ ] 0 d
 1 w
@@ -15694,19 +15777,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 409.87300000000033 Td
+165.79988544000003 283.6330000000003 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 395.5930000000003 Td
+165.79988544000003 269.3530000000003 Td
 ET
 
 
 BT
-165.79988544000003 395.5930000000003 Td
+165.79988544000003 269.3530000000003 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -15714,26 +15797,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.120 m
-563.760 426.120 l
+334.640 299.880 m
+563.760 299.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 388.560 m
-563.760 388.560 l
+334.640 262.320 m
+563.760 262.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.370 m
-334.640 388.310 l
+334.640 300.130 m
+334.640 262.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 426.370 m
-563.760 388.310 l
+563.760 300.130 m
+563.760 262.070 l
 S
 [ ] 0 d
 1 w
@@ -15741,7 +15824,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 402.73300000000035 Td
+337.6397136 276.49300000000034 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -15751,7 +15834,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 358.97600000000034 Td
+48.24000000000001 232.73600000000033 Td
 /F2.0 13 Tf
 <322e31392e322e20526573706f6e736573> Tj
 ET
@@ -15759,51 +15842,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 306.720 51.552 37.560 re
+48.240 180.480 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 306.720 360.864 37.560 re
+99.792 180.480 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 306.720 103.104 37.560 re
+460.656 180.480 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 283.440 51.552 23.280 re
+48.240 157.200 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 283.440 360.864 23.280 re
+99.792 157.200 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 283.440 103.104 23.280 re
+460.656 157.200 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 344.280 m
-99.792 344.280 l
+48.240 218.040 m
+99.792 218.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 306.720 m
-99.792 306.720 l
+48.240 180.480 m
+99.792 180.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 344.530 m
-48.240 305.970 l
+48.240 218.290 m
+48.240 179.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.530 m
-99.792 305.970 l
+99.792 218.290 m
+99.792 179.730 l
 S
 [ ] 0 d
 1 w
@@ -15811,14 +15894,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 328.5330000000003 Td
+51.24000000000001 202.29300000000032 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 314.25300000000027 Td
+51.24000000000001 188.01300000000032 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -15826,26 +15909,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.280 m
-460.656 344.280 l
+99.792 218.040 m
+460.656 218.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 306.720 m
-460.656 306.720 l
+99.792 180.480 m
+460.656 180.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.530 m
-99.792 305.970 l
+99.792 218.290 m
+99.792 179.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.530 m
-460.656 305.970 l
+460.656 218.290 m
+460.656 179.730 l
 S
 [ ] 0 d
 1 w
@@ -15853,7 +15936,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 328.5330000000003 Td
+102.792 202.29300000000032 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -15861,26 +15944,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.280 m
-563.760 344.280 l
+460.656 218.040 m
+563.760 218.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 306.720 m
-563.760 306.720 l
+460.656 180.480 m
+563.760 180.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.530 m
-460.656 305.970 l
+460.656 218.290 m
+460.656 179.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 344.530 m
-563.760 305.970 l
+563.760 218.290 m
+563.760 179.730 l
 S
 [ ] 0 d
 1 w
@@ -15888,7 +15971,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 328.5330000000003 Td
+463.65600000000006 202.29300000000032 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -15896,26 +15979,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 306.720 m
-99.792 306.720 l
+48.240 180.480 m
+99.792 180.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 283.440 m
-99.792 283.440 l
+48.240 157.200 m
+99.792 157.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 306.970 m
-48.240 283.190 l
+48.240 180.730 m
+48.240 156.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 306.970 m
-99.792 283.190 l
+99.792 180.730 m
+99.792 156.950 l
 S
 [ ] 0 d
 1 w
@@ -15923,7 +16006,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 290.4730000000003 Td
+51.24000000000001 164.23300000000032 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -15931,26 +16014,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 306.720 m
-460.656 306.720 l
+99.792 180.480 m
+460.656 180.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 283.440 m
-460.656 283.440 l
+99.792 157.200 m
+460.656 157.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 306.970 m
-99.792 283.190 l
+99.792 180.730 m
+99.792 156.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 306.970 m
-460.656 283.190 l
+460.656 180.730 m
+460.656 156.950 l
 S
 [ ] 0 d
 1 w
@@ -15958,7 +16041,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 290.4730000000003 Td
+102.792 164.23300000000032 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -15966,44 +16049,52 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 306.720 m
-563.760 306.720 l
+460.656 180.480 m
+563.760 180.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 283.440 m
-563.760 283.440 l
+460.656 157.200 m
+563.760 157.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 306.970 m
-460.656 283.190 l
+460.656 180.730 m
+460.656 156.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 306.970 m
-563.760 283.190 l
+563.760 180.730 m
+563.760 156.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 290.4730000000003 Td
+463.65600000000006 164.23300000000032 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4c6f6f70> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 253.85600000000028 Td
+48.24000000000001 127.61600000000028 Td
 /F2.0 13 Tf
 <322e31392e332e2050726f6475636573> Tj
 ET
@@ -16016,7 +16107,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 227.19600000000028 Td
+56.88050000000001 100.95600000000027 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -16029,20 +16120,108 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 229.38000000000028 Td
+66.24000000000001 103.14000000000027 Td
 /F4.0 10.5 Tf
-<6170706c69636174696f6e2f786d6c> Tj
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+557.7289999999999 14.388 Td
+/F1.0 9 Tf
+<39> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+124 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 123 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [134 0 R]
+>>
+endobj
+125 0 obj
+[124 0 R /XYZ 0 792.0 null]
+endobj
+126 0 obj
+[124 0 R /XYZ 0 702.1200000000001 null]
+endobj
+127 0 obj
+[124 0 R /XYZ 0 662.0400000000002 null]
+endobj
+128 0 obj
+[124 0 R /XYZ 0 556.9200000000003 null]
+endobj
+129 0 obj
+[124 0 R /XYZ 0 451.8000000000004 null]
+endobj
+130 0 obj
+<< /Limits [(_produces_16) (_produces_24)]
+/Names [(_produces_16) 125 0 R (_produces_17) 129 0 R (_produces_18) 135 0 R (_produces_19) 144 0 R (_produces_2) 36 0 R (_produces_20) 153 0 R (_produces_21) 161 0 R (_produces_22) 168 0 R (_produces_23) 172 0 R (_produces_24) 176 0 R]
+>>
+endobj
+131 0 obj
+[124 0 R /XYZ 0 395.5200000000004 null]
+endobj
+132 0 obj
+[124 0 R /XYZ 0 355.44000000000034 null]
+endobj
+133 0 obj
+[124 0 R /XYZ 0 250.32000000000033 null]
+endobj
+134 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 161.16700000000031 488.7510000000001 175.44700000000032]
+/Type /Annot
+>>
+endobj
+135 0 obj
+[124 0 R /XYZ 0 145.2000000000003 null]
+endobj
+136 0 obj
+<< /Length 19642
+>>
+stream
+q
+/DeviceRGB cs
 0.200 0.200 0.200 scn
+/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 191.73600000000027 Td
+48.24 734.976 Td
 /F2.0 18 Tf
-[<322e32302e20505554202f76322f6c6f6f702f756e6465706c6f> 20.01953125 <792f7b6c6f6f704e616d657d>] TJ
+[<322e32302e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -16051,7 +16230,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 157.49600000000027 Td
+48.24 700.7360000000001 Td
 /F2.0 13 Tf
 [<322e32302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -16059,51 +16238,63 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 119.520 114.560 23.280 re
+48.240 662.760 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 119.520 171.840 23.280 re
+162.800 662.760 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 119.520 229.120 23.280 re
+334.640 662.760 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 81.960 114.560 37.560 re
+48.240 625.200 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 81.960 171.840 37.560 re
+162.800 625.200 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 81.960 229.120 37.560 re
+334.640 625.200 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 587.640 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+162.800 587.640 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+334.640 587.640 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 142.800 m
-162.800 142.800 l
+48.240 686.040 m
+162.800 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 119.520 m
-162.800 119.520 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.050 m
-48.240 118.770 l
+48.240 686.290 m
+48.240 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 143.050 m
-162.800 118.770 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 1 w
@@ -16111,7 +16302,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 127.05300000000025 Td
+51.24 670.2930000000001 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -16119,26 +16310,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 142.800 m
-334.640 142.800 l
+162.800 686.040 m
+334.640 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 119.520 m
-334.640 119.520 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 143.050 m
-162.800 118.770 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 143.050 m
-334.640 118.770 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 1 w
@@ -16146,7 +16337,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 127.05300000000025 Td
+165.79988544 670.2930000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -16154,26 +16345,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 142.800 m
-563.760 142.800 l
+334.640 686.040 m
+563.760 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 119.520 m
-563.760 119.520 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 143.050 m
-334.640 118.770 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 143.050 m
-563.760 118.770 l
+563.760 686.290 m
+563.760 662.010 l
 S
 [ ] 0 d
 1 w
@@ -16181,7 +16372,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 127.05300000000025 Td
+337.6397136 670.2930000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -16189,26 +16380,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 119.520 m
-162.800 119.520 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 81.960 m
-162.800 81.960 l
+48.240 625.200 m
+162.800 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 119.770 m
-48.240 81.710 l
+48.240 663.010 m
+48.240 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.770 m
-162.800 81.710 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 1 w
@@ -16216,7 +16407,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 96.13300000000024 Td
+51.24 639.3730000000002 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -16224,26 +16415,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.520 m
-334.640 119.520 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 81.960 m
-334.640 81.960 l
+162.800 625.200 m
+334.640 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.770 m
-162.800 81.710 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.770 m
-334.640 81.710 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 1 w
@@ -16251,19 +16442,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 103.27300000000024 Td
+165.79988544 646.5130000000001 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 88.99300000000024 Td
+165.79988544 632.2330000000002 Td
 ET
 
 
 BT
-165.79988544000003 88.99300000000024 Td
+165.79988544 632.2330000000002 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -16271,26 +16462,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.520 m
-563.760 119.520 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 81.960 m
-563.760 81.960 l
+334.640 625.200 m
+563.760 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.770 m
-334.640 81.710 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 119.770 m
-563.760 81.710 l
+563.760 663.010 m
+563.760 624.950 l
 S
 [ ] 0 d
 1 w
@@ -16298,97 +16489,142 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 96.13300000000024 Td
+337.6397136 639.3730000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 625.200 m
+162.800 625.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 587.640 m
+162.800 587.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 625.450 m
+48.240 587.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 625.450 m
+162.800 587.390 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 601.8130000000001 Td
+/F2.0 10.5 Tf
+<426f6479> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 625.200 m
+334.640 625.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 587.640 m
+334.640 587.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+162.800 625.450 m
+162.800 587.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 625.450 m
+334.640 587.390 l
+S
+[ ] 0 d
 1 w
-0 J
-0 j
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+165.79988544 608.9530000000002 Td
+/F2.0 10.5 Tf
+<626f6479> Tj
+ET
+
+
+BT
+165.79988544 594.6730000000001 Td
+ET
+
+
+BT
+165.79988544 594.6730000000001 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 625.200 m
+563.760 625.200 l
+S
 [ ] 0 d
-/Stamp1 Do
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 587.640 m
+563.760 587.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+334.640 625.450 m
+334.640 587.390 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 625.450 m
+563.760 587.390 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-557.7289999999999 14.388 Td
-/F1.0 9 Tf
-<39> Tj
+337.6397136 601.8130000000001 Td
+/F1.0 10.5 Tf
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-126 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 125 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [128 0 R]
->>
-endobj
-127 0 obj
-[126 0 R /XYZ 0 683.1600000000001 null]
-endobj
-128 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 594.0070000000002 488.7510000000001 608.2870000000001]
-/Type /Annot
->>
-endobj
-129 0 obj
-[126 0 R /XYZ 0 578.0400000000002 null]
-endobj
-130 0 obj
-[126 0 R /XYZ 0 521.7600000000003 null]
-endobj
-131 0 obj
-[126 0 R /XYZ 0 481.68000000000035 null]
-endobj
-132 0 obj
-[126 0 R /XYZ 0 376.56000000000034 null]
-endobj
-133 0 obj
-[126 0 R /XYZ 0 271.4400000000003 null]
-endobj
-134 0 obj
-[126 0 R /XYZ 0 215.16000000000028 null]
-endobj
-135 0 obj
-[126 0 R /XYZ 0 175.08000000000027 null]
-endobj
-136 0 obj
-<< /Length 15145
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 740.816 Td
+48.24 558.0560000000002 Td
 /F2.0 13 Tf
 <322e32302e322e20526573706f6e736573> Tj
 ET
@@ -16396,51 +16632,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 688.560 51.552 37.560 re
+48.240 505.800 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 688.560 360.864 37.560 re
+99.792 505.800 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 688.560 103.104 37.560 re
+460.656 505.800 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 665.280 51.552 23.280 re
+48.240 482.520 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 665.280 360.864 23.280 re
+99.792 482.520 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 665.280 103.104 23.280 re
+460.656 482.520 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 726.120 m
-99.792 726.120 l
+48.240 543.360 m
+99.792 543.360 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 688.560 m
-99.792 688.560 l
+48.240 505.800 m
+99.792 505.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 726.370 m
-48.240 687.810 l
+48.240 543.610 m
+48.240 505.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.370 m
-99.792 687.810 l
+99.792 543.610 m
+99.792 505.050 l
 S
 [ ] 0 d
 1 w
@@ -16448,14 +16684,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 710.373 Td
+51.24 527.6130000000003 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 696.0930000000001 Td
+51.24 513.3330000000002 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -16463,26 +16699,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.120 m
-460.656 726.120 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 688.560 m
-460.656 688.560 l
+99.792 505.800 m
+460.656 505.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 726.370 m
-99.792 687.810 l
+99.792 543.610 m
+99.792 505.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.370 m
-460.656 687.810 l
+460.656 543.610 m
+460.656 505.050 l
 S
 [ ] 0 d
 1 w
@@ -16490,7 +16726,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 710.373 Td
+102.792 527.6130000000003 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -16498,26 +16734,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.120 m
-563.760 726.120 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 688.560 m
-563.760 688.560 l
+460.656 505.800 m
+563.760 505.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 726.370 m
-460.656 687.810 l
+460.656 543.610 m
+460.656 505.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 726.370 m
-563.760 687.810 l
+563.760 543.610 m
+563.760 505.050 l
 S
 [ ] 0 d
 1 w
@@ -16525,7 +16761,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 710.373 Td
+463.65600000000006 527.6130000000003 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -16533,26 +16769,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 688.560 m
-99.792 688.560 l
+48.240 505.800 m
+99.792 505.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 665.280 m
-99.792 665.280 l
+48.240 482.520 m
+99.792 482.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 688.810 m
-48.240 665.030 l
+48.240 506.050 m
+48.240 482.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.810 m
-99.792 665.030 l
+99.792 506.050 m
+99.792 482.270 l
 S
 [ ] 0 d
 1 w
@@ -16560,7 +16796,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 672.3130000000001 Td
+51.24 489.5530000000002 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -16568,26 +16804,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.560 m
-460.656 688.560 l
+99.792 505.800 m
+460.656 505.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 665.280 m
-460.656 665.280 l
+99.792 482.520 m
+460.656 482.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 688.810 m
-99.792 665.030 l
+99.792 506.050 m
+99.792 482.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.810 m
-460.656 665.030 l
+460.656 506.050 m
+460.656 482.270 l
 S
 [ ] 0 d
 1 w
@@ -16595,7 +16831,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 672.3130000000001 Td
+102.792 489.5530000000002 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -16603,26 +16839,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.560 m
-563.760 688.560 l
+460.656 505.800 m
+563.760 505.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 665.280 m
-563.760 665.280 l
+460.656 482.520 m
+563.760 482.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 688.810 m
-460.656 665.030 l
+460.656 506.050 m
+460.656 482.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 688.810 m
-563.760 665.030 l
+563.760 506.050 m
+563.760 482.270 l
 S
 [ ] 0 d
 1 w
@@ -16636,7 +16872,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 672.3130000000001 Td
+463.65600000000006 489.5530000000002 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -16648,9 +16884,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 635.6960000000003 Td
+48.24 452.9360000000002 Td
 /F2.0 13 Tf
-<322e32302e332e2050726f6475636573> Tj
+<322e32302e332e20436f6e73756d6573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -16661,7 +16897,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 609.0360000000003 Td
+56.88050000000001 426.2760000000002 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -16674,7 +16910,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 611.2200000000004 Td
+66.24000000000001 428.4600000000002 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -16685,9 +16921,46 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 573.5760000000004 Td
+48.24000000000001 396.6560000000002 Td
+/F2.0 13 Tf
+<322e32302e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 369.99600000000015 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 372.1800000000002 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 334.5360000000002 Td
 /F2.0 18 Tf
-[<322e32312e20504f53> 20.01953125 <54202f76322f6c6f6f702f757064617465476c6f62616c50726f706572746965732f7b6c6f6f704e616d657d>] TJ
+[<322e32312e20504f53> 20.01953125 <54>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -16696,7 +16969,18 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 539.3360000000005 Td
+48.24000000000001 306.45600000000013 Td
+/F2.0 18 Tf
+<2f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 272.2160000000001 Td
 /F2.0 13 Tf
 [<322e32312e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -16704,63 +16988,63 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 501.360 114.560 23.280 re
+48.240 234.240 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 501.360 171.840 23.280 re
+162.800 234.240 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 501.360 229.120 23.280 re
+334.640 234.240 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 463.800 114.560 37.560 re
+48.240 196.680 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 463.800 171.840 37.560 re
+162.800 196.680 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 463.800 229.120 37.560 re
+334.640 196.680 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 426.240 114.560 37.560 re
+48.240 159.120 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-162.800 426.240 171.840 37.560 re
+162.800 159.120 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-334.640 426.240 229.120 37.560 re
+334.640 159.120 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.640 m
-162.800 524.640 l
+48.240 257.520 m
+162.800 257.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-162.800 501.360 l
+48.240 234.240 m
+162.800 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.890 m
-48.240 500.610 l
+48.240 257.770 m
+48.240 233.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.890 m
-162.800 500.610 l
+162.800 257.770 m
+162.800 233.490 l
 S
 [ ] 0 d
 1 w
@@ -16768,7 +17052,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.89300000000054 Td
+51.24000000000001 241.7730000000001 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -16776,26 +17060,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.640 m
-334.640 524.640 l
+162.800 257.520 m
+334.640 257.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 501.360 m
-334.640 501.360 l
+162.800 234.240 m
+334.640 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 524.890 m
-162.800 500.610 l
+162.800 257.770 m
+162.800 233.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.890 m
-334.640 500.610 l
+334.640 257.770 m
+334.640 233.490 l
 S
 [ ] 0 d
 1 w
@@ -16803,7 +17087,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 508.89300000000054 Td
+165.79988544000003 241.7730000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -16811,26 +17095,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.640 m
-563.760 524.640 l
+334.640 257.520 m
+563.760 257.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 501.360 m
-563.760 501.360 l
+334.640 234.240 m
+563.760 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 524.890 m
-334.640 500.610 l
+334.640 257.770 m
+334.640 233.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 524.890 m
-563.760 500.610 l
+563.760 257.770 m
+563.760 233.490 l
 S
 [ ] 0 d
 1 w
@@ -16838,7 +17122,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 508.89300000000054 Td
+337.6397136 241.7730000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -16846,26 +17130,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.360 m
-162.800 501.360 l
+48.240 234.240 m
+162.800 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 463.800 m
-162.800 463.800 l
+48.240 196.680 m
+162.800 196.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 501.610 m
-48.240 463.550 l
+48.240 234.490 m
+48.240 196.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.610 m
-162.800 463.550 l
+162.800 234.490 m
+162.800 196.430 l
 S
 [ ] 0 d
 1 w
@@ -16873,7 +17157,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 477.9730000000006 Td
+51.24000000000001 210.8530000000001 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -16881,26 +17165,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.360 m
-334.640 501.360 l
+162.800 234.240 m
+334.640 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 463.800 m
-334.640 463.800 l
+162.800 196.680 m
+334.640 196.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 501.610 m
-162.800 463.550 l
+162.800 234.490 m
+162.800 196.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.610 m
-334.640 463.550 l
+334.640 234.490 m
+334.640 196.430 l
 S
 [ ] 0 d
 1 w
@@ -16908,19 +17192,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 485.11300000000057 Td
+165.79988544000003 217.9930000000001 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 470.83300000000054 Td
+165.79988544000003 203.7130000000001 Td
 ET
 
 
 BT
-165.79988544000003 470.83300000000054 Td
+165.79988544000003 203.7130000000001 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -16928,26 +17212,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.360 m
-563.760 501.360 l
+334.640 234.240 m
+563.760 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 463.800 m
-563.760 463.800 l
+334.640 196.680 m
+563.760 196.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 501.610 m
-334.640 463.550 l
+334.640 234.490 m
+334.640 196.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 501.610 m
-563.760 463.550 l
+563.760 234.490 m
+563.760 196.430 l
 S
 [ ] 0 d
 1 w
@@ -16955,7 +17239,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 477.9730000000006 Td
+337.6397136 210.8530000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -16963,26 +17247,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 463.800 m
-162.800 463.800 l
+48.240 196.680 m
+162.800 196.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.240 m
-162.800 426.240 l
+48.240 159.120 m
+162.800 159.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 464.050 m
-48.240 425.990 l
+48.240 196.930 m
+48.240 158.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 464.050 m
-162.800 425.990 l
+162.800 196.930 m
+162.800 158.870 l
 S
 [ ] 0 d
 1 w
@@ -16990,7 +17274,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 440.4130000000005 Td
+51.24000000000001 173.2930000000001 Td
 /F2.0 10.5 Tf
 <426f6479> Tj
 ET
@@ -16998,26 +17282,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 463.800 m
-334.640 463.800 l
+162.800 196.680 m
+334.640 196.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.240 m
-334.640 426.240 l
+162.800 159.120 m
+334.640 159.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 464.050 m
-162.800 425.990 l
+162.800 196.930 m
+162.800 158.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 464.050 m
-334.640 425.990 l
+334.640 196.930 m
+334.640 158.870 l
 S
 [ ] 0 d
 1 w
@@ -17025,19 +17309,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 447.5530000000005 Td
+165.79988544000003 180.4330000000001 Td
 /F2.0 10.5 Tf
 <626f6479> Tj
 ET
 
 
 BT
-165.79988544000003 433.2730000000005 Td
+165.79988544000003 166.1530000000001 Td
 ET
 
 
 BT
-165.79988544000003 433.2730000000005 Td
+165.79988544000003 166.1530000000001 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -17045,26 +17329,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 463.800 m
-563.760 463.800 l
+334.640 196.680 m
+563.760 196.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.240 m
-563.760 426.240 l
+334.640 159.120 m
+563.760 159.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 464.050 m
-334.640 425.990 l
+334.640 196.930 m
+334.640 158.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 464.050 m
-563.760 425.990 l
+563.760 196.930 m
+563.760 158.870 l
 S
 [ ] 0 d
 1 w
@@ -17078,9 +17362,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-337.6397136 440.4130000000005 Td
+337.6397136 173.2930000000001 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<4d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -17090,7 +17374,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 396.6560000000005 Td
+48.24000000000001 129.53600000000006 Td
 /F2.0 13 Tf
 <322e32312e322e20526573706f6e736573> Tj
 ET
@@ -17098,51 +17382,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 344.400 51.552 37.560 re
+48.240 77.280 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 344.400 360.864 37.560 re
+99.792 77.280 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 344.400 103.104 37.560 re
+460.656 77.280 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 321.120 51.552 23.280 re
+48.240 54.000 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 321.120 360.864 23.280 re
+99.792 54.000 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 321.120 103.104 23.280 re
+460.656 54.000 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 381.960 m
-99.792 381.960 l
+48.240 114.840 m
+99.792 114.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 344.400 m
-99.792 344.400 l
+48.240 77.280 m
+99.792 77.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 382.210 m
-48.240 343.650 l
+48.240 115.090 m
+48.240 76.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 382.210 m
-99.792 343.650 l
+99.792 115.090 m
+99.792 76.530 l
 S
 [ ] 0 d
 1 w
@@ -17150,14 +17434,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 366.2130000000005 Td
+51.24000000000001 99.09300000000006 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 351.93300000000045 Td
+51.24000000000001 84.81300000000006 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -17165,26 +17449,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 381.960 m
-460.656 381.960 l
+99.792 114.840 m
+460.656 114.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 344.400 m
-460.656 344.400 l
+99.792 77.280 m
+460.656 77.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 382.210 m
-99.792 343.650 l
+99.792 115.090 m
+99.792 76.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 382.210 m
-460.656 343.650 l
+460.656 115.090 m
+460.656 76.530 l
 S
 [ ] 0 d
 1 w
@@ -17192,7 +17476,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 366.2130000000005 Td
+102.792 99.09300000000006 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -17200,26 +17484,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 381.960 m
-563.760 381.960 l
+460.656 114.840 m
+563.760 114.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 344.400 m
-563.760 344.400 l
+460.656 77.280 m
+563.760 77.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 382.210 m
-460.656 343.650 l
+460.656 115.090 m
+460.656 76.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 382.210 m
-563.760 343.650 l
+563.760 115.090 m
+563.760 76.530 l
 S
 [ ] 0 d
 1 w
@@ -17227,7 +17511,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 366.2130000000005 Td
+463.65600000000006 99.09300000000006 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -17235,26 +17519,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 344.400 m
-99.792 344.400 l
+48.240 77.280 m
+99.792 77.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 321.120 m
-99.792 321.120 l
+48.240 54.000 m
+99.792 54.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 344.650 m
-48.240 320.870 l
+48.240 77.530 m
+48.240 53.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.650 m
-99.792 320.870 l
+99.792 77.530 m
+99.792 53.750 l
 S
 [ ] 0 d
 1 w
@@ -17262,7 +17546,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 328.1530000000005 Td
+51.24000000000001 61.03300000000006 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -17270,26 +17554,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.400 m
-460.656 344.400 l
+99.792 77.280 m
+460.656 77.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 321.120 m
-460.656 321.120 l
+99.792 54.000 m
+460.656 54.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.650 m
-99.792 320.870 l
+99.792 77.530 m
+99.792 53.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.650 m
-460.656 320.870 l
+460.656 77.530 m
+460.656 53.750 l
 S
 [ ] 0 d
 1 w
@@ -17297,7 +17581,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 328.1530000000005 Td
+102.792 61.03300000000006 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -17305,26 +17589,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.400 m
-563.760 344.400 l
+460.656 77.280 m
+563.760 77.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 321.120 m
-563.760 321.120 l
+460.656 54.000 m
+563.760 54.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.650 m
-460.656 320.870 l
+460.656 77.530 m
+460.656 53.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 344.650 m
-563.760 320.870 l
+563.760 77.530 m
+563.760 53.750 l
 S
 [ ] 0 d
 1 w
@@ -17338,19 +17622,123 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 328.1530000000005 Td
+463.65600000000006 61.03300000000006 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<4d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 291.53600000000046 Td
+49.24 14.388 Td
+/F1.0 9 Tf
+<3130> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+137 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 136 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [140 0 R 142 0 R 147 0 R 149 0 R]
+>>
+endobj
+138 0 obj
+[137 0 R /XYZ 0 792.0 null]
+endobj
+139 0 obj
+[137 0 R /XYZ 0 718.32 null]
+endobj
+140 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [337.6397136 598.7470000000002 390.7907136 613.0270000000002]
+/Type /Annot
+>>
+endobj
+141 0 obj
+[137 0 R /XYZ 0 575.6400000000001 null]
+endobj
+142 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 486.48700000000025 488.7510000000001 500.7670000000002]
+/Type /Annot
+>>
+endobj
+143 0 obj
+[137 0 R /XYZ 0 470.5200000000002 null]
+endobj
+144 0 obj
+[137 0 R /XYZ 0 414.2400000000002 null]
+endobj
+145 0 obj
+[137 0 R /XYZ 0 357.96000000000015 null]
+endobj
+146 0 obj
+[137 0 R /XYZ 0 289.8000000000001 null]
+endobj
+147 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [337.6397136 170.22700000000012 433.5677136 184.50700000000012]
+/Type /Annot
+>>
+endobj
+148 0 obj
+[137 0 R /XYZ 0 147.1200000000001 null]
+endobj
+149 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [463.65600000000006 57.967000000000056 559.5840000000001 72.24700000000006]
+/Type /Annot
+>>
+endobj
+150 0 obj
+<< /Length 15455
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 740.816 Td
 /F2.0 13 Tf
 <322e32312e332e20436f6e73756d6573> Tj
 ET
@@ -17363,7 +17751,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 264.87600000000043 Td
+56.88050000000001 714.1560000000001 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -17376,7 +17764,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 267.0600000000004 Td
+66.24000000000001 716.3400000000001 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -17387,7 +17775,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 235.25600000000043 Td
+48.24000000000001 684.5360000000002 Td
 /F2.0 13 Tf
 <322e32312e342e2050726f6475636573> Tj
 ET
@@ -17400,7 +17788,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 208.5960000000004 Td
+56.88050000000001 657.8760000000002 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -17413,7 +17801,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 210.7800000000004 Td
+66.24000000000001 660.0600000000003 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -17424,7 +17812,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 173.13600000000037 Td
+48.24000000000001 622.4160000000003 Td
 /F2.0 18 Tf
 [<322e32322e20504f53> 20.01953125 <54>] TJ
 ET
@@ -17435,9 +17823,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 145.05600000000038 Td
+48.24000000000001 594.3360000000004 Td
 /F2.0 18 Tf
-<2f76322f6c6f6f702f7570646174654d6963726f73657276696365506f6c6963792f7b6c6f6f704e616d657d> Tj
+[<2f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -17446,180 +17834,71 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 110.81600000000037 Td
+48.24000000000001 560.0960000000005 Td
 /F2.0 13 Tf
 [<322e32322e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3130> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-137 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 136 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
-/F3.0 24 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [139 0 R 143 0 R 145 0 R]
->>
-endobj
-138 0 obj
-[137 0 R /XYZ 0 792.0 null]
-endobj
-139 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 669.2470000000002 488.7510000000001 683.5270000000002]
-/Type /Annot
->>
-endobj
-140 0 obj
-[137 0 R /XYZ 0 653.2800000000002 null]
-endobj
-141 0 obj
-[137 0 R /XYZ 0 597.0000000000003 null]
-endobj
-142 0 obj
-[137 0 R /XYZ 0 556.9200000000004 null]
-endobj
-143 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [337.6397136 437.3470000000005 390.7907136 451.6270000000005]
-/Type /Annot
->>
-endobj
-144 0 obj
-[137 0 R /XYZ 0 414.2400000000005 null]
-endobj
-145 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 325.0870000000005 488.7510000000001 339.3670000000005]
-/Type /Annot
->>
-endobj
-146 0 obj
-[137 0 R /XYZ 0 309.12000000000046 null]
-endobj
-147 0 obj
-[137 0 R /XYZ 0 252.84000000000043 null]
-endobj
-148 0 obj
-<< /Limits [(_produces_19) (_produces_27)]
-/Names [(_produces_19) 140 0 R (_produces_2) 37 0 R (_produces_20) 147 0 R (_produces_21) 158 0 R (_produces_22) 167 0 R (_produces_23) 172 0 R (_produces_24) 176 0 R (_produces_25) 183 0 R (_produces_26) 188 0 R (_produces_27) 197 0 R]
->>
-endobj
-149 0 obj
-[137 0 R /XYZ 0 196.5600000000004 null]
-endobj
-150 0 obj
-[137 0 R /XYZ 0 128.40000000000038 null]
-endobj
-151 0 obj
-<< /Limits [(_parameters_15) (_paths)]
-/Names [(_parameters_15) 142 0 R (_parameters_16) 150 0 R (_parameters_17) 160 0 R (_parameters_18) 169 0 R (_parameters_19) 179 0 R (_parameters_2) 62 0 R (_parameters_20) 185 0 R (_parameters_21) 190 0 R (_parameters_22) 208 0 R (_parameters_3) 67 0 R (_parameters_4) 76 0 R (_parameters_5) 80 0 R (_parameters_6) 87 0 R (_parameters_7) 91 0 R (_parameters_8) 101 0 R (_parameters_9) 106 0 R (_paths) 28 0 R]
->>
-endobj
-152 0 obj
-<< /Length 19757
->>
-stream
-q
-/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 732.720 114.560 23.280 re
+48.240 522.120 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 732.720 171.840 23.280 re
+162.800 522.120 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 732.720 229.120 23.280 re
+334.640 522.120 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 114.560 37.560 re
+48.240 484.560 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 695.160 171.840 37.560 re
+162.800 484.560 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 695.160 229.120 37.560 re
+334.640 484.560 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 657.600 114.560 37.560 re
+48.240 447.000 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-162.800 657.600 171.840 37.560 re
+162.800 447.000 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-334.640 657.600 229.120 37.560 re
+334.640 447.000 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-162.800 756.000 l
+48.240 545.400 m
+162.800 545.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
+48.240 522.120 m
+162.800 522.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 545.650 m
+48.240 521.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
+162.800 545.650 m
+162.800 521.370 l
 S
 [ ] 0 d
 1 w
@@ -17627,7 +17906,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24000000000001 529.6530000000005 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -17635,26 +17914,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.000 m
-334.640 756.000 l
+162.800 545.400 m
+334.640 545.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
+162.800 522.120 m
+334.640 522.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
+162.800 545.650 m
+162.800 521.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
+334.640 545.650 m
+334.640 521.370 l
 S
 [ ] 0 d
 1 w
@@ -17662,7 +17941,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 740.2529999999999 Td
+165.79988544000003 529.6530000000005 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -17670,26 +17949,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.000 m
-563.760 756.000 l
+334.640 545.400 m
+563.760 545.400 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+334.640 522.120 m
+563.760 522.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
+334.640 545.650 m
+334.640 521.370 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 545.650 m
+563.760 521.370 l
 S
 [ ] 0 d
 1 w
@@ -17697,7 +17976,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 740.2529999999999 Td
+337.6397136 529.6530000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -17705,26 +17984,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
+48.240 522.120 m
+162.800 522.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-162.800 695.160 l
+48.240 484.560 m
+162.800 484.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 522.370 m
+48.240 484.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+162.800 522.370 m
+162.800 484.310 l
 S
 [ ] 0 d
 1 w
@@ -17732,7 +18011,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 709.333 Td
+51.24000000000001 498.7330000000006 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -17740,26 +18019,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
+162.800 522.120 m
+334.640 522.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 695.160 m
-334.640 695.160 l
+162.800 484.560 m
+334.640 484.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+162.800 522.370 m
+162.800 484.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+334.640 522.370 m
+334.640 484.310 l
 S
 [ ] 0 d
 1 w
@@ -17767,19 +18046,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 716.473 Td
+165.79988544000003 505.87300000000056 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544 702.193 Td
+165.79988544000003 491.59300000000053 Td
 ET
 
 
 BT
-165.79988544 702.193 Td
+165.79988544000003 491.59300000000053 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -17787,26 +18066,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+334.640 522.120 m
+563.760 522.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.160 m
-563.760 695.160 l
+334.640 484.560 m
+563.760 484.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+334.640 522.370 m
+334.640 484.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 522.370 m
+563.760 484.310 l
 S
 [ ] 0 d
 1 w
@@ -17814,7 +18093,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 709.333 Td
+337.6397136 498.7330000000006 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -17822,26 +18101,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-162.800 695.160 l
+48.240 484.560 m
+162.800 484.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-162.800 657.600 l
+48.240 447.000 m
+162.800 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 484.810 m
+48.240 446.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 695.410 m
-162.800 657.350 l
+162.800 484.810 m
+162.800 446.750 l
 S
 [ ] 0 d
 1 w
@@ -17849,7 +18128,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 671.7729999999999 Td
+51.24000000000001 461.1730000000005 Td
 /F2.0 10.5 Tf
 <426f6479> Tj
 ET
@@ -17857,26 +18136,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 695.160 m
-334.640 695.160 l
+162.800 484.560 m
+334.640 484.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 657.600 m
-334.640 657.600 l
+162.800 447.000 m
+334.640 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 695.410 m
-162.800 657.350 l
+162.800 484.810 m
+162.800 446.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.410 m
-334.640 657.350 l
+334.640 484.810 m
+334.640 446.750 l
 S
 [ ] 0 d
 1 w
@@ -17884,19 +18163,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 678.913 Td
+165.79988544000003 468.3130000000005 Td
 /F2.0 10.5 Tf
 <626f6479> Tj
 ET
 
 
 BT
-165.79988544 664.6329999999999 Td
+165.79988544000003 454.03300000000047 Td
 ET
 
 
 BT
-165.79988544 664.6329999999999 Td
+165.79988544000003 454.03300000000047 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -17904,26 +18183,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.160 m
-563.760 695.160 l
+334.640 484.560 m
+563.760 484.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 657.600 m
-563.760 657.600 l
+334.640 447.000 m
+563.760 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.410 m
-334.640 657.350 l
+334.640 484.810 m
+334.640 446.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 484.810 m
+563.760 446.750 l
 S
 [ ] 0 d
 1 w
@@ -17937,9 +18216,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-337.6397136 671.7729999999999 Td
+337.6397136 461.1730000000005 Td
 /F1.0 10.5 Tf
-<4d6963726f53657276696365506f6c696379> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -17949,7 +18228,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 628.016 Td
+48.24000000000001 417.4160000000005 Td
 /F2.0 13 Tf
 <322e32322e322e20526573706f6e736573> Tj
 ET
@@ -17957,51 +18236,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 575.760 51.552 37.560 re
+48.240 365.160 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 575.760 360.864 37.560 re
+99.792 365.160 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 575.760 103.104 37.560 re
+460.656 365.160 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 552.480 51.552 23.280 re
+48.240 341.880 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 552.480 360.864 23.280 re
+99.792 341.880 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 552.480 103.104 23.280 re
+460.656 341.880 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 402.720 m
+99.792 402.720 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 575.760 m
-99.792 575.760 l
+48.240 365.160 m
+99.792 365.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.570 m
-48.240 575.010 l
+48.240 402.970 m
+48.240 364.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 575.010 l
+99.792 402.970 m
+99.792 364.410 l
 S
 [ ] 0 d
 1 w
@@ -18009,14 +18288,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 597.5730000000001 Td
+51.24000000000001 386.97300000000047 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 583.293 Td
+51.24000000000001 372.69300000000044 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -18024,26 +18303,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 402.720 m
+460.656 402.720 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 575.760 m
-460.656 575.760 l
+99.792 365.160 m
+460.656 365.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 575.010 l
+99.792 402.970 m
+99.792 364.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 575.010 l
+460.656 402.970 m
+460.656 364.410 l
 S
 [ ] 0 d
 1 w
@@ -18051,7 +18330,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 597.5730000000001 Td
+102.792 386.97300000000047 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -18059,26 +18338,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 402.720 m
+563.760 402.720 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 575.760 m
-563.760 575.760 l
+460.656 365.160 m
+563.760 365.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 575.010 l
+460.656 402.970 m
+460.656 364.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 613.570 m
-563.760 575.010 l
+563.760 402.970 m
+563.760 364.410 l
 S
 [ ] 0 d
 1 w
@@ -18086,7 +18365,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 597.5730000000001 Td
+463.65600000000006 386.97300000000047 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -18094,26 +18373,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 575.760 m
-99.792 575.760 l
+48.240 365.160 m
+99.792 365.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 552.480 m
-99.792 552.480 l
+48.240 341.880 m
+99.792 341.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 576.010 m
-48.240 552.230 l
+48.240 365.410 m
+48.240 341.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 576.010 m
-99.792 552.230 l
+99.792 365.410 m
+99.792 341.630 l
 S
 [ ] 0 d
 1 w
@@ -18121,7 +18400,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 559.5129999999999 Td
+51.24000000000001 348.91300000000047 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -18129,26 +18408,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 575.760 m
-460.656 575.760 l
+99.792 365.160 m
+460.656 365.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 552.480 m
-460.656 552.480 l
+99.792 341.880 m
+460.656 341.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 576.010 m
-99.792 552.230 l
+99.792 365.410 m
+99.792 341.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 576.010 m
-460.656 552.230 l
+460.656 365.410 m
+460.656 341.630 l
 S
 [ ] 0 d
 1 w
@@ -18156,7 +18435,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 559.5129999999999 Td
+102.792 348.91300000000047 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -18164,26 +18443,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 575.760 m
-563.760 575.760 l
+460.656 365.160 m
+563.760 365.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 552.480 m
-563.760 552.480 l
+460.656 341.880 m
+563.760 341.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 576.010 m
-460.656 552.230 l
+460.656 365.410 m
+460.656 341.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 576.010 m
-563.760 552.230 l
+563.760 365.410 m
+563.760 341.630 l
 S
 [ ] 0 d
 1 w
@@ -18197,9 +18476,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 559.5129999999999 Td
+463.65600000000006 348.91300000000047 Td
 /F1.0 10.5 Tf
-<4d6963726f53657276696365506f6c696379> Tj
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18209,7 +18488,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 522.8960000000001 Td
+48.24000000000001 312.29600000000045 Td
 /F2.0 13 Tf
 <322e32322e332e20436f6e73756d6573> Tj
 ET
@@ -18222,7 +18501,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 496.23600000000016 Td
+56.88050000000001 285.6360000000004 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -18235,7 +18514,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 498.4200000000002 Td
+66.24000000000001 287.8200000000004 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -18246,7 +18525,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 466.61600000000016 Td
+48.24000000000001 256.0160000000004 Td
 /F2.0 13 Tf
 <322e32322e342e2050726f6475636573> Tj
 ET
@@ -18259,7 +18538,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 439.95600000000013 Td
+56.88050000000001 229.35600000000042 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -18272,7 +18551,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 442.14000000000016 Td
+66.24000000000001 231.54000000000042 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -18283,20 +18562,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 404.49600000000015 Td
-/F2.0 18 Tf
-[<322e32332e20504f53> 20.01953125 <54>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 376.41600000000017 Td
+48.24000000000001 193.8960000000004 Td
 /F2.0 18 Tf
-[<2f76322f6c6f6f702f7570646174654f706572> 20.01953125 <6174696f6e616c506f6c69636965732f7b6c6f6f704e616d657d>] TJ
+<322e32332e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18305,7 +18573,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 342.1760000000001 Td
+48.24000000000001 159.6560000000004 Td
 /F2.0 13 Tf
 [<322e32332e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -18313,63 +18581,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 304.200 114.560 23.280 re
+48.240 121.680 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 304.200 171.840 23.280 re
+162.800 121.680 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 304.200 229.120 23.280 re
+334.640 121.680 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 266.640 114.560 37.560 re
+48.240 84.120 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 266.640 171.840 37.560 re
+162.800 84.120 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 266.640 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 229.080 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-162.800 229.080 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-334.640 229.080 229.120 37.560 re
+334.640 84.120 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 327.480 m
-162.800 327.480 l
+48.240 144.960 m
+162.800 144.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 304.200 m
-162.800 304.200 l
+48.240 121.680 m
+162.800 121.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 327.730 m
-48.240 303.450 l
+48.240 145.210 m
+48.240 120.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 327.730 m
-162.800 303.450 l
+162.800 145.210 m
+162.800 120.930 l
 S
 [ ] 0 d
 1 w
@@ -18377,7 +18633,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 311.73300000000006 Td
+51.24000000000001 129.2130000000004 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -18385,26 +18641,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 327.480 m
-334.640 327.480 l
+162.800 144.960 m
+334.640 144.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 304.200 m
-334.640 304.200 l
+162.800 121.680 m
+334.640 121.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 327.730 m
-162.800 303.450 l
+162.800 145.210 m
+162.800 120.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 327.730 m
-334.640 303.450 l
+334.640 145.210 m
+334.640 120.930 l
 S
 [ ] 0 d
 1 w
@@ -18412,7 +18668,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 311.73300000000006 Td
+165.79988544000003 129.2130000000004 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -18420,26 +18676,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 327.480 m
-563.760 327.480 l
+334.640 144.960 m
+563.760 144.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 304.200 m
-563.760 304.200 l
+334.640 121.680 m
+563.760 121.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 327.730 m
-334.640 303.450 l
+334.640 145.210 m
+334.640 120.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 327.730 m
-563.760 303.450 l
+563.760 145.210 m
+563.760 120.930 l
 S
 [ ] 0 d
 1 w
@@ -18447,7 +18703,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 311.73300000000006 Td
+337.6397136 129.2130000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -18455,26 +18711,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 304.200 m
-162.800 304.200 l
+48.240 121.680 m
+162.800 121.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 266.640 m
-162.800 266.640 l
+48.240 84.120 m
+162.800 84.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 304.450 m
-48.240 266.390 l
+48.240 121.930 m
+48.240 83.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 304.450 m
-162.800 266.390 l
+162.800 121.930 m
+162.800 83.870 l
 S
 [ ] 0 d
 1 w
@@ -18482,7 +18738,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 280.81300000000005 Td
+51.24000000000001 98.29300000000038 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -18490,26 +18746,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 304.200 m
-334.640 304.200 l
+162.800 121.680 m
+334.640 121.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 266.640 m
-334.640 266.640 l
+162.800 84.120 m
+334.640 84.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 304.450 m
-162.800 266.390 l
+162.800 121.930 m
+162.800 83.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 304.450 m
-334.640 266.390 l
+334.640 121.930 m
+334.640 83.870 l
 S
 [ ] 0 d
 1 w
@@ -18517,19 +18773,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 287.95300000000003 Td
+165.79988544000003 105.43300000000038 Td
 /F2.0 10.5 Tf
 <6c6f6f704e616d65> Tj
 ET
 
 
 BT
-165.79988544000003 273.673 Td
+165.79988544000003 91.15300000000038 Td
 ET
 
 
 BT
-165.79988544000003 273.673 Td
+165.79988544000003 91.15300000000038 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -18537,26 +18793,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 304.200 m
-563.760 304.200 l
+334.640 121.680 m
+563.760 121.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 266.640 m
-563.760 266.640 l
+334.640 84.120 m
+563.760 84.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 304.450 m
-334.640 266.390 l
+334.640 121.930 m
+334.640 83.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 304.450 m
-563.760 266.390 l
+563.760 121.930 m
+563.760 83.870 l
 S
 [ ] 0 d
 1 w
@@ -18564,34 +18820,165 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 280.81300000000005 Td
+337.6397136 98.29300000000038 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3131> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+151 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 150 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [156 0 R 158 0 R]
+>>
+endobj
+152 0 obj
+[151 0 R /XYZ 0 792.0 null]
+endobj
+153 0 obj
+[151 0 R /XYZ 0 702.1200000000001 null]
+endobj
+154 0 obj
+[151 0 R /XYZ 0 645.8400000000003 null]
+endobj
+155 0 obj
+[151 0 R /XYZ 0 577.6800000000004 null]
+endobj
+156 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [337.6397136 458.1070000000005 387.64030344375 472.3870000000005]
+/Type /Annot
+>>
+endobj
+157 0 obj
+[151 0 R /XYZ 0 435.0000000000005 null]
+endobj
+158 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 345.8470000000005 488.7510000000001 360.12700000000046]
+/Type /Annot
+>>
+endobj
+159 0 obj
+[151 0 R /XYZ 0 329.88000000000045 null]
+endobj
+160 0 obj
+<< /Limits [(_parameters_13) (_parameters_7)]
+/Names [(_parameters_13) 127 0 R (_parameters_14) 132 0 R (_parameters_15) 139 0 R (_parameters_16) 146 0 R (_parameters_17) 155 0 R (_parameters_18) 163 0 R (_parameters_19) 174 0 R (_parameters_2) 56 0 R (_parameters_20) 180 0 R (_parameters_21) 185 0 R (_parameters_22) 202 0 R (_parameters_3) 63 0 R (_parameters_4) 70 0 R (_parameters_5) 76 0 R (_parameters_6) 80 0 R (_parameters_7) 86 0 R]
+>>
+endobj
+161 0 obj
+[151 0 R /XYZ 0 273.6000000000004 null]
+endobj
+162 0 obj
+[151 0 R /XYZ 0 217.32000000000042 null]
+endobj
+163 0 obj
+[151 0 R /XYZ 0 177.2400000000004 null]
+endobj
+164 0 obj
+<< /Length 16419
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 740.816 Td
+/F2.0 13 Tf
+<322e32332e322e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 688.560 51.552 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 688.560 360.864 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 688.560 103.104 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 665.280 51.552 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+99.792 665.280 360.864 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+460.656 665.280 103.104 23.280 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 266.640 m
-162.800 266.640 l
+48.240 726.120 m
+99.792 726.120 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 229.080 m
-162.800 229.080 l
+48.240 688.560 m
+99.792 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 266.890 m
-48.240 228.830 l
+48.240 726.370 m
+48.240 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 266.890 m
-162.800 228.830 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 1 w
@@ -18599,34 +18986,76 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 243.25300000000007 Td
+51.24 710.373 Td
 /F2.0 10.5 Tf
-<426f6479> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24 696.0930000000001 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 266.640 m
-334.640 266.640 l
+99.792 726.120 m
+460.656 726.120 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+99.792 688.560 m
+460.656 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 229.080 m
-334.640 229.080 l
+99.792 726.370 m
+99.792 687.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 266.890 m
-162.800 228.830 l
+460.656 726.370 m
+460.656 687.810 l
 S
 [ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+102.792 710.373 Td
+/F2.0 10.5 Tf
+<4465736372697074696f6e> Tj
+ET
+
+0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 266.890 m
-334.640 228.830 l
+460.656 726.120 m
+563.760 726.120 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+460.656 688.560 m
+563.760 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 726.370 m
+460.656 687.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 726.370 m
+563.760 687.810 l
 S
 [ ] 0 d
 1 w
@@ -18634,46 +19063,104 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 250.3930000000001 Td
+463.65600000000006 710.373 Td
 /F2.0 10.5 Tf
-<626f6479> Tj
+<536368656d61> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 688.560 m
+99.792 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 665.280 m
+99.792 665.280 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 688.810 m
+48.240 665.030 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 688.810 m
+99.792 665.030 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 236.11300000000008 Td
+51.24 672.3130000000001 Td
+/F2.0 10.5 Tf
+<323030> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 688.560 m
+460.656 688.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 665.280 m
+460.656 665.280 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+99.792 688.810 m
+99.792 665.030 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+460.656 688.810 m
+460.656 665.030 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 236.11300000000008 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 672.3130000000001 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 266.640 m
-563.760 266.640 l
+460.656 688.560 m
+563.760 688.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 229.080 m
-563.760 229.080 l
+460.656 665.280 m
+563.760 665.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 266.890 m
-334.640 228.830 l
+460.656 688.810 m
+460.656 665.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 266.890 m
-563.760 228.830 l
+563.760 688.810 m
+563.760 665.030 l
 S
 [ ] 0 d
 1 w
@@ -18687,9 +19174,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-337.6397136 243.25300000000007 Td
+463.65600000000006 672.3130000000001 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18699,59 +19186,107 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 199.4960000000001 Td
+48.24 635.6960000000003 Td
 /F2.0 13 Tf
-<322e32332e322e20526573706f6e736573> Tj
+<322e32332e332e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 609.0360000000003 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 611.2200000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 573.5760000000004 Td
+/F2.0 18 Tf
+[<322e32342e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c73>] TJ
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 539.3360000000005 Td
+/F2.0 13 Tf
+<322e32342e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 147.240 51.552 37.560 re
+48.240 487.080 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 147.240 360.864 37.560 re
+99.792 487.080 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 147.240 103.104 37.560 re
+460.656 487.080 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 123.960 51.552 23.280 re
+48.240 463.800 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 123.960 360.864 23.280 re
+99.792 463.800 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 123.960 103.104 23.280 re
+460.656 463.800 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 184.800 m
-99.792 184.800 l
+48.240 524.640 m
+99.792 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 147.240 m
-99.792 147.240 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 185.050 m
-48.240 146.490 l
+48.240 524.890 m
+48.240 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 185.050 m
-99.792 146.490 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 1 w
@@ -18759,14 +19294,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 169.05300000000008 Td
+51.24000000000001 508.89300000000054 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 154.77300000000008 Td
+51.24000000000001 494.6130000000005 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -18774,26 +19309,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 184.800 m
-460.656 184.800 l
+99.792 524.640 m
+460.656 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 147.240 m
-460.656 147.240 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 185.050 m
-99.792 146.490 l
+99.792 524.890 m
+99.792 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 185.050 m
-460.656 146.490 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 1 w
@@ -18801,7 +19336,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 169.05300000000008 Td
+102.792 508.89300000000054 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -18809,26 +19344,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 184.800 m
-563.760 184.800 l
+460.656 524.640 m
+563.760 524.640 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 147.240 m
-563.760 147.240 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 185.050 m
-460.656 146.490 l
+460.656 524.890 m
+460.656 486.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 185.050 m
-563.760 146.490 l
+563.760 524.890 m
+563.760 486.330 l
 S
 [ ] 0 d
 1 w
@@ -18836,7 +19371,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 169.05300000000008 Td
+463.65600000000006 508.89300000000054 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -18844,26 +19379,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 147.240 m
-99.792 147.240 l
+48.240 487.080 m
+99.792 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 123.960 m
-99.792 123.960 l
+48.240 463.800 m
+99.792 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 147.490 m
-48.240 123.710 l
+48.240 487.330 m
+48.240 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 147.490 m
-99.792 123.710 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 1 w
@@ -18871,7 +19406,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 130.99300000000008 Td
+51.24000000000001 470.83300000000054 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -18879,26 +19414,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 147.240 m
-460.656 147.240 l
+99.792 487.080 m
+460.656 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 123.960 m
-460.656 123.960 l
+99.792 463.800 m
+460.656 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 147.490 m
-99.792 123.710 l
+99.792 487.330 m
+99.792 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 147.490 m
-460.656 123.710 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 1 w
@@ -18906,7 +19441,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 130.99300000000008 Td
+102.792 470.83300000000054 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -18914,26 +19449,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 147.240 m
-563.760 147.240 l
+460.656 487.080 m
+563.760 487.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 123.960 m
-563.760 123.960 l
+460.656 463.800 m
+563.760 463.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 147.490 m
-460.656 123.710 l
+460.656 487.330 m
+460.656 463.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 147.490 m
-563.760 123.710 l
+563.760 487.330 m
+563.760 463.550 l
 S
 [ ] 0 d
 1 w
@@ -18947,9 +19482,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 130.99300000000008 Td
+463.65600000000006 470.83300000000054 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18959,9 +19494,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 94.37600000000006 Td
+48.24000000000001 434.2160000000005 Td
 /F2.0 13 Tf
-<322e32332e332e20436f6e73756d6573> Tj
+<322e32342e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -18972,7 +19507,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 67.71600000000007 Td
+56.88050000000001 407.5560000000005 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -18985,147 +19520,20 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 69.90000000000006 Td
+66.24000000000001 409.7400000000005 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3131> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-153 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 152 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [154 0 R 156 0 R 161 0 R 163 0 R]
->>
-endobj
-154 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [337.6397136 668.707 433.5677136 682.987]
-/Type /Annot
->>
-endobj
-155 0 obj
-[153 0 R /XYZ 0 645.5999999999999 null]
-endobj
-156 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [463.65600000000006 556.447 559.5840000000001 570.727]
-/Type /Annot
->>
-endobj
-157 0 obj
-[153 0 R /XYZ 0 540.48 null]
-endobj
-158 0 obj
-[153 0 R /XYZ 0 484.20000000000016 null]
-endobj
-159 0 obj
-[153 0 R /XYZ 0 427.92000000000013 null]
-endobj
-160 0 obj
-[153 0 R /XYZ 0 359.7600000000001 null]
-endobj
-161 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [337.6397136 240.1870000000001 387.64030344375 254.4670000000001]
-/Type /Annot
->>
-endobj
-162 0 obj
-[153 0 R /XYZ 0 217.0800000000001 null]
-endobj
-163 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 127.92700000000008 488.7510000000001 142.20700000000008]
-/Type /Annot
->>
-endobj
-164 0 obj
-[153 0 R /XYZ 0 111.96000000000006 null]
-endobj
-165 0 obj
-<< /Length 13523
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
-
-BT
-48.24 740.816 Td
-/F2.0 13 Tf
-<322e32332e342e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 714.1560000000001 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 716.3400000000001 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+48.24000000000001 372.0960000000005 Td
+/F2.0 18 Tf
+<322e32352e20474554> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19134,9 +19542,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 678.6960000000001 Td
+48.24000000000001 344.01600000000053 Td
 /F2.0 18 Tf
-<322e32342e20474554202f76322f6c6f6f702f7b6c6f6f704e616d657d> Tj
+[<2f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f79616d6c2f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -19145,59 +19553,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 644.4560000000002 Td
+48.24000000000001 309.77600000000047 Td
 /F2.0 13 Tf
-[<322e32342e312e20506172> 20.01953125 <616d6574657273>] TJ
+[<322e32352e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 606.480 114.560 23.280 re
+48.240 271.800 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 606.480 171.840 23.280 re
+162.800 271.800 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 606.480 229.120 23.280 re
+334.640 271.800 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 568.920 114.560 37.560 re
+48.240 234.240 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 568.920 171.840 37.560 re
+162.800 234.240 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 568.920 229.120 37.560 re
+334.640 234.240 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 629.760 m
-162.800 629.760 l
+48.240 295.080 m
+162.800 295.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
+48.240 271.800 m
+162.800 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 630.010 m
-48.240 605.730 l
+48.240 295.330 m
+48.240 271.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
+162.800 295.330 m
+162.800 271.050 l
 S
 [ ] 0 d
 1 w
@@ -19205,7 +19613,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 614.0130000000003 Td
+51.24000000000001 279.3330000000004 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -19213,26 +19621,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 629.760 m
-334.640 629.760 l
+162.800 295.080 m
+334.640 295.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
+162.800 271.800 m
+334.640 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 630.010 m
-162.800 605.730 l
+162.800 295.330 m
+162.800 271.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
+334.640 295.330 m
+334.640 271.050 l
 S
 [ ] 0 d
 1 w
@@ -19240,7 +19648,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 614.0130000000003 Td
+165.79988544000003 279.3330000000004 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -19248,26 +19656,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 629.760 m
-563.760 629.760 l
+334.640 295.080 m
+563.760 295.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
+334.640 271.800 m
+563.760 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 630.010 m
-334.640 605.730 l
+334.640 295.330 m
+334.640 271.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 630.010 m
-563.760 605.730 l
+563.760 295.330 m
+563.760 271.050 l
 S
 [ ] 0 d
 1 w
@@ -19275,7 +19683,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 614.0130000000003 Td
+337.6397136 279.3330000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -19283,26 +19691,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 606.480 m
-162.800 606.480 l
+48.240 271.800 m
+162.800 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 568.920 m
-162.800 568.920 l
+48.240 234.240 m
+162.800 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 606.730 m
-48.240 568.670 l
+48.240 272.050 m
+48.240 233.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
+162.800 272.050 m
+162.800 233.990 l
 S
 [ ] 0 d
 1 w
@@ -19310,7 +19718,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 583.0930000000003 Td
+51.24000000000001 248.41300000000038 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -19318,26 +19726,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.480 m
-334.640 606.480 l
+162.800 271.800 m
+334.640 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 568.920 m
-334.640 568.920 l
+162.800 234.240 m
+334.640 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 606.730 m
-162.800 568.670 l
+162.800 272.050 m
+162.800 233.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
+334.640 272.050 m
+334.640 233.990 l
 S
 [ ] 0 d
 1 w
@@ -19345,19 +19753,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 590.2330000000004 Td
+165.79988544000003 255.5530000000004 Td
 /F2.0 10.5 Tf
-<6c6f6f704e616d65> Tj
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-165.79988544000003 575.9530000000003 Td
+165.79988544000003 241.2730000000004 Td
 ET
 
 
 BT
-165.79988544000003 575.9530000000003 Td
+165.79988544000003 241.2730000000004 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -19365,26 +19773,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.480 m
-563.760 606.480 l
+334.640 271.800 m
+563.760 271.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 568.920 m
-563.760 568.920 l
+334.640 234.240 m
+563.760 234.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 606.730 m
-334.640 568.670 l
+334.640 272.050 m
+334.640 233.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 606.730 m
-563.760 568.670 l
+563.760 272.050 m
+563.760 233.990 l
 S
 [ ] 0 d
 1 w
@@ -19392,7 +19800,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 583.0930000000003 Td
+337.6397136 248.41300000000038 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -19402,59 +19810,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 539.3360000000004 Td
+48.24000000000001 204.6560000000004 Td
 /F2.0 13 Tf
-<322e32342e322e20526573706f6e736573> Tj
+<322e32352e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 487.080 51.552 37.560 re
+48.240 152.400 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 487.080 360.864 37.560 re
+99.792 152.400 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 487.080 103.104 37.560 re
+460.656 152.400 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 463.800 51.552 23.280 re
+48.240 129.120 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 463.800 360.864 23.280 re
+99.792 129.120 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 463.800 103.104 23.280 re
+460.656 129.120 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.640 m
-99.792 524.640 l
+48.240 189.960 m
+99.792 189.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 487.080 m
-99.792 487.080 l
+48.240 152.400 m
+99.792 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 524.890 m
-48.240 486.330 l
+48.240 190.210 m
+48.240 151.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.890 m
-99.792 486.330 l
+99.792 190.210 m
+99.792 151.650 l
 S
 [ ] 0 d
 1 w
@@ -19462,14 +19870,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 508.8930000000004 Td
+51.24000000000001 174.2130000000004 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 494.6130000000004 Td
+51.24000000000001 159.9330000000004 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -19477,26 +19885,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.640 m
-460.656 524.640 l
+99.792 189.960 m
+460.656 189.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 487.080 m
-460.656 487.080 l
+99.792 152.400 m
+460.656 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 524.890 m
-99.792 486.330 l
+99.792 190.210 m
+99.792 151.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.890 m
-460.656 486.330 l
+460.656 190.210 m
+460.656 151.650 l
 S
 [ ] 0 d
 1 w
@@ -19504,7 +19912,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 508.8930000000004 Td
+102.792 174.2130000000004 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -19512,26 +19920,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.640 m
-563.760 524.640 l
+460.656 189.960 m
+563.760 189.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 487.080 m
-563.760 487.080 l
+460.656 152.400 m
+563.760 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 524.890 m
-460.656 486.330 l
+460.656 190.210 m
+460.656 151.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 524.890 m
-563.760 486.330 l
+563.760 190.210 m
+563.760 151.650 l
 S
 [ ] 0 d
 1 w
@@ -19539,7 +19947,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 508.8930000000004 Td
+463.65600000000006 174.2130000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -19547,26 +19955,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 487.080 m
-99.792 487.080 l
+48.240 152.400 m
+99.792 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 463.800 m
-99.792 463.800 l
+48.240 129.120 m
+99.792 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 487.330 m
-48.240 463.550 l
+48.240 152.650 m
+48.240 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.330 m
-99.792 463.550 l
+99.792 152.650 m
+99.792 128.870 l
 S
 [ ] 0 d
 1 w
@@ -19574,7 +19982,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 470.8330000000004 Td
+51.24000000000001 136.1530000000004 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -19582,26 +19990,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.080 m
-460.656 487.080 l
+99.792 152.400 m
+460.656 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 463.800 m
-460.656 463.800 l
+99.792 129.120 m
+460.656 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 487.330 m
-99.792 463.550 l
+99.792 152.650 m
+99.792 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.330 m
-460.656 463.550 l
+460.656 152.650 m
+460.656 128.870 l
 S
 [ ] 0 d
 1 w
@@ -19609,7 +20017,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 470.8330000000004 Td
+102.792 136.1530000000004 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -19617,54 +20025,46 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.080 m
-563.760 487.080 l
+460.656 152.400 m
+563.760 152.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 463.800 m
-563.760 463.800 l
+460.656 129.120 m
+563.760 129.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 487.330 m
-460.656 463.550 l
+460.656 152.650 m
+460.656 128.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 487.330 m
-563.760 463.550 l
+563.760 152.650 m
+563.760 128.870 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 470.8330000000004 Td
+463.65600000000006 136.1530000000004 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 434.2160000000004 Td
+48.24000000000001 99.53600000000037 Td
 /F2.0 13 Tf
-<322e32342e332e2050726f6475636573> Tj
+<322e32352e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -19675,7 +20075,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 407.5560000000004 Td
+56.88050000000001 72.87600000000037 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -19688,20 +20088,111 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 409.7400000000004 Td
+66.24000000000001 75.06000000000037 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 372.0960000000004 Td
+49.24 14.388 Td
+/F1.0 9 Tf
+<3132> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+165 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 164 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F1.0 8 0 R
+/F4.0 33 0 R
+/F3.0 24 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [167 0 R 171 0 R]
+>>
+endobj
+166 0 obj
+[165 0 R /XYZ 0 792.0 null]
+endobj
+167 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [463.65600000000006 669.2470000000002 488.7510000000001 683.5270000000002]
+/Type /Annot
+>>
+endobj
+168 0 obj
+[165 0 R /XYZ 0 653.2800000000002 null]
+endobj
+169 0 obj
+[165 0 R /XYZ 0 597.0000000000003 null]
+endobj
+170 0 obj
+[165 0 R /XYZ 0 556.9200000000004 null]
+endobj
+171 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [463.65600000000006 467.76700000000056 524.955 482.04700000000054]
+/Type /Annot
+>>
+endobj
+172 0 obj
+[165 0 R /XYZ 0 451.8000000000005 null]
+endobj
+173 0 obj
+[165 0 R /XYZ 0 395.5200000000005 null]
+endobj
+174 0 obj
+[165 0 R /XYZ 0 327.36000000000047 null]
+endobj
+175 0 obj
+[165 0 R /XYZ 0 222.2400000000004 null]
+endobj
+176 0 obj
+[165 0 R /XYZ 0 117.12000000000037 null]
+endobj
+177 0 obj
+<< /Length 18056
+>>
+stream
+q
+/DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
 /F2.0 18 Tf
-[<322e32352e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c73>] TJ
+[<322e32362e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -19710,59 +20201,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 337.85600000000034 Td
+48.24 700.7360000000001 Td
 /F2.0 13 Tf
-<322e32352e312e20526573706f6e736573> Tj
+[<322e32362e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 285.600 51.552 37.560 re
+48.240 662.760 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 285.600 360.864 37.560 re
+162.800 662.760 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 285.600 103.104 37.560 re
+334.640 662.760 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 262.320 51.552 23.280 re
+48.240 625.200 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 262.320 360.864 23.280 re
+162.800 625.200 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 262.320 103.104 23.280 re
+334.640 625.200 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 323.160 m
-99.792 323.160 l
+48.240 686.040 m
+162.800 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 285.600 m
-99.792 285.600 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 323.410 m
-48.240 284.850 l
+48.240 686.290 m
+48.240 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 323.410 m
-99.792 284.850 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 1 w
@@ -19770,41 +20261,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 307.4130000000003 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 293.13300000000027 Td
+51.24 670.2930000000001 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 323.160 m
-460.656 323.160 l
+162.800 686.040 m
+334.640 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 285.600 m
-460.656 285.600 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 323.410 m
-99.792 284.850 l
+162.800 686.290 m
+162.800 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 323.410 m
-460.656 284.850 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 1 w
@@ -19812,34 +20296,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 307.4130000000003 Td
+165.79988544 670.2930000000001 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 323.160 m
-563.760 323.160 l
+334.640 686.040 m
+563.760 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 285.600 m
-563.760 285.600 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 323.410 m
-460.656 284.850 l
+334.640 686.290 m
+334.640 662.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 323.410 m
-563.760 284.850 l
+563.760 686.290 m
+563.760 662.010 l
 S
 [ ] 0 d
 1 w
@@ -19847,7 +20331,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 307.4130000000003 Td
+337.6397136 670.2930000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -19855,26 +20339,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 285.600 m
-99.792 285.600 l
+48.240 662.760 m
+162.800 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 262.320 m
-99.792 262.320 l
+48.240 625.200 m
+162.800 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 285.850 m
-48.240 262.070 l
+48.240 663.010 m
+48.240 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 285.850 m
-99.792 262.070 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 1 w
@@ -19882,445 +20366,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 269.3530000000003 Td
+51.24 639.3730000000002 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 285.600 m
-460.656 285.600 l
+162.800 662.760 m
+334.640 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 262.320 m
-460.656 262.320 l
+162.800 625.200 m
+334.640 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 285.850 m
-99.792 262.070 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 285.850 m
-460.656 262.070 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-102.792 269.3530000000003 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 285.600 m
-563.760 285.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 262.320 m
-563.760 262.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 285.850 m
-460.656 262.070 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 285.850 m
-563.760 262.070 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-463.65600000000006 269.3530000000003 Td
-/F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 232.73600000000027 Td
-/F2.0 13 Tf
-<322e32352e322e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-56.88050000000001 206.07600000000025 Td
-/F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 208.26000000000025 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 170.6160000000002 Td
-/F2.0 18 Tf
-<322e32362e20474554> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 142.53600000000023 Td
-/F2.0 18 Tf
-[<2f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f79616d6c2f7b706f6c6963794d6f64656c547970657d>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 108.29600000000022 Td
-/F2.0 13 Tf
-[<322e32362e312e20506172> 20.01953125 <616d6574657273>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3132> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-166 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 165 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
-/F3.0 24 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [171 0 R 175 0 R]
->>
-endobj
-167 0 obj
-[166 0 R /XYZ 0 792.0 null]
-endobj
-168 0 obj
-[166 0 R /XYZ 0 702.1200000000001 null]
-endobj
-169 0 obj
-[166 0 R /XYZ 0 662.0400000000002 null]
-endobj
-170 0 obj
-[166 0 R /XYZ 0 556.9200000000003 null]
-endobj
-171 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [463.65600000000006 467.76700000000045 488.7510000000001 482.0470000000004]
-/Type /Annot
->>
-endobj
-172 0 obj
-[166 0 R /XYZ 0 451.8000000000004 null]
-endobj
-173 0 obj
-[166 0 R /XYZ 0 395.5200000000004 null]
-endobj
-174 0 obj
-[166 0 R /XYZ 0 355.44000000000034 null]
-endobj
-175 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [463.65600000000006 266.2870000000003 524.955 280.5670000000003]
-/Type /Annot
->>
-endobj
-176 0 obj
-[166 0 R /XYZ 0 250.32000000000028 null]
-endobj
-177 0 obj
-[166 0 R /XYZ 0 194.04000000000025 null]
-endobj
-178 0 obj
-<< /Limits [(_route6) (_version_information)]
-/Names [(_route6) 159 0 R (_route7) 149 0 R (_route8) 90 0 R (_route9) 105 0 R (_service) 310 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 61 0 R (_v2_dictionary_name_elements_shortname_delete) 79 0 R (_v2_dictionary_name_put) 66 0 R (_v2_dictionary_secondary_names_get) 56 0 R (_v2_policytoscamodels_policymodeltype_get) 184 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 177 0 R (_v2_templates_names_get) 202 0 R (_v2_templates_templatename_get) 207 0 R (_version_information) 23 0 R]
->>
-endobj
-179 0 obj
-[166 0 R /XYZ 0 125.88000000000022 null]
-endobj
-180 0 obj
-<< /Length 18874
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 114.560 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 732.720 171.840 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 732.720 229.120 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 114.560 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-162.800 695.160 171.840 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-334.640 695.160 229.120 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-162.800 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<54797065> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 756.000 m
-334.640 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-165.79988544 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-337.6397136 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.160 m
-162.800 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 709.333 Td
-/F2.0 10.5 Tf
-<50617468> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 695.160 m
-334.640 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+162.800 663.010 m
+162.800 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 1 w
@@ -20328,19 +20401,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 716.473 Td
+165.79988544 646.5130000000001 Td
 /F2.0 10.5 Tf
 <706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-165.79988544 702.193 Td
+165.79988544 632.2330000000002 Td
 ET
 
 
 BT
-165.79988544 702.193 Td
+165.79988544 632.2330000000002 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -20348,26 +20421,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+334.640 662.760 m
+563.760 662.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.160 m
-563.760 695.160 l
+334.640 625.200 m
+563.760 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+334.640 663.010 m
+334.640 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 663.010 m
+563.760 624.950 l
 S
 [ ] 0 d
 1 w
@@ -20375,7 +20448,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 709.333 Td
+337.6397136 639.3730000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -20385,7 +20458,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 665.5760000000001 Td
+48.24 595.6160000000003 Td
 /F2.0 13 Tf
 <322e32362e322e20526573706f6e736573> Tj
 ET
@@ -20393,51 +20466,51 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 613.320 51.552 37.560 re
+48.240 543.360 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 613.320 360.864 37.560 re
+99.792 543.360 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 613.320 103.104 37.560 re
+460.656 543.360 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 590.040 51.552 23.280 re
+48.240 520.080 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 590.040 360.864 23.280 re
+99.792 520.080 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 590.040 103.104 23.280 re
+460.656 520.080 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 650.880 m
-99.792 650.880 l
+48.240 580.920 m
+99.792 580.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 543.360 m
+99.792 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 651.130 m
-48.240 612.570 l
+48.240 581.170 m
+48.240 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
+99.792 581.170 m
+99.792 542.610 l
 S
 [ ] 0 d
 1 w
@@ -20445,14 +20518,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 635.1330000000003 Td
+51.24 565.1730000000005 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 620.8530000000002 Td
+51.24 550.8930000000004 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -20460,26 +20533,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 650.880 m
-460.656 650.880 l
+99.792 580.920 m
+460.656 580.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
+99.792 581.170 m
+99.792 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
+460.656 581.170 m
+460.656 542.610 l
 S
 [ ] 0 d
 1 w
@@ -20487,7 +20560,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 635.1330000000003 Td
+102.792 565.1730000000005 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -20495,26 +20568,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 650.880 m
-563.760 650.880 l
+460.656 580.920 m
+563.760 580.920 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
+460.656 581.170 m
+460.656 542.610 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 651.130 m
-563.760 612.570 l
+563.760 581.170 m
+563.760 542.610 l
 S
 [ ] 0 d
 1 w
@@ -20522,7 +20595,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 635.1330000000003 Td
+463.65600000000006 565.1730000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -20530,26 +20603,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 543.360 m
+99.792 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 590.040 m
-99.792 590.040 l
+48.240 520.080 m
+99.792 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.570 m
-48.240 589.790 l
+48.240 543.610 m
+48.240 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
+99.792 543.610 m
+99.792 519.830 l
 S
 [ ] 0 d
 1 w
@@ -20557,7 +20630,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 597.0730000000001 Td
+51.24 527.1130000000003 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -20565,26 +20638,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 543.360 m
+460.656 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 590.040 m
-460.656 590.040 l
+99.792 520.080 m
+460.656 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
+99.792 543.610 m
+99.792 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
+460.656 543.610 m
+460.656 519.830 l
 S
 [ ] 0 d
 1 w
@@ -20592,7 +20665,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 597.0730000000001 Td
+102.792 527.1130000000003 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -20600,44 +20673,52 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 543.360 m
+563.760 543.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 590.040 m
-563.760 590.040 l
+460.656 520.080 m
+563.760 520.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
+460.656 543.610 m
+460.656 519.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 613.570 m
-563.760 589.790 l
+563.760 543.610 m
+563.760 519.830 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 597.0730000000001 Td
+463.65600000000006 527.1130000000003 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 560.4560000000002 Td
+48.24 490.4960000000004 Td
 /F2.0 13 Tf
 <322e32362e332e2050726f6475636573> Tj
 ET
@@ -20650,7 +20731,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 533.7960000000003 Td
+56.88050000000001 463.83600000000035 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -20663,7 +20744,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 535.9800000000004 Td
+66.24000000000001 466.0200000000004 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -20674,9 +20755,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 498.3360000000004 Td
+48.24000000000001 428.3760000000004 Td
 /F2.0 18 Tf
-[<322e32372e20474554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
+[<322e32372e20505554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -20685,7 +20766,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 464.09600000000034 Td
+48.24000000000001 394.1360000000003 Td
 /F2.0 13 Tf
 [<322e32372e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
@@ -20693,51 +20774,63 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 426.120 114.560 23.280 re
+48.240 356.160 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 426.120 171.840 23.280 re
+162.800 356.160 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 426.120 229.120 23.280 re
+334.640 356.160 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 388.560 114.560 37.560 re
+48.240 318.600 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 388.560 171.840 37.560 re
+162.800 318.600 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 388.560 229.120 37.560 re
+334.640 318.600 229.120 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 281.040 114.560 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+162.800 281.040 171.840 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+334.640 281.040 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 449.400 m
-162.800 449.400 l
+48.240 379.440 m
+162.800 379.440 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 426.120 m
-162.800 426.120 l
+48.240 356.160 m
+162.800 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 449.650 m
-48.240 425.370 l
+48.240 379.690 m
+48.240 355.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 449.650 m
-162.800 425.370 l
+162.800 379.690 m
+162.800 355.410 l
 S
 [ ] 0 d
 1 w
@@ -20745,7 +20838,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 433.6530000000003 Td
+51.24000000000001 363.69300000000027 Td
 /F2.0 10.5 Tf
 <54797065> Tj
 ET
@@ -20753,26 +20846,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 449.400 m
-334.640 449.400 l
+162.800 379.440 m
+334.640 379.440 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 426.120 m
-334.640 426.120 l
+162.800 356.160 m
+334.640 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 449.650 m
-162.800 425.370 l
+162.800 379.690 m
+162.800 355.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 449.650 m
-334.640 425.370 l
+334.640 379.690 m
+334.640 355.410 l
 S
 [ ] 0 d
 1 w
@@ -20780,7 +20873,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 433.6530000000003 Td
+165.79988544000003 363.69300000000027 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -20788,26 +20881,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 449.400 m
-563.760 449.400 l
+334.640 379.440 m
+563.760 379.440 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 426.120 m
-563.760 426.120 l
+334.640 356.160 m
+563.760 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 449.650 m
-334.640 425.370 l
+334.640 379.690 m
+334.640 355.410 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 449.650 m
-563.760 425.370 l
+563.760 379.690 m
+563.760 355.410 l
 S
 [ ] 0 d
 1 w
@@ -20815,7 +20908,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 433.6530000000003 Td
+337.6397136 363.69300000000027 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -20823,26 +20916,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.120 m
-162.800 426.120 l
+48.240 356.160 m
+162.800 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 388.560 m
-162.800 388.560 l
+48.240 318.600 m
+162.800 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 426.370 m
-48.240 388.310 l
+48.240 356.410 m
+48.240 318.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.370 m
-162.800 388.310 l
+162.800 356.410 m
+162.800 318.350 l
 S
 [ ] 0 d
 1 w
@@ -20850,7 +20943,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 402.73300000000035 Td
+51.24000000000001 332.7730000000003 Td
 /F2.0 10.5 Tf
 <50617468> Tj
 ET
@@ -20858,26 +20951,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.120 m
-334.640 426.120 l
+162.800 356.160 m
+334.640 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 388.560 m
-334.640 388.560 l
+162.800 318.600 m
+334.640 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 426.370 m
-162.800 388.310 l
+162.800 356.410 m
+162.800 318.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.370 m
-334.640 388.310 l
+334.640 356.410 m
+334.640 318.350 l
 S
 [ ] 0 d
 1 w
@@ -20885,19 +20978,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 409.87300000000033 Td
+165.79988544000003 339.9130000000003 Td
 /F2.0 10.5 Tf
 <706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-165.79988544000003 395.5930000000003 Td
+165.79988544000003 325.63300000000027 Td
 ET
 
 
 BT
-165.79988544000003 395.5930000000003 Td
+165.79988544000003 325.63300000000027 Td
 /F3.0 10.5 Tf
 <7265717569726564> Tj
 ET
@@ -20905,26 +20998,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.120 m
-563.760 426.120 l
+334.640 356.160 m
+563.760 356.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 388.560 m
-563.760 388.560 l
+334.640 318.600 m
+563.760 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 426.370 m
-334.640 388.310 l
-S
+334.640 356.410 m
+334.640 318.350 l
+S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 426.370 m
-563.760 388.310 l
+563.760 356.410 m
+563.760 318.350 l
 S
 [ ] 0 d
 1 w
@@ -20932,111 +21025,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 402.73300000000035 Td
+337.6397136 332.7730000000003 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 358.97600000000034 Td
-/F2.0 13 Tf
-<322e32372e322e20526573706f6e736573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 306.720 51.552 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 306.720 360.864 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 306.720 103.104 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 283.440 51.552 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-99.792 283.440 360.864 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-460.656 283.440 103.104 23.280 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 344.280 m
-99.792 344.280 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 306.720 m
-99.792 306.720 l
-S
-[ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 344.530 m
-48.240 305.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 344.530 m
-99.792 305.970 l
+48.240 318.600 m
+162.800 318.600 l
 S
 [ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24000000000001 328.5330000000003 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 314.25300000000027 Td
-/F2.0 10.5 Tf
-<436f6465> Tj
-ET
-
-0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.280 m
-460.656 344.280 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-99.792 306.720 m
-460.656 306.720 l
+48.240 281.040 m
+162.800 281.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 344.530 m
-99.792 305.970 l
+48.240 318.850 m
+48.240 280.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.530 m
-460.656 305.970 l
+162.800 318.850 m
+162.800 280.790 l
 S
 [ ] 0 d
 1 w
@@ -21044,34 +21060,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 328.5330000000003 Td
+51.24000000000001 295.21300000000025 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<426f6479> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.280 m
-563.760 344.280 l
+162.800 318.600 m
+334.640 318.600 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-460.656 306.720 m
-563.760 306.720 l
+162.800 281.040 m
+334.640 281.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 344.530 m
-460.656 305.970 l
+162.800 318.850 m
+162.800 280.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 344.530 m
-563.760 305.970 l
+334.640 318.850 m
+334.640 280.790 l
 S
 [ ] 0 d
 1 w
@@ -21079,230 +21095,116 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 328.5330000000003 Td
+165.79988544000003 302.35300000000024 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<626f6479> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 306.720 m
-99.792 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 283.440 m
-99.792 283.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 306.970 m
-48.240 283.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 306.970 m
-99.792 283.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 290.4730000000003 Td
-/F2.0 10.5 Tf
-<323030> Tj
+165.79988544000003 288.0730000000002 Td
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 306.720 m
-460.656 306.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 283.440 m
-460.656 283.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-99.792 306.970 m
-99.792 283.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-460.656 306.970 m
-460.656 283.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 
 BT
-102.792 290.4730000000003 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+165.79988544000003 288.0730000000002 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 306.720 m
-563.760 306.720 l
+334.640 318.600 m
+563.760 318.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 283.440 m
-563.760 283.440 l
+334.640 281.040 m
+563.760 281.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 306.970 m
-460.656 283.190 l
+334.640 318.850 m
+334.640 280.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 306.970 m
-563.760 283.190 l
+563.760 318.850 m
+563.760 280.790 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-463.65600000000006 290.4730000000003 Td
-/F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 253.85600000000028 Td
-/F2.0 13 Tf
-<322e32372e332e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 227.19600000000028 Td
+337.6397136 295.21300000000025 Td
 /F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 229.38000000000028 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 191.73600000000027 Td
-/F2.0 18 Tf
-[<322e32382e20505554202f76322f706f6c69637954> 29.78515625 <6f7363614d6f64656c732f7b706f6c6963794d6f64656c547970657d>] TJ
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 157.49600000000027 Td
+48.24000000000001 251.45600000000024 Td
 /F2.0 13 Tf
-[<322e32382e312e20506172> 20.01953125 <616d6574657273>] TJ
+<322e32372e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 119.520 114.560 23.280 re
+48.240 199.200 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 119.520 171.840 23.280 re
+99.792 199.200 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 119.520 229.120 23.280 re
+460.656 199.200 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 81.960 114.560 37.560 re
+48.240 175.920 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 81.960 171.840 37.560 re
+99.792 175.920 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 81.960 229.120 37.560 re
+460.656 175.920 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 142.800 m
-162.800 142.800 l
+48.240 236.760 m
+99.792 236.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 119.520 m
-162.800 119.520 l
+48.240 199.200 m
+99.792 199.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 143.050 m
-48.240 118.770 l
+48.240 237.010 m
+48.240 198.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 143.050 m
-162.800 118.770 l
+99.792 237.010 m
+99.792 198.450 l
 S
 [ ] 0 d
 1 w
@@ -21310,34 +21212,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 127.05300000000025 Td
+51.24000000000001 221.01300000000026 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24000000000001 206.73300000000026 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 142.800 m
-334.640 142.800 l
+99.792 236.760 m
+460.656 236.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 119.520 m
-334.640 119.520 l
+99.792 199.200 m
+460.656 199.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 143.050 m
-162.800 118.770 l
+99.792 237.010 m
+99.792 198.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 143.050 m
-334.640 118.770 l
+460.656 237.010 m
+460.656 198.450 l
 S
 [ ] 0 d
 1 w
@@ -21345,34 +21254,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 127.05300000000025 Td
+102.792 221.01300000000026 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 142.800 m
-563.760 142.800 l
+460.656 236.760 m
+563.760 236.760 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 119.520 m
-563.760 119.520 l
+460.656 199.200 m
+563.760 199.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 143.050 m
-334.640 118.770 l
+460.656 237.010 m
+460.656 198.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 143.050 m
-563.760 118.770 l
+563.760 237.010 m
+563.760 198.450 l
 S
 [ ] 0 d
 1 w
@@ -21380,7 +21289,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 127.05300000000025 Td
+463.65600000000006 221.01300000000026 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -21388,26 +21297,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 119.520 m
-162.800 119.520 l
+48.240 199.200 m
+99.792 199.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 81.960 m
-162.800 81.960 l
+48.240 175.920 m
+99.792 175.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 119.770 m
-48.240 81.710 l
+48.240 199.450 m
+48.240 175.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.770 m
-162.800 81.710 l
+99.792 199.450 m
+99.792 175.670 l
 S
 [ ] 0 d
 1 w
@@ -21415,34 +21324,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 96.13300000000024 Td
+51.24000000000001 182.95300000000026 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.520 m
-334.640 119.520 l
+99.792 199.200 m
+460.656 199.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 81.960 m
-334.640 81.960 l
+99.792 175.920 m
+460.656 175.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 119.770 m
-162.800 81.710 l
+99.792 199.450 m
+99.792 175.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.770 m
-334.640 81.710 l
+460.656 199.450 m
+460.656 175.670 l
 S
 [ ] 0 d
 1 w
@@ -21450,58 +21359,128 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544000003 103.27300000000024 Td
-/F2.0 10.5 Tf
-<706f6c6963794d6f64656c54797065> Tj
-ET
-
-
-BT
-165.79988544000003 88.99300000000024 Td
-ET
-
-
-BT
-165.79988544000003 88.99300000000024 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 182.95300000000026 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.520 m
-563.760 119.520 l
+460.656 199.200 m
+563.760 199.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 81.960 m
-563.760 81.960 l
+460.656 175.920 m
+563.760 175.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 119.770 m
-334.640 81.710 l
+460.656 199.450 m
+460.656 175.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 119.770 m
-563.760 81.710 l
+563.760 199.450 m
+563.760 175.670 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-337.6397136 96.13300000000024 Td
+463.65600000000006 182.95300000000026 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<506f6c6963794d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 146.33600000000024 Td
+/F2.0 13 Tf
+<322e32372e332e20436f6e73756d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 119.67600000000022 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 121.86000000000021 Td
+/F4.0 10.5 Tf
+<706c61696e2f74657874> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 90.05600000000021 Td
+/F2.0 13 Tf
+<322e32372e342e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 63.396000000000214 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 65.58000000000021 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
 ET
 
+0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -21527,108 +21506,146 @@ Q
 
 endstream
 endobj
-181 0 obj
+178 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 180 0 R
+/Contents 177 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [187 0 R]
+/Annots [182 0 R 188 0 R]
 >>
 endobj
+179 0 obj
+[178 0 R /XYZ 0 792.0 null]
+endobj
+180 0 obj
+[178 0 R /XYZ 0 718.32 null]
+endobj
+181 0 obj
+[178 0 R /XYZ 0 613.2000000000003 null]
+endobj
 182 0 obj
-[181 0 R /XYZ 0 683.1600000000001 null]
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [463.65600000000006 524.0470000000004 524.955 538.3270000000003]
+/Type /Annot
+>>
 endobj
 183 0 obj
-[181 0 R /XYZ 0 578.0400000000002 null]
+[178 0 R /XYZ 0 508.0800000000004 null]
 endobj
 184 0 obj
-[181 0 R /XYZ 0 521.7600000000003 null]
+[178 0 R /XYZ 0 451.80000000000035 null]
 endobj
 185 0 obj
-[181 0 R /XYZ 0 481.68000000000035 null]
+[178 0 R /XYZ 0 411.7200000000003 null]
 endobj
 186 0 obj
-[181 0 R /XYZ 0 376.56000000000034 null]
+[178 0 R /XYZ 0 269.04000000000025 null]
 endobj
 187 0 obj
+<< /Limits [(_responses_2) (_responses_4)]
+/Names [(_responses_2) 35 0 R (_responses_20) 141 0 R (_responses_21) 148 0 R (_responses_22) 157 0 R (_responses_23) 166 0 R (_responses_24) 170 0 R (_responses_25) 175 0 R (_responses_26) 181 0 R (_responses_27) 186 0 R (_responses_28) 194 0 R (_responses_29) 199 0 R (_responses_3) 38 0 R (_responses_30) 203 0 R (_responses_4) 46 0 R]
+>>
+endobj
+188 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
-/Rect [463.65600000000006 287.4070000000003 524.955 301.6870000000003]
+/Rect [463.65600000000006 179.88700000000026 524.955 194.16700000000026]
 /Type /Annot
 >>
 endobj
-188 0 obj
-[181 0 R /XYZ 0 271.4400000000003 null]
-endobj
 189 0 obj
-[181 0 R /XYZ 0 215.16000000000028 null]
+[178 0 R /XYZ 0 163.92000000000024 null]
 endobj
 190 0 obj
-[181 0 R /XYZ 0 175.08000000000027 null]
+[178 0 R /XYZ 0 107.64000000000021 null]
 endobj
 191 0 obj
-<< /Length 16505
+<< /Length 16516
 >>
 stream
 q
 /DeviceRGB cs
+0.200 0.200 0.200 scn
+/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+BT
+48.24 734.976 Td
+/F2.0 18 Tf
+<322e32382e20474554202f76322f74656d706c61746573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 700.7360000000001 Td
+/F2.0 13 Tf
+<322e32382e312e20526573706f6e736573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 732.720 114.560 23.280 re
+48.240 648.480 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 732.720 171.840 23.280 re
+99.792 648.480 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 732.720 229.120 23.280 re
+460.656 648.480 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 114.560 37.560 re
+48.240 625.200 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 695.160 171.840 37.560 re
+99.792 625.200 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 695.160 229.120 37.560 re
+460.656 625.200 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-162.800 756.000 l
+48.240 686.040 m
+99.792 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
+48.240 648.480 m
+99.792 648.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 686.290 m
+48.240 647.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
+99.792 686.290 m
+99.792 647.730 l
 S
 [ ] 0 d
 1 w
@@ -21636,34 +21653,41 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 670.2930000000001 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<48545450> Tj
+ET
+
+
+BT
+51.24 656.0130000000001 Td
+/F2.0 10.5 Tf
+<436f6465> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.000 m
-334.640 756.000 l
+99.792 686.040 m
+460.656 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
+99.792 648.480 m
+460.656 648.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 756.250 m
-162.800 731.970 l
+99.792 686.290 m
+99.792 647.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
+460.656 686.290 m
+460.656 647.730 l
 S
 [ ] 0 d
 1 w
@@ -21671,34 +21695,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 740.2529999999999 Td
+102.792 670.2930000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<4465736372697074696f6e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.000 m
-563.760 756.000 l
+460.656 686.040 m
+563.760 686.040 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+460.656 648.480 m
+563.760 648.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 756.250 m
-334.640 731.970 l
+460.656 686.290 m
+460.656 647.730 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 686.290 m
+563.760 647.730 l
 S
 [ ] 0 d
 1 w
@@ -21706,7 +21730,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 740.2529999999999 Td
+463.65600000000006 670.2930000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -21714,26 +21738,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-162.800 732.720 l
+48.240 648.480 m
+99.792 648.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-162.800 695.160 l
+48.240 625.200 m
+99.792 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 648.730 m
+48.240 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+99.792 648.730 m
+99.792 624.950 l
 S
 [ ] 0 d
 1 w
@@ -21741,34 +21765,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 709.333 Td
+51.24 632.2330000000002 Td
 /F2.0 10.5 Tf
-<426f6479> Tj
+<323030> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.720 m
-334.640 732.720 l
+99.792 648.480 m
+460.656 648.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 695.160 m
-334.640 695.160 l
+99.792 625.200 m
+460.656 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 732.970 m
-162.800 694.910 l
+99.792 648.730 m
+99.792 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+460.656 648.730 m
+460.656 624.950 l
 S
 [ ] 0 d
 1 w
@@ -21776,116 +21800,160 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 716.473 Td
-/F2.0 10.5 Tf
-<626f6479> Tj
-ET
-
-
-BT
-165.79988544 702.193 Td
-ET
-
-
-BT
-165.79988544 702.193 Td
-/F3.0 10.5 Tf
-<7265717569726564> Tj
+102.792 632.2330000000002 Td
+/F1.0 10.5 Tf
+<4f75747075742074797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.720 m
-563.760 732.720 l
+460.656 648.480 m
+563.760 648.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 695.160 m
-563.760 695.160 l
+460.656 625.200 m
+563.760 625.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 732.970 m
-334.640 694.910 l
+460.656 648.730 m
+460.656 624.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 648.730 m
+563.760 624.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-337.6397136 709.333 Td
+463.65600000000006 632.2330000000002 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 665.5760000000001 Td
+48.24 595.6160000000003 Td
 /F2.0 13 Tf
-<322e32382e322e20526573706f6e736573> Tj
+<322e32382e322e2050726f6475636573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+-0.500 Tc
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+56.88050000000001 568.9560000000004 Td
+/F1.0 10.5 Tf
+<a5> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+
+0.000 Tc
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+66.24000000000001 571.1400000000004 Td
+/F4.0 10.5 Tf
+<6170706c69636174696f6e2f6a736f6e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 533.4960000000005 Td
+/F2.0 18 Tf
+<322e32392e20474554202f76322f74656d706c617465732f6e616d6573> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24000000000001 499.25600000000054 Td
+/F2.0 13 Tf
+<322e32392e312e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 613.320 51.552 37.560 re
+48.240 447.000 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 613.320 360.864 37.560 re
+99.792 447.000 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 613.320 103.104 37.560 re
+460.656 447.000 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 590.040 51.552 23.280 re
+48.240 423.720 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 590.040 360.864 23.280 re
+99.792 423.720 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 590.040 103.104 23.280 re
+460.656 423.720 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 650.880 m
-99.792 650.880 l
+48.240 484.560 m
+99.792 484.560 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 447.000 m
+99.792 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 651.130 m
-48.240 612.570 l
+48.240 484.810 m
+48.240 446.250 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
+99.792 484.810 m
+99.792 446.250 l
 S
 [ ] 0 d
 1 w
@@ -21893,14 +21961,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 635.1330000000003 Td
+51.24000000000001 468.8130000000005 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24 620.8530000000002 Td
+51.24000000000001 454.53300000000047 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -21908,26 +21976,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 650.880 m
-460.656 650.880 l
+99.792 484.560 m
+460.656 484.560 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 447.000 m
+460.656 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 651.130 m
-99.792 612.570 l
+99.792 484.810 m
+99.792 446.250 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
+460.656 484.810 m
+460.656 446.250 l
 S
 [ ] 0 d
 1 w
@@ -21935,7 +22003,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 635.1330000000003 Td
+102.792 468.8130000000005 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -21943,26 +22011,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 650.880 m
-563.760 650.880 l
+460.656 484.560 m
+563.760 484.560 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 447.000 m
+563.760 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 651.130 m
-460.656 612.570 l
+460.656 484.810 m
+460.656 446.250 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 651.130 m
-563.760 612.570 l
+563.760 484.810 m
+563.760 446.250 l
 S
 [ ] 0 d
 1 w
@@ -21970,7 +22038,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 635.1330000000003 Td
+463.65600000000006 468.8130000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -21978,26 +22046,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.320 m
-99.792 613.320 l
+48.240 447.000 m
+99.792 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 590.040 m
-99.792 590.040 l
+48.240 423.720 m
+99.792 423.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 613.570 m
-48.240 589.790 l
+48.240 447.250 m
+48.240 423.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
+99.792 447.250 m
+99.792 423.470 l
 S
 [ ] 0 d
 1 w
@@ -22005,7 +22073,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 597.0730000000001 Td
+51.24000000000001 430.7530000000005 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -22013,26 +22081,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.320 m
-460.656 613.320 l
+99.792 447.000 m
+460.656 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 590.040 m
-460.656 590.040 l
+99.792 423.720 m
+460.656 423.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 613.570 m
-99.792 589.790 l
+99.792 447.250 m
+99.792 423.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
+460.656 447.250 m
+460.656 423.470 l
 S
 [ ] 0 d
 1 w
@@ -22040,7 +22108,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 597.0730000000001 Td
+102.792 430.7530000000005 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -22048,91 +22116,46 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.320 m
-563.760 613.320 l
+460.656 447.000 m
+563.760 447.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 590.040 m
-563.760 590.040 l
+460.656 423.720 m
+563.760 423.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 613.570 m
-460.656 589.790 l
+460.656 447.250 m
+460.656 423.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 613.570 m
-563.760 589.790 l
+563.760 447.250 m
+563.760 423.470 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-463.65600000000006 597.0730000000001 Td
-/F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 560.4560000000002 Td
-/F2.0 13 Tf
-<322e32382e332e20436f6e73756d6573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 533.7960000000003 Td
+463.65600000000006 430.7530000000005 Td
 /F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 535.9800000000004 Td
-/F4.0 10.5 Tf
-<706c61696e2f74657874> Tj
+[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 504.1760000000004 Td
+48.24000000000001 394.1360000000005 Td
 /F2.0 13 Tf
-<322e32382e342e2050726f6475636573> Tj
+<322e32392e322e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22143,7 +22166,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 477.51600000000036 Td
+56.88050000000001 367.47600000000045 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -22156,7 +22179,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 479.7000000000004 Td
+66.24000000000001 369.6600000000005 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -22167,9 +22190,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 442.0560000000004 Td
+48.24000000000001 332.0160000000005 Td
 /F2.0 18 Tf
-<322e32392e20474554202f76322f74656d706c61746573> Tj
+<322e33302e20474554202f76322f74656d706c617465732f7b74656d706c6174654e616d657d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22178,59 +22201,59 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 407.8160000000003 Td
+48.24000000000001 297.7760000000004 Td
 /F2.0 13 Tf
-<322e32392e312e20526573706f6e736573> Tj
+[<322e33302e312e20506172> 20.01953125 <616d6574657273>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 355.560 51.552 37.560 re
+48.240 259.800 114.560 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 355.560 360.864 37.560 re
+162.800 259.800 171.840 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 355.560 103.104 37.560 re
+334.640 259.800 229.120 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 332.280 51.552 23.280 re
+48.240 222.240 114.560 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 332.280 360.864 23.280 re
+162.800 222.240 171.840 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 332.280 103.104 23.280 re
+334.640 222.240 229.120 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 393.120 m
-99.792 393.120 l
+48.240 283.080 m
+162.800 283.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 355.560 m
-99.792 355.560 l
+48.240 259.800 m
+162.800 259.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 393.370 m
-48.240 354.810 l
+48.240 283.330 m
+48.240 259.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 393.370 m
-99.792 354.810 l
+162.800 283.330 m
+162.800 259.050 l
 S
 [ ] 0 d
 1 w
@@ -22238,41 +22261,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 377.3730000000003 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24000000000001 363.0930000000003 Td
+51.24000000000001 267.33300000000037 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<54797065> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 393.120 m
-460.656 393.120 l
+162.800 283.080 m
+334.640 283.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 355.560 m
-460.656 355.560 l
+162.800 259.800 m
+334.640 259.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 393.370 m
-99.792 354.810 l
+162.800 283.330 m
+162.800 259.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 393.370 m
-460.656 354.810 l
+334.640 283.330 m
+334.640 259.050 l
 S
 [ ] 0 d
 1 w
@@ -22280,34 +22296,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 377.3730000000003 Td
+165.79988544000003 267.33300000000037 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 393.120 m
-563.760 393.120 l
+334.640 283.080 m
+563.760 283.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 355.560 m
-563.760 355.560 l
+334.640 259.800 m
+563.760 259.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 393.370 m
-460.656 354.810 l
+334.640 283.330 m
+334.640 259.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 393.370 m
-563.760 354.810 l
+563.760 283.330 m
+563.760 259.050 l
 S
 [ ] 0 d
 1 w
@@ -22315,7 +22331,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 377.3730000000003 Td
+337.6397136 267.33300000000037 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -22323,26 +22339,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 355.560 m
-99.792 355.560 l
+48.240 259.800 m
+162.800 259.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 332.280 m
-99.792 332.280 l
+48.240 222.240 m
+162.800 222.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 355.810 m
-48.240 332.030 l
+48.240 260.050 m
+48.240 221.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 355.810 m
-99.792 332.030 l
+162.800 260.050 m
+162.800 221.990 l
 S
 [ ] 0 d
 1 w
@@ -22350,34 +22366,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 339.3130000000003 Td
+51.24000000000001 236.4130000000004 Td
 /F2.0 10.5 Tf
-<323030> Tj
+<50617468> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 355.560 m
-460.656 355.560 l
+162.800 259.800 m
+334.640 259.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 332.280 m
-460.656 332.280 l
+162.800 222.240 m
+334.640 222.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 355.810 m
-99.792 332.030 l
+162.800 260.050 m
+162.800 221.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 355.810 m
-460.656 332.030 l
+334.640 260.050 m
+334.640 221.990 l
 S
 [ ] 0 d
 1 w
@@ -22385,160 +22401,116 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 339.3130000000003 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+165.79988544000003 243.55300000000042 Td
+/F2.0 10.5 Tf
+<74656d706c6174654e616d65> Tj
+ET
+
+
+BT
+165.79988544000003 229.27300000000042 Td
+ET
+
+
+BT
+165.79988544000003 229.27300000000042 Td
+/F3.0 10.5 Tf
+<7265717569726564> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 355.560 m
-563.760 355.560 l
+334.640 259.800 m
+563.760 259.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 332.280 m
-563.760 332.280 l
+334.640 222.240 m
+563.760 222.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 355.810 m
-460.656 332.030 l
+334.640 260.050 m
+334.640 221.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 355.810 m
-563.760 332.030 l
+563.760 260.050 m
+563.760 221.990 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-463.65600000000006 339.3130000000003 Td
-/F1.0 10.5 Tf
-[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 302.6960000000003 Td
-/F2.0 13 Tf
-<322e32392e322e2050726f6475636573> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 276.0360000000003 Td
+337.6397136 236.4130000000004 Td
 /F1.0 10.5 Tf
-<a5> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-BT
-66.24000000000001 278.22000000000025 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24000000000001 240.5760000000003 Td
-/F2.0 18 Tf
-<322e33302e20474554202f76322f74656d706c617465732f6e616d6573> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 206.3360000000003 Td
+48.24000000000001 192.6560000000004 Td
 /F2.0 13 Tf
-<322e33302e312e20526573706f6e736573> Tj
+<322e33302e322e20526573706f6e736573> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 154.080 51.552 37.560 re
+48.240 140.400 51.552 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 154.080 360.864 37.560 re
+99.792 140.400 360.864 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 154.080 103.104 37.560 re
+460.656 140.400 103.104 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 130.800 51.552 23.280 re
+48.240 117.120 51.552 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 130.800 360.864 23.280 re
+99.792 117.120 360.864 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 130.800 103.104 23.280 re
+460.656 117.120 103.104 23.280 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 191.640 m
-99.792 191.640 l
+48.240 177.960 m
+99.792 177.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 154.080 m
-99.792 154.080 l
+48.240 140.400 m
+99.792 140.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 191.890 m
-48.240 153.330 l
+48.240 178.210 m
+48.240 139.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 191.890 m
-99.792 153.330 l
+99.792 178.210 m
+99.792 139.650 l
 S
 [ ] 0 d
 1 w
@@ -22546,14 +22518,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 175.89300000000028 Td
+51.24000000000001 162.2130000000004 Td
 /F2.0 10.5 Tf
 <48545450> Tj
 ET
 
 
 BT
-51.24000000000001 161.61300000000028 Td
+51.24000000000001 147.9330000000004 Td
 /F2.0 10.5 Tf
 <436f6465> Tj
 ET
@@ -22561,26 +22533,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 191.640 m
-460.656 191.640 l
+99.792 177.960 m
+460.656 177.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 154.080 m
-460.656 154.080 l
+99.792 140.400 m
+460.656 140.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 191.890 m
-99.792 153.330 l
+99.792 178.210 m
+99.792 139.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 191.890 m
-460.656 153.330 l
+460.656 178.210 m
+460.656 139.650 l
 S
 [ ] 0 d
 1 w
@@ -22588,7 +22560,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 175.89300000000028 Td
+102.792 162.2130000000004 Td
 /F2.0 10.5 Tf
 <4465736372697074696f6e> Tj
 ET
@@ -22596,26 +22568,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 191.640 m
-563.760 191.640 l
+460.656 177.960 m
+563.760 177.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-460.656 154.080 m
-563.760 154.080 l
+460.656 140.400 m
+563.760 140.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 191.890 m
-460.656 153.330 l
+460.656 178.210 m
+460.656 139.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 191.890 m
-563.760 153.330 l
+563.760 178.210 m
+563.760 139.650 l
 S
 [ ] 0 d
 1 w
@@ -22623,7 +22595,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 175.89300000000028 Td
+463.65600000000006 162.2130000000004 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -22631,26 +22603,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 154.080 m
-99.792 154.080 l
+48.240 140.400 m
+99.792 140.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 130.800 m
-99.792 130.800 l
+48.240 117.120 m
+99.792 117.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 154.330 m
-48.240 130.550 l
+48.240 140.650 m
+48.240 116.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 154.330 m
-99.792 130.550 l
+99.792 140.650 m
+99.792 116.870 l
 S
 [ ] 0 d
 1 w
@@ -22658,7 +22630,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24000000000001 137.83300000000028 Td
+51.24000000000001 124.15300000000039 Td
 /F2.0 10.5 Tf
 <323030> Tj
 ET
@@ -22666,26 +22638,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 154.080 m
-460.656 154.080 l
+99.792 140.400 m
+460.656 140.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 130.800 m
-460.656 130.800 l
+99.792 117.120 m
+460.656 117.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 154.330 m
-99.792 130.550 l
+99.792 140.650 m
+99.792 116.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 154.330 m
-460.656 130.550 l
+460.656 140.650 m
+460.656 116.870 l
 S
 [ ] 0 d
 1 w
@@ -22693,7 +22665,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 137.83300000000028 Td
+102.792 124.15300000000039 Td
 /F1.0 10.5 Tf
 <4f75747075742074797065> Tj
 ET
@@ -22701,46 +22673,54 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 154.080 m
-563.760 154.080 l
+460.656 140.400 m
+563.760 140.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 130.800 m
-563.760 130.800 l
+460.656 117.120 m
+563.760 117.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 154.330 m
-460.656 130.550 l
+460.656 140.650 m
+460.656 116.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 154.330 m
-563.760 130.550 l
+563.760 140.650 m
+563.760 116.870 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 137.83300000000028 Td
+463.65600000000006 124.15300000000039 Td
 /F1.0 10.5 Tf
-[<3c20737472696e67203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24000000000001 101.21600000000026 Td
+48.24000000000001 87.53600000000037 Td
 /F2.0 13 Tf
-<322e33302e322e2050726f6475636573> Tj
+<322e33302e332e2050726f6475636573> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22751,7 +22731,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 74.55600000000027 Td
+56.88050000000001 60.876000000000374 Td
 /F1.0 10.5 Tf
 <a5> Tj
 ET
@@ -22764,7 +22744,7 @@ ET
 0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 76.74000000000026 Td
+66.24000000000001 63.06000000000037 Td
 /F4.0 10.5 Tf
 <6170706c69636174696f6e2f6a736f6e> Tj
 ET
@@ -22802,66 +22782,69 @@ endobj
 /Contents 191 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
-/F3.0 24 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
+/F3.0 24 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [195 0 R 200 0 R]
+/Annots [195 0 R 204 0 R]
 >>
 endobj
 193 0 obj
-[192 0 R /XYZ 0 683.1600000000001 null]
+[192 0 R /XYZ 0 792.0 null]
 endobj
 194 0 obj
-<< /Limits [(_responses_2) (_responses_3)]
-/Names [(_responses_2) 35 0 R (_responses_20) 138 0 R (_responses_21) 144 0 R (_responses_22) 155 0 R (_responses_23) 162 0 R (_responses_24) 170 0 R (_responses_25) 174 0 R (_responses_26) 182 0 R (_responses_27) 186 0 R (_responses_28) 193 0 R (_responses_29) 199 0 R (_responses_3) 39 0 R]
->>
+[192 0 R /XYZ 0 718.32 null]
 endobj
 195 0 obj
 << /Border [0 0 0]
-/Dest (_policymodel)
+/Dest (_looptemplate)
 /Subtype /Link
-/Rect [463.65600000000006 594.0070000000002 524.955 608.2870000000001]
+/Rect [463.65600000000006 629.1670000000003 535.2997558593751 643.4470000000002]
 /Type /Annot
 >>
 endobj
 196 0 obj
-[192 0 R /XYZ 0 578.0400000000002 null]
+[192 0 R /XYZ 0 613.2000000000003 null]
 endobj
 197 0 obj
-[192 0 R /XYZ 0 521.7600000000003 null]
+<< /Limits [(_produces_25) (_responses)]
+/Names [(_produces_25) 183 0 R (_produces_26) 190 0 R (_produces_27) 196 0 R (_produces_28) 200 0 R (_produces_29) 205 0 R (_produces_3) 40 0 R (_produces_4) 49 0 R (_produces_5) 52 0 R (_produces_6) 61 0 R (_produces_7) 68 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
+>>
 endobj
 198 0 obj
-[192 0 R /XYZ 0 465.48000000000036 null]
+[192 0 R /XYZ 0 556.9200000000004 null]
 endobj
 199 0 obj
-[192 0 R /XYZ 0 425.4000000000003 null]
+[192 0 R /XYZ 0 516.8400000000005 null]
 endobj
 200 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [463.65600000000006 336.2470000000003 535.2997558593751 350.52700000000027]
-/Type /Annot
->>
+[192 0 R /XYZ 0 411.7200000000005 null]
 endobj
 201 0 obj
-[192 0 R /XYZ 0 320.2800000000003 null]
+[192 0 R /XYZ 0 355.44000000000045 null]
 endobj
 202 0 obj
-[192 0 R /XYZ 0 264.0000000000003 null]
+[192 0 R /XYZ 0 315.3600000000004 null]
 endobj
 203 0 obj
-[192 0 R /XYZ 0 223.9200000000003 null]
+[192 0 R /XYZ 0 210.2400000000004 null]
 endobj
 204 0 obj
-[192 0 R /XYZ 0 118.80000000000027 null]
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [463.65600000000006 121.08700000000039 535.2997558593751 135.3670000000004]
+/Type /Annot
+>>
 endobj
 205 0 obj
-<< /Length 7931
+[192 0 R /XYZ 0 105.12000000000037 null]
+endobj
+206 0 obj
+<< /Length 16082
 >>
 stream
 q
@@ -22871,9 +22854,9 @@ q
 0.200 0.200 0.200 SCN
 
 BT
-48.24 734.976 Td
-/F2.0 18 Tf
-<322e33312e20474554202f76322f74656d706c617465732f7b74656d706c6174654e616d657d> Tj
+48.24 730.304 Td
+/F2.0 22 Tf
+<4368617074657220332e20446566696e6974696f6e73> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -22882,59 +22865,67 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 700.7360000000001 Td
-/F2.0 13 Tf
-[<322e33312e312e20506172> 20.01953125 <616d6574657273>] TJ
+48.24 688.656 Td
+/F2.0 18 Tf
+<332e312e20436c64734865616c7468436865636b> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 662.760 114.560 23.280 re
+48.240 648.720 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 662.760 171.840 23.280 re
+269.177 648.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 662.760 229.120 23.280 re
+48.240 611.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 625.200 114.560 37.560 re
+269.177 611.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 573.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 573.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-162.800 625.200 171.840 37.560 re
+48.240 536.040 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-334.640 625.200 229.120 37.560 re
+269.177 536.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 686.040 m
-162.800 686.040 l
+48.240 672.000 m
+269.177 672.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
+48.240 648.720 m
+269.177 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 686.290 m
-48.240 662.010 l
+48.240 672.250 m
+48.240 647.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
+269.177 672.250 m
+269.177 647.970 l
 S
 [ ] 0 d
 1 w
@@ -22942,34 +22933,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 670.2930000000001 Td
+51.24 656.2529999999999 Td
 /F2.0 10.5 Tf
-<54797065> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.040 m
-334.640 686.040 l
+269.177 672.000 m
+563.760 672.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
+269.177 648.720 m
+563.760 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 686.290 m
-162.800 662.010 l
+269.177 672.250 m
+269.177 647.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
+563.760 672.250 m
+563.760 647.970 l
 S
 [ ] 0 d
 1 w
@@ -22977,34 +22968,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 670.2930000000001 Td
+272.17692192000004 656.2529999999999 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.040 m
-563.760 686.040 l
+48.240 648.720 m
+269.177 648.720 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
+48.240 611.160 m
+269.177 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 686.290 m
-334.640 662.010 l
+48.240 648.970 m
+48.240 610.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 686.290 m
-563.760 662.010 l
+269.177 648.970 m
+269.177 610.910 l
 S
 [ ] 0 d
 1 w
@@ -23012,34 +23003,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 670.2930000000001 Td
+51.24 632.473 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+<6465736372697074696f6e> Tj
+ET
+
+
+BT
+51.24 618.193 Td
+ET
+
+
+BT
+51.24 618.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 662.760 m
-162.800 662.760 l
+269.177 648.720 m
+563.760 648.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 625.200 m
-162.800 625.200 l
+269.177 611.160 m
+563.760 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 663.010 m
-48.240 624.950 l
+269.177 648.970 m
+269.177 610.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
+563.760 648.970 m
+563.760 610.910 l
 S
 [ ] 0 d
 1 w
@@ -23047,34 +23050,81 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 639.3730000000002 Td
+272.17692192000004 625.333 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 611.160 m
+269.177 611.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 573.600 m
+269.177 573.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 611.410 m
+48.240 573.350 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 611.410 m
+269.177 573.350 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 594.913 Td
 /F2.0 10.5 Tf
-<50617468> Tj
+<6865616c7468436865636b436f6d706f6e656e74> Tj
+ET
+
+
+BT
+51.24 580.6329999999999 Td
+ET
+
+
+BT
+51.24 580.6329999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 662.760 m
-334.640 662.760 l
+269.177 611.160 m
+563.760 611.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 625.200 m
-334.640 625.200 l
+269.177 573.600 m
+563.760 573.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-162.800 663.010 m
-162.800 624.950 l
+269.177 611.410 m
+269.177 573.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
+563.760 611.410 m
+563.760 573.350 l
 S
 [ ] 0 d
 1 w
@@ -23082,46 +23132,81 @@ S
 0.200 0.200 0.200 scn
 
 BT
-165.79988544 646.5130000000001 Td
+272.17692192000004 587.7729999999999 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 573.600 m
+269.177 573.600 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 536.040 m
+269.177 536.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 573.850 m
+48.240 535.790 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 573.850 m
+269.177 535.790 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 557.3530000000001 Td
 /F2.0 10.5 Tf
-<74656d706c6174654e616d65> Tj
+<6865616c7468436865636b537461747573> Tj
 ET
 
 
 BT
-165.79988544 632.2330000000002 Td
+51.24 543.073 Td
 ET
 
 
 BT
-165.79988544 632.2330000000002 Td
+51.24 543.073 Td
 /F3.0 10.5 Tf
-<7265717569726564> Tj
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 662.760 m
-563.760 662.760 l
+269.177 573.600 m
+563.760 573.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 625.200 m
-563.760 625.200 l
+269.177 536.040 m
+563.760 536.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-334.640 663.010 m
-334.640 624.950 l
+269.177 573.850 m
+269.177 535.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 663.010 m
-563.760 624.950 l
+563.760 573.850 m
+563.760 535.790 l
 S
 [ ] 0 d
 1 w
@@ -23129,7 +23214,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-337.6397136 639.3730000000002 Td
+272.17692192000004 550.213 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -23139,59 +23224,107 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 595.6160000000003 Td
-/F2.0 13 Tf
-<322e33312e322e20526573706f6e736573> Tj
+48.24 500.61600000000004 Td
+/F2.0 18 Tf
+<332e322e2044696374696f6e617279> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 543.360 51.552 37.560 re
+48.240 460.680 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 543.360 360.864 37.560 re
+269.177 460.680 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 543.360 103.104 37.560 re
+48.240 423.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 520.080 51.552 23.280 re
+269.177 423.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 385.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 385.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-99.792 520.080 360.864 23.280 re
+48.240 348.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-460.656 520.080 103.104 23.280 re
+269.177 348.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 310.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 310.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 272.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 272.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 235.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 235.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 197.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 197.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 160.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 160.200 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 580.920 m
-99.792 580.920 l
+48.240 483.960 m
+269.177 483.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 543.360 m
-99.792 543.360 l
+48.240 460.680 m
+269.177 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 581.170 m
-48.240 542.610 l
+48.240 484.210 m
+48.240 459.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 581.170 m
-99.792 542.610 l
+269.177 484.210 m
+269.177 459.930 l
 S
 [ ] 0 d
 1 w
@@ -23199,41 +23332,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.1730000000005 Td
-/F2.0 10.5 Tf
-<48545450> Tj
-ET
-
-
-BT
-51.24 550.8930000000004 Td
+51.24 468.21299999999997 Td
 /F2.0 10.5 Tf
-<436f6465> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 580.920 m
-460.656 580.920 l
+269.177 483.960 m
+563.760 483.960 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-99.792 543.360 m
-460.656 543.360 l
+269.177 460.680 m
+563.760 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 581.170 m
-99.792 542.610 l
+269.177 484.210 m
+269.177 459.930 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 581.170 m
-460.656 542.610 l
+563.760 484.210 m
+563.760 459.930 l
 S
 [ ] 0 d
 1 w
@@ -23241,34 +23367,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 565.1730000000005 Td
+272.17692192000004 468.21299999999997 Td
 /F2.0 10.5 Tf
-<4465736372697074696f6e> Tj
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 580.920 m
-563.760 580.920 l
+48.240 460.680 m
+269.177 460.680 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.360 m
-563.760 543.360 l
+48.240 423.120 m
+269.177 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 581.170 m
-460.656 542.610 l
+48.240 460.930 m
+48.240 422.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 581.170 m
-563.760 542.610 l
+269.177 460.930 m
+269.177 422.870 l
 S
 [ ] 0 d
 1 w
@@ -23276,34 +23402,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-463.65600000000006 565.1730000000005 Td
+51.24 444.43299999999994 Td
 /F2.0 10.5 Tf
-<536368656d61> Tj
+[<6372656174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 430.1529999999999 Td
+ET
+
+
+BT
+51.24 430.1529999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 543.360 m
-99.792 543.360 l
+269.177 460.680 m
+563.760 460.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 520.080 m
-99.792 520.080 l
+269.177 423.120 m
+563.760 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 543.610 m
-48.240 519.830 l
+269.177 460.930 m
+269.177 422.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 543.610 m
-99.792 519.830 l
+563.760 460.930 m
+563.760 422.870 l
 S
 [ ] 0 d
 1 w
@@ -23311,34 +23449,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 527.1130000000003 Td
-/F2.0 10.5 Tf
-<323030> Tj
+272.17692192000004 437.29299999999995 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 543.360 m
-460.656 543.360 l
+48.240 423.120 m
+269.177 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 520.080 m
-460.656 520.080 l
+48.240 385.560 m
+269.177 385.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-99.792 543.610 m
-99.792 519.830 l
+48.240 423.370 m
+48.240 385.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.610 m
-460.656 519.830 l
+269.177 423.370 m
+269.177 385.310 l
 S
 [ ] 0 d
 1 w
@@ -23346,241 +23484,185 @@ S
 0.200 0.200 0.200 scn
 
 BT
-102.792 527.1130000000003 Td
-/F1.0 10.5 Tf
-<4f75747075742074797065> Tj
+51.24 406.873 Td
+/F2.0 10.5 Tf
+<6372656174656444617465> Tj
+ET
+
+
+BT
+51.24 392.59299999999996 Td
+ET
+
+
+BT
+51.24 392.59299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.360 m
-563.760 543.360 l
+269.177 423.120 m
+563.760 423.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 520.080 m
-563.760 520.080 l
+269.177 385.560 m
+563.760 385.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-460.656 543.610 m
-460.656 519.830 l
+269.177 423.370 m
+269.177 385.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 543.610 m
-563.760 519.830 l
+563.760 423.370 m
+563.760 385.310 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-463.65600000000006 527.1130000000003 Td
+272.17692192000004 399.733 Td
 /F1.0 10.5 Tf
-[<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 385.560 m
+269.177 385.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 348.000 m
+269.177 348.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 385.810 m
+48.240 347.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 385.810 m
+269.177 347.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24 490.4960000000004 Td
-/F2.0 13 Tf
-<322e33312e332e2050726f6475636573> Tj
+51.24 369.31299999999993 Td
+/F2.0 10.5 Tf
+<64696374696f6e617279456c656d656e7473> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
--0.500 Tc
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-56.88050000000001 463.83600000000035 Td
-/F1.0 10.5 Tf
-<a5> Tj
+51.24 355.0329999999999 Td
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-
-0.000 Tc
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
 
 BT
-66.24000000000001 466.0200000000004 Td
-/F4.0 10.5 Tf
-<6170706c69636174696f6e2f6a736f6e> Tj
+51.24 355.0329999999999 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
 0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 385.560 m
+563.760 385.560 l
+S
 [ ] 0 d
-/Stamp1 Do
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 348.000 m
+563.760 348.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 385.810 m
+269.177 347.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 385.810 m
+563.760 347.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3135> Tj
+272.17692192000004 362.17299999999994 Td
+/F1.0 10.5 Tf
+<3c20> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-206 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 205 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
-/F4.0 33 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [210 0 R]
->>
-endobj
-207 0 obj
-[206 0 R /XYZ 0 792.0 null]
-endobj
-208 0 obj
-[206 0 R /XYZ 0 718.32 null]
-endobj
-209 0 obj
-[206 0 R /XYZ 0 613.2000000000003 null]
-endobj
-210 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [463.65600000000006 524.0470000000004 535.2997558593751 538.3270000000003]
-/Type /Annot
->>
-endobj
-211 0 obj
-[206 0 R /XYZ 0 508.0800000000004 null]
-endobj
-212 0 obj
-<< /Limits [(_produces_28) (_responses)]
-/Names [(_produces_28) 201 0 R (_produces_29) 204 0 R (_produces_3) 40 0 R (_produces_30) 211 0 R (_produces_4) 46 0 R (_produces_5) 53 0 R (_produces_6) 60 0 R (_produces_7) 65 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
->>
-endobj
-213 0 obj
-<< /Length 15761
->>
-stream
-q
-/DeviceRGB cs
-0.200 0.200 0.200 scn
-/DeviceRGB CS
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-48.24 730.304 Td
-/F2.0 22 Tf
-<4368617074657220332e20446566696e6974696f6e73> Tj
+280.76592192000004 362.17299999999994 Td
+/F1.0 10.5 Tf
+<44696374696f6e617279456c656d656e74> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24 688.656 Td
-/F2.0 18 Tf
-<332e312e20436c64734865616c7468436865636b> Tj
+374.97192192000006 362.17299999999994 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 648.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 648.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 611.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 611.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 573.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 573.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 536.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 536.040 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 672.000 m
-269.177 672.000 l
+48.240 348.000 m
+269.177 348.000 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 648.720 m
-269.177 648.720 l
+48.240 310.440 m
+269.177 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 672.250 m
-48.240 647.970 l
+48.240 348.250 m
+48.240 310.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 672.250 m
-269.177 647.970 l
+269.177 348.250 m
+269.177 310.190 l
 S
 [ ] 0 d
 1 w
@@ -23588,34 +23670,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 656.2529999999999 Td
+51.24 331.753 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 317.47299999999996 Td
+ET
+
+
+BT
+51.24 317.47299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 672.000 m
-563.760 672.000 l
+269.177 348.000 m
+563.760 348.000 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.720 m
-563.760 648.720 l
+269.177 310.440 m
+563.760 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 672.250 m
-269.177 647.970 l
+269.177 348.250 m
+269.177 310.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 672.250 m
-563.760 647.970 l
+563.760 348.250 m
+563.760 310.190 l
 S
 [ ] 0 d
 1 w
@@ -23623,34 +23717,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 656.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 324.613 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 648.720 m
-269.177 648.720 l
+48.240 310.440 m
+269.177 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 611.160 m
-269.177 611.160 l
+48.240 272.880 m
+269.177 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 648.970 m
-48.240 610.910 l
+48.240 310.690 m
+48.240 272.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.970 m
-269.177 610.910 l
+269.177 310.690 m
+269.177 272.630 l
 S
 [ ] 0 d
 1 w
@@ -23658,19 +23752,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 632.473 Td
+51.24 294.1929999999999 Td
 /F2.0 10.5 Tf
-<6465736372697074696f6e> Tj
+<7365636f6e644c6576656c44696374696f6e617279> Tj
 ET
 
 
 BT
-51.24 618.193 Td
+51.24 279.9129999999999 Td
 ET
 
 
 BT
-51.24 618.193 Td
+51.24 279.9129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -23678,26 +23772,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.720 m
-563.760 648.720 l
+269.177 310.440 m
+563.760 310.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.160 m
-563.760 611.160 l
+269.177 272.880 m
+563.760 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 648.970 m
-269.177 610.910 l
+269.177 310.690 m
+269.177 272.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 648.970 m
-563.760 610.910 l
+563.760 310.690 m
+563.760 272.630 l
 S
 [ ] 0 d
 1 w
@@ -23705,34 +23799,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 625.333 Td
+272.17692192000004 287.05299999999994 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 611.160 m
-269.177 611.160 l
+48.240 272.880 m
+269.177 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 573.600 m
-269.177 573.600 l
+48.240 235.320 m
+269.177 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 611.410 m
-48.240 573.350 l
+48.240 273.130 m
+48.240 235.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.410 m
-269.177 573.350 l
+269.177 273.130 m
+269.177 235.070 l
 S
 [ ] 0 d
 1 w
@@ -23740,19 +23834,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 594.913 Td
+51.24 256.633 Td
 /F2.0 10.5 Tf
-<6865616c7468436865636b436f6d706f6e656e74> Tj
+<73756244696374696f6e61727954797065> Tj
 ET
 
 
 BT
-51.24 580.6329999999999 Td
+51.24 242.35299999999998 Td
 ET
 
 
 BT
-51.24 580.6329999999999 Td
+51.24 242.35299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -23760,26 +23854,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.160 m
-563.760 611.160 l
+269.177 272.880 m
+563.760 272.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.600 m
-563.760 573.600 l
+269.177 235.320 m
+563.760 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 611.410 m
-269.177 573.350 l
+269.177 273.130 m
+269.177 235.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 611.410 m
-563.760 573.350 l
+563.760 273.130 m
+563.760 235.070 l
 S
 [ ] 0 d
 1 w
@@ -23787,7 +23881,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 587.7729999999999 Td
+272.17692192000004 249.49299999999997 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -23795,26 +23889,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 573.600 m
-269.177 573.600 l
+48.240 235.320 m
+269.177 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 536.040 m
-269.177 536.040 l
+48.240 197.760 m
+269.177 197.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 573.850 m
-48.240 535.790 l
+48.240 235.570 m
+48.240 197.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.850 m
-269.177 535.790 l
+269.177 235.570 m
+269.177 197.510 l
 S
 [ ] 0 d
 1 w
@@ -23822,19 +23916,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 557.3530000000001 Td
+51.24 219.07299999999998 Td
 /F2.0 10.5 Tf
-<6865616c7468436865636b537461747573> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 543.073 Td
+51.24 204.79299999999998 Td
 ET
 
 
 BT
-51.24 543.073 Td
+51.24 204.79299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -23842,26 +23936,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.600 m
-563.760 573.600 l
+269.177 235.320 m
+563.760 235.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 536.040 m
-563.760 536.040 l
+269.177 197.760 m
+563.760 197.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 573.850 m
-269.177 535.790 l
+269.177 235.570 m
+269.177 197.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 573.850 m
-563.760 535.790 l
+563.760 235.570 m
+563.760 197.510 l
 S
 [ ] 0 d
 1 w
@@ -23869,117 +23963,282 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 550.213 Td
+272.17692192000004 211.93299999999996 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 500.61600000000004 Td
-/F2.0 18 Tf
-<332e322e20436c6473496e666f> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 460.680 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 460.680 294.583 23.280 re
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 197.760 m
+269.177 197.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 160.200 m
+269.177 160.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 198.010 m
+48.240 159.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 198.010 m
+269.177 159.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 181.51299999999995 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 167.23299999999995 Td
+ET
+
+
+BT
+51.24 167.23299999999995 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 197.760 m
+563.760 197.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 160.200 m
+563.760 160.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 198.010 m
+269.177 159.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 198.010 m
+563.760 159.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 174.37299999999993 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 124.77599999999991 Td
+/F2.0 18 Tf
+<332e332e2044696374696f6e617279456c656d656e74> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3135> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+207 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 206 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [211 0 R]
+>>
+endobj
+208 0 obj
+[207 0 R /XYZ 0 792.0 null]
+endobj
+209 0 obj
+[207 0 R /XYZ 0 712.0799999999999 null]
+endobj
+210 0 obj
+[207 0 R /XYZ 0 524.04 null]
+endobj
+211 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionaryelement)
+/Subtype /Link
+/Rect [280.76592192000004 359.1069999999999 374.97192192000006 373.38699999999994]
+/Type /Annot
+>>
+endobj
+212 0 obj
+[207 0 R /XYZ 0 148.19999999999993 null]
+endobj
+213 0 obj
+<< /Length 20298
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 423.120 220.937 37.560 re
+269.177 732.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 423.120 294.583 37.560 re
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 385.560 220.937 37.560 re
+48.240 657.600 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 385.560 294.583 37.560 re
+269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 348.000 220.937 37.560 re
+48.240 620.040 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 348.000 294.583 37.560 re
+269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 310.440 220.937 37.560 re
+48.240 582.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 310.440 294.583 37.560 re
+269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 272.880 220.937 37.560 re
+48.240 544.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 272.880 294.583 37.560 re
+269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 235.320 220.937 37.560 re
+48.240 507.360 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 235.320 294.583 37.560 re
+269.177 507.360 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 197.760 220.937 37.560 re
+48.240 469.800 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 197.760 294.583 37.560 re
+269.177 469.800 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 160.200 220.937 37.560 re
+48.240 432.240 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 160.200 294.583 37.560 re
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 483.960 m
-269.177 483.960 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 460.680 m
-269.177 460.680 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 484.210 m
-48.240 459.930 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 484.210 m
-269.177 459.930 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -23987,7 +24246,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 468.21299999999997 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -23995,26 +24254,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 483.960 m
-563.760 483.960 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 460.680 m
-563.760 460.680 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 484.210 m
-269.177 459.930 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 484.210 m
-563.760 459.930 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -24022,7 +24281,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 468.21299999999997 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -24030,26 +24289,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 460.680 m
-269.177 460.680 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 423.120 m
-269.177 423.120 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 460.930 m
-48.240 422.870 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 460.930 m
-269.177 422.870 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -24057,19 +24316,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 444.43299999999994 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
-[<636c647356> 60.05859375 <657273696f6e>] TJ
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 430.1529999999999 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 430.1529999999999 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24077,26 +24336,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 460.680 m
-563.760 460.680 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.120 m
-563.760 423.120 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 460.930 m
-269.177 422.870 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 460.930 m
-563.760 422.870 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -24104,7 +24363,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 437.29299999999995 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -24112,26 +24371,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 423.120 m
-269.177 423.120 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 385.560 m
-269.177 385.560 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 423.370 m
-48.240 385.310 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.370 m
-269.177 385.310 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -24139,19 +24398,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 406.873 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
-<7065726d697373696f6e52656164436c> Tj
+<6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 392.59299999999996 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 392.59299999999996 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24159,26 +24418,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.120 m
-563.760 423.120 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.560 m
-563.760 385.560 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 423.370 m
-269.177 385.310 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 423.370 m
-563.760 385.310 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -24186,34 +24445,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 399.733 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 385.560 m
-269.177 385.560 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 348.000 m
-269.177 348.000 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 385.810 m
-48.240 347.750 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.810 m
-269.177 347.750 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -24221,19 +24480,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 369.31299999999993 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e5265616454> 29.78515625 <656d706c617465>] TJ
+<6465736372697074696f6e> Tj
 ET
 
 
 BT
-51.24 355.0329999999999 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 355.0329999999999 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24241,26 +24500,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.560 m
-563.760 385.560 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.000 m
-563.760 348.000 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 385.810 m
-269.177 347.750 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 385.810 m
-563.760 347.750 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -24268,34 +24527,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 362.17299999999994 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 348.000 m
-269.177 348.000 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 310.440 m
-269.177 310.440 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 348.250 m
-48.240 310.190 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.250 m
-269.177 310.190 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -24303,19 +24562,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 331.753 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e5265616454> 29.78515625 <6f736361>] TJ
+<6e616d65> Tj
 ET
 
 
 BT
-51.24 317.47299999999996 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 317.47299999999996 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24323,26 +24582,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.000 m
-563.760 348.000 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.440 m
-563.760 310.440 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 348.250 m
-269.177 310.190 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 348.250 m
-563.760 310.190 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -24350,34 +24609,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 324.613 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 310.440 m
-269.177 310.440 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 272.880 m
-269.177 272.880 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 310.690 m
-48.240 272.630 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.690 m
-269.177 272.630 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -24385,19 +24644,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 294.1929999999999 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-<7065726d697373696f6e557064617465436c> Tj
+<73686f72744e616d65> Tj
 ET
 
 
 BT
-51.24 279.9129999999999 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 279.9129999999999 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24405,26 +24664,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.440 m
-563.760 310.440 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 272.880 m
-563.760 272.880 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 310.690 m
-269.177 272.630 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 310.690 m
-563.760 272.630 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -24432,34 +24691,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 287.05299999999994 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 272.880 m
-269.177 272.880 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 235.320 m
-269.177 235.320 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 273.130 m
-48.240 235.070 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 273.130 m
-269.177 235.070 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -24467,19 +24726,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 256.633 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e55706461746554> 29.78515625 <656d706c617465>] TJ
+<73756244696374696f6e617279> Tj
 ET
 
 
 BT
-51.24 242.35299999999998 Td
+51.24 514.3929999999999 Td
 ET
 
 
 BT
-51.24 242.35299999999998 Td
+51.24 514.3929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24487,26 +24746,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 272.880 m
-563.760 272.880 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.320 m
-563.760 235.320 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 273.130 m
-269.177 235.070 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 273.130 m
-563.760 235.070 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -24514,54 +24773,54 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 249.49299999999997 Td
+272.17692192000004 521.5329999999999 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 235.320 m
-269.177 235.320 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 197.760 m
-269.177 197.760 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 235.570 m
-48.240 197.510 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.570 m
-269.177 197.510 l
-S
+269.177 507.610 m
+269.177 469.550 l
+S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-51.24 219.07299999999998 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
-[<7065726d697373696f6e55706461746554> 29.78515625 <6f736361>] TJ
+<74797065> Tj
 ET
 
 
 BT
-51.24 204.79299999999998 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 204.79299999999998 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24569,26 +24828,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.320 m
-563.760 235.320 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 197.760 m
-563.760 197.760 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 235.570 m
-269.177 197.510 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 235.570 m
-563.760 197.510 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -24596,34 +24855,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 211.93299999999996 Td
+272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 197.760 m
-269.177 197.760 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 160.200 m
-269.177 160.200 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 198.010 m
-48.240 159.950 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 198.010 m
-269.177 159.950 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -24631,19 +24890,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 181.51299999999995 Td
+51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
-<757365724e616d65> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 167.23299999999995 Td
+51.24 439.2729999999999 Td
 ET
 
 
 BT
-51.24 167.23299999999995 Td
+51.24 439.2729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24651,26 +24910,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 197.760 m
-563.760 197.760 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 160.200 m
-563.760 160.200 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 198.010 m
-269.177 159.950 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 198.010 m
-563.760 159.950 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -24678,175 +24937,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 174.37299999999993 Td
+272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 124.77599999999991 Td
-/F2.0 18 Tf
-<332e332e2044696374696f6e617279> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3136> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-214 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 213 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
->>
-endobj
-215 0 obj
-[214 0 R /XYZ 0 792.0 null]
-endobj
-216 0 obj
-[214 0 R /XYZ 0 712.0799999999999 null]
-endobj
-217 0 obj
-[214 0 R /XYZ 0 524.04 null]
-endobj
-218 0 obj
-[214 0 R /XYZ 0 148.19999999999993 null]
-endobj
-219 0 obj
-<< /Length 21216
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -24854,34 +24972,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 415.99299999999994 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
@@ -24889,34 +25019,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 408.85299999999995 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 394.930 m
+48.240 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 1 w
@@ -24924,19 +25054,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 378.43299999999994 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+[<7573656442> 20.01953125 <7944696374696f6e6172696573>] TJ
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 364.1529999999999 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 364.1529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -24944,61 +25074,118 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 394.930 m
+563.760 356.870 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 371.29299999999995 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 371.29299999999995 Td
+/F1.0 10.5 Tf
+<44696374696f6e617279> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+333.55992192 371.29299999999995 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 321.69599999999997 Td
+/F2.0 18 Tf
+<332e342e2045787465726e616c436f6d706f6e656e74> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.640 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 305.040 m
+269.177 305.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 305.290 m
+48.240 281.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 305.290 m
+269.177 281.010 l
 S
 [ ] 0 d
 1 w
@@ -25006,46 +25193,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 289.2929999999999 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
-ET
-
-
-BT
-51.24 664.6329999999999 Td
-ET
-
-
-BT
-51.24 664.6329999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 305.040 m
+563.760 305.040 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 305.290 m
+269.177 281.010 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 305.290 m
+563.760 281.010 l
 S
 [ ] 0 d
 1 w
@@ -25053,34 +25228,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+272.17692192000004 289.2929999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -25088,19 +25263,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 265.51299999999986 Td
 /F2.0 10.5 Tf
-<64696374696f6e617279456c656d656e7473> Tj
+<636f6d706f6e656e744e616d65> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 251.23299999999986 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 251.23299999999986 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25108,83 +25283,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 634.213 Td
-/F1.0 10.5 Tf
-<3c20> Tj
-ET
-
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-280.76592192000004 634.213 Td
-/F1.0 10.5 Tf
-<44696374696f6e617279456c656d656e74> Tj
-ET
-
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-374.97192192000006 634.213 Td
+272.17692192000004 258.3729999999999 Td
 /F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -25192,19 +25345,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 227.95299999999992 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<7374617465> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 213.67299999999992 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 213.67299999999992 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25212,61 +25365,104 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 220.8129999999999 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<45787465726e616c436f6d706f6e656e745374617465> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 171.2159999999999 Td
+/F2.0 18 Tf
+<332e352e2045787465726e616c436f6d706f6e656e745374617465> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.280 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.280 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 93.720 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 93.720 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.160 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 154.560 m
+269.177 154.560 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 131.280 m
+269.177 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 154.810 m
+48.240 130.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 154.810 m
+269.177 130.530 l
 S
 [ ] 0 d
 1 w
@@ -25274,46 +25470,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 138.8129999999999 Td
 /F2.0 10.5 Tf
-<7365636f6e644c6576656c44696374696f6e617279> Tj
-ET
-
-
-BT
-51.24 551.953 Td
-ET
-
-
-BT
-51.24 551.953 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 154.560 m
+563.760 154.560 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 131.280 m
+563.760 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 154.810 m
+269.177 130.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 154.810 m
+563.760 130.530 l
 S
 [ ] 0 d
 1 w
@@ -25321,34 +25505,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+272.17692192000004 138.8129999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 131.280 m
+269.177 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 93.720 m
+269.177 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 131.530 m
+48.240 93.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 131.530 m
+269.177 93.470 l
 S
 [ ] 0 d
 1 w
@@ -25356,19 +25540,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 115.03299999999989 Td
 /F2.0 10.5 Tf
-<73756244696374696f6e61727954797065> Tj
+<6465736372697074696f6e> Tj
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 100.75299999999989 Td
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 100.75299999999989 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25376,26 +25560,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 131.280 m
+563.760 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 93.720 m
+563.760 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 131.530 m
+269.177 93.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 131.530 m
+563.760 93.470 l
 S
 [ ] 0 d
 1 w
@@ -25403,7 +25587,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5329999999999 Td
+272.17692192000004 107.89299999999989 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -25411,26 +25595,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 93.720 m
+269.177 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 56.160 m
+269.177 56.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 93.970 m
+48.240 55.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 93.970 m
+269.177 55.910 l
 S
 [ ] 0 d
 1 w
@@ -25438,19 +25622,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+51.24 77.47299999999989 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<6c6576656c> Tj
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 63.192999999999884 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 63.192999999999884 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25458,26 +25642,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 93.720 m
+563.760 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 56.160 m
+563.760 56.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 93.970 m
+269.177 55.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 93.970 m
+563.760 55.910 l
 S
 [ ] 0 d
 1 w
@@ -25485,34 +25669,154 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 70.33299999999988 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74333229> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3136> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+214 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 213 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [215 0 R 217 0 R]
+>>
+endobj
+215 0 obj
+<< /Border [0 0 0]
+/Dest (_dictionary)
+/Subtype /Link
+/Rect [280.76592192000004 368.2269999999999 333.55992192 382.50699999999995]
+/Type /Annot
+>>
+endobj
+216 0 obj
+[214 0 R /XYZ 0 345.11999999999995 null]
+endobj
+217 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponentstate)
+/Subtype /Link
+/Rect [272.17692192000004 217.74699999999993 397.34742192000004 232.02699999999993]
+/Type /Annot
+>>
+endobj
+218 0 obj
+[214 0 R /XYZ 0 194.6399999999999 null]
+endobj
+219 0 obj
+<< /Length 21931
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -25520,19 +25824,54 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55299999999994 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<73746174654e616d65> Tj
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25540,26 +25879,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -25567,9 +25906,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.41299999999995 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -25577,107 +25916,163 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 396.816 Td
+48.24 659.7360000000001 Td
 /F2.0 18 Tf
-<332e342e2044696374696f6e617279456c656d656e74> Tj
+[<332e362e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 356.880 220.937 23.280 re
+48.240 619.800 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 356.880 294.583 23.280 re
+269.177 619.800 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.320 220.937 37.560 re
+48.240 582.240 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.320 294.583 37.560 re
+269.177 582.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 281.760 220.937 37.560 re
+48.240 544.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 281.760 294.583 37.560 re
+269.177 544.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 244.200 220.937 37.560 re
+48.240 507.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 244.200 294.583 37.560 re
+269.177 507.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 206.640 220.937 37.560 re
+48.240 469.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 206.640 294.583 37.560 re
+269.177 469.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
+48.240 394.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
+269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
+48.240 356.880 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
+269.177 356.880 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
 269.177 56.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 380.160 m
-269.177 380.160 l
+48.240 643.080 m
+269.177 643.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 619.800 m
+269.177 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 380.410 m
-48.240 356.130 l
+48.240 643.330 m
+48.240 619.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 380.410 m
-269.177 356.130 l
+269.177 643.330 m
+269.177 619.050 l
 S
 [ ] 0 d
 1 w
@@ -25685,7 +26080,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 364.4129999999999 Td
+51.24 627.3330000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -25693,26 +26088,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 380.160 m
-563.760 380.160 l
+269.177 643.080 m
+563.760 643.080 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 619.800 m
+563.760 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 380.410 m
-269.177 356.130 l
+269.177 643.330 m
+269.177 619.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 380.410 m
-563.760 356.130 l
+563.760 643.330 m
+563.760 619.050 l
 S
 [ ] 0 d
 1 w
@@ -25720,7 +26115,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 364.4129999999999 Td
+272.17692192000004 627.3330000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -25728,26 +26123,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 619.800 m
+269.177 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 620.050 m
+48.240 581.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 620.050 m
+269.177 581.990 l
 S
 [ ] 0 d
 1 w
@@ -25755,19 +26150,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.63299999999987 Td
+51.24 603.5530000000001 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 326.35299999999984 Td
+51.24 589.2730000000001 Td
 ET
 
 
 BT
-51.24 326.35299999999984 Td
+51.24 589.2730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25775,26 +26170,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 619.800 m
+563.760 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 620.050 m
+269.177 581.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 620.050 m
+563.760 581.990 l
 S
 [ ] 0 d
 1 w
@@ -25802,34 +26197,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.4929999999999 Td
+272.17692192000004 596.4130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<6e756d626572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -25837,19 +26232,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.0729999999999 Td
+51.24 565.9930000000002 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 288.7929999999999 Td
+51.24 551.7130000000001 Td
 ET
 
 
 BT
-51.24 288.7929999999999 Td
+51.24 551.7130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25857,26 +26252,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
-S
+269.177 582.240 m
+563.760 582.240 l
+S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -25884,34 +26279,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.93299999999994 Td
+272.17692192000004 558.8530000000001 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<696e7465676572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -25919,19 +26314,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.51299999999986 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
-<6465736372697074696f6e> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 251.23299999999986 Td
+51.24 514.1530000000001 Td
 ET
 
 
 BT
-51.24 251.23299999999986 Td
+51.24 514.1530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -25939,26 +26334,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -25966,34 +26361,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.3729999999999 Td
+272.17692192000004 521.2930000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -26001,19 +26396,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95299999999992 Td
+51.24 490.8730000000001 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 213.67299999999992 Td
+51.24 476.5930000000001 Td
 ET
 
 
 BT
-51.24 213.67299999999992 Td
+51.24 476.5930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26021,26 +26416,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -26048,34 +26443,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.8129999999999 Td
+272.17692192000004 483.7330000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -26083,19 +26478,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39299999999992 Td
+51.24 453.31300000000016 Td
 /F2.0 10.5 Tf
-<73686f72744e616d65> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 176.11299999999991 Td
+51.24 439.03300000000013 Td
 ET
 
 
 BT
-51.24 176.11299999999991 Td
+51.24 439.03300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26103,26 +26498,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -26130,7 +26525,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.2529999999999 Td
+272.17692192000004 446.1730000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -26138,26 +26533,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -26165,19 +26560,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.8329999999999 Td
+51.24 415.7530000000001 Td
 /F2.0 10.5 Tf
-<73756244696374696f6e617279> Tj
+<6173446f75626c65> Tj
 ET
 
 
 BT
-51.24 138.5529999999999 Td
+51.24 401.47300000000007 Td
 ET
 
 
 BT
-51.24 138.5529999999999 Td
+51.24 401.47300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26185,26 +26580,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -26212,34 +26607,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6929999999999 Td
+272.17692192000004 408.6130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -26247,19 +26642,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.2729999999999 Td
+51.24 378.19300000000015 Td
 /F2.0 10.5 Tf
-<74797065> Tj
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 100.9929999999999 Td
+51.24 363.9130000000001 Td
 ET
 
 
 BT
-51.24 100.9929999999999 Td
+51.24 363.9130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26267,26 +26662,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -26294,34 +26689,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.1329999999999 Td
+272.17692192000004 371.05300000000017 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<6e756d6265722028666c6f617429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -26329,19 +26724,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71299999999987 Td
+51.24 340.6330000000001 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 63.432999999999865 Td
+51.24 326.35300000000007 Td
 ET
 
 
 BT
-51.24 63.432999999999865 Td
+51.24 326.35300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26349,26 +26744,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -26376,116 +26771,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.57299999999987 Td
+272.17692192000004 333.4930000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3137> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-220 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 219 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [221 0 R]
->>
-endobj
-221 0 obj
-<< /Border [0 0 0]
-/Dest (_dictionaryelement)
-/Subtype /Link
-/Rect [280.76592192000004 631.147 374.97192192000006 645.427]
-/Type /Annot
->>
-endobj
-222 0 obj
-[220 0 R /XYZ 0 420.23999999999995 null]
-endobj
-223 0 obj
-<< /Length 19329
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -26493,69 +26806,89 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 303.0730000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 288.7930000000001 Td
+ET
+
+
+BT
+51.24 288.7930000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 295.9330000000001 Td
+/F1.0 10.5 Tf
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -26563,19 +26896,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 265.5130000000001 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 251.2330000000001 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 251.2330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26583,61 +26916,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 258.3730000000001 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -26645,19 +26986,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 227.95300000000012 Td
 /F2.0 10.5 Tf
-[<7573656442> 20.01953125 <7944696374696f6e6172696573>] TJ
+<61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 213.67300000000012 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 213.67300000000012 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26665,26 +27006,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -26694,89 +27035,130 @@ S
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 671.7729999999999 Td
-/F1.0 10.5 Tf
-<3c20> Tj
-ET
-
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 671.7729999999999 Td
+272.17692192000004 220.8130000000001 Td
 /F1.0 10.5 Tf
-<44696374696f6e617279> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-
-BT
-333.55992192 671.7729999999999 Td
-/F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.640 m
+269.177 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 206.890 m
+48.240 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 190.39300000000011 Td
+/F2.0 10.5 Tf
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 176.1130000000001 Td
+ET
+
+
+BT
+51.24 176.1130000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.640 m
+563.760 206.640 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 206.890 m
+269.177 168.830 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 206.890 m
+563.760 168.830 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-48.24 622.1759999999999 Td
-/F2.0 18 Tf
-<332e352e2045787465726e616c436f6d706f6e656e74> Tj
+272.17692192000004 183.2530000000001 Td
+/F1.0 10.5 Tf
+<4a736f6e5072696d6974697665> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 582.240 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 582.240 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.120 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 605.520 m
-269.177 605.520 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 605.770 m
-48.240 581.490 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.770 m
-269.177 581.490 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -26784,34 +27166,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 589.7729999999999 Td
+51.24 152.8330000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<61734c6f6e67> Tj
+ET
+
+
+BT
+51.24 138.5530000000001 Td
+ET
+
+
+BT
+51.24 138.5530000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.520 m
-563.760 605.520 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 605.770 m
-269.177 581.490 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 605.770 m
-563.760 581.490 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -26819,34 +27213,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 589.7729999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 145.6930000000001 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.490 m
-48.240 544.430 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -26854,19 +27248,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.9929999999999 Td
+51.24 115.2730000000001 Td
 /F2.0 10.5 Tf
-<636f6d706f6e656e744e616d65> Tj
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 551.713 Td
+51.24 100.9930000000001 Td
 ET
 
 
 BT
-51.24 551.713 Td
+51.24 100.9930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26874,61 +27268,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.490 m
-563.760 544.430 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 558.853 Td
+272.17692192000004 108.1330000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4e756d626572> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.930 m
-48.240 506.870 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -26936,19 +27338,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.433 Td
+51.24 77.71300000000004 Td
 /F2.0 10.5 Tf
-<7374617465> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 514.1529999999999 Td
+51.24 63.433000000000035 Td
 ET
 
 
 BT
-51.24 514.1529999999999 Td
+51.24 63.433000000000035 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -26956,112 +27358,199 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 544.930 m
-563.760 506.870 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 521.2929999999999 Td
+272.17692192000004 70.57300000000004 Td
 /F1.0 10.5 Tf
-<45787465726e616c436f6d706f6e656e745374617465> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 471.69599999999997 Td
-/F2.0 18 Tf
-<332e362e2045787465726e616c436f6d706f6e656e745374617465> Tj
+552.698 14.388 Td
+/F1.0 9 Tf
+<3137> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+220 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 219 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [222 0 R 223 0 R 224 0 R 225 0 R 226 0 R]
+>>
+endobj
+221 0 obj
+[220 0 R /XYZ 0 683.1600000000001 null]
+endobj
+222 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 292.8670000000001 322.17751176375003 307.1470000000001]
+/Type /Annot
+>>
+endobj
+223 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 255.3070000000001 314.65992192000004 269.5870000000001]
+/Type /Annot
+>>
+endobj
+224 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 217.74700000000013 325.32792192000005 232.0270000000001]
+/Type /Annot
+>>
+endobj
+225 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 180.18700000000013 340.1224219200001 194.4670000000001]
+/Type /Annot
+>>
+endobj
+226 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 105.06700000000009 313.75692192 119.3470000000001]
+/Type /Annot
+>>
+endobj
+227 0 obj
+<< /Length 21512
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 431.760 220.937 23.280 re
+48.240 695.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 431.760 294.583 23.280 re
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.200 220.937 37.560 re
+48.240 620.040 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.200 294.583 37.560 re
+269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 356.640 220.937 37.560 re
+48.240 582.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 356.640 294.583 37.560 re
+269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.080 220.937 37.560 re
+48.240 544.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.080 294.583 37.560 re
+269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 455.040 m
-269.177 455.040 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 431.760 m
-269.177 431.760 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 455.290 m
-48.240 431.010 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 455.290 m
-269.177 431.010 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -27069,7 +27558,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 439.2929999999999 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -27077,26 +27566,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 455.040 m
-563.760 455.040 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 431.760 m
-563.760 431.760 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 455.290 m
-269.177 431.010 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 455.290 m
-563.760 431.010 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -27104,7 +27593,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 439.2929999999999 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -27112,26 +27601,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 431.760 m
-269.177 431.760 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.200 m
-269.177 394.200 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.010 m
-48.240 393.950 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.010 m
-269.177 393.950 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -27139,19 +27628,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.51299999999986 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
-<6465736372697074696f6e> Tj
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 401.23299999999983 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 401.23299999999983 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27159,26 +27648,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 431.760 m
-563.760 431.760 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.200 m
-563.760 394.200 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.010 m
-269.177 393.950 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.010 m
-563.760 393.950 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -27186,7 +27675,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.3729999999999 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -27194,26 +27683,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.200 m
-269.177 394.200 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.640 m
-269.177 356.640 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.450 m
-48.240 356.390 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.450 m
-269.177 356.390 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -27221,19 +27710,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 377.9529999999999 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
-<6c6576656c> Tj
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 363.6729999999999 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 363.6729999999999 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27241,26 +27730,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.200 m
-563.760 394.200 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.640 m
-563.760 356.640 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.450 m
-269.177 356.390 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.450 m
-563.760 356.390 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -27268,34 +27757,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 370.81299999999993 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.640 m
-269.177 356.640 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.080 m
-269.177 319.080 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.890 m
-48.240 318.830 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.890 m
-269.177 318.830 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -27303,19 +27792,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.39299999999986 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<73746174654e616d65> Tj
+<6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 326.11299999999983 Td
+51.24 627.0730000000001 Td
 ET
 
 
 BT
-51.24 326.11299999999983 Td
+51.24 627.0730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27323,26 +27812,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.640 m
-563.760 356.640 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.080 m
-563.760 319.080 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.890 m
-269.177 318.830 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 356.890 m
-563.760 318.830 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -27350,93 +27839,305 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.2529999999999 Td
+272.17692192000004 634.2130000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 283.6559999999999 Td
-/F2.0 18 Tf
-[<332e372e204a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 243.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 243.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.160 294.583 37.560 re
-f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.040 m
+269.177 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.290 m
+48.240 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.7930000000001 Td
+/F2.0 10.5 Tf
+<6a736f6e4f626a656374> Tj
+ET
+
+
+BT
+51.24 589.5130000000001 Td
+ET
+
+
+BT
+51.24 589.5130000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.040 m
+563.760 620.040 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.290 m
+269.177 582.230 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.290 m
+563.760 582.230 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.6530000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.480 m
+269.177 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.920 m
+269.177 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.730 m
+48.240 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 566.2330000000002 Td
+/F2.0 10.5 Tf
+<6a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 551.9530000000002 Td
+ET
+
+
+BT
+51.24 551.9530000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.480 m
+563.760 582.480 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 544.920 m
+563.760 544.920 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.730 m
+269.177 544.670 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 582.730 m
+563.760 544.670 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 559.0930000000002 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 509.4960000000004 Td
+/F2.0 18 Tf
+<332e372e204a736f6e4e756c6c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.560 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.560 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 432.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 432.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 394.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 394.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 168.600 220.937 37.560 re
+48.240 169.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 168.600 294.583 37.560 re
+269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.040 220.937 37.560 re
+48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.040 294.583 37.560 re
+269.177 131.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 93.480 220.937 37.560 re
+48.240 93.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 93.480 294.583 37.560 re
+269.177 93.960 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 55.920 220.937 37.560 re
+48.240 56.400 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 55.920 294.583 37.560 re
+269.177 56.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 267.000 m
-269.177 267.000 l
+48.240 492.840 m
+269.177 492.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 243.720 m
-269.177 243.720 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 267.250 m
-48.240 242.970 l
+48.240 493.090 m
+48.240 468.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.250 m
-269.177 242.970 l
+269.177 493.090 m
+269.177 468.810 l
 S
 [ ] 0 d
 1 w
@@ -27444,7 +28145,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 251.25299999999982 Td
+51.24 477.0930000000003 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -27452,26 +28153,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.000 m
-563.760 267.000 l
+269.177 492.840 m
+563.760 492.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 243.720 m
-563.760 243.720 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 267.250 m
-269.177 242.970 l
+269.177 493.090 m
+269.177 468.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 267.250 m
-563.760 242.970 l
+563.760 493.090 m
+563.760 468.810 l
 S
 [ ] 0 d
 1 w
@@ -27479,7 +28180,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 251.25299999999982 Td
+272.17692192000004 477.0930000000003 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -27487,26 +28188,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.720 m
-269.177 243.720 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.160 m
-269.177 206.160 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 243.970 m
-48.240 205.910 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.970 m
-269.177 205.910 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -27514,19 +28215,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.47299999999984 Td
+51.24 453.3130000000003 Td
 /F2.0 10.5 Tf
 <6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 213.19299999999984 Td
+51.24 439.03300000000024 Td
 ET
 
 
 BT
-51.24 213.19299999999984 Td
+51.24 439.03300000000024 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27534,26 +28235,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.720 m
-563.760 243.720 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.160 m
-563.760 206.160 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 243.970 m
-269.177 205.910 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 243.970 m
-563.760 205.910 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -27561,7 +28262,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.33299999999983 Td
+272.17692192000004 446.1730000000003 Td
 /F1.0 10.5 Tf
 <6e756d626572> Tj
 ET
@@ -27569,26 +28270,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.160 m
-269.177 206.160 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.600 m
-269.177 168.600 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.410 m
-48.240 168.350 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.410 m
-269.177 168.350 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -27596,19 +28297,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 189.91299999999984 Td
+51.24 415.7530000000003 Td
 /F2.0 10.5 Tf
 <6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 175.63299999999984 Td
+51.24 401.4730000000003 Td
 ET
 
 
 BT
-51.24 175.63299999999984 Td
+51.24 401.4730000000003 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27616,26 +28317,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.160 m
-563.760 206.160 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.600 m
-563.760 168.600 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.410 m
-269.177 168.350 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.410 m
-563.760 168.350 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -27643,7 +28344,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 182.77299999999983 Td
+272.17692192000004 408.61300000000034 Td
 /F1.0 10.5 Tf
 <696e7465676572> Tj
 ET
@@ -27651,26 +28352,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.600 m
-269.177 168.600 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.040 m
-269.177 131.040 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 168.850 m
-48.240 130.790 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.850 m
-269.177 130.790 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -27678,19 +28379,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.35299999999984 Td
+51.24 378.19300000000027 Td
 /F2.0 10.5 Tf
 <6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 138.07299999999984 Td
+51.24 363.91300000000024 Td
 ET
 
 
 BT
-51.24 138.07299999999984 Td
+51.24 363.91300000000024 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27698,26 +28399,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.600 m
-563.760 168.600 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.040 m
-563.760 131.040 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 168.850 m
-269.177 130.790 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 168.850 m
-563.760 130.790 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -27725,7 +28426,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.21299999999982 Td
+272.17692192000004 371.0530000000003 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -27733,26 +28434,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.040 m
-269.177 131.040 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.480 m
-269.177 93.480 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.290 m
-48.240 93.230 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.290 m
-269.177 93.230 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -27760,19 +28461,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 114.79299999999982 Td
+51.24 340.6330000000003 Td
 /F2.0 10.5 Tf
 [<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 100.51299999999982 Td
+51.24 326.3530000000003 Td
 ET
 
 
 BT
-51.24 100.51299999999982 Td
+51.24 326.3530000000003 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27780,26 +28481,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.040 m
-563.760 131.040 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.480 m
-563.760 93.480 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.290 m
-269.177 93.230 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.290 m
-563.760 93.230 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -27807,7 +28508,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 107.65299999999982 Td
+272.17692192000004 333.49300000000034 Td
 /F1.0 10.5 Tf
 [<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
@@ -27815,26 +28516,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.480 m
-269.177 93.480 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 55.920 m
-269.177 55.920 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.730 m
-48.240 55.670 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.730 m
-269.177 55.670 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -27842,19 +28543,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.23299999999982 Td
+51.24 303.07300000000026 Td
 /F2.0 10.5 Tf
 [<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 62.95299999999982 Td
+51.24 288.79300000000023 Td
 ET
 
 
 BT
-51.24 62.95299999999982 Td
+51.24 288.79300000000023 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -27862,26 +28563,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.480 m
-563.760 93.480 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 55.920 m
-563.760 55.920 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.730 m
-269.177 55.670 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 93.730 m
-563.760 55.670 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -27889,391 +28590,116 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.09299999999982 Td
+272.17692192000004 295.9330000000003 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 281.760 m
+269.177 281.760 l
+S
 [ ] 0 d
-/Stamp1 Do
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 244.200 m
+269.177 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 282.010 m
+48.240 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3138> Tj
+51.24 265.5130000000003 Td
+/F2.0 10.5 Tf
+<6173446f75626c65> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
 
-endstream
-endobj
-224 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 223 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [225 0 R 227 0 R]
->>
-endobj
-225 0 obj
-<< /Border [0 0 0]
-/Dest (_dictionary)
-/Subtype /Link
-/Rect [280.76592192000004 668.707 333.55992192 682.987]
-/Type /Annot
->>
-endobj
-226 0 obj
-[224 0 R /XYZ 0 645.5999999999999 null]
-endobj
-227 0 obj
-<< /Border [0 0 0]
-/Dest (_externalcomponentstate)
-/Subtype /Link
-/Rect [272.17692192000004 518.227 397.34742192000004 532.507]
-/Type /Annot
->>
-endobj
-228 0 obj
-[224 0 R /XYZ 0 495.11999999999995 null]
-endobj
-229 0 obj
-[224 0 R /XYZ 0 307.07999999999987 null]
-endobj
-230 0 obj
-<< /Limits [(_dictionaryelement) (_looplog)]
-/Names [(_dictionaryelement) 222 0 R (_externalcomponent) 226 0 R (_externalcomponentstate) 228 0 R (_jsonarray) 229 0 R (_jsonnull) 238 0 R (_jsonobject) 248 0 R (_jsonprimitive) 256 0 R (_loop) 264 0 R (_loopelementmodel) 274 0 R (_looplog) 279 0 R]
->>
-endobj
-231 0 obj
-<< /Length 21606
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
+BT
+51.24 251.23300000000032 Td
+ET
+
+
+BT
+51.24 251.23300000000032 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 716.473 Td
-/F2.0 10.5 Tf
-<6173446f75626c65> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
-ET
-
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 281.760 m
+563.760 281.760 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 244.200 m
+563.760 244.200 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 282.010 m
+269.177 243.950 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 282.010 m
+563.760 243.950 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 258.37300000000033 Td
+/F1.0 10.5 Tf
+<6e756d6265722028646f75626c6529> Tj
+ET
+
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -28281,19 +28707,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 227.95300000000032 Td
 /F2.0 10.5 Tf
 <6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 213.67300000000031 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 213.67300000000031 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28301,26 +28727,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -28328,7 +28754,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 220.8130000000003 Td
 /F1.0 10.5 Tf
 <6e756d6265722028666c6f617429> Tj
 ET
@@ -28336,26 +28762,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -28363,19 +28789,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 190.39300000000028 Td
 /F2.0 10.5 Tf
 <6173496e74> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 176.11300000000028 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 176.11300000000028 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28383,26 +28809,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
@@ -28410,7 +28836,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 183.25300000000027 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -28418,26 +28844,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -28445,19 +28871,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 152.83300000000028 Td
 /F2.0 10.5 Tf
 [<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 138.55300000000028 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 138.55300000000028 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28465,26 +28891,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -28498,7 +28924,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 145.69300000000027 Td
 /F1.0 10.5 Tf
 [<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -28508,26 +28934,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -28535,19 +28961,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 115.27300000000027 Td
 /F2.0 10.5 Tf
 <61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 100.99300000000027 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 100.99300000000027 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28555,26 +28981,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -28588,7 +29014,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 108.13300000000027 Td
 /F1.0 10.5 Tf
 <4a736f6e4e756c6c> Tj
 ET
@@ -28598,26 +29024,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -28625,19 +29051,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 77.71300000000026 Td
 /F2.0 10.5 Tf
 <61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 63.43300000000026 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 63.43300000000026 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28645,26 +29071,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
@@ -28678,7 +29104,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 70.57300000000026 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -28686,48 +29112,272 @@ ET
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
-S
-[ ] 0 d
-1 w
+q
+0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 491.113 Td
-/F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 476.83299999999997 Td
+49.24 14.388 Td
+/F1.0 9 Tf
+<3138> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
 
-BT
-51.24 476.83299999999997 Td
+endstream
+endobj
+228 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 227 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [230 0 R 231 0 R 232 0 R]
+>>
+endobj
+229 0 obj
+[228 0 R /XYZ 0 532.9200000000003 null]
+endobj
+230 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 142.6270000000003 322.17751176375003 156.90700000000027]
+/Type /Annot
+>>
+endobj
+231 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 105.06700000000026 314.65992192000004 119.34700000000026]
+/Type /Annot
+>>
+endobj
+232 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 67.50700000000026 325.32792192000005 81.78700000000026]
+/Type /Annot
+>>
+endobj
+233 0 obj
+<< /Length 21163
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28735,26 +29385,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -28768,7 +29418,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <4a736f6e5072696d6974697665> Tj
 ET
@@ -28778,26 +29428,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -28805,19 +29455,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.553 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28825,26 +29475,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -28852,7 +29502,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.413 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -28860,26 +29510,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -28887,19 +29537,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
 <61734e756d626572> Tj
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28907,26 +29557,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -28940,7 +29590,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 408.853 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
 <4e756d626572> Tj
 ET
@@ -28950,26 +29600,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -28977,19 +29627,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.43299999999994 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
 <617353686f7274> Tj
 ET
 
 
 BT
-51.24 364.1529999999999 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 364.1529999999999 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -28997,26 +29647,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -29024,7 +29674,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.29299999999995 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -29032,26 +29682,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -29059,19 +29709,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.873 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
 <6173537472696e67> Tj
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29079,26 +29729,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -29106,7 +29756,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.733 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -29114,26 +29764,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -29141,19 +29791,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.31300000000005 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
 [<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 289.033 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 289.033 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29161,26 +29811,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -29188,7 +29838,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.17300000000006 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -29196,26 +29846,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.250 m
-48.240 244.190 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -29223,19 +29873,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.7530000000001 Td
+51.24 491.1130000000001 Td
 /F2.0 10.5 Tf
 <6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 251.4730000000001 Td
+51.24 476.8330000000001 Td
 ET
 
 
 BT
-51.24 251.4730000000001 Td
+51.24 476.8330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29243,26 +29893,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.250 m
-563.760 244.190 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -29270,7 +29920,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.6130000000001 Td
+272.17692192000004 483.9730000000001 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -29278,26 +29928,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.690 m
-48.240 206.630 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -29305,19 +29955,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 228.19300000000018 Td
+51.24 453.55300000000017 Td
 /F2.0 10.5 Tf
 <6a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 213.91300000000018 Td
+51.24 439.27300000000014 Td
 ET
 
 
 BT
-51.24 213.91300000000018 Td
+51.24 439.27300000000014 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29325,26 +29975,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.690 m
-563.760 206.630 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -29352,7 +30002,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 221.05300000000017 Td
+272.17692192000004 446.4130000000002 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -29360,26 +30010,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 207.130 m
-48.240 169.070 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -29387,19 +30037,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.63300000000024 Td
+51.24 415.9930000000002 Td
 /F2.0 10.5 Tf
 <6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 176.35300000000024 Td
+51.24 401.7130000000002 Td
 ET
 
 
 BT
-51.24 176.35300000000024 Td
+51.24 401.7130000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29407,26 +30057,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 207.130 m
-563.760 169.070 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
@@ -29434,7 +30084,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.49300000000022 Td
+272.17692192000004 408.85300000000024 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -29444,19 +30094,67 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 133.89600000000019 Td
+48.24 359.25600000000026 Td
 /F2.0 18 Tf
-<332e382e204a736f6e4e756c6c> Tj
+<332e382e204a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 23.280 re
+48.240 319.320 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.320 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 23.280 re
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
@@ -29469,26 +30167,26 @@ f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 117.240 m
-269.177 117.240 l
+48.240 342.600 m
+269.177 342.600 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 117.490 m
-48.240 93.210 l
+48.240 342.850 m
+48.240 318.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.490 m
-269.177 93.210 l
+269.177 342.850 m
+269.177 318.570 l
 S
 [ ] 0 d
 1 w
@@ -29496,7 +30194,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 101.49300000000021 Td
+51.24 326.8530000000002 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -29504,26 +30202,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.240 m
-563.760 117.240 l
+269.177 342.600 m
+563.760 342.600 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.490 m
-269.177 93.210 l
+269.177 342.850 m
+269.177 318.570 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 117.490 m
-563.760 93.210 l
+563.760 342.850 m
+563.760 318.570 l
 S
 [ ] 0 d
 1 w
@@ -29531,7 +30229,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 101.49300000000021 Td
+272.17692192000004 326.8530000000002 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -29539,26 +30237,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -29566,19 +30264,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.7130000000002 Td
+51.24 303.07300000000015 Td
 /F2.0 10.5 Tf
 <6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 63.433000000000206 Td
+51.24 288.7930000000001 Td
 ET
 
 
 BT
-51.24 63.433000000000206 Td
+51.24 288.7930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29586,26 +30284,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -29613,276 +30311,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.5730000000002 Td
+272.17692192000004 295.93300000000016 Td
 /F1.0 10.5 Tf
 <6e756d626572> Tj
 ET
 
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3139> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-232 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 231 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [233 0 R 234 0 R 235 0 R 236 0 R 237 0 R]
->>
-endobj
-233 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 593.587 322.17751176375003 607.867]
-/Type /Annot
->>
-endobj
-234 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 556.027 314.65992192000004 570.307]
-/Type /Annot
->>
-endobj
-235 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 518.4670000000001 325.32792192000005 532.7470000000001]
-/Type /Annot
->>
-endobj
-236 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 480.907 340.1224219200001 495.187]
-/Type /Annot
->>
-endobj
-237 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 405.787 313.75692192 420.067]
-/Type /Annot
->>
-endobj
-238 0 obj
-[232 0 R /XYZ 0 157.32000000000022 null]
-endobj
-239 0 obj
-<< /Length 22601
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 244.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 244.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 206.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 206.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 169.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 169.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 131.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 131.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 94.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 94.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 56.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 56.640 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -29890,34 +30346,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 265.5130000000002 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6173426967496e7465676572> Tj
+ET
+
+
+BT
+51.24 251.2330000000002 Td
+ET
+
+
+BT
+51.24 251.2330000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -29925,34 +30393,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 258.3730000000002 Td
+/F1.0 10.5 Tf
+<696e7465676572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -29960,19 +30428,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 227.9530000000002 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 213.6730000000002 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 213.6730000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -29980,1924 +30448,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<696e7465676572> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 678.913 Td
-/F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
-ET
-
-
-BT
-51.24 664.633 Td
-ET
-
-
-BT
-51.24 664.633 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 671.773 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 641.3530000000001 Td
-/F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
-ET
-
-
-BT
-51.24 627.073 Td
-ET
-
-
-BT
-51.24 627.073 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 634.213 Td
-/F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 603.7930000000001 Td
-/F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
-ET
-
-
-BT
-51.24 589.513 Td
-ET
-
-
-BT
-51.24 589.513 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 596.653 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 566.233 Td
-/F2.0 10.5 Tf
-<6173446f75626c65> Tj
-ET
-
-
-BT
-51.24 551.953 Td
-ET
-
-
-BT
-51.24 551.953 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 559.093 Td
-/F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 528.673 Td
-/F2.0 10.5 Tf
-<6173466c6f6174> Tj
-ET
-
-
-BT
-51.24 514.393 Td
-ET
-
-
-BT
-51.24 514.393 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 521.533 Td
-/F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 491.113 Td
-/F2.0 10.5 Tf
-<6173496e74> Tj
-ET
-
-
-BT
-51.24 476.83299999999997 Td
-ET
-
-
-BT
-51.24 476.83299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 483.973 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 453.553 Td
-/F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 439.273 Td
-ET
-
-
-BT
-51.24 439.273 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 446.413 Td
-/F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 415.993 Td
-/F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 401.71299999999997 Td
-ET
-
-
-BT
-51.24 401.71299999999997 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 408.853 Td
-/F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 378.433 Td
-/F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 364.153 Td
-ET
-
-
-BT
-51.24 364.153 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 371.293 Td
-/F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 340.873 Td
-/F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 326.59299999999996 Td
-ET
-
-
-BT
-51.24 326.59299999999996 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 333.733 Td
-/F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 303.313 Td
-/F2.0 10.5 Tf
-<61734c6f6e67> Tj
-ET
-
-
-BT
-51.24 289.033 Td
-ET
-
-
-BT
-51.24 289.033 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 296.173 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 282.250 m
-48.240 244.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 265.753 Td
-/F2.0 10.5 Tf
-<61734e756d626572> Tj
-ET
-
-
-BT
-51.24 251.47299999999998 Td
-ET
-
-
-BT
-51.24 251.47299999999998 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 282.250 m
-269.177 244.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 282.250 m
-563.760 244.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 258.613 Td
-/F1.0 10.5 Tf
-<4e756d626572> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 244.440 m
-269.177 244.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 244.690 m
-48.240 206.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 228.19299999999996 Td
-/F2.0 10.5 Tf
-<617353686f7274> Tj
-ET
-
-
-BT
-51.24 213.91299999999995 Td
-ET
-
-
-BT
-51.24 213.91299999999995 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.440 m
-563.760 244.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 244.690 m
-269.177 206.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 244.690 m
-563.760 206.630 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 221.05299999999994 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 206.880 m
-269.177 206.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 207.130 m
-48.240 169.070 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 190.633 Td
-/F2.0 10.5 Tf
-<6173537472696e67> Tj
-ET
-
-
-BT
-51.24 176.353 Td
-ET
-
-
-BT
-51.24 176.353 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 206.880 m
-563.760 206.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 207.130 m
-269.177 169.070 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 207.130 m
-563.760 169.070 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 183.493 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.320 m
-269.177 169.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 131.760 m
-269.177 131.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 169.570 m
-48.240 131.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.570 m
-269.177 131.510 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 153.07300000000006 Td
-/F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 138.79300000000006 Td
-ET
-
-
-BT
-51.24 138.79300000000006 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.320 m
-563.760 169.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.760 m
-563.760 131.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 169.570 m
-269.177 131.510 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 169.570 m
-563.760 131.510 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 145.93300000000005 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 131.760 m
-269.177 131.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 94.200 m
-269.177 94.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 132.010 m
-48.240 93.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 132.010 m
-269.177 93.950 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 115.5130000000001 Td
-/F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
-ET
-
-
-BT
-51.24 101.2330000000001 Td
-ET
-
-
-BT
-51.24 101.2330000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.760 m
-563.760 131.760 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.200 m
-563.760 94.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 132.010 m
-269.177 93.950 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 132.010 m
-563.760 93.950 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 108.3730000000001 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 94.200 m
-269.177 94.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 56.640 m
-269.177 56.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 94.450 m
-48.240 56.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.450 m
-269.177 56.390 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 77.95300000000016 Td
-/F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
-ET
-
-
-BT
-51.24 63.67300000000016 Td
-ET
-
-
-BT
-51.24 63.67300000000016 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.200 m
-563.760 94.200 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 56.640 m
-563.760 56.640 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 94.450 m
-269.177 56.390 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 94.450 m
-563.760 56.390 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 70.81300000000016 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3230> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-240 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 239 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [241 0 R 242 0 R 243 0 R 244 0 R 245 0 R]
->>
-endobj
-241 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 443.347 322.17751176375003 457.627]
-/Type /Annot
->>
-endobj
-242 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 405.787 314.65992192000004 420.067]
-/Type /Annot
->>
-endobj
-243 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 368.227 325.32792192000005 382.507]
-/Type /Annot
->>
-endobj
-244 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 330.667 340.1224219200001 344.947]
-/Type /Annot
->>
-endobj
-245 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 255.547 313.75692192 269.827]
-/Type /Annot
->>
-endobj
-246 0 obj
-<< /Length 21911
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 716.473 Td
-/F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 702.193 Td
-ET
-
-
-BT
-51.24 702.193 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 709.333 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 659.7360000000001 Td
-/F2.0 18 Tf
-<332e392e204a736f6e4f626a656374> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 619.800 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 619.800 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 582.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 582.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 544.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 544.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 507.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 507.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 469.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 469.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 432.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 432.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 394.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 394.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 643.080 m
-269.177 643.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 619.800 m
-269.177 619.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 643.330 m
-48.240 619.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.330 m
-269.177 619.050 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 627.3330000000001 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.080 m
-563.760 643.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 619.800 m
-563.760 619.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.330 m
-269.177 619.050 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 643.330 m
-563.760 619.050 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -31905,34 +30475,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 627.3330000000001 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 220.8130000000002 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.800 m
-269.177 619.800 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.050 m
-48.240 581.990 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.050 m
-269.177 581.990 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -31940,19 +30510,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.5530000000001 Td
+51.24 190.3930000000002 Td
 /F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
+[<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 589.2730000000001 Td
+51.24 176.1130000000002 Td
 ET
 
 
 BT
-51.24 589.2730000000001 Td
+51.24 176.1130000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -31960,26 +30530,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.800 m
-563.760 619.800 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.050 m
-269.177 581.990 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.050 m
-563.760 581.990 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
@@ -31987,34 +30557,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.4130000000001 Td
+272.17692192000004 183.25300000000018 Td
 /F1.0 10.5 Tf
-<6e756d626572> Tj
+[<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.240 m
-269.177 582.240 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.490 m
-48.240 544.430 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -32022,19 +30592,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.9930000000002 Td
+51.24 152.8330000000002 Td
 /F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
+[<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 551.7130000000001 Td
+51.24 138.5530000000002 Td
 ET
 
 
 BT
-51.24 551.7130000000001 Td
+51.24 138.5530000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32042,26 +30612,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.240 m
-563.760 582.240 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.490 m
-269.177 544.430 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.490 m
-563.760 544.430 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -32069,34 +30639,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 558.8530000000001 Td
+272.17692192000004 145.69300000000018 Td
 /F1.0 10.5 Tf
-<696e7465676572> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.680 m
-269.177 544.680 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.930 m
-48.240 506.870 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -32104,19 +30674,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.4330000000002 Td
+51.24 115.27300000000018 Td
 /F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
+<6173446f75626c65> Tj
 ET
 
 
 BT
-51.24 514.1530000000001 Td
+51.24 100.99300000000018 Td
 ET
 
 
 BT
-51.24 514.1530000000001 Td
+51.24 100.99300000000018 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32124,26 +30694,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.680 m
-563.760 544.680 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.930 m
-269.177 506.870 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 544.930 m
-563.760 506.870 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -32151,34 +30721,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.2930000000001 Td
+272.17692192000004 108.13300000000018 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<6e756d6265722028646f75626c6529> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.120 m
-269.177 507.120 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.370 m
-48.240 469.310 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -32186,19 +30756,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000001 Td
+51.24 77.71300000000018 Td
 /F2.0 10.5 Tf
-[<617342> 20.01953125 <797465>] TJ
+<6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 63.43300000000018 Td
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 63.43300000000018 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32206,26 +30776,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.120 m
-563.760 507.120 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.370 m
-269.177 469.310 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.370 m
-563.760 469.310 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
@@ -32233,34 +30803,212 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.7330000000001 Td
+272.17692192000004 70.57300000000018 Td
 /F1.0 10.5 Tf
-[<737472696e67202862> 20.01953125 <79746529>] TJ
+<6e756d6265722028666c6f617429> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3139> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+234 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 233 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [235 0 R 236 0 R]
+>>
+endobj
+235 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 706.267 340.1224219200001 720.547]
+/Type /Annot
+>>
+endobj
+236 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 631.147 313.75692192 645.427]
+/Type /Annot
+>>
+endobj
+237 0 obj
+[234 0 R /XYZ 0 382.68000000000023 null]
+endobj
+238 0 obj
+<< /Length 21656
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 357.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 357.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 282.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 282.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.440 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -32268,46 +31016,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000016 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-[<617343686172> 20.01953125 <6163746572>] TJ
-ET
-
-
-BT
-51.24 439.03300000000013 Td
-ET
-
-
-BT
-51.24 439.03300000000013 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -32315,34 +31051,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.1730000000002 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -32350,19 +31086,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000001 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
-<6173446f75626c65> Tj
+<6173496e74> Tj
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 401.47300000000007 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32370,26 +31106,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -32397,34 +31133,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.6130000000001 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<6e756d6265722028646f75626c6529> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -32432,19 +31168,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000015 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
-<6173466c6f6174> Tj
+[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 363.9130000000001 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 363.9130000000001 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32452,61 +31188,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 371.05300000000017 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<6e756d6265722028666c6f617429> Tj
+[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+0.867 0.867 0.867 SCN
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -32514,19 +31258,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000001 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<6173496e74> Tj
+<61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32534,61 +31278,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.4930000000001 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<4a736f6e4e756c6c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -32596,19 +31348,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.0730000000001 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-[<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 288.7930000000001 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 288.7930000000001 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32616,26 +31368,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -32649,9 +31401,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 295.9330000000001 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
-[<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -32659,26 +31411,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -32686,19 +31438,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000001 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-<61734a736f6e4e756c6c> Tj
+<61734a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32706,26 +31458,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -32739,9 +31491,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.3730000000001 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<4a736f6e4e756c6c> Tj
+<4a736f6e5072696d6974697665> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -32749,26 +31501,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -32776,19 +31528,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000012 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<61734a736f6e4f626a656374> Tj
+<61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 213.67300000000012 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 213.67300000000012 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32796,69 +31548,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 220.8130000000001 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -32866,19 +31610,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000011 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 176.1130000000001 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 176.1130000000001 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32886,26 +31630,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -32919,9 +31663,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 183.2530000000001 Td
+272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+<4e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -32929,26 +31673,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -32956,19 +31700,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.8330000000001 Td
+51.24 453.55299999999994 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 138.5530000000001 Td
+51.24 439.2729999999999 Td
 ET
 
 
 BT
-51.24 138.5530000000001 Td
+51.24 439.2729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -32976,26 +31720,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -33003,34 +31747,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6930000000001 Td
+272.17692192000004 446.41299999999995 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -33038,19 +31782,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.2730000000001 Td
+51.24 415.993 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 100.9930000000001 Td
+51.24 401.71299999999997 Td
 ET
 
 
 BT
-51.24 100.9930000000001 Td
+51.24 401.71299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33058,69 +31802,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.1330000000001 Td
+272.17692192000004 408.853 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 394.930 m
+48.240 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 1 w
@@ -33128,19 +31864,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000004 Td
+51.24 378.43300000000005 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 63.433000000000035 Td
+51.24 364.153 Td
 ET
 
 
 BT
-51.24 63.433000000000035 Td
+51.24 364.153 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33148,26 +31884,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 394.930 m
+563.760 356.870 l
 S
 [ ] 0 d
 1 w
@@ -33175,172 +31911,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.57300000000004 Td
+272.17692192000004 371.29300000000006 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3231> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-247 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 246 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [249 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
->>
-endobj
-248 0 obj
-[247 0 R /XYZ 0 683.1600000000001 null]
-endobj
-249 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 292.8670000000001 322.17751176375003 307.1470000000001]
-/Type /Annot
->>
-endobj
-250 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 255.3070000000001 314.65992192000004 269.5870000000001]
-/Type /Annot
->>
-endobj
-251 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 217.74700000000013 325.32792192000005 232.0270000000001]
-/Type /Annot
->>
-endobj
-252 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 180.18700000000013 340.1224219200001 194.4670000000001]
-/Type /Annot
->>
-endobj
-253 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 105.06700000000009 313.75692192 119.3470000000001]
-/Type /Annot
->>
-endobj
-254 0 obj
-<< /Length 21524
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 357.370 m
+48.240 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 1 w
@@ -33348,34 +31946,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 340.8730000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6a736f6e4e756c6c> Tj
+ET
+
+
+BT
+51.24 326.5930000000001 Td
+ET
+
+
+BT
+51.24 326.5930000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 357.370 m
+563.760 319.310 l
 S
 [ ] 0 d
 1 w
@@ -33383,34 +31993,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 333.7330000000001 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 319.810 m
+48.240 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 1 w
@@ -33418,19 +32028,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 303.31300000000016 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
+<6a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 289.03300000000013 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 289.03300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33438,26 +32048,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 319.810 m
+563.760 281.750 l
 S
 [ ] 0 d
 1 w
@@ -33465,34 +32075,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 296.1730000000002 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 282.250 m
+48.240 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 1 w
@@ -33500,19 +32110,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 265.7530000000002 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 251.4730000000002 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 251.4730000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33520,26 +32130,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 282.250 m
+563.760 244.190 l
 S
 [ ] 0 d
 1 w
@@ -33547,34 +32157,147 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 258.6130000000002 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 209.01600000000022 Td
+/F2.0 18 Tf
+<332e392e204a736f6e5072696d6974697665> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.080 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.080 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 192.360 m
+269.177 192.360 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 192.610 m
+48.240 168.330 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 192.610 m
+269.177 168.330 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 176.61300000000023 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+269.177 192.360 m
+563.760 192.360 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+269.177 192.610 m
+269.177 168.330 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+563.760 192.610 m
+563.760 168.330 l
 S
 [ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 176.61300000000023 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+48.240 169.080 m
+269.177 169.080 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 169.330 m
+48.240 131.270 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -33582,19 +32305,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 152.83300000000023 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<6173426967446563696d616c> Tj
 ET
 
 
 BT
-51.24 627.0730000000001 Td
+51.24 138.55300000000022 Td
 ET
 
 
 BT
-51.24 627.0730000000001 Td
+51.24 138.55300000000022 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33602,26 +32325,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -33629,34 +32352,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.2130000000001 Td
+272.17692192000004 145.6930000000002 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<6e756d626572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -33664,19 +32387,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7930000000001 Td
+51.24 115.27300000000021 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<6173426967496e7465676572> Tj
 ET
 
 
 BT
-51.24 589.5130000000001 Td
+51.24 100.99300000000021 Td
 ET
 
 
 BT
-51.24 589.5130000000001 Td
+51.24 100.99300000000021 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33684,26 +32407,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -33711,34 +32434,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6530000000001 Td
+272.17692192000004 108.13300000000021 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<696e7465676572> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -33746,19 +32469,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.2330000000002 Td
+51.24 77.7130000000002 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
+<6173426f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 551.9530000000002 Td
+51.24 63.433000000000206 Td
 ET
 
 
 BT
-51.24 551.9530000000002 Td
+51.24 63.433000000000206 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -33766,26 +32489,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
@@ -33793,141 +32516,281 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.0930000000002 Td
+272.17692192000004 70.5730000000002 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-48.24 509.4960000000004 Td
-/F2.0 18 Tf
-<332e31302e204a736f6e5072696d6974697665> Tj
+49.24 14.388 Td
+/F1.0 9 Tf
+<3230> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+239 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 238 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [240 0 R 241 0 R 242 0 R 243 0 R 244 0 R]
+>>
+endobj
+240 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 668.7070000000001 322.17751176375003 682.9870000000001]
+/Type /Annot
+>>
+endobj
+241 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 631.147 314.65992192000004 645.427]
+/Type /Annot
+>>
+endobj
+242 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 593.587 325.32792192000005 607.867]
+/Type /Annot
+>>
+endobj
+243 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 556.027 340.1224219200001 570.307]
+/Type /Annot
+>>
+endobj
+244 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 480.907 313.75692192 495.187]
+/Type /Annot
+>>
+endobj
+245 0 obj
+[239 0 R /XYZ 0 232.44000000000023 null]
+endobj
+246 0 obj
+<< /Limits [(_externalcomponent) (_parameters_12)]
+/Names [(_externalcomponent) 216 0 R (_externalcomponentstate) 218 0 R (_jsonarray) 221 0 R (_jsonnull) 229 0 R (_jsonobject) 237 0 R (_jsonprimitive) 245 0 R (_loop) 256 0 R (_loopelementmodel) 266 0 R (_looplog) 269 0 R (_looptemplate) 273 0 R (_looptemplateloopelementmodel) 278 0 R (_microservicepolicy) 281 0 R (_number) 289 0 R (_operationalpolicy) 290 0 R (_overview) 19 0 R (_parameters) 44 0 R (_parameters_10) 107 0 R (_parameters_11) 114 0 R (_parameters_12) 120 0 R]
+>>
+endobj
+247 0 obj
+<< /Length 22690
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.560 220.937 23.280 re
+269.177 732.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.560 294.583 23.280 re
+48.240 695.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 432.000 220.937 37.560 re
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 432.000 294.583 37.560 re
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 394.440 220.937 37.560 re
+48.240 582.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 394.440 294.583 37.560 re
+269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
+48.240 544.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
+269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 319.320 220.937 37.560 re
+48.240 507.360 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 319.320 294.583 37.560 re
+269.177 507.360 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
+48.240 469.800 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
+269.177 469.800 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
+48.240 432.240 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
+269.177 432.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
+48.240 394.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
+269.177 394.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
+48.240 357.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
+269.177 357.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
+48.240 319.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
+269.177 319.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 93.960 220.937 37.560 re
+48.240 282.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 93.960 294.583 37.560 re
+269.177 282.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.400 220.937 37.560 re
+48.240 244.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.400 294.583 37.560 re
+269.177 244.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 131.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 131.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 94.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 94.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 56.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 56.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 492.840 m
-269.177 492.840 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 493.090 m
-48.240 468.810 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 493.090 m
-269.177 468.810 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -33935,7 +32798,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 477.0930000000003 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -33943,26 +32806,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 492.840 m
-563.760 492.840 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 493.090 m
-269.177 468.810 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 493.090 m
-563.760 468.810 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -33970,7 +32833,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 477.0930000000003 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -33978,272 +32841,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 453.3130000000003 Td
-/F2.0 10.5 Tf
-<6173426967446563696d616c> Tj
-ET
-
-
-BT
-51.24 439.03300000000024 Td
-ET
-
-
-BT
-51.24 439.03300000000024 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 446.1730000000003 Td
-/F1.0 10.5 Tf
-<6e756d626572> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 415.7530000000003 Td
-/F2.0 10.5 Tf
-<6173426967496e7465676572> Tj
-ET
-
-
-BT
-51.24 401.4730000000003 Td
-ET
-
-
-BT
-51.24 401.4730000000003 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 408.61300000000034 Td
-/F1.0 10.5 Tf
-<696e7465676572> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 378.19300000000027 Td
-/F2.0 10.5 Tf
-<6173426f6f6c65616e> Tj
-ET
-
-
-BT
-51.24 363.91300000000024 Td
-ET
-
-
-BT
-51.24 363.91300000000024 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 371.0530000000003 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -34251,19 +32868,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000003 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 [<617342> 20.01953125 <797465>] TJ
 ET
 
 
 BT
-51.24 326.3530000000003 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 326.3530000000003 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34271,26 +32888,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -34298,7 +32915,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.49300000000034 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 [<737472696e67202862> 20.01953125 <79746529>] TJ
 ET
@@ -34306,26 +32923,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -34333,19 +32950,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.07300000000026 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 [<617343686172> 20.01953125 <6163746572>] TJ
 ET
 
 
 BT
-51.24 288.79300000000023 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 288.79300000000023 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34353,26 +32970,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -34380,7 +32997,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.9330000000003 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -34388,26 +33005,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -34415,19 +33032,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000003 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
 <6173446f75626c65> Tj
 ET
 
 
 BT
-51.24 251.23300000000032 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 251.23300000000032 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34435,26 +33052,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -34462,7 +33079,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.37300000000033 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
 <6e756d6265722028646f75626c6529> Tj
 ET
@@ -34470,26 +33087,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -34497,19 +33114,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95300000000032 Td
+51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
 <6173466c6f6174> Tj
 ET
 
 
 BT
-51.24 213.67300000000031 Td
+51.24 589.513 Td
 ET
 
 
 BT
-51.24 213.67300000000031 Td
+51.24 589.513 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34517,26 +33134,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -34544,7 +33161,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.8130000000003 Td
+272.17692192000004 596.653 Td
 /F1.0 10.5 Tf
 <6e756d6265722028666c6f617429> Tj
 ET
@@ -34552,26 +33169,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -34579,19 +33196,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000028 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
 <6173496e74> Tj
 ET
 
 
 BT
-51.24 176.11300000000028 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 176.11300000000028 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34599,26 +33216,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -34626,7 +33243,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000027 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -34634,26 +33251,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -34661,19 +33278,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000028 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
 [<61734a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 138.55300000000028 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 138.55300000000028 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34681,26 +33298,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
-0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+0.867 0.867 0.867 SCN
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -34714,7 +33331,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 145.69300000000027 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
 [<4a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -34724,26 +33341,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -34751,19 +33368,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000027 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
 <61734a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 100.99300000000027 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 100.99300000000027 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34771,26 +33388,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -34804,7 +33421,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.13300000000027 Td
+272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
 <4a736f6e4e756c6c> Tj
 ET
@@ -34814,26 +33431,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -34841,19 +33458,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71300000000026 Td
+51.24 453.553 Td
 /F2.0 10.5 Tf
 <61734a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 63.43300000000026 Td
+51.24 439.273 Td
 ET
 
 
 BT
-51.24 63.43300000000026 Td
+51.24 439.273 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -34861,26 +33478,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -34894,7 +33511,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 70.57300000000026 Td
+272.17692192000004 446.413 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -34902,206 +33519,28 @@ ET
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3232> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-255 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 254 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [257 0 R 258 0 R 259 0 R]
->>
-endobj
-256 0 obj
-[255 0 R /XYZ 0 532.9200000000003 null]
-endobj
-257 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonarray)
-/Subtype /Link
-/Rect [272.17692192000004 142.6270000000003 322.17751176375003 156.90700000000027]
-/Type /Annot
->>
-endobj
-258 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonnull)
-/Subtype /Link
-/Rect [272.17692192000004 105.06700000000026 314.65992192000004 119.34700000000026]
-/Type /Annot
->>
-endobj
-259 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 67.50700000000026 325.32792192000005 81.78700000000026]
-/Type /Annot
->>
-endobj
-260 0 obj
-<< /Length 21478
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 432.490 m
+48.240 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 1 w
@@ -35109,69 +33548,89 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 415.993 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<61734a736f6e5072696d6974697665> Tj
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+ET
+
+
+BT
+51.24 401.71299999999997 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 432.490 m
+269.177 394.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 432.490 m
+563.760 394.430 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 408.853 Td
+/F1.0 10.5 Tf
+<4a736f6e5072696d6974697665> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 394.680 m
+269.177 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 394.930 m
+48.240 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 1 w
@@ -35179,19 +33638,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 378.433 Td
 /F2.0 10.5 Tf
-<61734a736f6e5072696d6974697665> Tj
+<61734c6f6e67> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 364.153 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 364.153 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35199,69 +33658,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 394.680 m
+563.760 394.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 394.930 m
+269.177 356.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 394.930 m
+563.760 356.870 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 371.293 Td
 /F1.0 10.5 Tf
-<4a736f6e5072696d6974697665> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 357.120 m
+269.177 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 357.370 m
+48.240 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 1 w
@@ -35269,19 +33720,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 340.873 Td
 /F2.0 10.5 Tf
-<61734c6f6e67> Tj
+<61734e756d626572> Tj
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 326.59299999999996 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 326.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35289,61 +33740,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 357.120 m
+563.760 357.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 357.370 m
+269.177 319.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 357.370 m
+563.760 319.310 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 333.733 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<4e756d626572> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 319.560 m
+269.177 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 319.810 m
+48.240 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 1 w
@@ -35351,19 +33810,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 303.31299999999993 Td
 /F2.0 10.5 Tf
-<61734e756d626572> Tj
+<617353686f7274> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 289.0329999999999 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 289.0329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35371,69 +33830,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 319.560 m
+563.760 319.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 319.810 m
+269.177 281.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 319.810 m
+563.760 281.750 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 296.17299999999994 Td
 /F1.0 10.5 Tf
-<4e756d626572> Tj
+<696e74656765722028696e74333229> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 282.000 m
+269.177 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 282.250 m
+48.240 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 1 w
@@ -35441,19 +33892,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 265.753 Td
 /F2.0 10.5 Tf
-<617353686f7274> Tj
+<6173537472696e67> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 251.47299999999998 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 251.47299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35461,26 +33912,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 282.000 m
+563.760 282.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 282.250 m
+269.177 244.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 282.250 m
+563.760 244.190 l
 S
 [ ] 0 d
 1 w
@@ -35488,34 +33939,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 258.613 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74333229> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 244.440 m
+269.177 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 244.690 m
+48.240 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 1 w
@@ -35523,19 +33974,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 228.19300000000007 Td
 /F2.0 10.5 Tf
-<6173537472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 213.91300000000007 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 213.91300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35543,26 +33994,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 244.440 m
+563.760 244.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 244.690 m
+269.177 206.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 244.690 m
+563.760 206.630 l
 S
 [ ] 0 d
 1 w
@@ -35570,34 +34021,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 221.05300000000005 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 206.880 m
+269.177 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 169.320 m
+269.177 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 207.130 m
+48.240 169.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 207.130 m
+269.177 169.070 l
 S
 [ ] 0 d
 1 w
@@ -35605,19 +34056,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 190.63300000000012 Td
 /F2.0 10.5 Tf
-<626f6f6c65616e> Tj
+[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 176.35300000000012 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 176.35300000000012 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35625,26 +34076,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 206.880 m
+563.760 206.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 169.320 m
+563.760 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 207.130 m
+269.177 169.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 207.130 m
+563.760 169.070 l
 S
 [ ] 0 d
 1 w
@@ -35652,7 +34103,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 183.4930000000001 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -35660,26 +34111,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 169.320 m
+269.177 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 131.760 m
+269.177 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 169.570 m
+48.240 131.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 169.570 m
+269.177 131.510 l
 S
 [ ] 0 d
 1 w
@@ -35687,19 +34138,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.1130000000001 Td
+51.24 153.07300000000018 Td
 /F2.0 10.5 Tf
-[<6a736f6e417272> 20.01953125 <61> 20.01953125 <79>] TJ
+<6a736f6e4e756c6c> Tj
 ET
 
 
 BT
-51.24 476.8330000000001 Td
+51.24 138.79300000000018 Td
 ET
 
 
 BT
-51.24 476.8330000000001 Td
+51.24 138.79300000000018 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35707,26 +34158,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 169.320 m
+563.760 169.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 131.760 m
+563.760 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 169.570 m
+269.177 131.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 169.570 m
+563.760 131.510 l
 S
 [ ] 0 d
 1 w
@@ -35734,7 +34185,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.9730000000001 Td
+272.17692192000004 145.93300000000016 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -35742,26 +34193,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 131.760 m
+269.177 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 94.200 m
+269.177 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 132.010 m
+48.240 93.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 132.010 m
+269.177 93.950 l
 S
 [ ] 0 d
 1 w
@@ -35769,19 +34220,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55300000000017 Td
+51.24 115.51300000000022 Td
 /F2.0 10.5 Tf
-<6a736f6e4e756c6c> Tj
+<6a736f6e4f626a656374> Tj
 ET
 
 
 BT
-51.24 439.27300000000014 Td
+51.24 101.23300000000022 Td
 ET
 
 
 BT
-51.24 439.27300000000014 Td
+51.24 101.23300000000022 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35789,26 +34240,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 131.760 m
+563.760 131.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 94.200 m
+563.760 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 132.010 m
+269.177 93.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 132.010 m
+563.760 93.950 l
 S
 [ ] 0 d
 1 w
@@ -35816,7 +34267,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.4130000000002 Td
+272.17692192000004 108.37300000000022 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -35824,26 +34275,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 94.200 m
+269.177 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 56.640 m
+269.177 56.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 94.450 m
+48.240 56.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 94.450 m
+269.177 56.390 l
 S
 [ ] 0 d
 1 w
@@ -35851,19 +34302,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.9930000000002 Td
+51.24 77.95300000000027 Td
 /F2.0 10.5 Tf
-<6a736f6e4f626a656374> Tj
+<6a736f6e5072696d6974697665> Tj
 ET
 
 
 BT
-51.24 401.7130000000002 Td
+51.24 63.67300000000027 Td
 ET
 
 
 BT
-51.24 401.7130000000002 Td
+51.24 63.67300000000027 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -35871,26 +34322,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 94.200 m
+563.760 94.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 56.640 m
+563.760 56.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 94.450 m
+269.177 56.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 94.450 m
+563.760 56.390 l
 S
 [ ] 0 d
 1 w
@@ -35898,34 +34349,145 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.85300000000024 Td
+272.17692192000004 70.81300000000027 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
 
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3231> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+248 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 247 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [249 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
+>>
+endobj
+249 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonarray)
+/Subtype /Link
+/Rect [272.17692192000004 518.4670000000001 322.17751176375003 532.7470000000001]
+/Type /Annot
+>>
+endobj
+250 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonnull)
+/Subtype /Link
+/Rect [272.17692192000004 480.907 314.65992192000004 495.187]
+/Type /Annot
+>>
+endobj
+251 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 443.347 325.32792192000005 457.627]
+/Type /Annot
+>>
+endobj
+252 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonprimitive)
+/Subtype /Link
+/Rect [272.17692192000004 405.787 340.1224219200001 420.067]
+/Type /Annot
+>>
+endobj
+253 0 obj
+<< /Border [0 0 0]
+/Dest (_number)
+/Subtype /Link
+/Rect [272.17692192000004 330.667 313.75692192 344.947]
+/Type /Annot
+>>
+endobj
+254 0 obj
+<< /Length 23337
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -35933,46 +34495,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.4330000000003 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-<6a736f6e5072696d6974697665> Tj
-ET
-
-
-BT
-51.24 364.15300000000025 Td
-ET
-
-
-BT
-51.24 364.15300000000025 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -35980,34 +34530,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.2930000000003 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -36015,19 +34565,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.87300000000033 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 <6e756d626572> Tj
 ET
 
 
 BT
-51.24 326.5930000000003 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 326.5930000000003 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36035,26 +34585,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -36062,7 +34612,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.73300000000035 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -36070,26 +34620,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -36097,19 +34647,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.3130000000004 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 
 BT
-51.24 289.03300000000036 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 289.03300000000036 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36117,26 +34667,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -36144,7 +34694,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.1730000000004 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <626f6f6c65616e> Tj
 ET
@@ -36154,19 +34704,99 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 246.57600000000042 Td
+48.24 622.1760000000002 Td
 /F2.0 18 Tf
-<332e31312e204c6f6f70> Tj
+<332e31302e204c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 23.280 re
+48.240 582.240 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 582.240 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.200 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 23.280 re
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
@@ -36203,26 +34833,26 @@ f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 229.920 m
-269.177 229.920 l
+48.240 605.520 m
+269.177 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 230.170 m
-48.240 205.890 l
+48.240 605.770 m
+48.240 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 230.170 m
-269.177 205.890 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 1 w
@@ -36230,7 +34860,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 214.17300000000043 Td
+51.24 589.7730000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -36238,26 +34868,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 229.920 m
-563.760 229.920 l
+269.177 605.520 m
+563.760 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 230.170 m
-269.177 205.890 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 230.170 m
-563.760 205.890 l
+563.760 605.770 m
+563.760 581.490 l
 S
 [ ] 0 d
 1 w
@@ -36265,7 +34895,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 214.17300000000043 Td
+272.17692192000004 589.7730000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -36273,26 +34903,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -36300,19 +34930,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000043 Td
+51.24 565.9930000000002 Td
 /F2.0 10.5 Tf
 <636f6d706f6e656e7473> Tj
 ET
 
 
 BT
-51.24 176.11300000000043 Td
+51.24 551.7130000000002 Td
 ET
 
 
 BT
-51.24 176.11300000000043 Td
+51.24 551.7130000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36320,26 +34950,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -36351,7 +34981,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.2530000000004 Td
+272.17692192000004 558.8530000000002 Td
 /F1.0 10.5 Tf
 <3c20737472696e672c20> Tj
 ET
@@ -36360,7 +34990,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-315.25842192000005 183.2530000000004 Td
+315.25842192000005 558.8530000000002 Td
 /F1.0 10.5 Tf
 <45787465726e616c436f6d706f6e656e74> Tj
 ET
@@ -36369,7 +34999,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-415.81692192 183.2530000000004 Td
+415.81692192 558.8530000000002 Td
 /F1.0 10.5 Tf
 <203e206d6170> Tj
 ET
@@ -36377,26 +35007,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -36404,19 +35034,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000042 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
 [<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 138.55300000000042 Td
+51.24 514.1530000000001 Td
 ET
 
 
 BT
-51.24 138.55300000000042 Td
+51.24 514.1530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36424,26 +35054,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -36451,7 +35081,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6930000000004 Td
+272.17692192000004 521.2930000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -36459,26 +35089,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -36486,19 +35116,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000041 Td
+51.24 490.8730000000002 Td
 /F2.0 10.5 Tf
 <6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 100.99300000000041 Td
+51.24 476.5930000000002 Td
 ET
 
 
 BT
-51.24 100.99300000000041 Td
+51.24 476.5930000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36506,26 +35136,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -36533,7 +35163,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13300000000041 Td
+272.17692192000004 483.73300000000023 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -36541,26 +35171,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -36568,19 +35198,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.7130000000004 Td
+51.24 453.31300000000016 Td
 /F2.0 10.5 Tf
 [<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
 ET
 
 
 BT
-51.24 63.433000000000405 Td
+51.24 439.03300000000013 Td
 ET
 
 
 BT
-51.24 63.433000000000405 Td
+51.24 439.03300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36588,26 +35218,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -36615,282 +35245,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.5730000000004 Td
+272.17692192000004 446.1730000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3233> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-261 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 260 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [262 0 R 263 0 R 265 0 R]
->>
-endobj
-262 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonprimitive)
-/Subtype /Link
-/Rect [272.17692192000004 706.267 340.1224219200001 720.547]
-/Type /Annot
->>
-endobj
-263 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [272.17692192000004 631.147 313.75692192 645.427]
-/Type /Annot
->>
-endobj
-264 0 obj
-[261 0 R /XYZ 0 270.0000000000004 null]
-endobj
-265 0 obj
-<< /Border [0 0 0]
-/Dest (_externalcomponent)
-/Subtype /Link
-/Rect [315.25842192000005 180.18700000000044 415.81692192 194.46700000000044]
-/Type /Annot
->>
-endobj
-266 0 obj
-<< /Length 22976
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -36898,19 +35280,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 415.7530000000002 Td
 /F2.0 10.5 Tf
 [<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 401.4730000000002 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 401.4730000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -36918,26 +35300,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -36945,7 +35327,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 408.6130000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -36953,26 +35335,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -36980,19 +35362,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 378.19300000000015 Td
 /F2.0 10.5 Tf
 <676c6f62616c50726f706572746965734a736f6e> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 363.9130000000001 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 363.9130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37000,26 +35382,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -37033,7 +35415,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.7729999999999 Td
+272.17692192000004 371.05300000000017 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -37043,26 +35425,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -37070,19 +35452,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 340.6330000000002 Td
 /F2.0 10.5 Tf
 <6c617374436f6d70757465645374617465> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 326.3530000000002 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 326.3530000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37090,26 +35472,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -37117,14 +35499,14 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 641.3530000000001 Td
+272.17692192000004 340.6330000000002 Td
 /F1.0 10.5 Tf
 [<656e756d202844455349474e2c205355424d49545445442c204445504c4f> 29.78515625 <5945442c2052> 9.765625 <554e4e494e472c>] TJ
 ET
 
 
 BT
-272.17692192000004 627.073 Td
+272.17692192000004 326.3530000000002 Td
 /F1.0 10.5 Tf
 [<53> 20.01953125 <54> 20.01953125 <4f505045442c20494e5f455252> 20.01953125 <4f522c2057> 60.05859375 <414954494e4729>] TJ
 ET
@@ -37132,26 +35514,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -37159,19 +35541,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 303.07300000000015 Td
 /F2.0 10.5 Tf
 <6c6f6f704c6f6773> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 288.7930000000001 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 288.7930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37179,26 +35561,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -37210,7 +35592,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 295.93300000000016 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -37219,7 +35601,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 596.6529999999999 Td
+280.76592192000004 295.93300000000016 Td
 /F1.0 10.5 Tf
 <4c6f6f704c6f67> Tj
 ET
@@ -37228,7 +35610,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-324.10992192000003 596.6529999999999 Td
+324.10992192000003 295.93300000000016 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -37236,26 +35618,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -37263,19 +35645,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 265.51300000000015 Td
 /F2.0 10.5 Tf
 [<6c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 251.23300000000015 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 251.23300000000015 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37283,26 +35665,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -37316,7 +35698,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 258.37300000000016 Td
 /F1.0 10.5 Tf
 [<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
@@ -37326,26 +35708,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -37353,19 +35735,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 227.95300000000017 Td
 /F2.0 10.5 Tf
 <6d6963726f53657276696365506f6c6963696573> Tj
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 213.67300000000017 Td
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 213.67300000000017 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37373,26 +35755,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -37404,7 +35786,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5329999999999 Td
+272.17692192000004 220.81300000000016 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -37413,7 +35795,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 521.5329999999999 Td
+280.76592192000004 220.81300000000016 Td
 /F1.0 10.5 Tf
 <4d6963726f53657276696365506f6c696379> Tj
 ET
@@ -37422,7 +35804,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-376.69392192000004 521.5329999999999 Td
+376.69392192000004 220.81300000000016 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -37430,26 +35812,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -37457,19 +35839,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.11299999999994 Td
+51.24 190.39300000000017 Td
 /F2.0 10.5 Tf
 <6d6f64656c53657276696365> Tj
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 176.11300000000017 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 176.11300000000017 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37477,26 +35859,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
@@ -37510,7 +35892,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.97299999999996 Td
+272.17692192000004 183.25300000000016 Td
 /F1.0 10.5 Tf
 <53657276696365> Tj
 ET
@@ -37520,26 +35902,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -37547,19 +35929,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55299999999994 Td
+51.24 152.83300000000017 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 138.55300000000017 Td
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 138.55300000000017 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37567,26 +35949,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -37594,7 +35976,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.41299999999995 Td
+272.17692192000004 145.69300000000015 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -37602,26 +35984,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -37629,19 +36011,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.99299999999994 Td
+51.24 115.27300000000015 Td
 /F2.0 10.5 Tf
 [<6f706572> 20.01953125 <6174696f6e616c506f6c6963696573>] TJ
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 100.99300000000015 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 100.99300000000015 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37649,26 +36031,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -37680,7 +36062,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.85299999999995 Td
+272.17692192000004 108.13300000000015 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -37689,7 +36071,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 408.85299999999995 Td
+280.76592192000004 108.13300000000015 Td
 /F1.0 10.5 Tf
 [<4f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
@@ -37698,7 +36080,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-370.37271684187505 408.85299999999995 Td
+370.37271684187505 108.13300000000015 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -37706,26 +36088,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 56.400 m
+269.177 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 94.210 m
+48.240 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 1 w
@@ -37733,19 +36115,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.43299999999994 Td
+51.24 77.71300000000015 Td
 /F2.0 10.5 Tf
 <737667526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 364.1529999999999 Td
+51.24 63.43300000000015 Td
 ET
 
 
 BT
-51.24 364.1529999999999 Td
+51.24 63.43300000000015 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37753,26 +36135,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 56.400 m
+563.760 56.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 94.210 m
+269.177 56.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 94.210 m
+563.760 56.150 l
 S
 [ ] 0 d
 1 w
@@ -37780,34 +36162,234 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.29299999999995 Td
+272.17692192000004 70.57300000000015 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3232> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+255 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 254 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R]
+>>
+endobj
+256 0 obj
+[255 0 R /XYZ 0 645.6000000000001 null]
+endobj
+257 0 obj
+<< /Border [0 0 0]
+/Dest (_externalcomponent)
+/Subtype /Link
+/Rect [315.25842192000005 555.7870000000003 415.81692192 570.0670000000002]
+/Type /Annot
+>>
+endobj
+258 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 367.98700000000014 325.32792192000005 382.26700000000017]
+/Type /Annot
+>>
+endobj
+259 0 obj
+<< /Border [0 0 0]
+/Dest (_looplog)
+/Subtype /Link
+/Rect [280.76592192000004 292.86700000000013 324.10992192000003 307.14700000000016]
+/Type /Annot
+>>
+endobj
+260 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [272.17692192000004 255.30700000000016 343.82067777937505 269.58700000000016]
+/Type /Annot
+>>
+endobj
+261 0 obj
+<< /Border [0 0 0]
+/Dest (_microservicepolicy)
+/Subtype /Link
+/Rect [280.76592192000004 217.74700000000018 376.69392192000004 232.02700000000016]
+/Type /Annot
+>>
+endobj
+262 0 obj
+<< /Border [0 0 0]
+/Dest (_service)
+/Subtype /Link
+/Rect [272.17692192000004 180.18700000000018 308.65392192 194.46700000000016]
+/Type /Annot
+>>
+endobj
+263 0 obj
+<< /Border [0 0 0]
+/Dest (_operationalpolicy)
+/Subtype /Link
+/Rect [280.76592192000004 105.06700000000015 370.37271684187505 119.34700000000015]
+/Type /Annot
+>>
+endobj
+264 0 obj
+<< /Length 20640
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -37815,19 +36397,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.8729999999999 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 [<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 326.59299999999985 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 326.59299999999985 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -37835,26 +36417,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -37862,7 +36444,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.7329999999999 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -37870,26 +36452,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -37897,46 +36479,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.31299999999993 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 289.0329999999999 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 289.0329999999999 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -37944,7 +36526,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.17299999999994 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -37954,75 +36536,131 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 246.57599999999996 Td
+48.24 622.1760000000002 Td
 /F2.0 18 Tf
-<332e31322e204c6f6f70456c656d656e744d6f64656c> Tj
+<332e31312e204c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 23.280 re
+48.240 582.240 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 23.280 re
+269.177 582.240 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
+48.240 544.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
+269.177 544.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
+48.240 507.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
+269.177 507.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
+48.240 469.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
+269.177 469.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 56.400 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 56.400 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.440 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.440 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 229.920 m
-269.177 229.920 l
+48.240 605.520 m
+269.177 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 230.170 m
-48.240 205.890 l
+48.240 605.770 m
+48.240 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 230.170 m
-269.177 205.890 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 1 w
@@ -38030,7 +36668,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 214.17299999999997 Td
+51.24 589.7730000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -38038,26 +36676,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 229.920 m
-563.760 229.920 l
+269.177 605.520 m
+563.760 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 230.170 m
-269.177 205.890 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 230.170 m
-563.760 205.890 l
+563.760 605.770 m
+563.760 581.490 l
 S
 [ ] 0 d
 1 w
@@ -38065,7 +36703,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 214.17299999999997 Td
+272.17692192000004 589.7730000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -38073,26 +36711,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -38100,19 +36738,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39299999999997 Td
+51.24 565.9930000000002 Td
 /F2.0 10.5 Tf
 <626c75657072696e74> Tj
 ET
 
 
 BT
-51.24 176.11299999999997 Td
+51.24 551.7130000000002 Td
 ET
 
 
 BT
-51.24 176.11299999999997 Td
+51.24 551.7130000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38120,26 +36758,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -38147,7 +36785,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25299999999996 Td
+272.17692192000004 558.8530000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -38155,26 +36793,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -38182,19 +36820,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83299999999997 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
 [<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 138.55299999999997 Td
+51.24 514.1530000000001 Td
 ET
 
 
 BT
-51.24 138.55299999999997 Td
+51.24 514.1530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38202,26 +36840,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -38229,7 +36867,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.69299999999996 Td
+272.17692192000004 521.2930000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -38237,26 +36875,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -38264,19 +36902,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27299999999995 Td
+51.24 490.8730000000002 Td
 /F2.0 10.5 Tf
 <6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 100.99299999999995 Td
+51.24 476.5930000000002 Td
 ET
 
 
 BT
-51.24 100.99299999999995 Td
+51.24 476.5930000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38284,26 +36922,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -38311,7 +36949,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13299999999995 Td
+272.17692192000004 483.73300000000023 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -38319,26 +36957,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.400 m
-269.177 56.400 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.210 m
-48.240 56.150 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -38346,19 +36984,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.71299999999995 Td
+51.24 453.31300000000016 Td
 /F2.0 10.5 Tf
 <64636165426c75657072696e744964> Tj
 ET
 
 
 BT
-51.24 63.43299999999995 Td
+51.24 439.03300000000013 Td
 ET
 
 
 BT
-51.24 63.43299999999995 Td
+51.24 439.03300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38366,26 +37004,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.400 m
-563.760 56.400 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.210 m
-269.177 56.150 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.210 m
-563.760 56.150 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -38393,266 +37031,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.57299999999995 Td
+272.17692192000004 446.1730000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3234> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-267 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 266 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R]
->>
-endobj
-268 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 668.707 325.32792192000005 682.987]
-/Type /Annot
->>
-endobj
-269 0 obj
-<< /Border [0 0 0]
-/Dest (_looplog)
-/Subtype /Link
-/Rect [280.76592192000004 593.587 324.10992192000003 607.867]
-/Type /Annot
->>
-endobj
-270 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [272.17692192000004 556.027 343.82067777937505 570.307]
-/Type /Annot
->>
-endobj
-271 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [280.76592192000004 518.467 376.69392192000004 532.747]
-/Type /Annot
->>
-endobj
-272 0 obj
-<< /Border [0 0 0]
-/Dest (_service)
-/Subtype /Link
-/Rect [272.17692192000004 480.9069999999999 308.65392192 495.18699999999995]
-/Type /Annot
->>
-endobj
-273 0 obj
-<< /Border [0 0 0]
-/Dest (_operationalpolicy)
-/Subtype /Link
-/Rect [280.76592192000004 405.7869999999999 370.37271684187505 420.06699999999995]
-/Type /Annot
->>
-endobj
-274 0 obj
-[267 0 R /XYZ 0 269.99999999999994 null]
-endobj
-275 0 obj
-<< /Length 20786
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.5 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -38660,19 +37066,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 415.7530000000002 Td
 /F2.0 10.5 Tf
 <6c6f6f70456c656d656e7454797065> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 401.4730000000002 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 401.4730000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38680,26 +37086,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -38707,7 +37113,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 408.6130000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -38715,26 +37121,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -38742,19 +37148,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 378.19300000000015 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 363.9130000000001 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 363.9130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38762,26 +37168,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -38789,7 +37195,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.7729999999999 Td
+272.17692192000004 371.05300000000017 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -38797,26 +37203,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -38824,19 +37230,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 340.6330000000002 Td
 /F2.0 10.5 Tf
 <706f6c6963794d6f64656c73> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 326.3530000000002 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 326.3530000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38844,26 +37250,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -38875,7 +37281,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 333.4930000000002 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -38884,7 +37290,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 634.213 Td
+280.76592192000004 333.4930000000002 Td
 /F1.0 10.5 Tf
 <506f6c6963794d6f64656c> Tj
 ET
@@ -38893,7 +37299,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-342.0649219200001 634.213 Td
+342.0649219200001 333.4930000000002 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -38901,26 +37307,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -38928,19 +37334,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 303.07300000000015 Td
 /F2.0 10.5 Tf
 <73686f72744e616d65> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 288.7930000000001 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 288.7930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -38948,26 +37354,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -38975,7 +37381,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 295.93300000000016 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -38983,26 +37389,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -39010,19 +37416,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 265.51300000000015 Td
 /F2.0 10.5 Tf
 [<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 251.23300000000015 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 251.23300000000015 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39030,26 +37436,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -39057,7 +37463,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 258.37300000000016 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -39065,26 +37471,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -39092,19 +37498,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 227.95300000000017 Td
 /F2.0 10.5 Tf
 <7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 213.67300000000017 Td
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 213.67300000000017 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39112,26 +37518,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -39139,7 +37545,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5329999999999 Td
+272.17692192000004 220.81300000000016 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -39147,26 +37553,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -39174,19 +37580,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.11299999999994 Td
+51.24 190.39300000000017 Td
 /F2.0 10.5 Tf
 [<7573656442> 20.01953125 <794c6f6f7054> 29.78515625 <656d706c61746573>] TJ
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 176.11300000000017 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 176.11300000000017 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39194,26 +37600,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
@@ -39225,7 +37631,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.97299999999996 Td
+272.17692192000004 183.25300000000016 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -39234,7 +37640,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 483.97299999999996 Td
+280.76592192000004 183.25300000000016 Td
 /F1.0 10.5 Tf
 [<4c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
 ET
@@ -39243,7 +37649,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-450.12267777937507 483.97299999999996 Td
+450.12267777937507 183.25300000000016 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -39253,91 +37659,51 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 434.376 Td
+48.24 133.65600000000012 Td
 /F2.0 18 Tf
-<332e31332e204c6f6f704c6f67> Tj
+<332e31322e204c6f6f704c6f67> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.440 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 394.440 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
+48.240 93.720 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
+269.177 93.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
+48.240 56.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
+269.177 56.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 417.720 m
-269.177 417.720 l
+48.240 117.000 m
+269.177 117.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 93.720 m
+269.177 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 417.970 m
-48.240 393.690 l
+48.240 117.250 m
+48.240 92.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 417.970 m
-269.177 393.690 l
+269.177 117.250 m
+269.177 92.970 l
 S
 [ ] 0 d
 1 w
@@ -39345,7 +37711,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 401.9729999999999 Td
+51.24 101.25300000000014 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -39353,26 +37719,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 417.720 m
-563.760 417.720 l
+269.177 117.000 m
+563.760 117.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 93.720 m
+563.760 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 417.970 m
-269.177 393.690 l
+269.177 117.250 m
+269.177 92.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 417.970 m
-563.760 393.690 l
+563.760 117.250 m
+563.760 92.970 l
 S
 [ ] 0 d
 1 w
@@ -39380,7 +37746,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 401.9729999999999 Td
+272.17692192000004 101.25300000000014 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -39388,26 +37754,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
+48.240 93.720 m
+269.177 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
+48.240 56.160 m
+269.177 56.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 93.970 m
+48.240 55.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 93.970 m
+269.177 55.910 l
 S
 [ ] 0 d
 1 w
@@ -39415,19 +37781,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.1929999999999 Td
+51.24 77.47300000000014 Td
 /F2.0 10.5 Tf
 <6964> Tj
 ET
 
 
 BT
-51.24 363.9129999999999 Td
+51.24 63.19300000000014 Td
 ET
 
 
 BT
-51.24 363.9129999999999 Td
+51.24 63.19300000000014 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39435,26 +37801,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 93.720 m
+563.760 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
+269.177 56.160 m
+563.760 56.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 93.970 m
+269.177 55.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 93.970 m
+563.760 55.910 l
 S
 [ ] 0 d
 1 w
@@ -39462,163 +37828,186 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05299999999994 Td
+272.17692192000004 70.33300000000014 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 356.880 m
-269.177 356.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 357.130 m
-48.240 319.070 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
-S
-[ ] 0 d
-1 w
+q
+0.000 0.000 0.000 scn
 0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
 0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
 
 BT
-51.24 340.63299999999987 Td
-/F2.0 10.5 Tf
-<6c6f67436f6d706f6e656e74> Tj
-ET
-
-
-BT
-51.24 326.35299999999984 Td
-ET
-
-
-BT
-51.24 326.35299999999984 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+552.698 14.388 Td
+/F1.0 9 Tf
+<3233> Tj
 ET
 
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 356.880 m
-563.760 356.880 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 357.130 m
-269.177 319.070 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 357.130 m
-563.760 319.070 l
-S
-[ ] 0 d
-1 w
 0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 333.4929999999999 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
+0.000 0.000 0.000 scn
+Q
+Q
 
+endstream
+endobj
+265 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 264 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [267 0 R 268 0 R]
+>>
+endobj
+266 0 obj
+[265 0 R /XYZ 0 645.6000000000001 null]
+endobj
+267 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [280.76592192000004 330.4270000000002 342.0649219200001 344.7070000000002]
+/Type /Annot
+>>
+endobj
+268 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplateloopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 180.18700000000018 450.12267777937507 194.46700000000016]
+/Type /Annot
+>>
+endobj
+269 0 obj
+[265 0 R /XYZ 0 157.08000000000015 null]
+endobj
+270 0 obj
+<< /Length 21650
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
-BT
-51.24 303.0729999999999 Td
-/F2.0 10.5 Tf
-<6c6f67496e7374616e74> Tj
-ET
-
-
-BT
-51.24 288.7929999999999 Td
-ET
-
-
-BT
-51.24 288.7929999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -39626,34 +38015,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.93299999999994 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -39661,19 +38050,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.51299999999986 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
-<6c6f6754797065> Tj
+<6c6f67436f6d706f6e656e74> Tj
 ET
 
 
 BT
-51.24 251.23299999999986 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 251.23299999999986 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39681,26 +38070,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -39708,34 +38097,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.3729999999999 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-[<656e756d2028494e464f2c2057> 60.05859375 <41524e494e472c20455252> 20.01953125 <4f5229>] TJ
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -39743,19 +38132,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95299999999992 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
-<6c6f6f70> Tj
+<6c6f67496e7374616e74> Tj
 ET
 
 
 BT
-51.24 213.67299999999992 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 213.67299999999992 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39763,69 +38152,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 220.8129999999999 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -39833,19 +38214,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39299999999992 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<6d657373616765> Tj
+<6c6f6754797065> Tj
 ET
 
 
 BT
-51.24 176.11299999999991 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 176.11299999999991 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -39853,26 +38234,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -39880,61 +38261,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.2529999999999 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 133.6559999999999 Td
-/F2.0 18 Tf
-[<332e31342e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
+[<656e756d2028494e464f2c2057> 60.05859375 <41524e494e472c20455252> 20.01953125 <4f5229>] TJ
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 93.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 93.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 56.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 56.160 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 117.000 m
-269.177 117.000 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.720 m
-269.177 93.720 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 117.250 m
-48.240 92.970 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.250 m
-269.177 92.970 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -39942,69 +38296,89 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 101.25299999999989 Td
+51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<6c6f6f70> Tj
+ET
+
+
+BT
+51.24 589.513 Td
+ET
+
+
+BT
+51.24 589.513 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.000 m
-563.760 117.000 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.720 m
-563.760 93.720 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 117.250 m
-269.177 92.970 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 117.250 m
-563.760 92.970 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 101.25299999999989 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 596.653 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.720 m
-269.177 93.720 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.160 m
-269.177 56.160 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.970 m
-48.240 55.910 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.970 m
-269.177 55.910 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -40012,19 +38386,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.47299999999989 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
-<616c6c6f7765644c6f6f7054797065> Tj
+<6d657373616765> Tj
 ET
 
 
 BT
-51.24 63.192999999999884 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 63.192999999999884 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40032,26 +38406,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.720 m
-563.760 93.720 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.160 m
-563.760 56.160 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.970 m
-269.177 55.910 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 93.970 m
-563.760 55.910 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -40059,215 +38433,141 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.33299999999988 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<656e756d20284f50454e2c20434c4f5345442c2048594252494429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
 BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3235> Tj
+48.24 509.49600000000015 Td
+/F2.0 18 Tf
+[<332e31332e204c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-276 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 275 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [277 0 R 278 0 R 280 0 R]
->>
-endobj
-277 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [280.76592192000004 631.147 342.0649219200001 645.427]
-/Type /Annot
->>
-endobj
-278 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplateloopelementmodel)
-/Subtype /Link
-/Rect [280.76592192000004 480.9069999999999 450.12267777937507 495.18699999999995]
-/Type /Annot
->>
-endobj
-279 0 obj
-[276 0 R /XYZ 0 457.79999999999995 null]
-endobj
-280 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [272.17692192000004 217.74699999999993 297.27192192000007 232.02699999999993]
-/Type /Annot
->>
-endobj
-281 0 obj
-[276 0 R /XYZ 0 157.0799999999999 null]
-endobj
-282 0 obj
-<< /Length 20545
->>
-stream
-q
-/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
+48.240 469.560 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
+269.177 469.560 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
+48.240 394.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
+269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
+48.240 356.880 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
+269.177 356.880 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
+48.240 319.320 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
+269.177 319.320 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
+48.240 281.760 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
+269.177 281.760 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
+48.240 244.200 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
+269.177 244.200 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
+48.240 206.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
+269.177 206.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
+48.240 169.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
+269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
+48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
+269.177 131.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 357.120 220.937 37.560 re
+48.240 93.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 357.120 294.583 37.560 re
+269.177 93.960 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 319.560 220.937 37.560 re
+48.240 56.400 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.560 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 282.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 282.000 294.583 37.560 re
+269.177 56.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 492.840 m
+269.177 492.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 493.090 m
+48.240 468.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 493.090 m
+269.177 468.810 l
 S
 [ ] 0 d
 1 w
@@ -40275,7 +38575,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 477.0930000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -40283,26 +38583,108 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 492.840 m
+563.760 492.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 469.560 m
+563.760 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 493.090 m
+269.177 468.810 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 493.090 m
+563.760 468.810 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 477.0930000000001 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.560 m
+269.177 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.000 m
+269.177 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.810 m
+48.240 431.750 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.810 m
+269.177 431.750 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.31300000000005 Td
+/F2.0 10.5 Tf
+<616c6c6f7765644c6f6f7054797065> Tj
+ET
+
+
+BT
+51.24 439.033 Td
+ET
+
+
+BT
+51.24 439.033 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.560 m
+563.760 469.560 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -40310,34 +38692,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 446.17300000000006 Td
+/F1.0 10.5 Tf
+<656e756d20284f50454e2c20434c4f5345442c2048594252494429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -40345,19 +38727,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 415.7530000000001 Td
 /F2.0 10.5 Tf
 <626c75657072696e74> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 401.47300000000007 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 401.47300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40365,26 +38747,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -40392,7 +38774,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 408.6130000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -40400,26 +38782,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -40427,19 +38809,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 378.19300000000004 Td
 /F2.0 10.5 Tf
 [<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 363.913 Td
 ET
 
 
 BT
-51.24 664.633 Td
+51.24 363.913 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40447,26 +38829,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -40474,7 +38856,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.773 Td
+272.17692192000004 371.05300000000005 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -40482,26 +38864,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -40509,19 +38891,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 340.6330000000001 Td
 /F2.0 10.5 Tf
 <6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 326.35300000000007 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 326.35300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40529,26 +38911,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -40556,7 +38938,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 333.4930000000001 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -40564,26 +38946,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -40591,19 +38973,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7930000000001 Td
+51.24 303.07300000000004 Td
 /F2.0 10.5 Tf
 <64636165426c75657072696e744964> Tj
 ET
 
 
 BT
-51.24 589.513 Td
+51.24 288.793 Td
 ET
 
 
 BT
-51.24 589.513 Td
+51.24 288.793 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40611,26 +38993,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -40638,7 +39020,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.653 Td
+272.17692192000004 295.93300000000005 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -40646,26 +39028,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -40673,19 +39055,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 265.5130000000001 Td
 /F2.0 10.5 Tf
 <6c6f6f70456c656d656e744d6f64656c7355736564> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 251.2330000000001 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 251.2330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40693,26 +39075,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -40724,7 +39106,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 258.3730000000001 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -40733,7 +39115,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 559.093 Td
+280.76592192000004 258.3730000000001 Td
 /F1.0 10.5 Tf
 [<4c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
 ET
@@ -40742,7 +39124,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-450.12267777937507 559.093 Td
+450.12267777937507 258.3730000000001 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -40750,26 +39132,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -40777,19 +39159,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 227.9530000000001 Td
 /F2.0 10.5 Tf
 <6d6178696d756d496e7374616e636573416c6c6f776564> Tj
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 213.6730000000001 Td
 ET
 
 
 BT
-51.24 514.393 Td
+51.24 213.6730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40797,26 +39179,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -40824,7 +39206,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.533 Td
+272.17692192000004 220.81300000000007 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -40832,26 +39214,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -40859,19 +39241,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+51.24 190.39300000000006 Td
 /F2.0 10.5 Tf
 <6d6f64656c53657276696365> Tj
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 176.11300000000006 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 176.11300000000006 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40879,26 +39261,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
@@ -40912,7 +39294,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 183.25300000000004 Td
 /F1.0 10.5 Tf
 <53657276696365> Tj
 ET
@@ -40922,26 +39304,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -40949,19 +39331,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.553 Td
+51.24 152.83300000000006 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 138.55300000000005 Td
 ET
 
 
 BT
-51.24 439.273 Td
+51.24 138.55300000000005 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -40969,26 +39351,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -40996,7 +39378,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.413 Td
+272.17692192000004 145.69300000000004 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -41004,26 +39386,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 93.960 m
+269.177 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 131.770 m
+48.240 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 1 w
@@ -41031,19 +39413,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.993 Td
+51.24 115.27300000000004 Td
 /F2.0 10.5 Tf
 <737667526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 100.99300000000004 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 100.99300000000004 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41051,26 +39433,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 93.960 m
+563.760 93.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 131.770 m
+269.177 93.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 131.770 m
+563.760 93.710 l
 S
 [ ] 0 d
 1 w
@@ -41078,7 +39460,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.853 Td
+272.17692192000004 108.13300000000004 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -41086,26 +39468,206 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71300000000004 Td
+/F2.0 10.5 Tf
+<756e69717565426c75657072696e74> Tj
+ET
+
+
+BT
+51.24 63.433000000000035 Td
+ET
+
+
+BT
+51.24 63.433000000000035 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57300000000004 Td
+/F1.0 10.5 Tf
+<626f6f6c65616e> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3234> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+271 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 270 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [272 0 R 274 0 R 275 0 R]
+>>
+endobj
+272 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 593.5870000000001 297.27192192000007 607.8670000000001]
+/Type /Annot
+>>
+endobj
+273 0 obj
+[271 0 R /XYZ 0 532.9200000000001 null]
+endobj
+274 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplateloopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 255.3070000000001 450.12267777937507 269.5870000000001]
+/Type /Annot
+>>
+endobj
+275 0 obj
+<< /Border [0 0 0]
+/Dest (_service)
+/Subtype /Link
+/Rect [272.17692192000004 180.18700000000007 308.65392192 194.46700000000004]
+/Type /Annot
+>>
+endobj
+276 0 obj
+<< /Length 20753
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.930 m
-48.240 356.870 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -41113,46 +39675,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.433 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-<756e69717565426c75657072696e74> Tj
-ET
-
-
-BT
-51.24 364.153 Td
-ET
-
-
-BT
-51.24 364.153 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.930 m
-269.177 356.870 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.930 m
-563.760 356.870 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -41160,34 +39710,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.293 Td
-/F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.120 m
-269.177 357.120 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.370 m
-48.240 319.310 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -41195,19 +39745,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.873 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 [<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 326.59299999999996 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41215,26 +39765,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.120 m
-563.760 357.120 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.370 m
-269.177 319.310 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.370 m
-563.760 319.310 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -41242,7 +39792,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.733 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -41250,26 +39800,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.560 m
-269.177 319.560 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.000 m
-269.177 282.000 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.810 m
-48.240 281.750 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -41277,19 +39827,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.313 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 289.033 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 289.033 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41297,26 +39847,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.560 m
-563.760 319.560 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.000 m
-563.760 282.000 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.810 m
-269.177 281.750 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.810 m
-563.760 281.750 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -41324,7 +39874,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.173 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -41334,67 +39884,67 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 246.57600000000002 Td
+48.24 622.1760000000002 Td
 /F2.0 18 Tf
-[<332e31352e204c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
+[<332e31342e204c6f6f7054> 29.78515625 <656d706c6174654c6f6f70456c656d656e744d6f64656c>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 23.280 re
+48.240 582.240 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 23.280 re
+269.177 582.240 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 169.080 220.937 37.560 re
+48.240 544.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 169.080 294.583 37.560 re
+269.177 544.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 131.520 220.937 37.560 re
+48.240 507.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 131.520 294.583 37.560 re
+269.177 507.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 93.960 220.937 37.560 re
+48.240 469.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 93.960 294.583 37.560 re
+269.177 469.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 229.920 m
-269.177 229.920 l
+48.240 605.520 m
+269.177 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 230.170 m
-48.240 205.890 l
+48.240 605.770 m
+48.240 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 230.170 m
-269.177 205.890 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 1 w
@@ -41402,7 +39952,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 214.17300000000003 Td
+51.24 589.7730000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -41410,26 +39960,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 229.920 m
-563.760 229.920 l
+269.177 605.520 m
+563.760 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 230.170 m
-269.177 205.890 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 230.170 m
-563.760 205.890 l
+563.760 605.770 m
+563.760 581.490 l
 S
 [ ] 0 d
 1 w
@@ -41437,7 +39987,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 214.17300000000003 Td
+272.17692192000004 589.7730000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -41445,26 +39995,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 582.240 m
+269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 582.490 m
+48.240 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 1 w
@@ -41472,19 +40022,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000003 Td
+51.24 565.9930000000002 Td
 /F2.0 10.5 Tf
 <666c6f774f72646572> Tj
 ET
 
 
 BT
-51.24 176.11300000000003 Td
+51.24 551.7130000000002 Td
 ET
 
 
 BT
-51.24 176.11300000000003 Td
+51.24 551.7130000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41492,26 +40042,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -41519,7 +40069,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.25300000000001 Td
+272.17692192000004 558.8530000000002 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74333229> Tj
 ET
@@ -41527,26 +40077,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -41554,19 +40104,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000003 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
 <6c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 
 BT
-51.24 138.55300000000003 Td
+51.24 514.1530000000001 Td
 ET
 
 
 BT
-51.24 138.55300000000003 Td
+51.24 514.1530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41574,26 +40124,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -41607,7 +40157,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 145.693 Td
+272.17692192000004 521.2930000000001 Td
 /F1.0 10.5 Tf
 <4c6f6f70456c656d656e744d6f64656c> Tj
 ET
@@ -41617,26 +40167,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 93.960 m
-269.177 93.960 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.770 m
-48.240 93.710 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -41644,19 +40194,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27300000000001 Td
+51.24 490.8730000000002 Td
 /F2.0 10.5 Tf
 [<6c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
 
 
 BT
-51.24 100.99300000000001 Td
+51.24 476.5930000000002 Td
 ET
 
 
 BT
-51.24 100.99300000000001 Td
+51.24 476.5930000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -41664,26 +40214,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 93.960 m
-563.760 93.960 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.770 m
-269.177 93.710 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.770 m
-563.760 93.710 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -41697,7 +40247,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 108.13300000000001 Td
+272.17692192000004 483.73300000000023 Td
 /F1.0 10.5 Tf
 [<4c6f6f7054> 29.78515625 <656d706c617465>] TJ
 ET
@@ -41705,265 +40255,119 @@ ET
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3236> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-283 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 282 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [284 0 R 285 0 R 287 0 R 288 0 R]
->>
-endobj
-284 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplateloopelementmodel)
-/Subtype /Link
-/Rect [280.76592192000004 556.027 450.12267777937507 570.307]
-/Type /Annot
->>
-endobj
-285 0 obj
-<< /Border [0 0 0]
-/Dest (_service)
-/Subtype /Link
-/Rect [272.17692192000004 480.907 308.65392192 495.187]
-/Type /Annot
->>
-endobj
-286 0 obj
-[283 0 R /XYZ 0 270.0 null]
-endobj
-287 0 obj
-<< /Border [0 0 0]
-/Dest (_loopelementmodel)
-/Subtype /Link
-/Rect [272.17692192000004 142.62700000000004 369.88992192000006 156.90700000000004]
-/Type /Annot
->>
-endobj
-288 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [272.17692192000004 105.06700000000001 343.82067777937505 119.34700000000001]
-/Type /Annot
->>
-endobj
-289 0 obj
-<< /Length 21277
->>
-stream
-q
-/DeviceRGB cs
 0.200 0.200 0.200 scn
-/DeviceRGB CS
 0.200 0.200 0.200 SCN
 
 BT
-48.24 734.976 Td
+48.24 434.13600000000025 Td
 /F2.0 18 Tf
-<332e31362e204d6963726f53657276696365506f6c696379> Tj
+<332e31352e204d6963726f53657276696365506f6c696379> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.040 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.040 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 657.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 657.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 619.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 619.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 582.360 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 582.360 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 544.800 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 544.800 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 507.240 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 507.240 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 469.680 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 469.680 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 432.120 220.937 37.560 re
+48.240 394.200 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 432.120 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 394.560 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 394.560 294.583 37.560 re
+269.177 394.200 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 357.000 220.937 37.560 re
+48.240 356.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 357.000 294.583 37.560 re
+269.177 356.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 319.440 220.937 37.560 re
+48.240 319.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 319.440 294.583 37.560 re
+269.177 319.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 281.880 220.937 37.560 re
+48.240 281.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 281.880 294.583 37.560 re
+269.177 281.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 244.320 220.937 37.560 re
+48.240 243.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 244.320 294.583 37.560 re
+269.177 243.960 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.760 220.937 37.560 re
+48.240 206.400 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.760 294.583 37.560 re
+269.177 206.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 169.200 220.937 37.560 re
+48.240 168.840 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 169.200 294.583 37.560 re
+269.177 168.840 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.640 220.937 37.560 re
+48.240 131.280 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.640 294.583 37.560 re
+269.177 131.280 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 94.080 220.937 37.560 re
+48.240 93.720 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 94.080 294.583 37.560 re
+269.177 93.720 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 56.520 220.937 37.560 re
+48.240 56.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 56.520 294.583 37.560 re
+269.177 56.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 718.320 m
-269.177 718.320 l
+48.240 417.480 m
+269.177 417.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 695.040 m
-269.177 695.040 l
+48.240 394.200 m
+269.177 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 718.570 m
-48.240 694.290 l
+48.240 417.730 m
+48.240 393.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.570 m
-269.177 694.290 l
+269.177 417.730 m
+269.177 393.450 l
 S
 [ ] 0 d
 1 w
@@ -41971,7 +40375,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 702.573 Td
+51.24 401.7330000000002 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -41979,26 +40383,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.320 m
-563.760 718.320 l
+269.177 417.480 m
+563.760 417.480 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 695.040 m
-563.760 695.040 l
+269.177 394.200 m
+563.760 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 718.570 m
-269.177 694.290 l
+269.177 417.730 m
+269.177 393.450 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 718.570 m
-563.760 694.290 l
+563.760 417.730 m
+563.760 393.450 l
 S
 [ ] 0 d
 1 w
@@ -42006,7 +40410,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 702.573 Td
+272.17692192000004 401.7330000000002 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -42014,26 +40418,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.040 m
-269.177 695.040 l
+48.240 394.200 m
+269.177 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.480 m
-269.177 657.480 l
+48.240 356.640 m
+269.177 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.290 m
-48.240 657.230 l
+48.240 394.450 m
+48.240 356.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.290 m
-269.177 657.230 l
+269.177 394.450 m
+269.177 356.390 l
 S
 [ ] 0 d
 1 w
@@ -42041,19 +40445,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.7930000000001 Td
+51.24 377.95300000000015 Td
 /F2.0 10.5 Tf
 [<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
 ET
 
 
 BT
-51.24 664.513 Td
+51.24 363.6730000000001 Td
 ET
 
 
 BT
-51.24 664.513 Td
+51.24 363.6730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42061,26 +40465,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.040 m
-563.760 695.040 l
+269.177 394.200 m
+563.760 394.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.480 m
-563.760 657.480 l
+269.177 356.640 m
+563.760 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.290 m
-269.177 657.230 l
+269.177 394.450 m
+269.177 356.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.290 m
-563.760 657.230 l
+563.760 394.450 m
+563.760 356.390 l
 S
 [ ] 0 d
 1 w
@@ -42094,7 +40498,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.653 Td
+272.17692192000004 370.81300000000016 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -42104,26 +40508,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.480 m
-269.177 657.480 l
+48.240 356.640 m
+269.177 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.920 m
-269.177 619.920 l
+48.240 319.080 m
+269.177 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.730 m
-48.240 619.670 l
+48.240 356.890 m
+48.240 318.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.730 m
-269.177 619.670 l
+269.177 356.890 m
+269.177 318.830 l
 S
 [ ] 0 d
 1 w
@@ -42131,19 +40535,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.233 Td
+51.24 340.3930000000002 Td
 /F2.0 10.5 Tf
 <636f6e74657874> Tj
 ET
 
 
 BT
-51.24 626.953 Td
+51.24 326.11300000000017 Td
 ET
 
 
 BT
-51.24 626.953 Td
+51.24 326.11300000000017 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42151,26 +40555,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.480 m
-563.760 657.480 l
+269.177 356.640 m
+563.760 356.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.920 m
-563.760 619.920 l
+269.177 319.080 m
+563.760 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.730 m
-269.177 619.670 l
+269.177 356.890 m
+269.177 318.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.730 m
-563.760 619.670 l
+563.760 356.890 m
+563.760 318.830 l
 S
 [ ] 0 d
 1 w
@@ -42178,7 +40582,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.093 Td
+272.17692192000004 333.2530000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -42186,26 +40590,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 619.920 m
-269.177 619.920 l
+48.240 319.080 m
+269.177 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.360 m
-269.177 582.360 l
+48.240 281.520 m
+269.177 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.170 m
-48.240 582.110 l
+48.240 319.330 m
+48.240 281.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.170 m
-269.177 582.110 l
+269.177 319.330 m
+269.177 281.270 l
 S
 [ ] 0 d
 1 w
@@ -42213,19 +40617,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.673 Td
+51.24 302.83300000000014 Td
 /F2.0 10.5 Tf
 [<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 589.393 Td
+51.24 288.5530000000001 Td
 ET
 
 
 BT
-51.24 589.393 Td
+51.24 288.5530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42233,26 +40637,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.920 m
-563.760 619.920 l
+269.177 319.080 m
+563.760 319.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.360 m
-563.760 582.360 l
+269.177 281.520 m
+563.760 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.170 m
-269.177 582.110 l
+269.177 319.330 m
+269.177 281.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.170 m
-563.760 582.110 l
+563.760 319.330 m
+563.760 281.270 l
 S
 [ ] 0 d
 1 w
@@ -42260,7 +40664,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.533 Td
+272.17692192000004 295.69300000000015 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -42268,26 +40672,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.360 m
-269.177 582.360 l
+48.240 281.520 m
+269.177 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.800 m
-269.177 544.800 l
+48.240 243.960 m
+269.177 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.610 m
-48.240 544.550 l
+48.240 281.770 m
+48.240 243.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.610 m
-269.177 544.550 l
+269.177 281.770 m
+269.177 243.710 l
 S
 [ ] 0 d
 1 w
@@ -42295,19 +40699,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.113 Td
+51.24 265.2730000000002 Td
 /F2.0 10.5 Tf
 <6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 551.833 Td
+51.24 250.9930000000002 Td
 ET
 
 
 BT
-51.24 551.833 Td
+51.24 250.9930000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42315,26 +40719,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.360 m
-563.760 582.360 l
+269.177 281.520 m
+563.760 281.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.800 m
-563.760 544.800 l
+269.177 243.960 m
+563.760 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.610 m
-269.177 544.550 l
+269.177 281.770 m
+269.177 243.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.610 m
-563.760 544.550 l
+563.760 281.770 m
+563.760 243.710 l
 S
 [ ] 0 d
 1 w
@@ -42342,7 +40746,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 558.973 Td
+272.17692192000004 258.1330000000002 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -42350,108 +40754,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.800 m
-269.177 544.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.240 m
-269.177 507.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 545.050 m
-48.240 506.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.050 m
-269.177 506.990 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 528.5530000000001 Td
-/F2.0 10.5 Tf
-<64636165426c75657072696e744964> Tj
-ET
-
-
-BT
-51.24 514.273 Td
-ET
-
-
-BT
-51.24 514.273 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 544.800 m
-563.760 544.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 507.240 m
-563.760 507.240 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 545.050 m
-269.177 506.990 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 545.050 m
-563.760 506.990 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 521.413 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 507.240 m
-269.177 507.240 l
+48.240 243.960 m
+269.177 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.680 m
-269.177 469.680 l
+48.240 206.400 m
+269.177 206.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.490 m
-48.240 469.430 l
+48.240 244.210 m
+48.240 206.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.490 m
-269.177 469.430 l
+269.177 244.210 m
+269.177 206.150 l
 S
 [ ] 0 d
 1 w
@@ -42459,19 +40781,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.993 Td
+51.24 227.7130000000002 Td
 /F2.0 10.5 Tf
-[<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
+<64636165426c75657072696e744964> Tj
 ET
 
 
 BT
-51.24 476.71299999999997 Td
+51.24 213.4330000000002 Td
 ET
 
 
 BT
-51.24 476.71299999999997 Td
+51.24 213.4330000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42479,26 +40801,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.240 m
-563.760 507.240 l
+269.177 243.960 m
+563.760 243.960 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.680 m
-563.760 469.680 l
+269.177 206.400 m
+563.760 206.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.490 m
-269.177 469.430 l
+269.177 244.210 m
+269.177 206.150 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.490 m
-563.760 469.430 l
+563.760 244.210 m
+563.760 206.150 l
 S
 [ ] 0 d
 1 w
@@ -42506,7 +40828,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.853 Td
+272.17692192000004 220.57300000000018 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -42514,26 +40836,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.680 m
-269.177 469.680 l
+48.240 206.400 m
+269.177 206.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.120 m
-269.177 432.120 l
+48.240 168.840 m
+269.177 168.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.930 m
-48.240 431.870 l
+48.240 206.650 m
+48.240 168.590 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.930 m
-269.177 431.870 l
+269.177 206.650 m
+269.177 168.590 l
 S
 [ ] 0 d
 1 w
@@ -42541,19 +40863,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.43300000000005 Td
+51.24 190.1530000000002 Td
 /F2.0 10.5 Tf
-[<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
+[<646361654465706c6f> 20.01953125 <796d656e744964>] TJ
 ET
 
 
 BT
-51.24 439.153 Td
+51.24 175.8730000000002 Td
 ET
 
 
 BT
-51.24 439.153 Td
+51.24 175.8730000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42561,26 +40883,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.680 m
-563.760 469.680 l
+269.177 206.400 m
+563.760 206.400 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.120 m
-563.760 432.120 l
+269.177 168.840 m
+563.760 168.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.930 m
-269.177 431.870 l
+269.177 206.650 m
+269.177 168.590 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.930 m
-563.760 431.870 l
+563.760 206.650 m
+563.760 168.590 l
 S
 [ ] 0 d
 1 w
@@ -42588,7 +40910,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.29300000000006 Td
+272.17692192000004 183.01300000000018 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -42596,26 +40918,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.120 m
-269.177 432.120 l
+48.240 168.840 m
+269.177 168.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.560 m
-269.177 394.560 l
+48.240 131.280 m
+269.177 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.370 m
-48.240 394.310 l
+48.240 169.090 m
+48.240 131.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.370 m
-269.177 394.310 l
+269.177 169.090 m
+269.177 131.030 l
 S
 [ ] 0 d
 1 w
@@ -42623,19 +40945,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.873 Td
+51.24 152.5930000000002 Td
 /F2.0 10.5 Tf
-<6465766963655479706553636f7065> Tj
+[<646361654465706c6f> 20.01953125 <796d656e7453746174757355726c>] TJ
 ET
 
 
 BT
-51.24 401.59299999999996 Td
+51.24 138.3130000000002 Td
 ET
 
 
 BT
-51.24 401.59299999999996 Td
+51.24 138.3130000000002 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42643,26 +40965,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.120 m
-563.760 432.120 l
+269.177 168.840 m
+563.760 168.840 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.560 m
-563.760 394.560 l
+269.177 131.280 m
+563.760 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.370 m
-269.177 394.310 l
+269.177 169.090 m
+269.177 131.030 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.370 m
-563.760 394.310 l
+563.760 169.090 m
+563.760 131.030 l
 S
 [ ] 0 d
 1 w
@@ -42670,7 +40992,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.733 Td
+272.17692192000004 145.45300000000017 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -42678,26 +41000,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.560 m
-269.177 394.560 l
+48.240 131.280 m
+269.177 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.000 m
-269.177 357.000 l
+48.240 93.720 m
+269.177 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.810 m
-48.240 356.750 l
+48.240 131.530 m
+48.240 93.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.810 m
-269.177 356.750 l
+269.177 131.530 m
+269.177 93.470 l
 S
 [ ] 0 d
 1 w
@@ -42705,19 +41027,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.313 Td
+51.24 115.03300000000014 Td
 /F2.0 10.5 Tf
-<6a736f6e526570726573656e746174696f6e> Tj
+<6465766963655479706553636f7065> Tj
 ET
 
 
 BT
-51.24 364.033 Td
+51.24 100.75300000000014 Td
 ET
 
 
 BT
-51.24 364.033 Td
+51.24 100.75300000000014 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42725,69 +41047,61 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.560 m
-563.760 394.560 l
+269.177 131.280 m
+563.760 131.280 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.000 m
-563.760 357.000 l
+269.177 93.720 m
+563.760 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.810 m
-269.177 356.750 l
+269.177 131.530 m
+269.177 93.470 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.810 m
-563.760 356.750 l
+563.760 131.530 m
+563.760 93.470 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 371.173 Td
+272.17692192000004 107.89300000000014 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.000 m
-269.177 357.000 l
+48.240 93.720 m
+269.177 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.440 m
-269.177 319.440 l
+48.240 56.160 m
+269.177 56.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 357.250 m
-48.240 319.190 l
+48.240 93.970 m
+48.240 55.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.250 m
-269.177 319.190 l
+269.177 93.970 m
+269.177 55.910 l
 S
 [ ] 0 d
 1 w
@@ -42795,19 +41109,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.753 Td
+51.24 77.47300000000014 Td
 /F2.0 10.5 Tf
-<6c6f6f70456c656d656e744d6f64656c> Tj
+<6a736f6e526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 326.47299999999996 Td
+51.24 63.19300000000014 Td
 ET
 
 
 BT
-51.24 326.47299999999996 Td
+51.24 63.19300000000014 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42815,26 +41129,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.000 m
-563.760 357.000 l
+269.177 93.720 m
+563.760 93.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.440 m
-563.760 319.440 l
+269.177 56.160 m
+563.760 56.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 357.250 m
-269.177 319.190 l
+269.177 93.970 m
+269.177 55.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 357.250 m
-563.760 319.190 l
+563.760 93.970 m
+563.760 55.910 l
 S
 [ ] 0 d
 1 w
@@ -42848,36 +41162,193 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 333.613 Td
+272.17692192000004 70.33300000000014 Td
 /F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3235> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+277 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 276 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [279 0 R 280 0 R 282 0 R 283 0 R]
+>>
+endobj
+278 0 obj
+[277 0 R /XYZ 0 645.6000000000001 null]
+endobj
+279 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 518.2270000000002 369.88992192000006 532.5070000000002]
+/Type /Annot
+>>
+endobj
+280 0 obj
+<< /Border [0 0 0]
+/Dest (_looptemplate)
+/Subtype /Link
+/Rect [272.17692192000004 480.6670000000002 343.82067777937505 494.94700000000023]
+/Type /Annot
+>>
+endobj
+281 0 obj
+[277 0 R /XYZ 0 457.56000000000023 null]
+endobj
+282 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 367.7470000000001 325.32792192000005 382.02700000000016]
+/Type /Annot
+>>
+endobj
+283 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 67.26700000000014 325.32792192000005 81.54700000000014]
+/Type /Annot
+>>
+endobj
+284 0 obj
+<< /Length 20603
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 319.440 m
-269.177 319.440 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 281.880 m
-269.177 281.880 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.690 m
-48.240 281.630 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.690 m
-269.177 281.630 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -42885,46 +41356,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.193 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-<6d6f64656c54797065> Tj
-ET
-
-
-BT
-51.24 288.913 Td
-ET
-
-
-BT
-51.24 288.913 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.440 m
-563.760 319.440 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 281.880 m
-563.760 281.880 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.690 m
-269.177 281.630 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.690 m
-563.760 281.630 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -42932,34 +41391,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 296.053 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.880 m
-269.177 281.880 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.320 m
-269.177 244.320 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.130 m
-48.240 244.070 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.130 m
-269.177 244.070 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -42967,19 +41426,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.633 Td
+51.24 716.4730000000002 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<6c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 
 BT
-51.24 251.35299999999998 Td
+51.24 702.1930000000001 Td
 ET
 
 
 BT
-51.24 251.35299999999998 Td
+51.24 702.1930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42987,61 +41446,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.880 m
-563.760 281.880 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.320 m
-563.760 244.320 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.130 m
-269.177 244.070 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.130 m
-563.760 244.070 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.493 Td
+272.17692192000004 709.3330000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.320 m
-269.177 244.320 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.760 m
-269.177 206.760 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.570 m
-48.240 206.510 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.570 m
-269.177 206.510 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -43049,19 +41516,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 228.073 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
-<70647047726f7570> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-51.24 213.793 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 213.793 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43069,26 +41536,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.320 m
-563.760 244.320 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.760 m
-563.760 206.760 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.570 m
-269.177 206.510 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.570 m
-563.760 206.510 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -43096,7 +41563,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.933 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -43104,26 +41571,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.760 m
-269.177 206.760 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.200 m
-269.177 169.200 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 207.010 m
-48.240 168.950 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.010 m
-269.177 168.950 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -43131,19 +41598,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.513 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-[<706f6c69637954> 29.78515625 <6f736361>] TJ
+<70647047726f7570> Tj
 ET
 
 
 BT
-51.24 176.233 Td
+51.24 627.0730000000001 Td
 ET
 
 
 BT
-51.24 176.233 Td
+51.24 627.0730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43151,26 +41618,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.760 m
-563.760 206.760 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.200 m
-563.760 169.200 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 207.010 m
-269.177 168.950 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 207.010 m
-563.760 168.950 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -43178,7 +41645,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.373 Td
+272.17692192000004 634.2130000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -43186,26 +41653,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.200 m
-269.177 169.200 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.640 m
-269.177 131.640 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.450 m
-48.240 131.390 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.450 m
-269.177 131.390 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -43213,19 +41680,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.95299999999995 Td
+51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
-<736861726564> Tj
+<706f6c6963794d6f64656c> Tj
 ET
 
 
 BT
-51.24 138.67299999999994 Td
+51.24 589.5130000000001 Td
 ET
 
 
 BT
-51.24 138.67299999999994 Td
+51.24 589.5130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43233,61 +41700,69 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.200 m
-563.760 169.200 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.640 m
-563.760 131.640 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.450 m
-269.177 131.390 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.450 m
-563.760 131.390 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 145.81299999999993 Td
+272.17692192000004 596.6530000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.640 m
-269.177 131.640 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.080 m
-269.177 94.080 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.890 m
-48.240 93.830 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.890 m
-269.177 93.830 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -43295,19 +41770,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.39299999999999 Td
+51.24 566.2330000000002 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<736861726564> Tj
 ET
 
 
 BT
-51.24 101.11299999999999 Td
+51.24 551.9530000000001 Td
 ET
 
 
 BT
-51.24 101.11299999999999 Td
+51.24 551.9530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43315,26 +41790,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.640 m
-563.760 131.640 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.080 m
-563.760 94.080 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.890 m
-269.177 93.830 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 131.890 m
-563.760 93.830 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -43342,34 +41817,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.25299999999999 Td
+272.17692192000004 559.0930000000001 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.080 m
-269.177 94.080 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 56.520 m
-269.177 56.520 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 94.330 m
-48.240 56.270 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.330 m
-269.177 56.270 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -43377,19 +41852,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 77.83300000000004 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 63.55300000000004 Td
+51.24 514.393 Td
 ET
 
 
 BT
-51.24 63.55300000000004 Td
+51.24 514.393 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43397,26 +41872,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.080 m
-563.760 94.080 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 56.520 m
-563.760 56.520 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 94.330 m
-269.177 56.270 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 94.330 m
-563.760 56.270 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -43424,124 +41899,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.69300000000004 Td
+272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3237> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-290 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 289 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [292 0 R 293 0 R 294 0 R]
->>
-endobj
-291 0 obj
-[290 0 R /XYZ 0 792.0 null]
-endobj
-292 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 668.5870000000001 325.32792192000005 682.8670000000001]
-/Type /Annot
->>
-endobj
-293 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 368.10699999999997 325.32792192000005 382.387]
-/Type /Annot
->>
-endobj
-294 0 obj
-<< /Border [0 0 0]
-/Dest (_loopelementmodel)
-/Subtype /Link
-/Rect [272.17692192000004 330.54699999999997 369.88992192000006 344.827]
-/Type /Annot
->>
-endobj
-295 0 obj
-<< /Length 18305
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -43549,34 +41934,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 491.1130000000001 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 476.8330000000001 Td
+ET
+
+
+BT
+51.24 476.8330000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -43584,34 +41981,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 483.9730000000001 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 432.240 m
+269.177 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 470.050 m
+48.240 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 1 w
@@ -43619,19 +42016,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 453.55300000000017 Td
 /F2.0 10.5 Tf
 [<7573656442> 20.01953125 <794c6f6f7073>] TJ
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 439.27300000000014 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 439.27300000000014 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43639,26 +42036,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 432.240 m
+563.760 432.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 470.050 m
+269.177 431.990 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 470.050 m
+563.760 431.990 l
 S
 [ ] 0 d
 1 w
@@ -43670,7 +42067,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 446.4130000000002 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -43679,7 +42076,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 709.333 Td
+280.76592192000004 446.4130000000002 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -43688,7 +42085,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-305.86092192000007 709.333 Td
+305.86092192000007 446.4130000000002 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -43698,9 +42095,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 659.7360000000001 Td
+48.24 396.8160000000002 Td
 /F2.0 18 Tf
-<332e31372e204e756d626572> Tj
+<332e31362e204e756d626572> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -43709,7 +42106,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 631.1160000000001 Td
+48.24 368.19600000000014 Td
 /F3.0 10.5 Tf
 <54797065> Tj
 ET
@@ -43720,7 +42117,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-71.4345 631.1160000000001 Td
+71.4345 368.19600000000014 Td
 /F1.0 10.5 Tf
 <203a206f626a656374> Tj
 ET
@@ -43731,131 +42128,91 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 591.8760000000002 Td
+48.24 328.95600000000013 Td
 /F2.0 18 Tf
-[<332e31382e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
+[<332e31372e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 551.940 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 551.940 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 514.380 220.937 37.560 re
+48.240 289.020 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 514.380 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 476.820 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 476.820 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 439.260 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 439.260 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 401.700 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 401.700 294.583 37.560 re
+269.177 289.020 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 364.140 220.937 37.560 re
+48.240 251.460 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 364.140 294.583 37.560 re
+269.177 251.460 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 326.580 220.937 37.560 re
+48.240 213.900 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 326.580 294.583 37.560 re
+269.177 213.900 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 289.020 220.937 37.560 re
+48.240 176.340 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 289.020 294.583 37.560 re
+269.177 176.340 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 251.460 220.937 37.560 re
+48.240 138.780 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 251.460 294.583 37.560 re
+269.177 138.780 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 213.900 220.937 37.560 re
+48.240 101.220 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 213.900 294.583 37.560 re
+269.177 101.220 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 176.340 220.937 37.560 re
+48.240 63.660 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 176.340 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 138.780 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 138.780 294.583 37.560 re
+269.177 63.660 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 575.220 m
-269.177 575.220 l
+48.240 312.300 m
+269.177 312.300 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 551.940 m
-269.177 551.940 l
+48.240 289.020 m
+269.177 289.020 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 575.470 m
-48.240 551.190 l
+48.240 312.550 m
+48.240 288.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 575.470 m
-269.177 551.190 l
+269.177 312.550 m
+269.177 288.270 l
 S
 [ ] 0 d
 1 w
@@ -43863,7 +42220,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 559.4730000000002 Td
+51.24 296.55300000000005 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -43871,26 +42228,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 575.220 m
-563.760 575.220 l
+269.177 312.300 m
+563.760 312.300 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 551.940 m
-563.760 551.940 l
+269.177 289.020 m
+563.760 289.020 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 575.470 m
-269.177 551.190 l
+269.177 312.550 m
+269.177 288.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 575.470 m
-563.760 551.190 l
+563.760 312.550 m
+563.760 288.270 l
 S
 [ ] 0 d
 1 w
@@ -43898,7 +42255,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.4730000000002 Td
+272.17692192000004 296.55300000000005 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -43906,26 +42263,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 551.940 m
-269.177 551.940 l
+48.240 289.020 m
+269.177 289.020 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.380 m
-269.177 514.380 l
+48.240 251.460 m
+269.177 251.460 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 552.190 m
-48.240 514.130 l
+48.240 289.270 m
+48.240 251.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 552.190 m
-269.177 514.130 l
+269.177 289.270 m
+269.177 251.210 l
 S
 [ ] 0 d
 1 w
@@ -43933,19 +42290,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 535.6930000000002 Td
+51.24 272.7730000000001 Td
 /F2.0 10.5 Tf
 [<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
 ET
 
 
 BT
-51.24 521.4130000000002 Td
+51.24 258.49300000000005 Td
 ET
 
 
 BT
-51.24 521.4130000000002 Td
+51.24 258.49300000000005 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43953,26 +42310,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 551.940 m
-563.760 551.940 l
+269.177 289.020 m
+563.760 289.020 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.380 m
-563.760 514.380 l
+269.177 251.460 m
+563.760 251.460 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 552.190 m
-269.177 514.130 l
+269.177 289.270 m
+269.177 251.210 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 552.190 m
-563.760 514.130 l
+563.760 289.270 m
+563.760 251.210 l
 S
 [ ] 0 d
 1 w
@@ -43986,7 +42343,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 528.5530000000002 Td
+272.17692192000004 265.6330000000001 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -43996,26 +42353,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.380 m
-269.177 514.380 l
+48.240 251.460 m
+269.177 251.460 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 476.820 m
-269.177 476.820 l
+48.240 213.900 m
+269.177 213.900 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 514.630 m
-48.240 476.570 l
+48.240 251.710 m
+48.240 213.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.630 m
-269.177 476.570 l
+269.177 251.710 m
+269.177 213.650 l
 S
 [ ] 0 d
 1 w
@@ -44023,19 +42380,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 498.1330000000002 Td
+51.24 235.21300000000008 Td
 /F2.0 10.5 Tf
 [<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 483.8530000000002 Td
+51.24 220.93300000000008 Td
 ET
 
 
 BT
-51.24 483.8530000000002 Td
+51.24 220.93300000000008 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44043,26 +42400,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.380 m
-563.760 514.380 l
+269.177 251.460 m
+563.760 251.460 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 476.820 m
-563.760 476.820 l
+269.177 213.900 m
+563.760 213.900 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 514.630 m
-269.177 476.570 l
+269.177 251.710 m
+269.177 213.650 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 514.630 m
-563.760 476.570 l
+563.760 251.710 m
+563.760 213.650 l
 S
 [ ] 0 d
 1 w
@@ -44070,7 +42427,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 490.9930000000002 Td
+272.17692192000004 228.07300000000006 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44078,26 +42435,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 476.820 m
-269.177 476.820 l
+48.240 213.900 m
+269.177 213.900 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 439.260 m
-269.177 439.260 l
+48.240 176.340 m
+269.177 176.340 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 477.070 m
-48.240 439.010 l
+48.240 214.150 m
+48.240 176.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 477.070 m
-269.177 439.010 l
+269.177 214.150 m
+269.177 176.090 l
 S
 [ ] 0 d
 1 w
@@ -44105,19 +42462,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 460.57300000000026 Td
+51.24 197.65300000000008 Td
 /F2.0 10.5 Tf
 <6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 446.29300000000023 Td
+51.24 183.37300000000008 Td
 ET
 
 
 BT
-51.24 446.29300000000023 Td
+51.24 183.37300000000008 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44125,26 +42482,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 476.820 m
-563.760 476.820 l
+269.177 213.900 m
+563.760 213.900 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.260 m
-563.760 439.260 l
+269.177 176.340 m
+563.760 176.340 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 477.070 m
-269.177 439.010 l
+269.177 214.150 m
+269.177 176.090 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 477.070 m
-563.760 439.010 l
+563.760 214.150 m
+563.760 176.090 l
 S
 [ ] 0 d
 1 w
@@ -44152,7 +42509,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 453.4330000000003 Td
+272.17692192000004 190.51300000000006 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -44160,26 +42517,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 439.260 m
-269.177 439.260 l
+48.240 176.340 m
+269.177 176.340 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.700 m
-269.177 401.700 l
+48.240 138.780 m
+269.177 138.780 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 439.510 m
-48.240 401.450 l
+48.240 176.590 m
+48.240 138.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.510 m
-269.177 401.450 l
+269.177 176.590 m
+269.177 138.530 l
 S
 [ ] 0 d
 1 w
@@ -44187,19 +42544,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 423.0130000000002 Td
+51.24 160.09300000000007 Td
 /F2.0 10.5 Tf
 <6a736f6e526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 408.7330000000002 Td
+51.24 145.81300000000007 Td
 ET
 
 
 BT
-51.24 408.7330000000002 Td
+51.24 145.81300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44207,26 +42564,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.260 m
-563.760 439.260 l
+269.177 176.340 m
+563.760 176.340 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.700 m
-563.760 401.700 l
+269.177 138.780 m
+563.760 138.780 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 439.510 m
-269.177 401.450 l
+269.177 176.590 m
+269.177 138.530 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 439.510 m
-563.760 401.450 l
+563.760 176.590 m
+563.760 138.530 l
 S
 [ ] 0 d
 1 w
@@ -44240,7 +42597,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 415.8730000000002 Td
+272.17692192000004 152.95300000000006 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -44250,26 +42607,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.700 m
-269.177 401.700 l
+48.240 138.780 m
+269.177 138.780 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 364.140 m
-269.177 364.140 l
+48.240 101.220 m
+269.177 101.220 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 401.950 m
-48.240 363.890 l
+48.240 139.030 m
+48.240 100.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 401.950 m
-269.177 363.890 l
+269.177 139.030 m
+269.177 100.970 l
 S
 [ ] 0 d
 1 w
@@ -44277,89 +42634,336 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 385.45300000000026 Td
+51.24 122.53300000000007 Td
 /F2.0 10.5 Tf
 <6c6f6f70> Tj
 ET
 
 
 BT
-51.24 371.17300000000023 Td
+51.24 108.25300000000007 Td
+ET
+
+
+BT
+51.24 108.25300000000007 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 138.780 m
+563.760 138.780 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 101.220 m
+563.760 101.220 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 139.030 m
+269.177 100.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 139.030 m
+563.760 100.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 115.39300000000007 Td
+/F1.0 10.5 Tf
+<4c6f6f70> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 101.220 m
+269.177 101.220 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 63.660 m
+269.177 63.660 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 101.470 m
+48.240 63.410 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 101.470 m
+269.177 63.410 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 84.97300000000006 Td
+/F2.0 10.5 Tf
+<6c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+
+BT
+51.24 70.69300000000005 Td
 ET
 
 
 BT
-51.24 371.17300000000023 Td
+51.24 70.69300000000005 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 401.700 m
-563.760 401.700 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 364.140 m
-563.760 364.140 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 401.950 m
-269.177 363.890 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 401.950 m
-563.760 363.890 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-272.17692192000004 378.3130000000003 Td
-/F1.0 10.5 Tf
-<4c6f6f70> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 101.220 m
+563.760 101.220 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 63.660 m
+563.760 63.660 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 101.470 m
+269.177 63.410 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 101.470 m
+563.760 63.410 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+272.17692192000004 77.83300000000006 Td
+/F1.0 10.5 Tf
+<4c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+49.24 14.388 Td
+/F1.0 9 Tf
+<3236> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+285 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 284 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [286 0 R 287 0 R 288 0 R 291 0 R 292 0 R 293 0 R 294 0 R]
+>>
+endobj
+286 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 706.2670000000002 369.88992192000006 720.5470000000001]
+/Type /Annot
+>>
+endobj
+287 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [272.17692192000004 593.5870000000002 333.47592192 607.8670000000002]
+/Type /Annot
+>>
+endobj
+288 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [280.76592192000004 443.34700000000015 305.86092192000007 457.6270000000002]
+/Type /Annot
+>>
+endobj
+289 0 obj
+[285 0 R /XYZ 0 420.2400000000002 null]
+endobj
+290 0 obj
+[285 0 R /XYZ 0 352.3800000000001 null]
+endobj
+291 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 262.56700000000006 325.32792192000005 276.8470000000001]
+/Type /Annot
+>>
+endobj
+292 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 149.88700000000009 325.32792192000005 164.1670000000001]
+/Type /Annot
+>>
+endobj
+293 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 112.32700000000007 297.27192192000007 126.60700000000007]
+/Type /Annot
+>>
+endobj
+294 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 74.76700000000005 369.88992192000006 89.04700000000005]
+/Type /Annot
+>>
+endobj
+295 0 obj
+<< /Length 19359
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 620.040 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 620.040 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 582.480 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 582.480 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 544.920 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 544.920 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 364.140 m
-269.177 364.140 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-48.240 326.580 m
-269.177 326.580 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 364.390 m
-48.240 326.330 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.390 m
-269.177 326.330 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -44367,89 +42971,69 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 347.8930000000002 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
-<6c6f6f70456c656d656e744d6f64656c> Tj
-ET
-
-
-BT
-51.24 333.61300000000017 Td
-ET
-
-
-BT
-51.24 333.61300000000017 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.140 m
-563.760 364.140 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
-269.177 326.580 m
-563.760 326.580 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 364.390 m
-269.177 326.330 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 364.390 m
-563.760 326.330 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 340.7530000000002 Td
-/F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 326.580 m
-269.177 326.580 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 289.020 m
-269.177 289.020 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 326.830 m
-48.240 288.770 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 326.830 m
-269.177 288.770 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -44457,19 +43041,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 310.33300000000025 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 296.0530000000002 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 296.0530000000002 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44477,26 +43061,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 326.580 m
-563.760 326.580 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.020 m
-563.760 289.020 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 326.830 m
-269.177 288.770 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 326.830 m
-563.760 288.770 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -44504,7 +43088,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 303.19300000000027 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44512,26 +43096,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 289.020 m
-269.177 289.020 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 251.460 m
-269.177 251.460 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 289.270 m
-48.240 251.210 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.270 m
-269.177 251.210 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -44539,19 +43123,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 272.7730000000002 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <70647047726f7570> Tj
 ET
 
 
 BT
-51.24 258.49300000000017 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 258.49300000000017 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44559,26 +43143,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.020 m
-563.760 289.020 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.460 m
-563.760 251.460 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.270 m
-269.177 251.210 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 289.270 m
-563.760 251.210 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -44586,7 +43170,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 265.6330000000002 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44594,26 +43178,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 251.460 m
-269.177 251.460 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 213.900 m
-269.177 213.900 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 251.710 m
-48.240 213.650 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.710 m
-269.177 213.650 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -44621,19 +43205,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 235.21300000000022 Td
+51.24 641.3529999999998 Td
 /F2.0 10.5 Tf
 <706f6c6963794d6f64656c> Tj
 ET
 
 
 BT
-51.24 220.93300000000022 Td
+51.24 627.0729999999999 Td
 ET
 
 
 BT
-51.24 220.93300000000022 Td
+51.24 627.0729999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44641,26 +43225,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.460 m
-563.760 251.460 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 213.900 m
-563.760 213.900 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 251.710 m
-269.177 213.650 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 251.710 m
-563.760 213.650 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -44674,7 +43258,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 228.0730000000002 Td
+272.17692192000004 634.2129999999999 Td
 /F1.0 10.5 Tf
 <506f6c6963794d6f64656c> Tj
 ET
@@ -44684,26 +43268,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 213.900 m
-269.177 213.900 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 176.340 m
-269.177 176.340 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 214.150 m
-48.240 176.090 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 214.150 m
-269.177 176.090 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -44711,19 +43295,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 197.65300000000022 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
 [<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 183.37300000000022 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 183.37300000000022 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44731,26 +43315,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 213.900 m
-563.760 213.900 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.340 m
-563.760 176.340 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 214.150 m
-269.177 176.090 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 214.150 m
-563.760 176.090 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -44758,7 +43342,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 190.5130000000002 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44766,26 +43350,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 176.340 m
-269.177 176.340 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 138.780 m
-269.177 138.780 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 176.590 m
-48.240 138.530 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.590 m
-269.177 138.530 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -44793,19 +43377,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 160.09300000000022 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
 <7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 145.81300000000022 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 145.81300000000022 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44813,26 +43397,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.340 m
-563.760 176.340 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 138.780 m
-563.760 138.780 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 176.590 m
-269.177 138.530 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 176.590 m
-563.760 138.530 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -44840,7 +43424,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 152.9530000000002 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -44850,224 +43434,115 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 103.3560000000002 Td
+48.24 509.49600000000015 Td
 /F2.0 18 Tf
-<332e31392e20506f6c6963794d6f64656c> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-49.24 14.388 Td
-/F1.0 9 Tf
-<3238> Tj
+<332e31382e20506f6c6963794d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-296 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 295 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 603 0 R
->>
->>
-/Annots [297 0 R 301 0 R 302 0 R 303 0 R 304 0 R 305 0 R]
->>
-endobj
-297 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [280.76592192000004 706.267 305.86092192000007 720.547]
-/Type /Annot
->>
-endobj
-298 0 obj
-[296 0 R /XYZ 0 683.1600000000001 null]
-endobj
-299 0 obj
-<< /Limits [(_looptemplate) (_parameters_14)]
-/Names [(_looptemplate) 281 0 R (_looptemplateloopelementmodel) 286 0 R (_microservicepolicy) 291 0 R (_number) 298 0 R (_operationalpolicy) 300 0 R (_overview) 19 0 R (_parameters) 48 0 R (_parameters_10) 113 0 R (_parameters_11) 118 0 R (_parameters_12) 124 0 R (_parameters_13) 131 0 R (_parameters_14) 135 0 R]
->>
-endobj
-300 0 obj
-[296 0 R /XYZ 0 615.3000000000002 null]
-endobj
-301 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 525.4870000000003 325.32792192000005 539.7670000000003]
-/Type /Annot
->>
-endobj
-302 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 412.8070000000002 325.32792192000005 427.0870000000002]
-/Type /Annot
->>
-endobj
-303 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [272.17692192000004 375.24700000000024 297.27192192000007 389.52700000000027]
-/Type /Annot
->>
-endobj
-304 0 obj
-<< /Border [0 0 0]
-/Dest (_loopelementmodel)
-/Subtype /Link
-/Rect [272.17692192000004 337.6870000000002 369.88992192000006 351.9670000000002]
-/Type /Annot
->>
-endobj
-305 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [272.17692192000004 225.00700000000023 333.47592192 239.2870000000002]
-/Type /Annot
->>
-endobj
-306 0 obj
-[296 0 R /XYZ 0 126.7800000000002 null]
-endobj
-307 0 obj
-<< /Length 19335
->>
-stream
-q
-/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
+48.240 469.560 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
+269.177 469.560 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
+48.240 394.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
+269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
+48.240 356.880 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
+269.177 356.880 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
+48.240 319.320 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
+269.177 319.320 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
+48.240 281.760 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
+269.177 281.760 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 507.360 220.937 37.560 re
+48.240 244.200 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 507.360 294.583 37.560 re
+269.177 244.200 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 469.800 220.937 37.560 re
+48.240 206.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 469.800 294.583 37.560 re
+269.177 206.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 432.240 220.937 37.560 re
+48.240 169.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 432.240 294.583 37.560 re
+269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.680 220.937 37.560 re
+48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.680 294.583 37.560 re
+269.177 131.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
+48.240 492.840 m
+269.177 492.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
+48.240 493.090 m
+48.240 468.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 493.090 m
+269.177 468.810 l
 S
 [ ] 0 d
 1 w
@@ -45075,7 +43550,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 740.2529999999999 Td
+51.24 477.0930000000001 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -45083,26 +43558,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
+269.177 492.840 m
+563.760 492.840 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
+269.177 493.090 m
+269.177 468.810 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
+563.760 493.090 m
+563.760 468.810 l
 S
 [ ] 0 d
 1 w
@@ -45110,7 +43585,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 740.2529999999999 Td
+272.17692192000004 477.0930000000001 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -45118,26 +43593,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -45145,19 +43620,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 453.31300000000005 Td
 /F2.0 10.5 Tf
 [<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 439.033 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 439.033 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45165,26 +43640,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -45192,7 +43667,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 446.17300000000006 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45200,26 +43675,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+48.240 432.250 m
+48.240 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 1 w
@@ -45227,46 +43702,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+51.24 415.7530000000001 Td
 /F2.0 10.5 Tf
 <6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 401.47300000000007 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 401.47300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
-0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 432.250 m
+269.177 394.190 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 432.250 m
+563.760 394.190 l
 S
 [ ] 0 d
 1 w
@@ -45274,7 +43749,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.7729999999999 Td
+272.17692192000004 408.6130000000001 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -45282,26 +43757,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 394.440 m
+269.177 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 394.690 m
+48.240 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 1 w
@@ -45309,19 +43784,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 378.19300000000004 Td
 /F2.0 10.5 Tf
 [<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 363.913 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 363.913 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45329,26 +43804,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 394.440 m
+563.760 394.440 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 394.690 m
+269.177 356.630 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 394.690 m
+563.760 356.630 l
 S
 [ ] 0 d
 1 w
@@ -45356,7 +43831,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 371.05300000000005 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45364,26 +43839,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 356.880 m
+269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 357.130 m
+48.240 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 1 w
@@ -45391,19 +43866,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 340.6330000000001 Td
 /F2.0 10.5 Tf
 [<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 326.35300000000007 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 326.35300000000007 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45411,26 +43886,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 356.880 m
+563.760 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 357.130 m
+269.177 319.070 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 357.130 m
+563.760 319.070 l
 S
 [ ] 0 d
 1 w
@@ -45438,7 +43913,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 333.4930000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45446,26 +43921,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 319.320 m
+269.177 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 319.570 m
+48.240 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 1 w
@@ -45473,19 +43948,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 303.07300000000004 Td
 /F2.0 10.5 Tf
 <706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 288.793 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 288.793 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45493,26 +43968,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 319.320 m
+563.760 319.320 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 319.570 m
+269.177 281.510 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 319.570 m
+563.760 281.510 l
 S
 [ ] 0 d
 1 w
@@ -45520,7 +43995,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 295.93300000000005 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45528,26 +44003,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 281.760 m
+269.177 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 545.170 m
-48.240 507.110 l
+48.240 282.010 m
+48.240 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 1 w
@@ -45555,19 +44030,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.673 Td
+51.24 265.5130000000001 Td
 /F2.0 10.5 Tf
 [<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 251.2330000000001 Td
 ET
 
 
 BT
-51.24 514.3929999999999 Td
+51.24 251.2330000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45575,26 +44050,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 281.760 m
+563.760 281.760 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 545.170 m
-269.177 507.110 l
+269.177 282.010 m
+269.177 243.950 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 545.170 m
-563.760 507.110 l
+563.760 282.010 m
+563.760 243.950 l
 S
 [ ] 0 d
 1 w
@@ -45602,7 +44077,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 521.5329999999999 Td
+272.17692192000004 258.3730000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45610,26 +44085,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.360 m
-269.177 507.360 l
+48.240 244.200 m
+269.177 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 507.610 m
-48.240 469.550 l
+48.240 244.450 m
+48.240 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 1 w
@@ -45637,19 +44112,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 491.113 Td
+51.24 227.9530000000001 Td
 /F2.0 10.5 Tf
 <7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 213.6730000000001 Td
 ET
 
 
 BT
-51.24 476.83299999999997 Td
+51.24 213.6730000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45657,26 +44132,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.360 m
-563.760 507.360 l
+269.177 244.200 m
+563.760 244.200 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 507.610 m
-269.177 469.550 l
+269.177 244.450 m
+269.177 206.390 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 507.610 m
-563.760 469.550 l
+563.760 244.450 m
+563.760 206.390 l
 S
 [ ] 0 d
 1 w
@@ -45684,7 +44159,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 483.973 Td
+272.17692192000004 220.81300000000007 Td
 /F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
@@ -45692,26 +44167,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.800 m
-269.177 469.800 l
+48.240 206.640 m
+269.177 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 470.050 m
-48.240 431.990 l
+48.240 206.890 m
+48.240 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 1 w
@@ -45719,19 +44194,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.55299999999994 Td
+51.24 190.39300000000006 Td
 /F2.0 10.5 Tf
 [<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 176.11300000000006 Td
 ET
 
 
 BT
-51.24 439.2729999999999 Td
+51.24 176.11300000000006 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45739,26 +44214,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.800 m
-563.760 469.800 l
+269.177 206.640 m
+563.760 206.640 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 470.050 m
-269.177 431.990 l
+269.177 206.890 m
+269.177 168.830 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 470.050 m
-563.760 431.990 l
+563.760 206.890 m
+563.760 168.830 l
 S
 [ ] 0 d
 1 w
@@ -45770,7 +44245,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.41299999999995 Td
+272.17692192000004 183.25300000000004 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -45779,7 +44254,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 446.41299999999995 Td
+280.76592192000004 183.25300000000004 Td
 /F1.0 10.5 Tf
 <4c6f6f70456c656d656e744d6f64656c> Tj
 ET
@@ -45788,7 +44263,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-378.47892192000006 446.41299999999995 Td
+378.47892192000006 183.25300000000004 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -45796,26 +44271,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.240 m
-269.177 432.240 l
+48.240 169.080 m
+269.177 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.680 m
-269.177 394.680 l
+48.240 131.520 m
+269.177 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.490 m
-48.240 394.430 l
+48.240 169.330 m
+48.240 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 1 w
@@ -45823,19 +44298,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.99299999999994 Td
+51.24 152.83300000000006 Td
 /F2.0 10.5 Tf
 <76657273696f6e> Tj
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 138.55300000000005 Td
 ET
 
 
 BT
-51.24 401.71299999999997 Td
+51.24 138.55300000000005 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45843,26 +44318,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.240 m
-563.760 432.240 l
+269.177 169.080 m
+563.760 169.080 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.680 m
-563.760 394.680 l
+269.177 131.520 m
+563.760 131.520 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.490 m
-269.177 394.430 l
+269.177 169.330 m
+269.177 131.270 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.490 m
-563.760 394.430 l
+563.760 169.330 m
+563.760 131.270 l
 S
 [ ] 0 d
 1 w
@@ -45870,7 +44345,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.85299999999995 Td
+272.17692192000004 145.69300000000004 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45880,83 +44355,152 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 359.256 Td
+48.24 96.09600000000003 Td
 /F2.0 18 Tf
-<332e32302e2053657276696365> Tj
+<332e31392e2053657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3237> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+296 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 295 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 587 0 R
+>>
+>>
+/Annots [297 0 R 299 0 R]
+>>
+endobj
+297 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [272.17692192000004 631.1469999999999 333.47592192 645.4269999999999]
+/Type /Annot
+>>
+endobj
+298 0 obj
+[296 0 R /XYZ 0 532.9200000000001 null]
+endobj
+299 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 180.18700000000007 378.47892192000006 194.46700000000004]
+/Type /Annot
+>>
+endobj
+300 0 obj
+[296 0 R /XYZ 0 119.52000000000004 null]
+endobj
+301 0 obj
+<< /Length 7264
+>>
+stream
+q
+/DeviceRGB cs
 1.000 1.000 1.000 scn
-48.240 319.320 220.937 23.280 re
+48.240 732.720 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 319.320 294.583 23.280 re
+269.177 732.720 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
+48.240 695.160 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
+269.177 695.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
+48.240 657.600 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
+269.177 657.600 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
+48.240 620.040 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
+269.177 620.040 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
+48.240 582.480 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
+269.177 582.480 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
+48.240 544.920 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
+269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
+/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 342.600 m
-269.177 342.600 l
+48.240 756.000 m
+269.177 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 342.850 m
-48.240 318.570 l
+48.240 756.250 m
+48.240 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.850 m
-269.177 318.570 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 1 w
@@ -45964,7 +44508,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 326.8529999999999 Td
+51.24 740.2529999999999 Td
 /F2.0 10.5 Tf
 <4e616d65> Tj
 ET
@@ -45972,26 +44516,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.600 m
-563.760 342.600 l
+269.177 756.000 m
+563.760 756.000 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 342.850 m
-269.177 318.570 l
+269.177 756.250 m
+269.177 731.970 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 342.850 m
-563.760 318.570 l
+563.760 756.250 m
+563.760 731.970 l
 S
 [ ] 0 d
 1 w
@@ -45999,7 +44543,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 326.8529999999999 Td
+272.17692192000004 740.2529999999999 Td
 /F2.0 10.5 Tf
 <536368656d61> Tj
 ET
@@ -46007,26 +44551,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.320 m
-269.177 319.320 l
+48.240 732.720 m
+269.177 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 319.570 m
-48.240 281.510 l
+48.240 732.970 m
+48.240 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 1 w
@@ -46034,19 +44578,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.0729999999999 Td
+51.24 716.473 Td
 /F2.0 10.5 Tf
 <6e616d65> Tj
 ET
 
 
 BT
-51.24 288.7929999999999 Td
+51.24 702.193 Td
 ET
 
 
 BT
-51.24 288.7929999999999 Td
+51.24 702.193 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46054,26 +44598,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.320 m
-563.760 319.320 l
+269.177 732.720 m
+563.760 732.720 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 319.570 m
-269.177 281.510 l
+269.177 732.970 m
+269.177 694.910 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 319.570 m
-563.760 281.510 l
+563.760 732.970 m
+563.760 694.910 l
 S
 [ ] 0 d
 1 w
@@ -46081,7 +44625,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.93299999999994 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -46089,26 +44633,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 281.760 m
-269.177 281.760 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 282.010 m
-48.240 243.950 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -46116,19 +44660,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.51299999999986 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <7265736f7572636544657461696c73> Tj
 ET
 
 
 BT
-51.24 251.23299999999986 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 251.23299999999986 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46136,26 +44680,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 281.760 m
-563.760 281.760 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 282.010 m
-269.177 243.950 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 282.010 m
-563.760 243.950 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -46169,7 +44713,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 258.3729999999999 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -46179,26 +44723,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.200 m
-269.177 244.200 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 244.450 m
-48.240 206.390 l
+48.240 657.850 m
+48.240 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 1 w
@@ -46206,19 +44750,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.95299999999992 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
 <7365727669636544657461696c73> Tj
 ET
 
 
 BT
-51.24 213.67299999999992 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 213.67299999999992 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46226,26 +44770,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.200 m
-563.760 244.200 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 244.450 m
-269.177 206.390 l
+269.177 657.850 m
+269.177 619.790 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 244.450 m
-563.760 206.390 l
+563.760 657.850 m
+563.760 619.790 l
 S
 [ ] 0 d
 1 w
@@ -46259,7 +44803,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 220.8129999999999 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -46269,26 +44813,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.640 m
-269.177 206.640 l
+48.240 620.040 m
+269.177 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 206.890 m
-48.240 168.830 l
+48.240 620.290 m
+48.240 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 1 w
@@ -46296,19 +44840,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39299999999992 Td
+51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
 <7365727669636555756964> Tj
 ET
 
 
 BT
-51.24 176.11299999999991 Td
+51.24 589.5129999999999 Td
 ET
 
 
 BT
-51.24 176.11299999999991 Td
+51.24 589.5129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46316,26 +44860,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.640 m
-563.760 206.640 l
+269.177 620.040 m
+563.760 620.040 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 206.890 m
-269.177 168.830 l
+269.177 620.290 m
+269.177 582.230 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 206.890 m
-563.760 168.830 l
+563.760 620.290 m
+563.760 582.230 l
 S
 [ ] 0 d
 1 w
@@ -46343,7 +44887,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 183.2529999999999 Td
+272.17692192000004 596.6529999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -46351,26 +44895,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.080 m
-269.177 169.080 l
+48.240 582.480 m
+269.177 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 131.520 m
-269.177 131.520 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 169.330 m
-48.240 131.270 l
+48.240 582.730 m
+48.240 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 1 w
@@ -46378,19 +44922,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.8329999999999 Td
+51.24 566.233 Td
 /F2.0 10.5 Tf
 <76657273696f6e> Tj
 ET
 
 
 BT
-51.24 138.5529999999999 Td
+51.24 551.953 Td
 ET
 
 
 BT
-51.24 138.5529999999999 Td
+51.24 551.953 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -46398,26 +44942,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.080 m
-563.760 169.080 l
+269.177 582.480 m
+563.760 582.480 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 131.520 m
-563.760 131.520 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 169.330 m
-269.177 131.270 l
+269.177 582.730 m
+269.177 544.670 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 169.330 m
-563.760 131.270 l
+563.760 582.730 m
+563.760 544.670 l
 S
 [ ] 0 d
 1 w
@@ -46425,7 +44969,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.6929999999999 Td
+272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -46443,9 +44987,9 @@ q
 0.200 0.200 0.200 SCN
 
 BT
-552.698 14.388 Td
+49.24 14.388 Td
 /F1.0 9 Tf
-<3239> Tj
+<3238> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -46455,50 +44999,39 @@ Q
 
 endstream
 endobj
-308 0 obj
+302 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 307 0 R
+/Contents 301 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 603 0 R
+/XObject << /Stamp1 587 0 R
 >>
 >>
-/Annots [309 0 R 311 0 R 312 0 R]
->>
-endobj
-309 0 obj
-<< /Border [0 0 0]
-/Dest (_loopelementmodel)
-/Subtype /Link
-/Rect [280.76592192000004 443.3469999999999 378.47892192000006 457.62699999999995]
-/Type /Annot
+/Annots [303 0 R 304 0 R]
 >>
 endobj
-310 0 obj
-[308 0 R /XYZ 0 382.67999999999995 null]
-endobj
-311 0 obj
+303 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 255.30699999999987 325.32792192000005 269.5869999999999]
+/Rect [272.17692192000004 668.707 325.32792192000005 682.987]
 /Type /Annot
 >>
 endobj
-312 0 obj
+304 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 217.74699999999993 325.32792192000005 232.02699999999993]
+/Rect [272.17692192000004 631.147 325.32792192000005 645.427]
 /Type /Annot
 >>
 endobj
-313 0 obj
+305 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -46506,7 +45039,7 @@ endobj
 /Type /Annot
 >>
 endobj
-314 0 obj
+306 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -46514,7 +45047,7 @@ endobj
 /Type /Annot
 >>
 endobj
-315 0 obj
+307 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -46522,7 +45055,7 @@ endobj
 /Type /Annot
 >>
 endobj
-316 0 obj
+308 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -46530,7 +45063,7 @@ endobj
 /Type /Annot
 >>
 endobj
-317 0 obj
+309 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -46538,7 +45071,7 @@ endobj
 /Type /Annot
 >>
 endobj
-318 0 obj
+310 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -46546,7 +45079,7 @@ endobj
 /Type /Annot
 >>
 endobj
-319 0 obj
+311 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -46554,7 +45087,7 @@ endobj
 /Type /Annot
 >>
 endobj
-320 0 obj
+312 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -46562,23 +45095,23 @@ endobj
 /Type /Annot
 >>
 endobj
-321 0 obj
+313 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route92)
 /Subtype /Link
-/Rect [60.24000000000001 621.7799999999997 183.88800000000003 636.0599999999998]
+/Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998]
 /Type /Annot
 >>
 endobj
-322 0 obj
+314 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route92)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
 >>
 endobj
-323 0 obj
+315 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -46586,7 +45119,7 @@ endobj
 /Type /Annot
 >>
 endobj
-324 0 obj
+316 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -46594,7 +45127,7 @@ endobj
 /Type /Annot
 >>
 endobj
-325 0 obj
+317 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -46602,7 +45135,7 @@ endobj
 /Type /Annot
 >>
 endobj
-326 0 obj
+318 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -46610,23 +45143,23 @@ endobj
 /Type /Annot
 >>
 endobj
-327 0 obj
+319 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route93)
 /Subtype /Link
-/Rect [60.24000000000001 566.3399999999997 181.64100000000002 580.6199999999998]
+/Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998]
 /Type /Annot
 >>
 endobj
-328 0 obj
+320 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route93)
 /Subtype /Link
 /Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
 /Type /Annot
 >>
 endobj
-329 0 obj
+321 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -46634,7 +45167,7 @@ endobj
 /Type /Annot
 >>
 endobj
-330 0 obj
+322 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -46642,7 +45175,7 @@ endobj
 /Type /Annot
 >>
 endobj
-331 0 obj
+323 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -46650,7 +45183,7 @@ endobj
 /Type /Annot
 >>
 endobj
-332 0 obj
+324 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -46658,23 +45191,23 @@ endobj
 /Type /Annot
 >>
 endobj
-333 0 obj
+325 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route80)
 /Subtype /Link
-/Rect [60.24000000000001 510.89999999999975 183.8775 525.1799999999997]
+/Rect [60.24000000000001 510.89999999999975 172.716 525.1799999999997]
 /Type /Annot
 >>
 endobj
-334 0 obj
+326 0 obj
 << /Border [0 0 0]
-/Dest (_route32)
+/Dest (_route80)
 /Subtype /Link
 /Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
 /Type /Annot
 >>
 endobj
-335 0 obj
+327 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -46682,7 +45215,7 @@ endobj
 /Type /Annot
 >>
 endobj
-336 0 obj
+328 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -46690,7 +45223,7 @@ endobj
 /Type /Annot
 >>
 endobj
-337 0 obj
+329 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -46698,7 +45231,7 @@ endobj
 /Type /Annot
 >>
 endobj
-338 0 obj
+330 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -46706,435 +45239,499 @@ endobj
 /Type /Annot
 >>
 endobj
+331 0 obj
+<< /Border [0 0 0]
+/Dest (_route82)
+/Subtype /Link
+/Rect [60.24000000000001 455.4599999999997 172.548 469.73999999999967]
+/Type /Annot
+>>
+endobj
+332 0 obj
+<< /Border [0 0 0]
+/Dest (_route82)
+/Subtype /Link
+/Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
+/Type /Annot
+>>
+endobj
+333 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters)
+/Subtype /Link
+/Rect [72.24000000000001 436.9799999999997 157.84629492187503 451.25999999999965]
+/Type /Annot
+>>
+endobj
+334 0 obj
+<< /Border [0 0 0]
+/Dest (_parameters)
+/Subtype /Link
+/Rect [557.8905 436.9799999999997 563.76 451.25999999999965]
+/Type /Annot
+>>
+endobj
+335 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_4)
+/Subtype /Link
+/Rect [72.24000000000001 418.49999999999966 152.0295 432.77999999999963]
+/Type /Annot
+>>
+endobj
+336 0 obj
+<< /Border [0 0 0]
+/Dest (_responses_4)
+/Subtype /Link
+/Rect [557.8905 418.49999999999966 563.76 432.77999999999963]
+/Type /Annot
+>>
+endobj
+337 0 obj
+<< /Border [0 0 0]
+/Dest (_consumes)
+/Subtype /Link
+/Rect [72.24000000000001 400.01999999999964 151.368 414.2999999999996]
+/Type /Annot
+>>
+endobj
+338 0 obj
+<< /Border [0 0 0]
+/Dest (_consumes)
+/Subtype /Link
+/Rect [557.8905 400.01999999999964 563.76 414.2999999999996]
+/Type /Annot
+>>
+endobj
 339 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_produces_4)
 /Subtype /Link
-/Rect [60.24000000000001 455.4599999999997 172.716 469.73999999999967]
+/Rect [72.24000000000001 381.5399999999996 146.4015 395.8199999999996]
 /Type /Annot
 >>
 endobj
 340 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_produces_4)
 /Subtype /Link
-/Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
+/Rect [557.8905 381.5399999999996 563.76 395.8199999999996]
 /Type /Annot
 >>
 endobj
 341 0 obj
 << /Border [0 0 0]
-/Dest (_responses_4)
+/Dest (_v2_dictionary_secondary_names_get)
 /Subtype /Link
-/Rect [72.24000000000001 436.9799999999997 152.0295 451.25999999999965]
+/Rect [60.24000000000001 363.0599999999996 263.25750000000005 377.3399999999996]
 /Type /Annot
 >>
 endobj
 342 0 obj
 << /Border [0 0 0]
-/Dest (_responses_4)
+/Dest (_v2_dictionary_secondary_names_get)
 /Subtype /Link
-/Rect [557.8905 436.9799999999997 563.76 451.25999999999965]
+/Rect [557.8905 363.0599999999996 563.76 377.3399999999996]
 /Type /Annot
 >>
 endobj
 343 0 obj
 << /Border [0 0 0]
-/Dest (_produces_4)
+/Dest (_responses_5)
 /Subtype /Link
-/Rect [72.24000000000001 418.49999999999966 146.4015 432.77999999999963]
+/Rect [72.24000000000001 344.5799999999996 152.0295 358.85999999999956]
 /Type /Annot
 >>
 endobj
 344 0 obj
 << /Border [0 0 0]
-/Dest (_produces_4)
+/Dest (_responses_5)
 /Subtype /Link
-/Rect [557.8905 418.49999999999966 563.76 432.77999999999963]
+/Rect [557.8905 344.5799999999996 563.76 358.85999999999956]
 /Type /Annot
 >>
 endobj
 345 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_produces_5)
 /Subtype /Link
-/Rect [60.24000000000001 400.01999999999964 172.548 414.2999999999996]
+/Rect [72.24000000000001 326.09999999999957 146.4015 340.37999999999954]
 /Type /Annot
 >>
 endobj
 346 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_produces_5)
 /Subtype /Link
-/Rect [557.8905 400.01999999999964 563.76 414.2999999999996]
+/Rect [557.8905 326.09999999999957 563.76 340.37999999999954]
 /Type /Annot
 >>
 endobj
 347 0 obj
 << /Border [0 0 0]
-/Dest (_parameters)
+/Dest (_v2_dictionary_dictionaryname_get)
 /Subtype /Link
-/Rect [72.24000000000001 381.5399999999996 157.84629492187503 395.8199999999996]
+/Rect [60.24000000000001 307.61999999999955 265.76700000000005 321.8999999999995]
 /Type /Annot
 >>
 endobj
 348 0 obj
 << /Border [0 0 0]
-/Dest (_parameters)
+/Dest (_v2_dictionary_dictionaryname_get)
 /Subtype /Link
-/Rect [557.8905 381.5399999999996 563.76 395.8199999999996]
+/Rect [557.8905 307.61999999999955 563.76 321.8999999999995]
 /Type /Annot
 >>
 endobj
 349 0 obj
 << /Border [0 0 0]
-/Dest (_responses_5)
+/Dest (_parameters_2)
 /Subtype /Link
-/Rect [72.24000000000001 363.0599999999996 152.0295 377.3399999999996]
+/Rect [72.24000000000001 289.13999999999953 157.84629492187503 303.4199999999995]
 /Type /Annot
 >>
 endobj
 350 0 obj
 << /Border [0 0 0]
-/Dest (_responses_5)
+/Dest (_parameters_2)
 /Subtype /Link
-/Rect [557.8905 363.0599999999996 563.76 377.3399999999996]
+/Rect [557.8905 289.13999999999953 563.76 303.4199999999995]
 /Type /Annot
 >>
 endobj
 351 0 obj
 << /Border [0 0 0]
-/Dest (_consumes)
+/Dest (_responses_6)
 /Subtype /Link
-/Rect [72.24000000000001 344.5799999999996 151.368 358.85999999999956]
+/Rect [72.24000000000001 270.6599999999995 152.0295 284.9399999999995]
 /Type /Annot
 >>
 endobj
 352 0 obj
 << /Border [0 0 0]
-/Dest (_consumes)
+/Dest (_responses_6)
 /Subtype /Link
-/Rect [557.8905 344.5799999999996 563.76 358.85999999999956]
+/Rect [557.8905 270.6599999999995 563.76 284.9399999999995]
 /Type /Annot
 >>
 endobj
 353 0 obj
 << /Border [0 0 0]
-/Dest (_produces_5)
+/Dest (_produces_6)
 /Subtype /Link
-/Rect [72.24000000000001 326.09999999999957 146.4015 340.37999999999954]
+/Rect [72.24000000000001 252.17999999999947 146.4015 266.45999999999947]
 /Type /Annot
 >>
 endobj
 354 0 obj
 << /Border [0 0 0]
-/Dest (_produces_5)
+/Dest (_produces_6)
 /Subtype /Link
-/Rect [557.8905 326.09999999999957 563.76 340.37999999999954]
+/Rect [557.8905 252.17999999999947 563.76 266.45999999999947]
 /Type /Annot
 >>
 endobj
 355 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_secondary_names_get)
+/Dest (_v2_dictionary_name_put)
 /Subtype /Link
-/Rect [60.24000000000001 307.61999999999955 263.25750000000005 321.8999999999995]
+/Rect [60.24000000000001 233.69999999999948 212.763 247.97999999999948]
 /Type /Annot
 >>
 endobj
 356 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_secondary_names_get)
+/Dest (_v2_dictionary_name_put)
 /Subtype /Link
-/Rect [557.8905 307.61999999999955 563.76 321.8999999999995]
+/Rect [557.8905 233.69999999999948 563.76 247.97999999999948]
 /Type /Annot
 >>
 endobj
 357 0 obj
 << /Border [0 0 0]
-/Dest (_responses_6)
+/Dest (_parameters_3)
 /Subtype /Link
-/Rect [72.24000000000001 289.13999999999953 152.0295 303.4199999999995]
+/Rect [72.24000000000001 215.2199999999995 157.84629492187503 229.4999999999995]
 /Type /Annot
 >>
 endobj
 358 0 obj
 << /Border [0 0 0]
-/Dest (_responses_6)
+/Dest (_parameters_3)
 /Subtype /Link
-/Rect [557.8905 289.13999999999953 563.76 303.4199999999995]
+/Rect [557.8905 215.2199999999995 563.76 229.4999999999995]
 /Type /Annot
 >>
 endobj
 359 0 obj
 << /Border [0 0 0]
-/Dest (_produces_6)
+/Dest (_responses_7)
 /Subtype /Link
-/Rect [72.24000000000001 270.6599999999995 146.4015 284.9399999999995]
+/Rect [72.24000000000001 196.7399999999995 152.0295 211.0199999999995]
 /Type /Annot
 >>
 endobj
 360 0 obj
 << /Border [0 0 0]
-/Dest (_produces_6)
+/Dest (_responses_7)
 /Subtype /Link
-/Rect [557.8905 270.6599999999995 563.76 284.9399999999995]
+/Rect [557.8905 196.7399999999995 563.76 211.0199999999995]
 /Type /Annot
 >>
 endobj
 361 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_dictionaryname_get)
+/Dest (_consumes_2)
 /Subtype /Link
-/Rect [60.24000000000001 252.17999999999947 265.76700000000005 266.45999999999947]
+/Rect [72.24000000000001 178.2599999999995 151.368 192.5399999999995]
 /Type /Annot
 >>
 endobj
 362 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_dictionaryname_get)
+/Dest (_consumes_2)
 /Subtype /Link
-/Rect [557.8905 252.17999999999947 563.76 266.45999999999947]
+/Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
 /Type /Annot
 >>
 endobj
 363 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_2)
+/Dest (_produces_7)
 /Subtype /Link
-/Rect [72.24000000000001 233.69999999999948 157.84629492187503 247.97999999999948]
+/Rect [72.24000000000001 159.77999999999952 146.4015 174.05999999999952]
 /Type /Annot
 >>
 endobj
 364 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_2)
+/Dest (_produces_7)
 /Subtype /Link
-/Rect [557.8905 233.69999999999948 563.76 247.97999999999948]
+/Rect [557.8905 159.77999999999952 563.76 174.05999999999952]
 /Type /Annot
 >>
 endobj
 365 0 obj
 << /Border [0 0 0]
-/Dest (_responses_7)
+/Dest (_route84)
 /Subtype /Link
-/Rect [72.24000000000001 215.2199999999995 152.0295 229.4999999999995]
+/Rect [60.24000000000001 141.29999999999953 232.70250000000001 155.57999999999953]
 /Type /Annot
 >>
 endobj
 366 0 obj
 << /Border [0 0 0]
-/Dest (_responses_7)
+/Dest (_route84)
 /Subtype /Link
-/Rect [557.8905 215.2199999999995 563.76 229.4999999999995]
+/Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
 /Type /Annot
 >>
 endobj
 367 0 obj
 << /Border [0 0 0]
-/Dest (_produces_7)
+/Dest (_parameters_4)
 /Subtype /Link
-/Rect [72.24000000000001 196.7399999999995 146.4015 211.0199999999995]
+/Rect [72.24000000000001 122.81999999999954 157.84629492187503 137.09999999999954]
 /Type /Annot
 >>
 endobj
 368 0 obj
 << /Border [0 0 0]
-/Dest (_produces_7)
+/Dest (_parameters_4)
 /Subtype /Link
-/Rect [557.8905 196.7399999999995 563.76 211.0199999999995]
+/Rect [557.8905 122.81999999999954 563.76 137.09999999999954]
 /Type /Annot
 >>
 endobj
 369 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_name_put)
+/Dest (_responses_8)
 /Subtype /Link
-/Rect [60.24000000000001 178.2599999999995 212.763 192.5399999999995]
+/Rect [72.24000000000001 104.33999999999955 152.0295 118.61999999999955]
 /Type /Annot
 >>
 endobj
 370 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_name_put)
+/Dest (_responses_8)
 /Subtype /Link
-/Rect [557.8905 178.2599999999995 563.76 192.5399999999995]
+/Rect [557.8905 104.33999999999955 563.76 118.61999999999955]
 /Type /Annot
 >>
 endobj
 371 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_3)
+/Dest (_produces_8)
 /Subtype /Link
-/Rect [72.24000000000001 159.77999999999952 157.84629492187503 174.05999999999952]
+/Rect [72.24000000000001 85.85999999999956 146.4015 100.13999999999956]
 /Type /Annot
 >>
 endobj
 372 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_3)
+/Dest (_produces_8)
 /Subtype /Link
-/Rect [557.8905 159.77999999999952 563.76 174.05999999999952]
+/Rect [557.8905 85.85999999999956 563.76 100.13999999999956]
 /Type /Annot
 >>
 endobj
 373 0 obj
 << /Border [0 0 0]
-/Dest (_responses_8)
+/Dest (_v2_dictionary_name_elements_shortname_delete)
 /Subtype /Link
-/Rect [72.24000000000001 141.29999999999953 152.0295 155.57999999999953]
+/Rect [60.24000000000001 67.37999999999957 348.4965 81.65999999999957]
 /Type /Annot
 >>
 endobj
 374 0 obj
 << /Border [0 0 0]
-/Dest (_responses_8)
+/Dest (_v2_dictionary_name_elements_shortname_delete)
 /Subtype /Link
-/Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
+/Rect [557.8905 67.37999999999957 563.76 81.65999999999957]
 /Type /Annot
 >>
 endobj
 375 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_2)
+/Dest (_parameters_5)
 /Subtype /Link
-/Rect [72.24000000000001 122.81999999999954 151.368 137.09999999999954]
+/Rect [72.24000000000001 48.89999999999957 157.84629492187503 63.17999999999957]
 /Type /Annot
 >>
 endobj
 376 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_2)
+/Dest (_parameters_5)
 /Subtype /Link
-/Rect [557.8905 122.81999999999954 563.76 137.09999999999954]
+/Rect [557.8905 48.89999999999957 563.76 63.17999999999957]
 /Type /Annot
 >>
 endobj
 377 0 obj
 << /Border [0 0 0]
-/Dest (_produces_8)
+/Dest (_responses_9)
 /Subtype /Link
-/Rect [72.24000000000001 104.33999999999955 146.4015 118.61999999999955]
+/Rect [72.24000000000001 741.7199999999999 152.0295 756.0]
 /Type /Annot
 >>
 endobj
 378 0 obj
 << /Border [0 0 0]
-/Dest (_produces_8)
+/Dest (_responses_9)
 /Subtype /Link
-/Rect [557.8905 104.33999999999955 563.76 118.61999999999955]
+/Rect [557.8905 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
 379 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_produces_9)
 /Subtype /Link
-/Rect [60.24000000000001 85.85999999999956 232.70250000000001 100.13999999999956]
+/Rect [72.24000000000001 723.2399999999999 146.4015 737.52]
 /Type /Annot
 >>
 endobj
 380 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_produces_9)
 /Subtype /Link
-/Rect [557.8905 85.85999999999956 563.76 100.13999999999956]
+/Rect [557.8905 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
 381 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_4)
+/Dest (_route76)
 /Subtype /Link
-/Rect [72.24000000000001 67.37999999999957 157.84629492187503 81.65999999999957]
+/Rect [60.24000000000001 704.7599999999999 245.15550000000002 719.04]
 /Type /Annot
 >>
 endobj
 382 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_4)
+/Dest (_route76)
 /Subtype /Link
-/Rect [557.8905 67.37999999999957 563.76 81.65999999999957]
+/Rect [557.8905 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
 383 0 obj
 << /Border [0 0 0]
-/Dest (_responses_9)
+/Dest (_parameters_6)
 /Subtype /Link
-/Rect [72.24000000000001 48.89999999999957 152.0295 63.17999999999957]
+/Rect [72.24000000000001 686.2799999999999 163.71579492187502 700.56]
 /Type /Annot
 >>
 endobj
 384 0 obj
 << /Border [0 0 0]
-/Dest (_responses_9)
+/Dest (_parameters_6)
 /Subtype /Link
-/Rect [557.8905 48.89999999999957 563.76 63.17999999999957]
+/Rect [557.8905 686.2799999999999 563.76 700.56]
 /Type /Annot
 >>
 endobj
 385 0 obj
 << /Border [0 0 0]
-/Dest (_produces_9)
+/Dest (_responses_10)
 /Subtype /Link
-/Rect [72.24000000000001 741.7199999999999 146.4015 756.0]
+/Rect [72.24000000000001 667.7999999999998 157.899 682.0799999999999]
 /Type /Annot
 >>
 endobj
 386 0 obj
 << /Border [0 0 0]
-/Dest (_produces_9)
+/Dest (_responses_10)
 /Subtype /Link
-/Rect [557.8905 741.7199999999999 563.76 756.0]
+/Rect [557.8905 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
 387 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_name_elements_shortname_delete)
+/Dest (_route70)
 /Subtype /Link
-/Rect [60.24000000000001 723.2399999999999 354.36600000000004 737.52]
+/Rect [60.24000000000001 649.3199999999998 248.431294921875 663.5999999999999]
 /Type /Annot
 >>
 endobj
 388 0 obj
 << /Border [0 0 0]
-/Dest (_v2_dictionary_name_elements_shortname_delete)
+/Dest (_route70)
 /Subtype /Link
-/Rect [557.8905 723.2399999999999 563.76 737.52]
+/Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
 389 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_5)
+/Dest (_parameters_7)
 /Subtype /Link
-/Rect [72.24000000000001 704.7599999999999 163.71579492187502 719.04]
+/Rect [72.24000000000001 630.8399999999998 163.71579492187502 645.1199999999999]
 /Type /Annot
 >>
 endobj
 390 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_5)
+/Dest (_parameters_7)
 /Subtype /Link
-/Rect [557.8905 704.7599999999999 563.76 719.04]
+/Rect [557.8905 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
 391 0 obj
 << /Border [0 0 0]
-/Dest (_responses_10)
+/Dest (_responses_11)
 /Subtype /Link
-/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
+/Rect [72.24000000000001 612.3599999999998 157.899 626.6399999999999]
 /Type /Annot
 >>
 endobj
 392 0 obj
 << /Border [0 0 0]
-/Dest (_responses_10)
+/Dest (_responses_11)
 /Subtype /Link
-/Rect [557.8905 686.2799999999999 563.76 700.56]
+/Rect [557.8905 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
@@ -47142,7 +45739,7 @@ endobj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
-/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
+/Rect [72.24000000000001 593.8799999999998 152.27100000000002 608.1599999999999]
 /Type /Annot
 >>
 endobj
@@ -47150,3031 +45747,2867 @@ endobj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
-/Rect [557.8905 667.7999999999998 563.76 682.0799999999999]
+/Rect [557.8905 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
 >>
 endobj
 395 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route64)
 /Subtype /Link
-/Rect [60.24000000000001 649.3199999999998 245.15550000000002 663.5999999999999]
+/Rect [60.24000000000001 575.3999999999997 214.8735 589.6799999999998]
 /Type /Annot
 >>
 endobj
 396 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route64)
 /Subtype /Link
-/Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
+/Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
 397 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_6)
+/Dest (_responses_12)
 /Subtype /Link
-/Rect [72.24000000000001 630.8399999999998 163.71579492187502 645.1199999999999]
+/Rect [72.24000000000001 556.9199999999998 157.899 571.1999999999998]
 /Type /Annot
 >>
 endobj
 398 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_6)
+/Dest (_responses_12)
 /Subtype /Link
-/Rect [557.8905 630.8399999999998 563.76 645.1199999999999]
+/Rect [557.8905 556.9199999999998 563.76 571.1999999999998]
 /Type /Annot
 >>
 endobj
 399 0 obj
 << /Border [0 0 0]
-/Dest (_responses_11)
+/Dest (_produces_11)
 /Subtype /Link
-/Rect [72.24000000000001 612.3599999999998 157.899 626.6399999999999]
+/Rect [72.24000000000001 538.4399999999998 152.27100000000002 552.7199999999998]
 /Type /Annot
 >>
 endobj
 400 0 obj
 << /Border [0 0 0]
-/Dest (_responses_11)
+/Dest (_produces_11)
 /Subtype /Link
-/Rect [557.8905 612.3599999999998 563.76 626.6399999999999]
+/Rect [557.8905 538.4399999999998 563.76 552.7199999999998]
 /Type /Annot
 >>
 endobj
 401 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route77)
 /Subtype /Link
-/Rect [60.24000000000001 593.8799999999998 248.431294921875 608.1599999999999]
+/Rect [60.24000000000001 519.9599999999998 259.467 534.2399999999998]
 /Type /Annot
 >>
 endobj
 402 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route77)
 /Subtype /Link
-/Rect [557.8905 593.8799999999998 563.76 608.1599999999999]
+/Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
 403 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_7)
+/Dest (_parameters_8)
 /Subtype /Link
-/Rect [72.24000000000001 575.3999999999997 163.71579492187502 589.6799999999998]
+/Rect [72.24000000000001 501.4799999999998 163.71579492187502 515.7599999999998]
 /Type /Annot
 >>
 endobj
 404 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_7)
+/Dest (_parameters_8)
 /Subtype /Link
-/Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
+/Rect [557.8905 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
 405 0 obj
 << /Border [0 0 0]
-/Dest (_responses_12)
+/Dest (_responses_13)
 /Subtype /Link
-/Rect [72.24000000000001 556.9199999999998 157.899 571.1999999999998]
+/Rect [72.24000000000001 482.9999999999998 157.899 497.27999999999975]
 /Type /Annot
 >>
 endobj
 406 0 obj
 << /Border [0 0 0]
-/Dest (_responses_12)
+/Dest (_responses_13)
 /Subtype /Link
-/Rect [557.8905 556.9199999999998 563.76 571.1999999999998]
+/Rect [557.8905 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
 407 0 obj
 << /Border [0 0 0]
-/Dest (_produces_11)
+/Dest (_produces_12)
 /Subtype /Link
-/Rect [72.24000000000001 538.4399999999998 152.27100000000002 552.7199999999998]
+/Rect [72.24000000000001 464.51999999999975 152.27100000000002 478.7999999999997]
 /Type /Annot
 >>
 endobj
 408 0 obj
 << /Border [0 0 0]
-/Dest (_produces_11)
+/Dest (_produces_12)
 /Subtype /Link
-/Rect [557.8905 538.4399999999998 563.76 552.7199999999998]
+/Rect [557.8905 464.51999999999975 563.76 478.7999999999997]
 /Type /Annot
 >>
 endobj
 409 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route71)
 /Subtype /Link
-/Rect [60.24000000000001 519.9599999999998 214.8735 534.2399999999998]
+/Rect [60.24000000000001 446.03999999999974 355.8885 460.3199999999997]
 /Type /Annot
 >>
 endobj
 410 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route71)
 /Subtype /Link
-/Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
+/Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
 411 0 obj
 << /Border [0 0 0]
-/Dest (_responses_13)
+/Dest (_parameters_9)
 /Subtype /Link
-/Rect [72.24000000000001 501.4799999999998 157.899 515.7599999999998]
+/Rect [72.24000000000001 427.5599999999997 163.71579492187502 441.8399999999997]
 /Type /Annot
 >>
 endobj
 412 0 obj
 << /Border [0 0 0]
-/Dest (_responses_13)
+/Dest (_parameters_9)
 /Subtype /Link
-/Rect [557.8905 501.4799999999998 563.76 515.7599999999998]
+/Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
 413 0 obj
 << /Border [0 0 0]
-/Dest (_produces_12)
+/Dest (_responses_14)
 /Subtype /Link
-/Rect [72.24000000000001 482.9999999999998 152.27100000000002 497.27999999999975]
+/Rect [72.24000000000001 409.0799999999997 157.899 423.3599999999997]
 /Type /Annot
 >>
 endobj
 414 0 obj
 << /Border [0 0 0]
-/Dest (_produces_12)
+/Dest (_responses_14)
 /Subtype /Link
-/Rect [557.8905 482.9999999999998 563.76 497.27999999999975]
+/Rect [557.8905 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
 415 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_produces_13)
 /Subtype /Link
-/Rect [60.24000000000001 464.51999999999975 259.467 478.7999999999997]
+/Rect [72.24000000000001 390.5999999999997 152.27100000000002 404.87999999999965]
 /Type /Annot
 >>
 endobj
 416 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_produces_13)
 /Subtype /Link
-/Rect [557.8905 464.51999999999975 563.76 478.7999999999997]
+/Rect [557.8905 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
 417 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_8)
+/Dest (_route74)
 /Subtype /Link
-/Rect [72.24000000000001 446.03999999999974 163.71579492187502 460.3199999999997]
+/Rect [60.24000000000001 372.11999999999966 248.45250000000001 386.39999999999964]
 /Type /Annot
 >>
 endobj
 418 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_8)
+/Dest (_route74)
 /Subtype /Link
-/Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
+/Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
 419 0 obj
 << /Border [0 0 0]
-/Dest (_responses_14)
+/Dest (_parameters_10)
 /Subtype /Link
-/Rect [72.24000000000001 427.5599999999997 157.899 441.8399999999997]
+/Rect [72.24000000000001 353.63999999999965 163.71579492187502 367.9199999999996]
 /Type /Annot
 >>
 endobj
 420 0 obj
 << /Border [0 0 0]
-/Dest (_responses_14)
+/Dest (_parameters_10)
 /Subtype /Link
-/Rect [557.8905 427.5599999999997 563.76 441.8399999999997]
+/Rect [557.8905 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
 421 0 obj
 << /Border [0 0 0]
-/Dest (_produces_13)
+/Dest (_responses_15)
 /Subtype /Link
-/Rect [72.24000000000001 409.0799999999997 152.27100000000002 423.3599999999997]
+/Rect [72.24000000000001 335.1599999999996 157.899 349.4399999999996]
 /Type /Annot
 >>
 endobj
 422 0 obj
 << /Border [0 0 0]
-/Dest (_produces_13)
+/Dest (_responses_15)
 /Subtype /Link
-/Rect [557.8905 409.0799999999997 563.76 423.3599999999997]
+/Rect [557.8905 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
 423 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_produces_14)
 /Subtype /Link
-/Rect [60.24000000000001 390.5999999999997 355.8885 404.87999999999965]
+/Rect [72.24000000000001 316.6799999999996 152.27100000000002 330.9599999999996]
 /Type /Annot
 >>
 endobj
 424 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_produces_14)
 /Subtype /Link
-/Rect [557.8905 390.5999999999997 563.76 404.87999999999965]
+/Rect [557.8905 316.6799999999996 563.76 330.9599999999996]
 /Type /Annot
 >>
 endobj
 425 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_9)
+/Dest (_route73)
 /Subtype /Link
-/Rect [72.24000000000001 372.11999999999966 163.71579492187502 386.39999999999964]
+/Rect [60.24000000000001 298.1999999999996 235.842 312.47999999999956]
 /Type /Annot
 >>
 endobj
 426 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_9)
+/Dest (_route73)
 /Subtype /Link
-/Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
+/Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
 427 0 obj
 << /Border [0 0 0]
-/Dest (_responses_15)
+/Dest (_parameters_11)
 /Subtype /Link
-/Rect [72.24000000000001 353.63999999999965 157.899 367.9199999999996]
+/Rect [72.24000000000001 279.7199999999996 163.71579492187502 293.99999999999955]
 /Type /Annot
 >>
 endobj
 428 0 obj
 << /Border [0 0 0]
-/Dest (_responses_15)
+/Dest (_parameters_11)
 /Subtype /Link
-/Rect [557.8905 353.63999999999965 563.76 367.9199999999996]
+/Rect [557.8905 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
 429 0 obj
 << /Border [0 0 0]
-/Dest (_produces_14)
+/Dest (_responses_16)
 /Subtype /Link
-/Rect [72.24000000000001 335.1599999999996 152.27100000000002 349.4399999999996]
+/Rect [72.24000000000001 261.23999999999955 157.899 275.5199999999995]
 /Type /Annot
 >>
 endobj
 430 0 obj
 << /Border [0 0 0]
-/Dest (_produces_14)
+/Dest (_responses_16)
 /Subtype /Link
-/Rect [557.8905 335.1599999999996 563.76 349.4399999999996]
+/Rect [557.8905 261.23999999999955 563.76 275.5199999999995]
 /Type /Annot
 >>
 endobj
 431 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_produces_15)
 /Subtype /Link
-/Rect [60.24000000000001 316.6799999999996 248.45250000000001 330.9599999999996]
+/Rect [72.24000000000001 242.7599999999995 152.27100000000002 257.0399999999995]
 /Type /Annot
 >>
 endobj
 432 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_produces_15)
 /Subtype /Link
-/Rect [557.8905 316.6799999999996 563.76 330.9599999999996]
+/Rect [557.8905 242.7599999999995 563.76 257.0399999999995]
 /Type /Annot
 >>
 endobj
 433 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_10)
+/Dest (_route75)
 /Subtype /Link
-/Rect [72.24000000000001 298.1999999999996 163.71579492187502 312.47999999999956]
+/Rect [60.24000000000001 224.27999999999952 249.70200000000003 238.55999999999952]
 /Type /Annot
 >>
 endobj
 434 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_10)
+/Dest (_route75)
 /Subtype /Link
-/Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
+/Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
 435 0 obj
 << /Border [0 0 0]
-/Dest (_responses_16)
+/Dest (_parameters_12)
 /Subtype /Link
-/Rect [72.24000000000001 279.7199999999996 157.899 293.99999999999955]
+/Rect [72.24000000000001 205.79999999999953 163.71579492187502 220.07999999999953]
 /Type /Annot
 >>
 endobj
 436 0 obj
 << /Border [0 0 0]
-/Dest (_responses_16)
+/Dest (_parameters_12)
 /Subtype /Link
-/Rect [557.8905 279.7199999999996 563.76 293.99999999999955]
+/Rect [557.8905 205.79999999999953 563.76 220.07999999999953]
 /Type /Annot
 >>
 endobj
 437 0 obj
 << /Border [0 0 0]
-/Dest (_produces_15)
+/Dest (_responses_17)
 /Subtype /Link
-/Rect [72.24000000000001 261.23999999999955 152.27100000000002 275.5199999999995]
+/Rect [72.24000000000001 187.31999999999954 157.899 201.59999999999954]
 /Type /Annot
 >>
 endobj
 438 0 obj
 << /Border [0 0 0]
-/Dest (_produces_15)
+/Dest (_responses_17)
 /Subtype /Link
-/Rect [557.8905 261.23999999999955 563.76 275.5199999999995]
+/Rect [557.8905 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
 439 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_produces_16)
 /Subtype /Link
-/Rect [60.24000000000001 242.7599999999995 235.842 257.0399999999995]
+/Rect [72.24000000000001 168.83999999999955 152.27100000000002 183.11999999999955]
 /Type /Annot
 >>
 endobj
 440 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_produces_16)
 /Subtype /Link
-/Rect [557.8905 242.7599999999995 563.76 257.0399999999995]
+/Rect [557.8905 168.83999999999955 563.76 183.11999999999955]
 /Type /Annot
 >>
 endobj
 441 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_11)
+/Dest (_route66)
 /Subtype /Link
-/Rect [72.24000000000001 224.27999999999952 163.71579492187502 238.55999999999952]
+/Rect [60.24000000000001 150.35999999999956 307.641 164.63999999999956]
 /Type /Annot
 >>
 endobj
 442 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_11)
+/Dest (_route66)
 /Subtype /Link
-/Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
+/Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
 443 0 obj
 << /Border [0 0 0]
-/Dest (_responses_17)
+/Dest (_parameters_13)
 /Subtype /Link
-/Rect [72.24000000000001 205.79999999999953 157.899 220.07999999999953]
+/Rect [72.24000000000001 131.87999999999957 163.71579492187502 146.15999999999957]
 /Type /Annot
 >>
 endobj
 444 0 obj
 << /Border [0 0 0]
-/Dest (_responses_17)
+/Dest (_parameters_13)
 /Subtype /Link
-/Rect [557.8905 205.79999999999953 563.76 220.07999999999953]
+/Rect [557.8905 131.87999999999957 563.76 146.15999999999957]
 /Type /Annot
 >>
 endobj
 445 0 obj
 << /Border [0 0 0]
-/Dest (_produces_16)
+/Dest (_responses_18)
 /Subtype /Link
-/Rect [72.24000000000001 187.31999999999954 152.27100000000002 201.59999999999954]
+/Rect [72.24000000000001 113.39999999999958 157.899 127.67999999999958]
 /Type /Annot
 >>
 endobj
 446 0 obj
 << /Border [0 0 0]
-/Dest (_produces_16)
+/Dest (_responses_18)
 /Subtype /Link
-/Rect [557.8905 187.31999999999954 563.76 201.59999999999954]
+/Rect [557.8905 113.39999999999958 563.76 127.67999999999958]
 /Type /Annot
 >>
 endobj
 447 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_produces_17)
 /Subtype /Link
-/Rect [60.24000000000001 168.83999999999955 249.70200000000003 183.11999999999955]
+/Rect [72.24000000000001 94.91999999999959 152.27100000000002 109.19999999999959]
 /Type /Annot
 >>
 endobj
 448 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_produces_17)
 /Subtype /Link
-/Rect [557.8905 168.83999999999955 563.76 183.11999999999955]
+/Rect [557.8905 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
 449 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_12)
+/Dest (_route72)
 /Subtype /Link
-/Rect [72.24000000000001 150.35999999999956 163.71579492187502 164.63999999999956]
+/Rect [60.24000000000001 76.4399999999996 261.860794921875 90.7199999999996]
 /Type /Annot
 >>
 endobj
 450 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_12)
+/Dest (_route72)
 /Subtype /Link
-/Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
+/Rect [557.8905 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
 451 0 obj
 << /Border [0 0 0]
-/Dest (_responses_18)
+/Dest (_parameters_14)
 /Subtype /Link
-/Rect [72.24000000000001 131.87999999999957 157.899 146.15999999999957]
+/Rect [72.24000000000001 57.95999999999961 163.71579492187502 72.23999999999961]
 /Type /Annot
 >>
 endobj
 452 0 obj
 << /Border [0 0 0]
-/Dest (_responses_18)
+/Dest (_parameters_14)
 /Subtype /Link
-/Rect [557.8905 131.87999999999957 563.76 146.15999999999957]
+/Rect [557.8905 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
 453 0 obj
 << /Border [0 0 0]
-/Dest (_produces_17)
+/Dest (_responses_19)
 /Subtype /Link
-/Rect [72.24000000000001 113.39999999999958 152.27100000000002 127.67999999999958]
+/Rect [72.24000000000001 741.7199999999999 157.899 756.0]
 /Type /Annot
 >>
 endobj
 454 0 obj
 << /Border [0 0 0]
-/Dest (_produces_17)
+/Dest (_responses_19)
 /Subtype /Link
-/Rect [557.8905 113.39999999999958 563.76 127.67999999999958]
+/Rect [557.8905 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
 455 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_produces_18)
 /Subtype /Link
-/Rect [60.24000000000001 94.91999999999959 307.641 109.19999999999959]
+/Rect [72.24000000000001 723.2399999999999 152.27100000000002 737.52]
 /Type /Annot
 >>
 endobj
 456 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_produces_18)
 /Subtype /Link
-/Rect [557.8905 94.91999999999959 563.76 109.19999999999959]
+/Rect [557.8905 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
 457 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_13)
+/Dest (_route67)
 /Subtype /Link
-/Rect [72.24000000000001 76.4399999999996 163.71579492187502 90.7199999999996]
+/Rect [60.24000000000001 704.7599999999999 339.560794921875 719.04]
 /Type /Annot
 >>
 endobj
 458 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_13)
+/Dest (_route67)
 /Subtype /Link
-/Rect [557.8905 76.4399999999996 563.76 90.7199999999996]
+/Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
 459 0 obj
 << /Border [0 0 0]
-/Dest (_responses_19)
+/Dest (_parameters_15)
 /Subtype /Link
-/Rect [72.24000000000001 57.95999999999961 157.899 72.23999999999961]
+/Rect [72.24000000000001 686.2799999999999 163.71579492187502 700.56]
 /Type /Annot
 >>
 endobj
 460 0 obj
 << /Border [0 0 0]
-/Dest (_responses_19)
+/Dest (_parameters_15)
 /Subtype /Link
-/Rect [557.8905 57.95999999999961 563.76 72.23999999999961]
+/Rect [552.021 686.2799999999999 563.76 700.56]
 /Type /Annot
 >>
 endobj
 461 0 obj
 << /Border [0 0 0]
-/Dest (_produces_18)
+/Dest (_responses_20)
 /Subtype /Link
-/Rect [72.24000000000001 741.7199999999999 152.27100000000002 756.0]
+/Rect [72.24000000000001 667.7999999999998 157.899 682.0799999999999]
 /Type /Annot
 >>
 endobj
 462 0 obj
 << /Border [0 0 0]
-/Dest (_produces_18)
+/Dest (_responses_20)
 /Subtype /Link
-/Rect [557.8905 741.7199999999999 563.76 756.0]
+/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
 463 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_consumes_3)
 /Subtype /Link
-/Rect [60.24000000000001 723.2399999999999 261.860794921875 737.52]
+/Rect [72.24000000000001 649.3199999999998 157.2375 663.5999999999999]
 /Type /Annot
 >>
 endobj
 464 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_consumes_3)
 /Subtype /Link
-/Rect [557.8905 723.2399999999999 563.76 737.52]
+/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
 465 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_14)
+/Dest (_produces_19)
 /Subtype /Link
-/Rect [72.24000000000001 704.7599999999999 163.71579492187502 719.04]
+/Rect [72.24000000000001 630.8399999999998 152.27100000000002 645.1199999999999]
 /Type /Annot
 >>
 endobj
 466 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_14)
+/Dest (_produces_19)
 /Subtype /Link
-/Rect [557.8905 704.7599999999999 563.76 719.04]
+/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
 467 0 obj
 << /Border [0 0 0]
-/Dest (_responses_20)
+/Dest (_route69)
 /Subtype /Link
-/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
+/Rect [60.24000000000001 612.3599999999998 350.38629492187505 626.6399999999999]
 /Type /Annot
 >>
 endobj
 468 0 obj
 << /Border [0 0 0]
-/Dest (_responses_20)
+/Dest (_route69)
 /Subtype /Link
-/Rect [552.021 686.2799999999999 563.76 700.56]
+/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
 469 0 obj
 << /Border [0 0 0]
-/Dest (_produces_19)
+/Dest (_parameters_16)
 /Subtype /Link
-/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
+/Rect [72.24000000000001 593.8799999999998 163.71579492187502 608.1599999999999]
 /Type /Annot
 >>
 endobj
 470 0 obj
 << /Border [0 0 0]
-/Dest (_produces_19)
+/Dest (_parameters_16)
 /Subtype /Link
-/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
+/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
 >>
 endobj
 471 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_responses_21)
 /Subtype /Link
-/Rect [60.24000000000001 649.3199999999998 339.560794921875 663.5999999999999]
+/Rect [72.24000000000001 575.3999999999997 157.899 589.6799999999998]
 /Type /Annot
 >>
 endobj
 472 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_responses_21)
 /Subtype /Link
-/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
+/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
 473 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_15)
+/Dest (_consumes_4)
 /Subtype /Link
-/Rect [72.24000000000001 630.8399999999998 163.71579492187502 645.1199999999999]
+/Rect [72.24000000000001 556.9199999999998 157.2375 571.1999999999998]
 /Type /Annot
 >>
 endobj
 474 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_15)
+/Dest (_consumes_4)
 /Subtype /Link
-/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
+/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
 /Type /Annot
 >>
 endobj
 475 0 obj
 << /Border [0 0 0]
-/Dest (_responses_21)
+/Dest (_produces_20)
 /Subtype /Link
-/Rect [72.24000000000001 612.3599999999998 157.899 626.6399999999999]
+/Rect [72.24000000000001 538.4399999999998 152.27100000000002 552.7199999999998]
 /Type /Annot
 >>
 endobj
 476 0 obj
 << /Border [0 0 0]
-/Dest (_responses_21)
+/Dest (_produces_20)
 /Subtype /Link
-/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
+/Rect [552.021 538.4399999999998 563.76 552.7199999999998]
 /Type /Annot
 >>
 endobj
 477 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_3)
+/Dest (_route68)
 /Subtype /Link
-/Rect [72.24000000000001 593.8799999999998 157.2375 608.1599999999999]
+/Rect [60.24000000000001 519.9599999999998 352.81158984375 534.2399999999998]
 /Type /Annot
 >>
 endobj
 478 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_3)
+/Dest (_route68)
 /Subtype /Link
-/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
+/Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
 479 0 obj
 << /Border [0 0 0]
-/Dest (_produces_20)
+/Dest (_parameters_17)
 /Subtype /Link
-/Rect [72.24000000000001 575.3999999999997 152.27100000000002 589.6799999999998]
+/Rect [72.24000000000001 501.4799999999998 163.71579492187502 515.7599999999998]
 /Type /Annot
 >>
 endobj
 480 0 obj
 << /Border [0 0 0]
-/Dest (_produces_20)
+/Dest (_parameters_17)
 /Subtype /Link
-/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
+/Rect [552.021 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
 481 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_responses_22)
 /Subtype /Link
-/Rect [60.24000000000001 556.9199999999998 350.38629492187505 571.1999999999998]
+/Rect [72.24000000000001 482.9999999999998 157.899 497.27999999999975]
 /Type /Annot
 >>
 endobj
 482 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_responses_22)
 /Subtype /Link
-/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
+/Rect [552.021 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
 483 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_16)
+/Dest (_consumes_5)
 /Subtype /Link
-/Rect [72.24000000000001 538.4399999999998 163.71579492187502 552.7199999999998]
+/Rect [72.24000000000001 464.51999999999975 157.2375 478.7999999999997]
 /Type /Annot
 >>
 endobj
 484 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_16)
+/Dest (_consumes_5)
 /Subtype /Link
-/Rect [552.021 538.4399999999998 563.76 552.7199999999998]
+/Rect [552.021 464.51999999999975 563.76 478.7999999999997]
 /Type /Annot
 >>
 endobj
 485 0 obj
 << /Border [0 0 0]
-/Dest (_responses_22)
+/Dest (_produces_21)
 /Subtype /Link
-/Rect [72.24000000000001 519.9599999999998 157.899 534.2399999999998]
+/Rect [72.24000000000001 446.03999999999974 152.27100000000002 460.3199999999997]
 /Type /Annot
 >>
 endobj
 486 0 obj
 << /Border [0 0 0]
-/Dest (_responses_22)
+/Dest (_produces_21)
 /Subtype /Link
-/Rect [552.021 519.9599999999998 563.76 534.2399999999998]
+/Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
 487 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_4)
+/Dest (_route65)
 /Subtype /Link
-/Rect [72.24000000000001 501.4799999999998 157.2375 515.7599999999998]
+/Rect [60.24000000000001 427.5599999999997 212.0595 441.8399999999997]
 /Type /Annot
 >>
 endobj
 488 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_4)
+/Dest (_route65)
 /Subtype /Link
-/Rect [552.021 501.4799999999998 563.76 515.7599999999998]
+/Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
 489 0 obj
 << /Border [0 0 0]
-/Dest (_produces_21)
+/Dest (_parameters_18)
 /Subtype /Link
-/Rect [72.24000000000001 482.9999999999998 152.27100000000002 497.27999999999975]
+/Rect [72.24000000000001 409.0799999999997 163.71579492187502 423.3599999999997]
 /Type /Annot
 >>
 endobj
 490 0 obj
 << /Border [0 0 0]
-/Dest (_produces_21)
+/Dest (_parameters_18)
 /Subtype /Link
-/Rect [552.021 482.9999999999998 563.76 497.27999999999975]
+/Rect [552.021 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
 491 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_responses_23)
 /Subtype /Link
-/Rect [60.24000000000001 464.51999999999975 352.81158984375 478.7999999999997]
+/Rect [72.24000000000001 390.5999999999997 157.899 404.87999999999965]
 /Type /Annot
 >>
 endobj
 492 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_responses_23)
 /Subtype /Link
-/Rect [552.021 464.51999999999975 563.76 478.7999999999997]
+/Rect [552.021 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
 493 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_17)
+/Dest (_produces_22)
 /Subtype /Link
-/Rect [72.24000000000001 446.03999999999974 163.71579492187502 460.3199999999997]
+/Rect [72.24000000000001 372.11999999999966 152.27100000000002 386.39999999999964]
 /Type /Annot
 >>
 endobj
 494 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_17)
+/Dest (_produces_22)
 /Subtype /Link
-/Rect [552.021 446.03999999999974 563.76 460.3199999999997]
+/Rect [552.021 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
 495 0 obj
 << /Border [0 0 0]
-/Dest (_responses_23)
+/Dest (_route87)
 /Subtype /Link
-/Rect [72.24000000000001 427.5599999999997 157.899 441.8399999999997]
+/Rect [60.24000000000001 353.63999999999965 221.091755859375 367.9199999999996]
 /Type /Annot
 >>
 endobj
 496 0 obj
 << /Border [0 0 0]
-/Dest (_responses_23)
+/Dest (_route87)
 /Subtype /Link
-/Rect [552.021 427.5599999999997 563.76 441.8399999999997]
+/Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
 497 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_5)
+/Dest (_responses_24)
 /Subtype /Link
-/Rect [72.24000000000001 409.0799999999997 157.2375 423.3599999999997]
+/Rect [72.24000000000001 335.1599999999996 157.899 349.4399999999996]
 /Type /Annot
 >>
 endobj
 498 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_5)
+/Dest (_responses_24)
 /Subtype /Link
-/Rect [552.021 409.0799999999997 563.76 423.3599999999997]
+/Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
 499 0 obj
 << /Border [0 0 0]
-/Dest (_produces_22)
+/Dest (_produces_23)
 /Subtype /Link
-/Rect [72.24000000000001 390.5999999999997 152.27100000000002 404.87999999999965]
+/Rect [72.24000000000001 316.6799999999996 152.27100000000002 330.9599999999996]
 /Type /Annot
 >>
 endobj
 500 0 obj
 << /Border [0 0 0]
-/Dest (_produces_22)
+/Dest (_produces_23)
 /Subtype /Link
-/Rect [552.021 390.5999999999997 563.76 404.87999999999965]
+/Rect [552.021 316.6799999999996 563.76 330.9599999999996]
 /Type /Annot
 >>
 endobj
 501 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
 /Subtype /Link
-/Rect [60.24000000000001 372.11999999999966 212.0595 386.39999999999964]
+/Rect [60.24000000000001 298.1999999999996 346.913255859375 312.47999999999956]
 /Type /Annot
 >>
 endobj
 502 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
 /Subtype /Link
-/Rect [552.021 372.11999999999966 563.76 386.39999999999964]
+/Rect [552.021 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
 503 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_18)
+/Dest (_parameters_19)
 /Subtype /Link
-/Rect [72.24000000000001 353.63999999999965 163.71579492187502 367.9199999999996]
+/Rect [72.24000000000001 279.7199999999996 163.71579492187502 293.99999999999955]
 /Type /Annot
 >>
 endobj
 504 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_18)
+/Dest (_parameters_19)
 /Subtype /Link
-/Rect [552.021 353.63999999999965 563.76 367.9199999999996]
+/Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
 505 0 obj
 << /Border [0 0 0]
-/Dest (_responses_24)
+/Dest (_responses_25)
 /Subtype /Link
-/Rect [72.24000000000001 335.1599999999996 157.899 349.4399999999996]
+/Rect [72.24000000000001 261.23999999999955 157.899 275.5199999999995]
 /Type /Annot
 >>
 endobj
 506 0 obj
 << /Border [0 0 0]
-/Dest (_responses_24)
+/Dest (_responses_25)
 /Subtype /Link
-/Rect [552.021 335.1599999999996 563.76 349.4399999999996]
+/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
 /Type /Annot
 >>
 endobj
 507 0 obj
 << /Border [0 0 0]
-/Dest (_produces_23)
+/Dest (_produces_24)
 /Subtype /Link
-/Rect [72.24000000000001 316.6799999999996 152.27100000000002 330.9599999999996]
+/Rect [72.24000000000001 242.7599999999995 152.27100000000002 257.0399999999995]
 /Type /Annot
 >>
 endobj
 508 0 obj
 << /Border [0 0 0]
-/Dest (_produces_23)
+/Dest (_produces_24)
 /Subtype /Link
-/Rect [552.021 316.6799999999996 563.76 330.9599999999996]
+/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
 /Type /Annot
 >>
 endobj
 509 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_v2_policytoscamodels_policymodeltype_get)
 /Subtype /Link
-/Rect [60.24000000000001 298.1999999999996 221.091755859375 312.47999999999956]
+/Rect [60.24000000000001 224.27999999999952 318.89925585937505 238.55999999999952]
 /Type /Annot
 >>
 endobj
 510 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_v2_policytoscamodels_policymodeltype_get)
 /Subtype /Link
-/Rect [552.021 298.1999999999996 563.76 312.47999999999956]
+/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
 511 0 obj
 << /Border [0 0 0]
-/Dest (_responses_25)
+/Dest (_parameters_20)
 /Subtype /Link
-/Rect [72.24000000000001 279.7199999999996 157.899 293.99999999999955]
+/Rect [72.24000000000001 205.79999999999953 163.71579492187502 220.07999999999953]
 /Type /Annot
 >>
 endobj
 512 0 obj
 << /Border [0 0 0]
-/Dest (_responses_25)
+/Dest (_parameters_20)
 /Subtype /Link
-/Rect [552.021 279.7199999999996 563.76 293.99999999999955]
+/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
 /Type /Annot
 >>
 endobj
 513 0 obj
 << /Border [0 0 0]
-/Dest (_produces_24)
+/Dest (_responses_26)
 /Subtype /Link
-/Rect [72.24000000000001 261.23999999999955 152.27100000000002 275.5199999999995]
+/Rect [72.24000000000001 187.31999999999954 157.899 201.59999999999954]
 /Type /Annot
 >>
 endobj
 514 0 obj
 << /Border [0 0 0]
-/Dest (_produces_24)
+/Dest (_responses_26)
 /Subtype /Link
-/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
+/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
 /Type /Annot
 >>
 endobj
 515 0 obj
 << /Border [0 0 0]
-/Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
+/Dest (_produces_25)
 /Subtype /Link
-/Rect [60.24000000000001 242.7599999999995 346.913255859375 257.0399999999995]
+/Rect [72.24000000000001 168.83999999999955 152.27100000000002 183.11999999999955]
 /Type /Annot
 >>
 endobj
 516 0 obj
 << /Border [0 0 0]
-/Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
+/Dest (_produces_25)
 /Subtype /Link
-/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
+/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
 /Type /Annot
 >>
 endobj
 517 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_19)
+/Dest (_route88)
 /Subtype /Link
-/Rect [72.24000000000001 224.27999999999952 163.71579492187502 238.55999999999952]
+/Rect [60.24000000000001 150.35999999999956 318.73125585937504 164.63999999999956]
 /Type /Annot
 >>
 endobj
 518 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_19)
+/Dest (_route88)
 /Subtype /Link
-/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
+/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
 519 0 obj
 << /Border [0 0 0]
-/Dest (_responses_26)
+/Dest (_parameters_21)
 /Subtype /Link
-/Rect [72.24000000000001 205.79999999999953 157.899 220.07999999999953]
+/Rect [72.24000000000001 131.87999999999957 163.71579492187502 146.15999999999957]
 /Type /Annot
 >>
 endobj
 520 0 obj
 << /Border [0 0 0]
-/Dest (_responses_26)
+/Dest (_parameters_21)
 /Subtype /Link
-/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
+/Rect [552.021 131.87999999999957 563.76 146.15999999999957]
 /Type /Annot
 >>
 endobj
 521 0 obj
 << /Border [0 0 0]
-/Dest (_produces_25)
+/Dest (_responses_27)
 /Subtype /Link
-/Rect [72.24000000000001 187.31999999999954 152.27100000000002 201.59999999999954]
+/Rect [72.24000000000001 113.39999999999958 157.899 127.67999999999958]
 /Type /Annot
 >>
 endobj
 522 0 obj
 << /Border [0 0 0]
-/Dest (_produces_25)
+/Dest (_responses_27)
 /Subtype /Link
-/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
+/Rect [552.021 113.39999999999958 563.76 127.67999999999958]
 /Type /Annot
 >>
 endobj
 523 0 obj
 << /Border [0 0 0]
-/Dest (_v2_policytoscamodels_policymodeltype_get)
+/Dest (_consumes_6)
 /Subtype /Link
-/Rect [60.24000000000001 168.83999999999955 318.89925585937505 183.11999999999955]
+/Rect [72.24000000000001 94.91999999999959 157.2375 109.19999999999959]
 /Type /Annot
 >>
 endobj
 524 0 obj
 << /Border [0 0 0]
-/Dest (_v2_policytoscamodels_policymodeltype_get)
+/Dest (_consumes_6)
 /Subtype /Link
-/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
+/Rect [552.021 94.91999999999959 563.76 109.19999999999959]
 /Type /Annot
 >>
 endobj
 525 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_20)
+/Dest (_produces_26)
 /Subtype /Link
-/Rect [72.24000000000001 150.35999999999956 163.71579492187502 164.63999999999956]
+/Rect [72.24000000000001 76.4399999999996 152.27100000000002 90.7199999999996]
 /Type /Annot
 >>
 endobj
 526 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_20)
+/Dest (_produces_26)
 /Subtype /Link
-/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
+/Rect [552.021 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
 527 0 obj
 << /Border [0 0 0]
-/Dest (_responses_27)
+/Dest (_route91)
 /Subtype /Link
-/Rect [72.24000000000001 131.87999999999957 157.899 146.15999999999957]
+/Rect [60.24000000000001 57.95999999999961 175.8555 72.23999999999961]
 /Type /Annot
 >>
 endobj
 528 0 obj
 << /Border [0 0 0]
-/Dest (_responses_27)
+/Dest (_route91)
 /Subtype /Link
-/Rect [552.021 131.87999999999957 563.76 146.15999999999957]
+/Rect [552.021 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
 529 0 obj
 << /Border [0 0 0]
-/Dest (_produces_26)
+/Dest (_responses_28)
 /Subtype /Link
-/Rect [72.24000000000001 113.39999999999958 152.27100000000002 127.67999999999958]
+/Rect [72.24000000000001 741.7199999999999 157.899 756.0]
 /Type /Annot
 >>
 endobj
 530 0 obj
 << /Border [0 0 0]
-/Dest (_produces_26)
+/Dest (_responses_28)
 /Subtype /Link
-/Rect [552.021 113.39999999999958 563.76 127.67999999999958]
+/Rect [552.021 741.7199999999999 563.76 756.0]
 /Type /Annot
 >>
 endobj
 531 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_produces_27)
 /Subtype /Link
-/Rect [60.24000000000001 94.91999999999959 318.73125585937504 109.19999999999959]
+/Rect [72.24000000000001 723.2399999999999 152.27100000000002 737.52]
 /Type /Annot
 >>
 endobj
 532 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_produces_27)
 /Subtype /Link
-/Rect [552.021 94.91999999999959 563.76 109.19999999999959]
+/Rect [552.021 723.2399999999999 563.76 737.52]
 /Type /Annot
 >>
 endobj
 533 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_21)
+/Dest (_v2_templates_names_get)
 /Subtype /Link
-/Rect [72.24000000000001 76.4399999999996 163.71579492187502 90.7199999999996]
+/Rect [60.24000000000001 704.7599999999999 211.818 719.04]
 /Type /Annot
 >>
 endobj
 534 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_21)
+/Dest (_v2_templates_names_get)
 /Subtype /Link
-/Rect [552.021 76.4399999999996 563.76 90.7199999999996]
+/Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
 535 0 obj
 << /Border [0 0 0]
-/Dest (_responses_28)
+/Dest (_responses_29)
 /Subtype /Link
-/Rect [72.24000000000001 57.95999999999961 157.899 72.23999999999961]
+/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
 /Type /Annot
 >>
 endobj
 536 0 obj
 << /Border [0 0 0]
-/Dest (_responses_28)
+/Dest (_responses_29)
 /Subtype /Link
-/Rect [552.021 57.95999999999961 563.76 72.23999999999961]
+/Rect [552.021 686.2799999999999 563.76 700.56]
 /Type /Annot
 >>
 endobj
 537 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_6)
+/Dest (_produces_28)
 /Subtype /Link
-/Rect [72.24000000000001 741.7199999999999 157.2375 756.0]
+/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
 /Type /Annot
 >>
 endobj
 538 0 obj
 << /Border [0 0 0]
-/Dest (_consumes_6)
+/Dest (_produces_28)
 /Subtype /Link
-/Rect [552.021 741.7199999999999 563.76 756.0]
+/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
 /Type /Annot
 >>
 endobj
 539 0 obj
 << /Border [0 0 0]
-/Dest (_produces_27)
+/Dest (_v2_templates_templatename_get)
 /Subtype /Link
-/Rect [72.24000000000001 723.2399999999999 152.27100000000002 737.52]
+/Rect [60.24000000000001 649.3199999999998 261.44100000000003 663.5999999999999]
 /Type /Annot
 >>
 endobj
 540 0 obj
 << /Border [0 0 0]
-/Dest (_produces_27)
+/Dest (_v2_templates_templatename_get)
 /Subtype /Link
-/Rect [552.021 723.2399999999999 563.76 737.52]
+/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
 541 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_parameters_22)
 /Subtype /Link
-/Rect [60.24000000000001 704.7599999999999 175.8555 719.04]
+/Rect [72.24000000000001 630.8399999999998 163.71579492187502 645.1199999999999]
 /Type /Annot
 >>
 endobj
 542 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_parameters_22)
 /Subtype /Link
-/Rect [552.021 704.7599999999999 563.76 719.04]
+/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
 /Type /Annot
 >>
 endobj
 543 0 obj
 << /Border [0 0 0]
-/Dest (_responses_29)
+/Dest (_responses_30)
 /Subtype /Link
-/Rect [72.24000000000001 686.2799999999999 157.899 700.56]
+/Rect [72.24000000000001 612.3599999999998 157.899 626.6399999999999]
 /Type /Annot
 >>
 endobj
 544 0 obj
 << /Border [0 0 0]
-/Dest (_responses_29)
+/Dest (_responses_30)
 /Subtype /Link
-/Rect [552.021 686.2799999999999 563.76 700.56]
+/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
 545 0 obj
 << /Border [0 0 0]
-/Dest (_produces_28)
+/Dest (_produces_29)
 /Subtype /Link
-/Rect [72.24000000000001 667.7999999999998 152.27100000000002 682.0799999999999]
+/Rect [72.24000000000001 593.8799999999998 152.27100000000002 608.1599999999999]
 /Type /Annot
 >>
 endobj
 546 0 obj
 << /Border [0 0 0]
-/Dest (_produces_28)
+/Dest (_produces_29)
 /Subtype /Link
-/Rect [552.021 667.7999999999998 563.76 682.0799999999999]
+/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
 /Type /Annot
 >>
 endobj
 547 0 obj
 << /Border [0 0 0]
-/Dest (_v2_templates_names_get)
+/Dest (_definitions)
 /Subtype /Link
-/Rect [60.24000000000001 649.3199999999998 211.818 663.5999999999999]
+/Rect [48.24000000000001 575.3999999999997 114.66300000000001 589.6799999999998]
 /Type /Annot
 >>
 endobj
 548 0 obj
 << /Border [0 0 0]
-/Dest (_v2_templates_names_get)
+/Dest (_definitions)
 /Subtype /Link
-/Rect [552.021 649.3199999999998 563.76 663.5999999999999]
+/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
 549 0 obj
 << /Border [0 0 0]
-/Dest (_responses_30)
+/Dest (_cldshealthcheck)
 /Subtype /Link
-/Rect [72.24000000000001 630.8399999999998 157.899 645.1199999999999]
+/Rect [60.24000000000001 556.9199999999998 164.26350000000002 571.1999999999998]
 /Type /Annot
 >>
 endobj
 550 0 obj
 << /Border [0 0 0]
-/Dest (_responses_30)
+/Dest (_cldshealthcheck)
 /Subtype /Link
-/Rect [552.021 630.8399999999998 563.76 645.1199999999999]
+/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
 /Type /Annot
 >>
 endobj
 551 0 obj
 << /Border [0 0 0]
-/Dest (_produces_29)
+/Dest (_dictionary)
 /Subtype /Link
-/Rect [72.24000000000001 612.3599999999998 152.27100000000002 626.6399999999999]
+/Rect [60.24000000000001 538.4399999999998 132.7425 552.7199999999998]
 /Type /Annot
 >>
 endobj
 552 0 obj
 << /Border [0 0 0]
-/Dest (_produces_29)
+/Dest (_dictionary)
 /Subtype /Link
-/Rect [552.021 612.3599999999998 563.76 626.6399999999999]
+/Rect [552.021 538.4399999999998 563.76 552.7199999999998]
 /Type /Annot
 >>
 endobj
 553 0 obj
 << /Border [0 0 0]
-/Dest (_v2_templates_templatename_get)
+/Dest (_dictionaryelement)
 /Subtype /Link
-/Rect [60.24000000000001 593.8799999999998 261.44100000000003 608.1599999999999]
+/Rect [60.24000000000001 519.9599999999998 174.1545 534.2399999999998]
 /Type /Annot
 >>
 endobj
 554 0 obj
 << /Border [0 0 0]
-/Dest (_v2_templates_templatename_get)
+/Dest (_dictionaryelement)
 /Subtype /Link
-/Rect [552.021 593.8799999999998 563.76 608.1599999999999]
+/Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
 555 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_22)
+/Dest (_externalcomponent)
 /Subtype /Link
-/Rect [72.24000000000001 575.3999999999997 163.71579492187502 589.6799999999998]
+/Rect [60.24000000000001 501.4799999999998 180.507 515.7599999999998]
 /Type /Annot
 >>
 endobj
 556 0 obj
 << /Border [0 0 0]
-/Dest (_parameters_22)
+/Dest (_externalcomponent)
 /Subtype /Link
-/Rect [552.021 575.3999999999997 563.76 589.6799999999998]
+/Rect [552.021 501.4799999999998 563.76 515.7599999999998]
 /Type /Annot
 >>
 endobj
 557 0 obj
 << /Border [0 0 0]
-/Dest (_responses_31)
+/Dest (_externalcomponentstate)
 /Subtype /Link
-/Rect [72.24000000000001 556.9199999999998 157.899 571.1999999999998]
+/Rect [60.24000000000001 482.9999999999998 205.11900000000003 497.27999999999975]
 /Type /Annot
 >>
 endobj
 558 0 obj
 << /Border [0 0 0]
-/Dest (_responses_31)
+/Dest (_externalcomponentstate)
 /Subtype /Link
-/Rect [552.021 556.9199999999998 563.76 571.1999999999998]
+/Rect [552.021 482.9999999999998 563.76 497.27999999999975]
 /Type /Annot
 >>
 endobj
 559 0 obj
 << /Border [0 0 0]
-/Dest (_produces_30)
+/Dest (_jsonarray)
 /Subtype /Link
-/Rect [72.24000000000001 538.4399999999998 152.27100000000002 552.7199999999998]
+/Rect [60.24000000000001 464.51999999999975 129.94908984375002 478.7999999999997]
 /Type /Annot
 >>
 endobj
 560 0 obj
 << /Border [0 0 0]
-/Dest (_produces_30)
+/Dest (_jsonarray)
 /Subtype /Link
-/Rect [552.021 538.4399999999998 563.76 552.7199999999998]
+/Rect [552.021 464.51999999999975 563.76 478.7999999999997]
 /Type /Annot
 >>
 endobj
 561 0 obj
 << /Border [0 0 0]
-/Dest (_definitions)
+/Dest (_jsonnull)
 /Subtype /Link
-/Rect [48.24000000000001 519.9599999999998 114.66300000000001 534.2399999999998]
+/Rect [60.24000000000001 446.03999999999974 122.43150000000001 460.3199999999997]
 /Type /Annot
 >>
 endobj
 562 0 obj
 << /Border [0 0 0]
-/Dest (_definitions)
+/Dest (_jsonnull)
 /Subtype /Link
-/Rect [552.021 519.9599999999998 563.76 534.2399999999998]
+/Rect [552.021 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
 563 0 obj
 << /Border [0 0 0]
-/Dest (_cldshealthcheck)
+/Dest (_jsonobject)
 /Subtype /Link
-/Rect [60.24000000000001 501.4799999999998 164.26350000000002 515.7599999999998]
+/Rect [60.24000000000001 427.5599999999997 133.09950000000003 441.8399999999997]
 /Type /Annot
 >>
 endobj
 564 0 obj
 << /Border [0 0 0]
-/Dest (_cldshealthcheck)
+/Dest (_jsonobject)
 /Subtype /Link
-/Rect [552.021 501.4799999999998 563.76 515.7599999999998]
+/Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
 565 0 obj
 << /Border [0 0 0]
-/Dest (_cldsinfo)
+/Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [60.24000000000001 482.9999999999998 121.37100000000001 497.27999999999975]
+/Rect [60.24000000000001 409.0799999999997 147.894 423.3599999999997]
 /Type /Annot
 >>
 endobj
 566 0 obj
 << /Border [0 0 0]
-/Dest (_cldsinfo)
+/Dest (_jsonprimitive)
 /Subtype /Link
-/Rect [552.021 482.9999999999998 563.76 497.27999999999975]
+/Rect [552.021 409.0799999999997 563.76 423.3599999999997]
 /Type /Annot
 >>
 endobj
 567 0 obj
 << /Border [0 0 0]
-/Dest (_dictionary)
+/Dest (_loop)
 /Subtype /Link
-/Rect [60.24000000000001 464.51999999999975 132.7425 478.7999999999997]
+/Rect [60.24000000000001 390.5999999999997 110.91300000000001 404.87999999999965]
 /Type /Annot
 >>
 endobj
 568 0 obj
 << /Border [0 0 0]
-/Dest (_dictionary)
+/Dest (_loop)
 /Subtype /Link
-/Rect [552.021 464.51999999999975 563.76 478.7999999999997]
+/Rect [552.021 390.5999999999997 563.76 404.87999999999965]
 /Type /Annot
 >>
 endobj
 569 0 obj
 << /Border [0 0 0]
-/Dest (_dictionaryelement)
+/Dest (_loopelementmodel)
 /Subtype /Link
-/Rect [60.24000000000001 446.03999999999974 174.1545 460.3199999999997]
+/Rect [60.24000000000001 372.11999999999966 183.531 386.39999999999964]
 /Type /Annot
 >>
 endobj
 570 0 obj
 << /Border [0 0 0]
-/Dest (_dictionaryelement)
+/Dest (_loopelementmodel)
 /Subtype /Link
-/Rect [552.021 446.03999999999974 563.76 460.3199999999997]
+/Rect [552.021 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
 571 0 obj
 << /Border [0 0 0]
-/Dest (_externalcomponent)
+/Dest (_looplog)
 /Subtype /Link
-/Rect [60.24000000000001 427.5599999999997 180.507 441.8399999999997]
+/Rect [60.24000000000001 353.63999999999965 129.16200000000003 367.9199999999996]
 /Type /Annot
 >>
 endobj
 572 0 obj
 << /Border [0 0 0]
-/Dest (_externalcomponent)
+/Dest (_looplog)
 /Subtype /Link
-/Rect [552.021 427.5599999999997 563.76 441.8399999999997]
+/Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
 573 0 obj
 << /Border [0 0 0]
-/Dest (_externalcomponentstate)
+/Dest (_looptemplate)
 /Subtype /Link
-/Rect [60.24000000000001 409.0799999999997 205.11900000000003 423.3599999999997]
+/Rect [60.24000000000001 335.1599999999996 157.46175585937502 349.4399999999996]
 /Type /Annot
 >>
 endobj
 574 0 obj
 << /Border [0 0 0]
-/Dest (_externalcomponentstate)
+/Dest (_looptemplate)
 /Subtype /Link
-/Rect [552.021 409.0799999999997 563.76 423.3599999999997]
+/Rect [552.021 335.1599999999996 563.76 349.4399999999996]
 /Type /Annot
 >>
 endobj
 575 0 obj
 << /Border [0 0 0]
-/Dest (_jsonarray)
+/Dest (_looptemplateloopelementmodel)
 /Subtype /Link
-/Rect [60.24000000000001 390.5999999999997 129.94908984375002 404.87999999999965]
+/Rect [60.24000000000001 316.6799999999996 255.174755859375 330.9599999999996]
 /Type /Annot
 >>
 endobj
 576 0 obj
 << /Border [0 0 0]
-/Dest (_jsonarray)
+/Dest (_looptemplateloopelementmodel)
 /Subtype /Link
-/Rect [552.021 390.5999999999997 563.76 404.87999999999965]
+/Rect [552.021 316.6799999999996 563.76 330.9599999999996]
 /Type /Annot
 >>
 endobj
 577 0 obj
 << /Border [0 0 0]
-/Dest (_jsonnull)
+/Dest (_microservicepolicy)
 /Subtype /Link
-/Rect [60.24000000000001 372.11999999999966 122.43150000000001 386.39999999999964]
+/Rect [60.24000000000001 298.1999999999996 181.74600000000004 312.47999999999956]
 /Type /Annot
 >>
 endobj
 578 0 obj
 << /Border [0 0 0]
-/Dest (_jsonnull)
+/Dest (_microservicepolicy)
 /Subtype /Link
-/Rect [552.021 372.11999999999966 563.76 386.39999999999964]
+/Rect [552.021 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
 579 0 obj
 << /Border [0 0 0]
-/Dest (_jsonobject)
+/Dest (_number)
 /Subtype /Link
-/Rect [60.24000000000001 353.63999999999965 133.09950000000003 367.9199999999996]
+/Rect [60.24000000000001 279.7199999999996 127.39800000000001 293.99999999999955]
 /Type /Annot
 >>
 endobj
 580 0 obj
 << /Border [0 0 0]
-/Dest (_jsonobject)
+/Dest (_number)
 /Subtype /Link
-/Rect [552.021 353.63999999999965 563.76 367.9199999999996]
+/Rect [552.021 279.7199999999996 563.76 293.99999999999955]
 /Type /Annot
 >>
 endobj
 581 0 obj
 << /Border [0 0 0]
-/Dest (_jsonprimitive)
+/Dest (_operationalpolicy)
 /Subtype /Link
-/Rect [60.24000000000001 335.1599999999996 153.76350000000002 349.4399999999996]
+/Rect [60.24000000000001 261.23999999999955 175.42479492187502 275.5199999999995]
 /Type /Annot
 >>
 endobj
 582 0 obj
 << /Border [0 0 0]
-/Dest (_jsonprimitive)
+/Dest (_operationalpolicy)
 /Subtype /Link
-/Rect [552.021 335.1599999999996 563.76 349.4399999999996]
+/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
 /Type /Annot
 >>
 endobj
 583 0 obj
 << /Border [0 0 0]
-/Dest (_loop)
+/Dest (_policymodel)
 /Subtype /Link
-/Rect [60.24000000000001 316.6799999999996 110.91300000000001 330.9599999999996]
+/Rect [60.24000000000001 242.7599999999995 147.11700000000002 257.0399999999995]
 /Type /Annot
 >>
 endobj
 584 0 obj
 << /Border [0 0 0]
-/Dest (_loop)
+/Dest (_policymodel)
 /Subtype /Link
-/Rect [552.021 316.6799999999996 563.76 330.9599999999996]
+/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
 /Type /Annot
 >>
 endobj
 585 0 obj
 << /Border [0 0 0]
-/Dest (_loopelementmodel)
+/Dest (_service)
 /Subtype /Link
-/Rect [60.24000000000001 298.1999999999996 183.531 312.47999999999956]
+/Rect [60.24000000000001 224.27999999999952 122.29500000000002 238.55999999999952]
 /Type /Annot
 >>
 endobj
 586 0 obj
 << /Border [0 0 0]
-/Dest (_loopelementmodel)
+/Dest (_service)
 /Subtype /Link
-/Rect [552.021 298.1999999999996 563.76 312.47999999999956]
+/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
 587 0 obj
-<< /Border [0 0 0]
-/Dest (_looplog)
-/Subtype /Link
-/Rect [60.24000000000001 279.7199999999996 129.16200000000003 293.99999999999955]
-/Type /Annot
+<< /Type /XObject
+/Subtype /Form
+/BBox [0 0 612.0 792.0]
+/Length 178
 >>
+stream
+q
+/DeviceRGB cs
+0.000 0.000 0.000 scn
+/DeviceRGB CS
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+q
+0.25 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 30.000 m
+563.760 30.000 l
+S
+Q
+Q
+
+endstream
 endobj
 588 0 obj
-<< /Border [0 0 0]
-/Dest (_looplog)
-/Subtype /Link
-/Rect [552.021 279.7199999999996 563.76 293.99999999999955]
-/Type /Annot
+<< /Type /Outlines
+/Count 143
+/First 589 0 R
+/Last 712 0 R
 >>
 endobj
 589 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [60.24000000000001 261.23999999999955 157.46175585937502 275.5199999999995]
-/Type /Annot
+<< /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
+/Parent 588 0 R
+/Count 0
+/Next 590 0 R
+/Dest [7 0 R /XYZ 0 792.0 null]
 >>
 endobj
 590 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplate)
-/Subtype /Link
-/Rect [552.021 261.23999999999955 563.76 275.5199999999995]
-/Type /Annot
+<< /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
+/Parent 588 0 R
+/Count 0
+/Next 591 0 R
+/Prev 589 0 R
+/Dest [10 0 R /XYZ 0 792.0 null]
 >>
 endobj
 591 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplateloopelementmodel)
-/Subtype /Link
-/Rect [60.24000000000001 242.7599999999995 255.174755859375 257.0399999999995]
-/Type /Annot
+<< /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
+/Parent 588 0 R
+/Count 2
+/First 592 0 R
+/Last 593 0 R
+/Next 594 0 R
+/Prev 590 0 R
+/Dest [18 0 R /XYZ 0 792.0 null]
 >>
 endobj
 592 0 obj
-<< /Border [0 0 0]
-/Dest (_looptemplateloopelementmodel)
-/Subtype /Link
-/Rect [552.021 242.7599999999995 563.76 257.0399999999995]
-/Type /Annot
+<< /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
+/Parent 591 0 R
+/Count 0
+/Next 593 0 R
+/Dest [18 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
 593 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [60.24000000000001 224.27999999999952 181.74600000000004 238.55999999999952]
-/Type /Annot
+<< /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
+/Parent 591 0 R
+/Count 0
+/Prev 592 0 R
+/Dest [18 0 R /XYZ 0 644.22 null]
 >>
 endobj
 594 0 obj
-<< /Border [0 0 0]
-/Dest (_microservicepolicy)
-/Subtype /Link
-/Rect [552.021 224.27999999999952 563.76 238.55999999999952]
-/Type /Annot
+<< /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
+/Parent 588 0 R
+/Count 117
+/First 595 0 R
+/Last 708 0 R
+/Next 712 0 R
+/Prev 591 0 R
+/Dest [27 0 R /XYZ 0 792.0 null]
 >>
 endobj
 595 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [60.24000000000001 205.79999999999953 127.39800000000001 220.07999999999953]
-/Type /Annot
+<< /Title <feff0032002e0031002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
+/Parent 594 0 R
+/Count 2
+/First 596 0 R
+/Last 597 0 R
+/Next 598 0 R
+/Dest [27 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
 596 0 obj
-<< /Border [0 0 0]
-/Dest (_number)
-/Subtype /Link
-/Rect [552.021 205.79999999999953 563.76 220.07999999999953]
-/Type /Annot
+<< /Title <feff0032002e0031002e0031002e00200052006500730070006f006e007300650073>
+/Parent 595 0 R
+/Count 0
+/Next 597 0 R
+/Dest [27 0 R /XYZ 0 672.0 null]
 >>
 endobj
 597 0 obj
-<< /Border [0 0 0]
-/Dest (_operationalpolicy)
-/Subtype /Link
-/Rect [60.24000000000001 187.31999999999954 175.42479492187502 201.59999999999954]
-/Type /Annot
+<< /Title <feff0032002e0031002e0032002e002000500072006f00640075006300650073>
+/Parent 595 0 R
+/Count 0
+/Prev 596 0 R
+/Dest [27 0 R /XYZ 0 566.8800000000001 null]
 >>
 endobj
 598 0 obj
-<< /Border [0 0 0]
-/Dest (_operationalpolicy)
-/Subtype /Link
-/Rect [552.021 187.31999999999954 563.76 201.59999999999954]
-/Type /Annot
+<< /Title <feff0032002e0032002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
+/Parent 594 0 R
+/Count 2
+/First 599 0 R
+/Last 600 0 R
+/Next 601 0 R
+/Prev 595 0 R
+/Dest [27 0 R /XYZ 0 510.60000000000025 null]
 >>
 endobj
 599 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [60.24000000000001 168.83999999999955 147.11700000000002 183.11999999999955]
-/Type /Annot
+<< /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
+/Parent 598 0 R
+/Count 0
+/Next 600 0 R
+/Dest [27 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
 600 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [552.021 168.83999999999955 563.76 183.11999999999955]
-/Type /Annot
+<< /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
+/Parent 598 0 R
+/Count 0
+/Prev 599 0 R
+/Dest [27 0 R /XYZ 0 379.6800000000002 null]
 >>
 endobj
 601 0 obj
-<< /Border [0 0 0]
-/Dest (_service)
-/Subtype /Link
-/Rect [60.24000000000001 150.35999999999956 122.29500000000002 164.63999999999956]
-/Type /Annot
+<< /Title <feff0032002e0033002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079>
+/Parent 594 0 R
+/Count 2
+/First 602 0 R
+/Last 603 0 R
+/Next 604 0 R
+/Prev 598 0 R
+/Dest [27 0 R /XYZ 0 323.40000000000015 null]
 >>
 endobj
 602 0 obj
-<< /Border [0 0 0]
-/Dest (_service)
-/Subtype /Link
-/Rect [552.021 150.35999999999956 563.76 164.63999999999956]
-/Type /Annot
+<< /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
+/Parent 601 0 R
+/Count 0
+/Next 603 0 R
+/Dest [27 0 R /XYZ 0 283.3200000000001 null]
 >>
 endobj
 603 0 obj
-<< /Type /XObject
-/Subtype /Form
-/BBox [0 0 612.0 792.0]
-/Length 178
+<< /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
+/Parent 601 0 R
+/Count 0
+/Prev 602 0 R
+/Dest [27 0 R /XYZ 0 178.2000000000001 null]
 >>
-stream
-q
-/DeviceRGB cs
-0.000 0.000 0.000 scn
-/DeviceRGB CS
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-q
-0.25 w
-/DeviceRGB CS
-0.867 0.867 0.867 SCN
-48.240 30.000 m
-563.760 30.000 l
-S
-Q
-Q
-
-endstream
 endobj
 604 0 obj
-<< /Type /Outlines
-/Count 147
+<< /Title <feff0032002e0034002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079>
+/Parent 594 0 R
+/Count 4
 /First 605 0 R
-/Last 731 0 R
+/Last 608 0 R
+/Next 609 0 R
+/Prev 601 0 R
+/Dest [27 0 R /XYZ 0 121.92000000000007 null]
 >>
 endobj
 605 0 obj
-<< /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
+<< /Title <feff0032002e0034002e0031002e00200050006100720061006d00650074006500720073>
 /Parent 604 0 R
 /Count 0
 /Next 606 0 R
-/Dest [7 0 R /XYZ 0 792.0 null]
+/Dest [43 0 R /XYZ 0 792.0 null]
 >>
 endobj
 606 0 obj
-<< /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
+<< /Title <feff0032002e0034002e0032002e00200052006500730070006f006e007300650073>
 /Parent 604 0 R
 /Count 0
 /Next 607 0 R
 /Prev 605 0 R
-/Dest [10 0 R /XYZ 0 792.0 null]
+/Dest [43 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 607 0 obj
-<< /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
+<< /Title <feff0032002e0034002e0033002e00200043006f006e00730075006d00650073>
 /Parent 604 0 R
-/Count 2
-/First 608 0 R
-/Last 609 0 R
-/Next 610 0 R
+/Count 0
+/Next 608 0 R
 /Prev 606 0 R
-/Dest [18 0 R /XYZ 0 792.0 null]
+/Dest [43 0 R /XYZ 0 548.1600000000003 null]
 >>
 endobj
 608 0 obj
-<< /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
-/Parent 607 0 R
+<< /Title <feff0032002e0034002e0034002e002000500072006f00640075006300650073>
+/Parent 604 0 R
 /Count 0
-/Next 609 0 R
-/Dest [18 0 R /XYZ 0 712.0799999999999 null]
+/Prev 607 0 R
+/Dest [43 0 R /XYZ 0 491.88000000000045 null]
 >>
 endobj
 609 0 obj
-<< /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
-/Parent 607 0 R
-/Count 0
-/Prev 608 0 R
-/Dest [18 0 R /XYZ 0 644.22 null]
+<< /Title <feff0032002e0035002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007300650063006f006e0064006100720079002f006e0061006d00650073>
+/Parent 594 0 R
+/Count 2
+/First 610 0 R
+/Last 611 0 R
+/Next 612 0 R
+/Prev 604 0 R
+/Dest [43 0 R /XYZ 0 435.6000000000004 null]
 >>
 endobj
 610 0 obj
-<< /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
-/Parent 604 0 R
-/Count 120
-/First 611 0 R
-/Last 727 0 R
-/Next 731 0 R
-/Prev 607 0 R
-/Dest [27 0 R /XYZ 0 792.0 null]
+<< /Title <feff0032002e0035002e0031002e00200052006500730070006f006e007300650073>
+/Parent 609 0 R
+/Count 0
+/Next 611 0 R
+/Dest [43 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
 611 0 obj
-<< /Title <feff0032002e0031002e00200047004500540020002f00760031002f0063006c00640073002f0063006c006400730049006e0066006f>
-/Parent 610 0 R
-/Count 2
-/First 612 0 R
-/Last 613 0 R
-/Next 614 0 R
-/Dest [27 0 R /XYZ 0 712.0799999999999 null]
+<< /Title <feff0032002e0035002e0032002e002000500072006f00640075006300650073>
+/Parent 609 0 R
+/Count 0
+/Prev 610 0 R
+/Dest [43 0 R /XYZ 0 290.4000000000003 null]
 >>
 endobj
 612 0 obj
-<< /Title <feff0032002e0031002e0031002e00200052006500730070006f006e007300650073>
-/Parent 611 0 R
-/Count 0
-/Next 613 0 R
-/Dest [27 0 R /XYZ 0 672.0 null]
+<< /Title <feff0032002e0036002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 613 0 R
+/Last 615 0 R
+/Next 616 0 R
+/Prev 609 0 R
+/Dest [43 0 R /XYZ 0 234.1200000000003 null]
 >>
 endobj
 613 0 obj
-<< /Title <feff0032002e0031002e0032002e002000500072006f00640075006300650073>
-/Parent 611 0 R
+<< /Title <feff0032002e0036002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 612 0 R
 /Count 0
-/Prev 612 0 R
-/Dest [27 0 R /XYZ 0 566.8800000000001 null]
+/Next 614 0 R
+/Dest [43 0 R /XYZ 0 194.04000000000028 null]
 >>
 endobj
 614 0 obj
-<< /Title <feff0032002e0032002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
-/Parent 610 0 R
-/Count 2
-/First 615 0 R
-/Last 616 0 R
-/Next 617 0 R
-/Prev 611 0 R
-/Dest [27 0 R /XYZ 0 510.60000000000025 null]
+<< /Title <feff0032002e0036002e0032002e00200052006500730070006f006e007300650073>
+/Parent 612 0 R
+/Count 0
+/Next 615 0 R
+/Prev 613 0 R
+/Dest [58 0 R /XYZ 0 792.0 null]
 >>
 endobj
 615 0 obj
-<< /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 614 0 R
+<< /Title <feff0032002e0036002e0033002e002000500072006f00640075006300650073>
+/Parent 612 0 R
 /Count 0
-/Next 616 0 R
-/Dest [27 0 R /XYZ 0 470.5200000000002 null]
+/Prev 614 0 R
+/Dest [58 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 616 0 obj
-<< /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
-/Parent 614 0 R
-/Count 0
-/Prev 615 0 R
-/Dest [27 0 R /XYZ 0 365.4000000000002 null]
+<< /Title <feff0032002e0037002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
+/Parent 594 0 R
+/Count 4
+/First 617 0 R
+/Last 620 0 R
+/Next 621 0 R
+/Prev 612 0 R
+/Dest [58 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
 617 0 obj
-<< /Title <feff0032002e0033002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
-/Parent 610 0 R
-/Count 2
-/First 618 0 R
-/Last 619 0 R
-/Next 620 0 R
-/Prev 614 0 R
-/Dest [27 0 R /XYZ 0 309.1200000000002 null]
+<< /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 616 0 R
+/Count 0
+/Next 618 0 R
+/Dest [58 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
 618 0 obj
-<< /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 617 0 R
+<< /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
+/Parent 616 0 R
 /Count 0
 /Next 619 0 R
-/Dest [27 0 R /XYZ 0 269.04000000000013 null]
+/Prev 617 0 R
+/Dest [58 0 R /XYZ 0 414.2400000000005 null]
 >>
 endobj
 619 0 obj
-<< /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
-/Parent 617 0 R
+<< /Title <feff0032002e0037002e0033002e00200043006f006e00730075006d00650073>
+/Parent 616 0 R
 /Count 0
+/Next 620 0 R
 /Prev 618 0 R
-/Dest [27 0 R /XYZ 0 178.20000000000013 null]
+/Dest [58 0 R /XYZ 0 309.12000000000046 null]
 >>
 endobj
 620 0 obj
-<< /Title <feff0032002e0034002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 610 0 R
-/Count 2
-/First 621 0 R
-/Last 622 0 R
-/Next 623 0 R
-/Prev 617 0 R
-/Dest [27 0 R /XYZ 0 121.9200000000001 null]
+<< /Title <feff0032002e0037002e0034002e002000500072006f00640075006300650073>
+/Parent 616 0 R
+/Count 0
+/Prev 619 0 R
+/Dest [58 0 R /XYZ 0 252.84000000000043 null]
 >>
 endobj
 621 0 obj
-<< /Title <feff0032002e0034002e0031002e00200052006500730070006f006e007300650073>
-/Parent 620 0 R
-/Count 0
-/Next 622 0 R
-/Dest [43 0 R /XYZ 0 792.0 null]
+<< /Title <feff0032002e0038002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 622 0 R
+/Last 624 0 R
+/Next 625 0 R
+/Prev 616 0 R
+/Dest [58 0 R /XYZ 0 196.5600000000004 null]
 >>
 endobj
 622 0 obj
-<< /Title <feff0032002e0034002e0032002e002000500072006f00640075006300650073>
-/Parent 620 0 R
+<< /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 621 0 R
 /Count 0
-/Prev 621 0 R
-/Dest [43 0 R /XYZ 0 653.2800000000002 null]
+/Next 623 0 R
+/Dest [58 0 R /XYZ 0 156.4800000000004 null]
 >>
 endobj
 623 0 obj
-<< /Title <feff0032002e0035002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 610 0 R
-/Count 4
-/First 624 0 R
-/Last 627 0 R
-/Next 628 0 R
-/Prev 620 0 R
-/Dest [43 0 R /XYZ 0 597.0000000000003 null]
+<< /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
+/Parent 621 0 R
+/Count 0
+/Next 624 0 R
+/Prev 622 0 R
+/Dest [72 0 R /XYZ 0 792.0 null]
 >>
 endobj
 624 0 obj
-<< /Title <feff0032002e0035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 623 0 R
+<< /Title <feff0032002e0038002e0033002e002000500072006f00640075006300650073>
+/Parent 621 0 R
 /Count 0
-/Next 625 0 R
-/Dest [43 0 R /XYZ 0 556.9200000000004 null]
+/Prev 623 0 R
+/Dest [72 0 R /XYZ 0 667.5600000000002 null]
 >>
 endobj
 625 0 obj
-<< /Title <feff0032002e0035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 623 0 R
-/Count 0
-/Next 626 0 R
-/Prev 624 0 R
-/Dest [43 0 R /XYZ 0 451.8000000000006 null]
+<< /Title <feff0032002e0039002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d002f0065006c0065006d0065006e00740073002f007b00730068006f00720074004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 626 0 R
+/Last 628 0 R
+/Next 629 0 R
+/Prev 621 0 R
+/Dest [72 0 R /XYZ 0 611.2800000000003 null]
 >>
 endobj
 626 0 obj
-<< /Title <feff0032002e0035002e0033002e00200043006f006e00730075006d00650073>
-/Parent 623 0 R
+<< /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 625 0 R
 /Count 0
 /Next 627 0 R
-/Prev 625 0 R
-/Dest [43 0 R /XYZ 0 346.6800000000005 null]
+/Dest [72 0 R /XYZ 0 543.1200000000005 null]
 >>
 endobj
 627 0 obj
-<< /Title <feff0032002e0035002e0034002e002000500072006f00640075006300650073>
-/Parent 623 0 R
+<< /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
+/Parent 625 0 R
 /Count 0
+/Next 628 0 R
 /Prev 626 0 R
-/Dest [43 0 R /XYZ 0 290.4000000000005 null]
+/Dest [72 0 R /XYZ 0 400.44000000000057 null]
 >>
 endobj
 628 0 obj
-<< /Title <feff0032002e0036002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007300650063006f006e0064006100720079002f006e0061006d00650073>
-/Parent 610 0 R
-/Count 2
-/First 629 0 R
-/Last 630 0 R
-/Next 631 0 R
-/Prev 623 0 R
-/Dest [43 0 R /XYZ 0 234.12000000000046 null]
+<< /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
+/Parent 625 0 R
+/Count 0
+/Prev 627 0 R
+/Dest [72 0 R /XYZ 0 309.6000000000006 null]
 >>
 endobj
 629 0 obj
-<< /Title <feff0032002e0036002e0031002e00200052006500730070006f006e007300650073>
-/Parent 628 0 R
-/Count 0
-/Next 630 0 R
-/Dest [43 0 R /XYZ 0 194.04000000000045 null]
+<< /Title <feff0032002e00310030002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 2
+/First 630 0 R
+/Last 631 0 R
+/Next 632 0 R
+/Prev 625 0 R
+/Dest [72 0 R /XYZ 0 253.32000000000056 null]
 >>
 endobj
 630 0 obj
-<< /Title <feff0032002e0036002e0032002e002000500072006f00640075006300650073>
-/Parent 628 0 R
+<< /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 629 0 R
 /Count 0
-/Prev 629 0 R
-/Dest [59 0 R /XYZ 0 792.0 null]
+/Next 631 0 R
+/Dest [72 0 R /XYZ 0 213.24000000000055 null]
 >>
 endobj
 631 0 obj
-<< /Title <feff0032002e0037002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 632 0 R
-/Last 634 0 R
-/Next 635 0 R
-/Prev 628 0 R
-/Dest [59 0 R /XYZ 0 702.1200000000001 null]
+<< /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
+/Parent 629 0 R
+/Count 0
+/Prev 630 0 R
+/Dest [72 0 R /XYZ 0 108.12000000000052 null]
 >>
 endobj
 632 0 obj
-<< /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 631 0 R
-/Count 0
-/Next 633 0 R
-/Dest [59 0 R /XYZ 0 662.0400000000002 null]
+<< /Title <feff0032002e00310031002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 633 0 R
+/Last 635 0 R
+/Next 636 0 R
+/Prev 629 0 R
+/Dest [84 0 R /XYZ 0 697.44 null]
 >>
 endobj
 633 0 obj
-<< /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 631 0 R
+<< /Title <feff0032002e00310031002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 632 0 R
 /Count 0
 /Next 634 0 R
-/Prev 632 0 R
-/Dest [59 0 R /XYZ 0 556.9200000000003 null]
+/Dest [84 0 R /XYZ 0 657.3600000000001 null]
 >>
 endobj
 634 0 obj
-<< /Title <feff0032002e0037002e0033002e002000500072006f00640075006300650073>
-/Parent 631 0 R
+<< /Title <feff0032002e00310031002e0032002e00200052006500730070006f006e007300650073>
+/Parent 632 0 R
 /Count 0
+/Next 635 0 R
 /Prev 633 0 R
-/Dest [59 0 R /XYZ 0 451.8000000000004 null]
+/Dest [84 0 R /XYZ 0 552.2400000000002 null]
 >>
 endobj
 635 0 obj
-<< /Title <feff0032002e0038002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 610 0 R
-/Count 4
-/First 636 0 R
-/Last 639 0 R
-/Next 640 0 R
-/Prev 631 0 R
-/Dest [59 0 R /XYZ 0 395.5200000000004 null]
+<< /Title <feff0032002e00310031002e0033002e002000500072006f00640075006300650073>
+/Parent 632 0 R
+/Count 0
+/Prev 634 0 R
+/Dest [84 0 R /XYZ 0 447.12000000000035 null]
 >>
 endobj
 636 0 obj
-<< /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 635 0 R
-/Count 0
-/Next 637 0 R
-/Dest [59 0 R /XYZ 0 355.44000000000034 null]
+<< /Title <feff0032002e00310032002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
+/Parent 594 0 R
+/Count 2
+/First 637 0 R
+/Last 638 0 R
+/Next 639 0 R
+/Prev 632 0 R
+/Dest [84 0 R /XYZ 0 390.8400000000003 null]
 >>
 endobj
 637 0 obj
-<< /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 635 0 R
+<< /Title <feff0032002e00310032002e0031002e00200052006500730070006f006e007300650073>
+/Parent 636 0 R
 /Count 0
 /Next 638 0 R
-/Prev 636 0 R
-/Dest [59 0 R /XYZ 0 212.76000000000028 null]
+/Dest [84 0 R /XYZ 0 350.7600000000003 null]
 >>
 endobj
 638 0 obj
-<< /Title <feff0032002e0038002e0033002e00200043006f006e00730075006d00650073>
-/Parent 635 0 R
+<< /Title <feff0032002e00310032002e0032002e002000500072006f00640075006300650073>
+/Parent 636 0 R
 /Count 0
-/Next 639 0 R
 /Prev 637 0 R
-/Dest [59 0 R /XYZ 0 107.64000000000024 null]
+/Dest [84 0 R /XYZ 0 245.6400000000002 null]
 >>
 endobj
 639 0 obj
-<< /Title <feff0032002e0038002e0034002e002000500072006f00640075006300650073>
-/Parent 635 0 R
-/Count 0
-/Prev 638 0 R
-/Dest [73 0 R /XYZ 0 792.0 null]
+<< /Title <feff0032002e00310033002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 640 0 R
+/Last 642 0 R
+/Next 643 0 R
+/Prev 636 0 R
+/Dest [84 0 R /XYZ 0 189.36000000000018 null]
 >>
 endobj
 640 0 obj
-<< /Title <feff0032002e0039002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 641 0 R
-/Last 643 0 R
-/Next 644 0 R
-/Prev 635 0 R
-/Dest [73 0 R /XYZ 0 702.1200000000001 null]
+<< /Title <feff0032002e00310033002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 639 0 R
+/Count 0
+/Next 641 0 R
+/Dest [84 0 R /XYZ 0 149.28000000000017 null]
 >>
 endobj
 641 0 obj
-<< /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 640 0 R
+<< /Title <feff0032002e00310033002e0032002e00200052006500730070006f006e007300650073>
+/Parent 639 0 R
 /Count 0
 /Next 642 0 R
-/Dest [73 0 R /XYZ 0 662.0400000000002 null]
+/Prev 640 0 R
+/Dest [97 0 R /XYZ 0 792.0 null]
 >>
 endobj
 642 0 obj
-<< /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 640 0 R
+<< /Title <feff0032002e00310033002e0033002e002000500072006f00640075006300650073>
+/Parent 639 0 R
 /Count 0
-/Next 643 0 R
 /Prev 641 0 R
-/Dest [73 0 R /XYZ 0 556.9200000000003 null]
+/Dest [97 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 643 0 obj
-<< /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
-/Parent 640 0 R
-/Count 0
-/Prev 642 0 R
-/Dest [73 0 R /XYZ 0 466.0800000000005 null]
+<< /Title <feff0032002e00310034002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004f00700050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 644 0 R
+/Last 646 0 R
+/Next 647 0 R
+/Prev 639 0 R
+/Dest [97 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
 644 0 obj
-<< /Title <feff0032002e00310030002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d002f0065006c0065006d0065006e00740073002f007b00730068006f00720074004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 645 0 R
-/Last 647 0 R
-/Next 648 0 R
-/Prev 640 0 R
-/Dest [73 0 R /XYZ 0 409.80000000000047 null]
+<< /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 643 0 R
+/Count 0
+/Next 645 0 R
+/Dest [97 0 R /XYZ 0 528.8400000000005 null]
 >>
 endobj
 645 0 obj
-<< /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 644 0 R
+<< /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
+/Parent 643 0 R
 /Count 0
 /Next 646 0 R
-/Dest [73 0 R /XYZ 0 341.64000000000044 null]
+/Prev 644 0 R
+/Dest [97 0 R /XYZ 0 423.72000000000054 null]
 >>
 endobj
 646 0 obj
-<< /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 644 0 R
+<< /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
+/Parent 643 0 R
 /Count 0
-/Next 647 0 R
 /Prev 645 0 R
-/Dest [73 0 R /XYZ 0 198.9600000000004 null]
+/Dest [97 0 R /XYZ 0 318.6000000000005 null]
 >>
 endobj
 647 0 obj
-<< /Title <feff0032002e00310030002e0033002e002000500072006f00640075006300650073>
-/Parent 644 0 R
-/Count 0
-/Prev 646 0 R
-/Dest [73 0 R /XYZ 0 108.12000000000037 null]
+<< /Title <feff0032002e00310035002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 648 0 R
+/Last 650 0 R
+/Next 651 0 R
+/Prev 643 0 R
+/Dest [97 0 R /XYZ 0 262.32000000000045 null]
 >>
 endobj
 648 0 obj
-<< /Title <feff0032002e00310031002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 2
-/First 649 0 R
-/Last 650 0 R
-/Next 651 0 R
-/Prev 644 0 R
-/Dest [85 0 R /XYZ 0 792.0 null]
+<< /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 647 0 R
+/Count 0
+/Next 649 0 R
+/Dest [97 0 R /XYZ 0 222.24000000000046 null]
 >>
 endobj
 649 0 obj
-<< /Title <feff0032002e00310031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 648 0 R
+<< /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
+/Parent 647 0 R
 /Count 0
 /Next 650 0 R
-/Dest [85 0 R /XYZ 0 718.32 null]
+/Prev 648 0 R
+/Dest [97 0 R /XYZ 0 117.12000000000043 null]
 >>
 endobj
 650 0 obj
-<< /Title <feff0032002e00310031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 648 0 R
+<< /Title <feff0032002e00310035002e0033002e002000500072006f00640075006300650073>
+/Parent 647 0 R
 /Count 0
 /Prev 649 0 R
-/Dest [85 0 R /XYZ 0 613.2000000000003 null]
+/Dest [110 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
 651 0 obj
-<< /Title <feff0032002e00310032002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
+<< /Title <feff0032002e00310036002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
 /Count 3
 /First 652 0 R
 /Last 654 0 R
 /Next 655 0 R
-/Prev 648 0 R
-/Dest [85 0 R /XYZ 0 522.3600000000005 null]
+/Prev 647 0 R
+/Dest [110 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
 652 0 obj
-<< /Title <feff0032002e00310032002e0031002e00200050006100720061006d00650074006500720073>
+<< /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
 /Parent 651 0 R
 /Count 0
 /Next 653 0 R
-/Dest [85 0 R /XYZ 0 482.2800000000005 null]
+/Dest [110 0 R /XYZ 0 586.8000000000003 null]
 >>
 endobj
 653 0 obj
-<< /Title <feff0032002e00310032002e0032002e00200052006500730070006f006e007300650073>
+<< /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
 /Parent 651 0 R
 /Count 0
 /Next 654 0 R
 /Prev 652 0 R
-/Dest [85 0 R /XYZ 0 377.1600000000005 null]
+/Dest [110 0 R /XYZ 0 481.68000000000046 null]
 >>
 endobj
 654 0 obj
-<< /Title <feff0032002e00310032002e0033002e002000500072006f00640075006300650073>
+<< /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
 /Parent 651 0 R
 /Count 0
 /Prev 653 0 R
-/Dest [85 0 R /XYZ 0 272.0400000000004 null]
+/Dest [110 0 R /XYZ 0 376.5600000000004 null]
 >>
 endobj
 655 0 obj
-<< /Title <feff0032002e00310033002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
-/Parent 610 0 R
-/Count 2
+<< /Title <feff0032002e00310037002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
 /First 656 0 R
-/Last 657 0 R
-/Next 658 0 R
+/Last 658 0 R
+/Next 659 0 R
 /Prev 651 0 R
-/Dest [85 0 R /XYZ 0 215.76000000000042 null]
+/Dest [110 0 R /XYZ 0 320.28000000000037 null]
 >>
 endobj
 656 0 obj
-<< /Title <feff0032002e00310033002e0031002e00200052006500730070006f006e007300650073>
+<< /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
 /Parent 655 0 R
 /Count 0
 /Next 657 0 R
-/Dest [85 0 R /XYZ 0 175.6800000000004 null]
+/Dest [110 0 R /XYZ 0 280.20000000000033 null]
 >>
 endobj
 657 0 obj
-<< /Title <feff0032002e00310033002e0032002e002000500072006f00640075006300650073>
+<< /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
 /Parent 655 0 R
 /Count 0
+/Next 658 0 R
 /Prev 656 0 R
-/Dest [98 0 R /XYZ 0 792.0 null]
+/Dest [110 0 R /XYZ 0 175.08000000000033 null]
 >>
 endobj
 658 0 obj
-<< /Title <feff0032002e00310034002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 659 0 R
-/Last 661 0 R
-/Next 662 0 R
-/Prev 655 0 R
-/Dest [98 0 R /XYZ 0 702.1200000000001 null]
+<< /Title <feff0032002e00310037002e0033002e002000500072006f00640075006300650073>
+/Parent 655 0 R
+/Count 0
+/Prev 657 0 R
+/Dest [124 0 R /XYZ 0 792.0 null]
 >>
 endobj
 659 0 obj
-<< /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 658 0 R
-/Count 0
-/Next 660 0 R
-/Dest [98 0 R /XYZ 0 662.0400000000002 null]
+<< /Title <feff0032002e00310038002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 660 0 R
+/Last 662 0 R
+/Next 663 0 R
+/Prev 655 0 R
+/Dest [124 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 660 0 obj
-<< /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 658 0 R
+<< /Title <feff0032002e00310038002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 659 0 R
 /Count 0
 /Next 661 0 R
-/Prev 659 0 R
-/Dest [98 0 R /XYZ 0 556.9200000000003 null]
+/Dest [124 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
 661 0 obj
-<< /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
-/Parent 658 0 R
+<< /Title <feff0032002e00310038002e0032002e00200052006500730070006f006e007300650073>
+/Parent 659 0 R
 /Count 0
+/Next 662 0 R
 /Prev 660 0 R
-/Dest [98 0 R /XYZ 0 451.8000000000004 null]
+/Dest [124 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
 662 0 obj
-<< /Title <feff0032002e00310035002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004f00700050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 663 0 R
-/Last 665 0 R
-/Next 666 0 R
-/Prev 658 0 R
-/Dest [98 0 R /XYZ 0 395.5200000000004 null]
+<< /Title <feff0032002e00310038002e0033002e002000500072006f00640075006300650073>
+/Parent 659 0 R
+/Count 0
+/Prev 661 0 R
+/Dest [124 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
 663 0 obj
-<< /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 662 0 R
-/Count 0
-/Next 664 0 R
-/Dest [98 0 R /XYZ 0 327.36000000000035 null]
+<< /Title <feff0032002e00310039002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 3
+/First 664 0 R
+/Last 666 0 R
+/Next 667 0 R
+/Prev 659 0 R
+/Dest [124 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
 664 0 obj
-<< /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 662 0 R
+<< /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 663 0 R
 /Count 0
 /Next 665 0 R
-/Prev 663 0 R
-/Dest [98 0 R /XYZ 0 222.2400000000003 null]
+/Dest [124 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
 665 0 obj
-<< /Title <feff0032002e00310035002e0033002e002000500072006f00640075006300650073>
-/Parent 662 0 R
+<< /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
+/Parent 663 0 R
 /Count 0
+/Next 666 0 R
 /Prev 664 0 R
-/Dest [98 0 R /XYZ 0 117.12000000000026 null]
+/Dest [124 0 R /XYZ 0 250.32000000000033 null]
 >>
 endobj
 666 0 obj
-<< /Title <feff0032002e00310036002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 667 0 R
-/Last 669 0 R
-/Next 670 0 R
-/Prev 662 0 R
-/Dest [111 0 R /XYZ 0 792.0 null]
+<< /Title <feff0032002e00310039002e0033002e002000500072006f00640075006300650073>
+/Parent 663 0 R
+/Count 0
+/Prev 665 0 R
+/Dest [124 0 R /XYZ 0 145.2000000000003 null]
 >>
 endobj
 667 0 obj
-<< /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 666 0 R
-/Count 0
-/Next 668 0 R
-/Dest [111 0 R /XYZ 0 718.32 null]
+<< /Title <feff0032002e00320030002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 4
+/First 668 0 R
+/Last 671 0 R
+/Next 672 0 R
+/Prev 663 0 R
+/Dest [137 0 R /XYZ 0 792.0 null]
 >>
 endobj
 668 0 obj
-<< /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 666 0 R
+<< /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 667 0 R
 /Count 0
 /Next 669 0 R
-/Prev 667 0 R
-/Dest [111 0 R /XYZ 0 613.2000000000003 null]
+/Dest [137 0 R /XYZ 0 718.32 null]
 >>
 endobj
 669 0 obj
-<< /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
-/Parent 666 0 R
+<< /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
+/Parent 667 0 R
 /Count 0
+/Next 670 0 R
 /Prev 668 0 R
-/Dest [111 0 R /XYZ 0 508.0800000000004 null]
+/Dest [137 0 R /XYZ 0 575.6400000000001 null]
 >>
 endobj
 670 0 obj
-<< /Title <feff0032002e00310037002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 671 0 R
-/Last 673 0 R
-/Next 674 0 R
-/Prev 666 0 R
-/Dest [111 0 R /XYZ 0 451.80000000000035 null]
+<< /Title <feff0032002e00320030002e0033002e00200043006f006e00730075006d00650073>
+/Parent 667 0 R
+/Count 0
+/Next 671 0 R
+/Prev 669 0 R
+/Dest [137 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
 671 0 obj
-<< /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 670 0 R
+<< /Title <feff0032002e00320030002e0034002e002000500072006f00640075006300650073>
+/Parent 667 0 R
 /Count 0
-/Next 672 0 R
-/Dest [111 0 R /XYZ 0 411.7200000000003 null]
+/Prev 670 0 R
+/Dest [137 0 R /XYZ 0 414.2400000000002 null]
 >>
 endobj
 672 0 obj
-<< /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 670 0 R
-/Count 0
-/Next 673 0 R
-/Prev 671 0 R
-/Dest [111 0 R /XYZ 0 306.6000000000003 null]
+<< /Title <feff0032002e00320031002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 4
+/First 673 0 R
+/Last 676 0 R
+/Next 677 0 R
+/Prev 667 0 R
+/Dest [137 0 R /XYZ 0 357.96000000000015 null]
 >>
 endobj
 673 0 obj
-<< /Title <feff0032002e00310037002e0033002e002000500072006f00640075006300650073>
-/Parent 670 0 R
+<< /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 672 0 R
 /Count 0
-/Prev 672 0 R
-/Dest [111 0 R /XYZ 0 201.48000000000027 null]
+/Next 674 0 R
+/Dest [137 0 R /XYZ 0 289.8000000000001 null]
 >>
 endobj
 674 0 obj
-<< /Title <feff0032002e00310038002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 675 0 R
-/Last 677 0 R
-/Next 678 0 R
-/Prev 670 0 R
-/Dest [111 0 R /XYZ 0 145.20000000000024 null]
+<< /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
+/Parent 672 0 R
+/Count 0
+/Next 675 0 R
+/Prev 673 0 R
+/Dest [137 0 R /XYZ 0 147.1200000000001 null]
 >>
 endobj
 675 0 obj
-<< /Title <feff0032002e00310038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 674 0 R
+<< /Title <feff0032002e00320031002e0033002e00200043006f006e00730075006d00650073>
+/Parent 672 0 R
 /Count 0
 /Next 676 0 R
-/Dest [111 0 R /XYZ 0 105.12000000000023 null]
+/Prev 674 0 R
+/Dest [151 0 R /XYZ 0 792.0 null]
 >>
 endobj
 676 0 obj
-<< /Title <feff0032002e00310038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 674 0 R
+<< /Title <feff0032002e00320031002e0034002e002000500072006f00640075006300650073>
+/Parent 672 0 R
 /Count 0
-/Next 677 0 R
 /Prev 675 0 R
-/Dest [126 0 R /XYZ 0 683.1600000000001 null]
+/Dest [151 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
 677 0 obj
-<< /Title <feff0032002e00310038002e0033002e002000500072006f00640075006300650073>
-/Parent 674 0 R
-/Count 0
-/Prev 676 0 R
-/Dest [126 0 R /XYZ 0 578.0400000000002 null]
+<< /Title <feff0032002e00320032002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
+/Count 4
+/First 678 0 R
+/Last 681 0 R
+/Next 682 0 R
+/Prev 672 0 R
+/Dest [151 0 R /XYZ 0 645.8400000000003 null]
 >>
 endobj
 678 0 obj
-<< /Title <feff0032002e00310039002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 679 0 R
-/Last 681 0 R
-/Next 682 0 R
-/Prev 674 0 R
-/Dest [126 0 R /XYZ 0 521.7600000000003 null]
+<< /Title <feff0032002e00320032002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 677 0 R
+/Count 0
+/Next 679 0 R
+/Dest [151 0 R /XYZ 0 577.6800000000004 null]
 >>
 endobj
 679 0 obj
-<< /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 678 0 R
+<< /Title <feff0032002e00320032002e0032002e00200052006500730070006f006e007300650073>
+/Parent 677 0 R
 /Count 0
 /Next 680 0 R
-/Dest [126 0 R /XYZ 0 481.68000000000035 null]
+/Prev 678 0 R
+/Dest [151 0 R /XYZ 0 435.0000000000005 null]
 >>
 endobj
 680 0 obj
-<< /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 678 0 R
+<< /Title <feff0032002e00320032002e0033002e00200043006f006e00730075006d00650073>
+/Parent 677 0 R
 /Count 0
 /Next 681 0 R
 /Prev 679 0 R
-/Dest [126 0 R /XYZ 0 376.56000000000034 null]
+/Dest [151 0 R /XYZ 0 329.88000000000045 null]
 >>
 endobj
 681 0 obj
-<< /Title <feff0032002e00310039002e0033002e002000500072006f00640075006300650073>
-/Parent 678 0 R
+<< /Title <feff0032002e00320032002e0034002e002000500072006f00640075006300650073>
+/Parent 677 0 R
 /Count 0
 /Prev 680 0 R
-/Dest [126 0 R /XYZ 0 271.4400000000003 null]
+/Dest [151 0 R /XYZ 0 273.6000000000004 null]
 >>
 endobj
 682 0 obj
-<< /Title <feff0032002e00320030002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
+<< /Title <feff0032002e00320033002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
+/Parent 594 0 R
 /Count 3
 /First 683 0 R
 /Last 685 0 R
 /Next 686 0 R
-/Prev 678 0 R
-/Dest [126 0 R /XYZ 0 215.16000000000028 null]
+/Prev 677 0 R
+/Dest [151 0 R /XYZ 0 217.32000000000042 null]
 >>
 endobj
 683 0 obj
-<< /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
+<< /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
 /Parent 682 0 R
 /Count 0
 /Next 684 0 R
-/Dest [126 0 R /XYZ 0 175.08000000000027 null]
+/Dest [151 0 R /XYZ 0 177.2400000000004 null]
 >>
 endobj
 684 0 obj
-<< /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
+<< /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
 /Parent 682 0 R
 /Count 0
 /Next 685 0 R
 /Prev 683 0 R
-/Dest [137 0 R /XYZ 0 792.0 null]
+/Dest [165 0 R /XYZ 0 792.0 null]
 >>
 endobj
 685 0 obj
-<< /Title <feff0032002e00320030002e0033002e002000500072006f00640075006300650073>
+<< /Title <feff0032002e00320033002e0033002e002000500072006f00640075006300650073>
 /Parent 682 0 R
 /Count 0
 /Prev 684 0 R
-/Dest [137 0 R /XYZ 0 653.2800000000002 null]
+/Dest [165 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
 686 0 obj
-<< /Title <feff0032002e00320031002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 4
+<< /Title <feff0032002e00320034002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
+/Parent 594 0 R
+/Count 2
 /First 687 0 R
-/Last 690 0 R
-/Next 691 0 R
+/Last 688 0 R
+/Next 689 0 R
 /Prev 682 0 R
-/Dest [137 0 R /XYZ 0 597.0000000000003 null]
+/Dest [165 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
 687 0 obj
-<< /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
+<< /Title <feff0032002e00320034002e0031002e00200052006500730070006f006e007300650073>
 /Parent 686 0 R
 /Count 0
 /Next 688 0 R
-/Dest [137 0 R /XYZ 0 556.9200000000004 null]
+/Dest [165 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
 688 0 obj
-<< /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
+<< /Title <feff0032002e00320034002e0032002e002000500072006f00640075006300650073>
 /Parent 686 0 R
 /Count 0
-/Next 689 0 R
 /Prev 687 0 R
-/Dest [137 0 R /XYZ 0 414.2400000000005 null]
+/Dest [165 0 R /XYZ 0 451.8000000000005 null]
 >>
 endobj
 689 0 obj
-<< /Title <feff0032002e00320031002e0033002e00200043006f006e00730075006d00650073>
-/Parent 686 0 R
-/Count 0
-/Next 690 0 R
-/Prev 688 0 R
-/Dest [137 0 R /XYZ 0 309.12000000000046 null]
+<< /Title <feff0032002e00320035002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f00790061006d006c002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
+/Parent 594 0 R
+/Count 3
+/First 690 0 R
+/Last 692 0 R
+/Next 693 0 R
+/Prev 686 0 R
+/Dest [165 0 R /XYZ 0 395.5200000000005 null]
 >>
 endobj
 690 0 obj
-<< /Title <feff0032002e00320031002e0034002e002000500072006f00640075006300650073>
-/Parent 686 0 R
+<< /Title <feff0032002e00320035002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 689 0 R
 /Count 0
-/Prev 689 0 R
-/Dest [137 0 R /XYZ 0 252.84000000000043 null]
+/Next 691 0 R
+/Dest [165 0 R /XYZ 0 327.36000000000047 null]
 >>
 endobj
 691 0 obj
-<< /Title <feff0032002e00320032002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 4
-/First 692 0 R
-/Last 695 0 R
-/Next 696 0 R
-/Prev 686 0 R
-/Dest [137 0 R /XYZ 0 196.5600000000004 null]
+<< /Title <feff0032002e00320035002e0032002e00200052006500730070006f006e007300650073>
+/Parent 689 0 R
+/Count 0
+/Next 692 0 R
+/Prev 690 0 R
+/Dest [165 0 R /XYZ 0 222.2400000000004 null]
 >>
 endobj
 692 0 obj
-<< /Title <feff0032002e00320032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 691 0 R
+<< /Title <feff0032002e00320035002e0033002e002000500072006f00640075006300650073>
+/Parent 689 0 R
 /Count 0
-/Next 693 0 R
-/Dest [137 0 R /XYZ 0 128.40000000000038 null]
+/Prev 691 0 R
+/Dest [165 0 R /XYZ 0 117.12000000000037 null]
 >>
 endobj
 693 0 obj
-<< /Title <feff0032002e00320032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 691 0 R
-/Count 0
-/Next 694 0 R
-/Prev 692 0 R
-/Dest [153 0 R /XYZ 0 645.5999999999999 null]
+<< /Title <feff0032002e00320036002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
+/Parent 594 0 R
+/Count 3
+/First 694 0 R
+/Last 696 0 R
+/Next 697 0 R
+/Prev 689 0 R
+/Dest [178 0 R /XYZ 0 792.0 null]
 >>
 endobj
 694 0 obj
-<< /Title <feff0032002e00320032002e0033002e00200043006f006e00730075006d00650073>
-/Parent 691 0 R
+<< /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 693 0 R
 /Count 0
 /Next 695 0 R
-/Prev 693 0 R
-/Dest [153 0 R /XYZ 0 540.48 null]
+/Dest [178 0 R /XYZ 0 718.32 null]
 >>
 endobj
 695 0 obj
-<< /Title <feff0032002e00320032002e0034002e002000500072006f00640075006300650073>
-/Parent 691 0 R
+<< /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
+/Parent 693 0 R
 /Count 0
+/Next 696 0 R
 /Prev 694 0 R
-/Dest [153 0 R /XYZ 0 484.20000000000016 null]
+/Dest [178 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
 696 0 obj
-<< /Title <feff0032002e00320033002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 4
-/First 697 0 R
-/Last 700 0 R
-/Next 701 0 R
-/Prev 691 0 R
-/Dest [153 0 R /XYZ 0 427.92000000000013 null]
+<< /Title <feff0032002e00320036002e0033002e002000500072006f00640075006300650073>
+/Parent 693 0 R
+/Count 0
+/Prev 695 0 R
+/Dest [178 0 R /XYZ 0 508.0800000000004 null]
 >>
 endobj
 697 0 obj
-<< /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 696 0 R
-/Count 0
-/Next 698 0 R
-/Dest [153 0 R /XYZ 0 359.7600000000001 null]
+<< /Title <feff0032002e00320037002e00200050005500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
+/Parent 594 0 R
+/Count 4
+/First 698 0 R
+/Last 701 0 R
+/Next 702 0 R
+/Prev 693 0 R
+/Dest [178 0 R /XYZ 0 451.80000000000035 null]
 >>
 endobj
 698 0 obj
-<< /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 696 0 R
+<< /Title <feff0032002e00320037002e0031002e00200050006100720061006d00650074006500720073>
+/Parent 697 0 R
 /Count 0
 /Next 699 0 R
-/Prev 697 0 R
-/Dest [153 0 R /XYZ 0 217.0800000000001 null]
+/Dest [178 0 R /XYZ 0 411.7200000000003 null]
 >>
 endobj
 699 0 obj
-<< /Title <feff0032002e00320033002e0033002e00200043006f006e00730075006d00650073>
-/Parent 696 0 R
+<< /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
+/Parent 697 0 R
 /Count 0
 /Next 700 0 R
 /Prev 698 0 R
-/Dest [153 0 R /XYZ 0 111.96000000000006 null]
+/Dest [178 0 R /XYZ 0 269.04000000000025 null]
 >>
 endobj
 700 0 obj
-<< /Title <feff0032002e00320033002e0034002e002000500072006f00640075006300650073>
-/Parent 696 0 R
+<< /Title <feff0032002e00320037002e0033002e00200043006f006e00730075006d00650073>
+/Parent 697 0 R
 /Count 0
+/Next 701 0 R
 /Prev 699 0 R
-/Dest [166 0 R /XYZ 0 792.0 null]
+/Dest [178 0 R /XYZ 0 163.92000000000024 null]
 >>
 endobj
 701 0 obj
-<< /Title <feff0032002e00320034002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 702 0 R
-/Last 704 0 R
-/Next 705 0 R
-/Prev 696 0 R
-/Dest [166 0 R /XYZ 0 702.1200000000001 null]
+<< /Title <feff0032002e00320037002e0034002e002000500072006f00640075006300650073>
+/Parent 697 0 R
+/Count 0
+/Prev 700 0 R
+/Dest [178 0 R /XYZ 0 107.64000000000021 null]
 >>
 endobj
 702 0 obj
-<< /Title <feff0032002e00320034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 701 0 R
-/Count 0
-/Next 703 0 R
-/Dest [166 0 R /XYZ 0 662.0400000000002 null]
+<< /Title <feff0032002e00320038002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073>
+/Parent 594 0 R
+/Count 2
+/First 703 0 R
+/Last 704 0 R
+/Next 705 0 R
+/Prev 697 0 R
+/Dest [192 0 R /XYZ 0 792.0 null]
 >>
 endobj
 703 0 obj
-<< /Title <feff0032002e00320034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 701 0 R
+<< /Title <feff0032002e00320038002e0031002e00200052006500730070006f006e007300650073>
+/Parent 702 0 R
 /Count 0
 /Next 704 0 R
-/Prev 702 0 R
-/Dest [166 0 R /XYZ 0 556.9200000000003 null]
+/Dest [192 0 R /XYZ 0 718.32 null]
 >>
 endobj
 704 0 obj
-<< /Title <feff0032002e00320034002e0033002e002000500072006f00640075006300650073>
-/Parent 701 0 R
+<< /Title <feff0032002e00320038002e0032002e002000500072006f00640075006300650073>
+/Parent 702 0 R
 /Count 0
 /Prev 703 0 R
-/Dest [166 0 R /XYZ 0 451.8000000000004 null]
+/Dest [192 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
 705 0 obj
-<< /Title <feff0032002e00320035002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
-/Parent 610 0 R
+<< /Title <feff0032002e00320039002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f006e0061006d00650073>
+/Parent 594 0 R
 /Count 2
 /First 706 0 R
 /Last 707 0 R
 /Next 708 0 R
-/Prev 701 0 R
-/Dest [166 0 R /XYZ 0 395.5200000000004 null]
+/Prev 702 0 R
+/Dest [192 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
 706 0 obj
-<< /Title <feff0032002e00320035002e0031002e00200052006500730070006f006e007300650073>
+<< /Title <feff0032002e00320039002e0031002e00200052006500730070006f006e007300650073>
 /Parent 705 0 R
 /Count 0
 /Next 707 0 R
-/Dest [166 0 R /XYZ 0 355.44000000000034 null]
+/Dest [192 0 R /XYZ 0 516.8400000000005 null]
 >>
 endobj
 707 0 obj
-<< /Title <feff0032002e00320035002e0032002e002000500072006f00640075006300650073>
+<< /Title <feff0032002e00320039002e0032002e002000500072006f00640075006300650073>
 /Parent 705 0 R
 /Count 0
 /Prev 706 0 R
-/Dest [166 0 R /XYZ 0 250.32000000000028 null]
+/Dest [192 0 R /XYZ 0 411.7200000000005 null]
 >>
 endobj
 708 0 obj
-<< /Title <feff0032002e00320036002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f00790061006d006c002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 610 0 R
+<< /Title <feff0032002e00330030002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f007b00740065006d0070006c006100740065004e0061006d0065007d>
+/Parent 594 0 R
 /Count 3
 /First 709 0 R
 /Last 711 0 R
-/Next 712 0 R
 /Prev 705 0 R
-/Dest [166 0 R /XYZ 0 194.04000000000025 null]
+/Dest [192 0 R /XYZ 0 355.44000000000045 null]
 >>
 endobj
 709 0 obj
-<< /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
+<< /Title <feff0032002e00330030002e0031002e00200050006100720061006d00650074006500720073>
 /Parent 708 0 R
 /Count 0
 /Next 710 0 R
-/Dest [166 0 R /XYZ 0 125.88000000000022 null]
+/Dest [192 0 R /XYZ 0 315.3600000000004 null]
 >>
 endobj
 710 0 obj
-<< /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
+<< /Title <feff0032002e00330030002e0032002e00200052006500730070006f006e007300650073>
 /Parent 708 0 R
 /Count 0
 /Next 711 0 R
 /Prev 709 0 R
-/Dest [181 0 R /XYZ 0 683.1600000000001 null]
+/Dest [192 0 R /XYZ 0 210.2400000000004 null]
 >>
 endobj
 711 0 obj
-<< /Title <feff0032002e00320036002e0033002e002000500072006f00640075006300650073>
+<< /Title <feff0032002e00330030002e0033002e002000500072006f00640075006300650073>
 /Parent 708 0 R
 /Count 0
 /Prev 710 0 R
-/Dest [181 0 R /XYZ 0 578.0400000000002 null]
+/Dest [192 0 R /XYZ 0 105.12000000000037 null]
 >>
 endobj
 712 0 obj
-<< /Title <feff0032002e00320037002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 610 0 R
-/Count 3
+<< /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
+/Parent 588 0 R
+/Count 19
 /First 713 0 R
-/Last 715 0 R
-/Next 716 0 R
-/Prev 708 0 R
-/Dest [181 0 R /XYZ 0 521.7600000000003 null]
+/Last 731 0 R
+/Prev 594 0 R
+/Dest [207 0 R /XYZ 0 792.0 null]
 >>
 endobj
 713 0 obj
-<< /Title <feff0032002e00320037002e0031002e00200050006100720061006d00650074006500720073>
+<< /Title <feff0033002e0031002e00200043006c00640073004800650061006c007400680043006800650063006b>
 /Parent 712 0 R
 /Count 0
 /Next 714 0 R
-/Dest [181 0 R /XYZ 0 481.68000000000035 null]
+/Dest [207 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
 714 0 obj
-<< /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
+<< /Title <feff0033002e0032002e002000440069006300740069006f006e006100720079>
 /Parent 712 0 R
 /Count 0
 /Next 715 0 R
 /Prev 713 0 R
-/Dest [181 0 R /XYZ 0 376.56000000000034 null]
+/Dest [207 0 R /XYZ 0 524.04 null]
 >>
 endobj
 715 0 obj
-<< /Title <feff0032002e00320037002e0033002e002000500072006f00640075006300650073>
+<< /Title <feff0033002e0033002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
 /Parent 712 0 R
 /Count 0
+/Next 716 0 R
 /Prev 714 0 R
-/Dest [181 0 R /XYZ 0 271.4400000000003 null]
+/Dest [207 0 R /XYZ 0 148.19999999999993 null]
 >>
 endobj
 716 0 obj
-<< /Title <feff0032002e00320038002e00200050005500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 610 0 R
-/Count 4
-/First 717 0 R
-/Last 720 0 R
-/Next 721 0 R
-/Prev 712 0 R
-/Dest [181 0 R /XYZ 0 215.16000000000028 null]
+<< /Title <feff0033002e0034002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
+/Parent 712 0 R
+/Count 0
+/Next 717 0 R
+/Prev 715 0 R
+/Dest [214 0 R /XYZ 0 345.11999999999995 null]
 >>
 endobj
 717 0 obj
-<< /Title <feff0032002e00320038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 716 0 R
+<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
+/Parent 712 0 R
 /Count 0
 /Next 718 0 R
-/Dest [181 0 R /XYZ 0 175.08000000000027 null]
+/Prev 716 0 R
+/Dest [214 0 R /XYZ 0 194.6399999999999 null]
 >>
 endobj
 718 0 obj
-<< /Title <feff0032002e00320038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 716 0 R
+<< /Title <feff0033002e0036002e0020004a0073006f006e00410072007200610079>
+/Parent 712 0 R
 /Count 0
 /Next 719 0 R
 /Prev 717 0 R
-/Dest [192 0 R /XYZ 0 683.1600000000001 null]
+/Dest [220 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
 719 0 obj
-<< /Title <feff0032002e00320038002e0033002e00200043006f006e00730075006d00650073>
-/Parent 716 0 R
+<< /Title <feff0033002e0037002e0020004a0073006f006e004e0075006c006c>
+/Parent 712 0 R
 /Count 0
 /Next 720 0 R
 /Prev 718 0 R
-/Dest [192 0 R /XYZ 0 578.0400000000002 null]
+/Dest [228 0 R /XYZ 0 532.9200000000003 null]
 >>
 endobj
 720 0 obj
-<< /Title <feff0032002e00320038002e0034002e002000500072006f00640075006300650073>
-/Parent 716 0 R
+<< /Title <feff0033002e0038002e0020004a0073006f006e004f0062006a006500630074>
+/Parent 712 0 R
 /Count 0
+/Next 721 0 R
 /Prev 719 0 R
-/Dest [192 0 R /XYZ 0 521.7600000000003 null]
+/Dest [234 0 R /XYZ 0 382.68000000000023 null]
 >>
 endobj
 721 0 obj
-<< /Title <feff0032002e00320039002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073>
-/Parent 610 0 R
-/Count 2
-/First 722 0 R
-/Last 723 0 R
-/Next 724 0 R
-/Prev 716 0 R
-/Dest [192 0 R /XYZ 0 465.48000000000036 null]
+<< /Title <feff0033002e0039002e0020004a0073006f006e005000720069006d00690074006900760065>
+/Parent 712 0 R
+/Count 0
+/Next 722 0 R
+/Prev 720 0 R
+/Dest [239 0 R /XYZ 0 232.44000000000023 null]
 >>
 endobj
 722 0 obj
-<< /Title <feff0032002e00320039002e0031002e00200052006500730070006f006e007300650073>
-/Parent 721 0 R
+<< /Title <feff0033002e00310030002e0020004c006f006f0070>
+/Parent 712 0 R
 /Count 0
 /Next 723 0 R
-/Dest [192 0 R /XYZ 0 425.4000000000003 null]
+/Prev 721 0 R
+/Dest [255 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 723 0 obj
-<< /Title <feff0032002e00320039002e0032002e002000500072006f00640075006300650073>
-/Parent 721 0 R
+<< /Title <feff0033002e00310031002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 712 0 R
 /Count 0
+/Next 724 0 R
 /Prev 722 0 R
-/Dest [192 0 R /XYZ 0 320.2800000000003 null]
+/Dest [265 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 724 0 obj
-<< /Title <feff0032002e00330030002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f006e0061006d00650073>
-/Parent 610 0 R
-/Count 2
-/First 725 0 R
-/Last 726 0 R
-/Next 727 0 R
-/Prev 721 0 R
-/Dest [192 0 R /XYZ 0 264.0000000000003 null]
+<< /Title <feff0033002e00310032002e0020004c006f006f0070004c006f0067>
+/Parent 712 0 R
+/Count 0
+/Next 725 0 R
+/Prev 723 0 R
+/Dest [265 0 R /XYZ 0 157.08000000000015 null]
 >>
 endobj
 725 0 obj
-<< /Title <feff0032002e00330030002e0031002e00200052006500730070006f006e007300650073>
-/Parent 724 0 R
+<< /Title <feff0033002e00310033002e0020004c006f006f007000540065006d0070006c006100740065>
+/Parent 712 0 R
 /Count 0
 /Next 726 0 R
-/Dest [192 0 R /XYZ 0 223.9200000000003 null]
+/Prev 724 0 R
+/Dest [271 0 R /XYZ 0 532.9200000000001 null]
 >>
 endobj
 726 0 obj
-<< /Title <feff0032002e00330030002e0032002e002000500072006f00640075006300650073>
-/Parent 724 0 R
+<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 712 0 R
 /Count 0
+/Next 727 0 R
 /Prev 725 0 R
-/Dest [192 0 R /XYZ 0 118.80000000000027 null]
+/Dest [277 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 727 0 obj
-<< /Title <feff0032002e00330031002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 610 0 R
-/Count 3
-/First 728 0 R
-/Last 730 0 R
-/Prev 724 0 R
-/Dest [206 0 R /XYZ 0 792.0 null]
+<< /Title <feff0033002e00310035002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
+/Parent 712 0 R
+/Count 0
+/Next 728 0 R
+/Prev 726 0 R
+/Dest [277 0 R /XYZ 0 457.56000000000023 null]
 >>
 endobj
 728 0 obj
-<< /Title <feff0032002e00330031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 727 0 R
+<< /Title <feff0033002e00310036002e0020004e0075006d006200650072>
+/Parent 712 0 R
 /Count 0
 /Next 729 0 R
-/Dest [206 0 R /XYZ 0 718.32 null]
+/Prev 727 0 R
+/Dest [285 0 R /XYZ 0 420.2400000000002 null]
 >>
 endobj
 729 0 obj
-<< /Title <feff0032002e00330031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 727 0 R
+<< /Title <feff0033002e00310037002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
+/Parent 712 0 R
 /Count 0
 /Next 730 0 R
 /Prev 728 0 R
-/Dest [206 0 R /XYZ 0 613.2000000000003 null]
+/Dest [285 0 R /XYZ 0 352.3800000000001 null]
 >>
 endobj
 730 0 obj
-<< /Title <feff0032002e00330031002e0033002e002000500072006f00640075006300650073>
-/Parent 727 0 R
+<< /Title <feff0033002e00310038002e00200050006f006c006900630079004d006f00640065006c>
+/Parent 712 0 R
 /Count 0
+/Next 731 0 R
 /Prev 729 0 R
-/Dest [206 0 R /XYZ 0 508.0800000000004 null]
+/Dest [296 0 R /XYZ 0 532.9200000000001 null]
 >>
 endobj
 731 0 obj
-<< /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
-/Parent 604 0 R
-/Count 20
-/First 732 0 R
-/Last 751 0 R
-/Prev 610 0 R
-/Dest [214 0 R /XYZ 0 792.0 null]
->>
-endobj
-732 0 obj
-<< /Title <feff0033002e0031002e00200043006c00640073004800650061006c007400680043006800650063006b>
-/Parent 731 0 R
-/Count 0
-/Next 733 0 R
-/Dest [214 0 R /XYZ 0 712.0799999999999 null]
->>
-endobj
-733 0 obj
-<< /Title <feff0033002e0032002e00200043006c006400730049006e0066006f>
-/Parent 731 0 R
-/Count 0
-/Next 734 0 R
-/Prev 732 0 R
-/Dest [214 0 R /XYZ 0 524.04 null]
->>
-endobj
-734 0 obj
-<< /Title <feff0033002e0033002e002000440069006300740069006f006e006100720079>
-/Parent 731 0 R
-/Count 0
-/Next 735 0 R
-/Prev 733 0 R
-/Dest [214 0 R /XYZ 0 148.19999999999993 null]
->>
-endobj
-735 0 obj
-<< /Title <feff0033002e0034002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
-/Parent 731 0 R
-/Count 0
-/Next 736 0 R
-/Prev 734 0 R
-/Dest [220 0 R /XYZ 0 420.23999999999995 null]
->>
-endobj
-736 0 obj
-<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
-/Parent 731 0 R
-/Count 0
-/Next 737 0 R
-/Prev 735 0 R
-/Dest [224 0 R /XYZ 0 645.5999999999999 null]
->>
-endobj
-737 0 obj
-<< /Title <feff0033002e0036002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
-/Parent 731 0 R
-/Count 0
-/Next 738 0 R
-/Prev 736 0 R
-/Dest [224 0 R /XYZ 0 495.11999999999995 null]
->>
-endobj
-738 0 obj
-<< /Title <feff0033002e0037002e0020004a0073006f006e00410072007200610079>
-/Parent 731 0 R
-/Count 0
-/Next 739 0 R
-/Prev 737 0 R
-/Dest [224 0 R /XYZ 0 307.07999999999987 null]
->>
-endobj
-739 0 obj
-<< /Title <feff0033002e0038002e0020004a0073006f006e004e0075006c006c>
-/Parent 731 0 R
-/Count 0
-/Next 740 0 R
-/Prev 738 0 R
-/Dest [232 0 R /XYZ 0 157.32000000000022 null]
->>
-endobj
-740 0 obj
-<< /Title <feff0033002e0039002e0020004a0073006f006e004f0062006a006500630074>
-/Parent 731 0 R
-/Count 0
-/Next 741 0 R
-/Prev 739 0 R
-/Dest [247 0 R /XYZ 0 683.1600000000001 null]
->>
-endobj
-741 0 obj
-<< /Title <feff0033002e00310030002e0020004a0073006f006e005000720069006d00690074006900760065>
-/Parent 731 0 R
-/Count 0
-/Next 742 0 R
-/Prev 740 0 R
-/Dest [255 0 R /XYZ 0 532.9200000000003 null]
->>
-endobj
-742 0 obj
-<< /Title <feff0033002e00310031002e0020004c006f006f0070>
-/Parent 731 0 R
-/Count 0
-/Next 743 0 R
-/Prev 741 0 R
-/Dest [261 0 R /XYZ 0 270.0000000000004 null]
->>
-endobj
-743 0 obj
-<< /Title <feff0033002e00310032002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 731 0 R
-/Count 0
-/Next 744 0 R
-/Prev 742 0 R
-/Dest [267 0 R /XYZ 0 269.99999999999994 null]
->>
-endobj
-744 0 obj
-<< /Title <feff0033002e00310033002e0020004c006f006f0070004c006f0067>
-/Parent 731 0 R
-/Count 0
-/Next 745 0 R
-/Prev 743 0 R
-/Dest [276 0 R /XYZ 0 457.79999999999995 null]
->>
-endobj
-745 0 obj
-<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065>
-/Parent 731 0 R
-/Count 0
-/Next 746 0 R
-/Prev 744 0 R
-/Dest [276 0 R /XYZ 0 157.0799999999999 null]
->>
-endobj
-746 0 obj
-<< /Title <feff0033002e00310035002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 731 0 R
-/Count 0
-/Next 747 0 R
-/Prev 745 0 R
-/Dest [283 0 R /XYZ 0 270.0 null]
->>
-endobj
-747 0 obj
-<< /Title <feff0033002e00310036002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
-/Parent 731 0 R
-/Count 0
-/Next 748 0 R
-/Prev 746 0 R
-/Dest [290 0 R /XYZ 0 792.0 null]
->>
-endobj
-748 0 obj
-<< /Title <feff0033002e00310037002e0020004e0075006d006200650072>
-/Parent 731 0 R
-/Count 0
-/Next 749 0 R
-/Prev 747 0 R
-/Dest [296 0 R /XYZ 0 683.1600000000001 null]
->>
-endobj
-749 0 obj
-<< /Title <feff0033002e00310038002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
-/Parent 731 0 R
-/Count 0
-/Next 750 0 R
-/Prev 748 0 R
-/Dest [296 0 R /XYZ 0 615.3000000000002 null]
->>
-endobj
-750 0 obj
-<< /Title <feff0033002e00310039002e00200050006f006c006900630079004d006f00640065006c>
-/Parent 731 0 R
-/Count 0
-/Next 751 0 R
-/Prev 749 0 R
-/Dest [296 0 R /XYZ 0 126.7800000000002 null]
->>
-endobj
-751 0 obj
-<< /Title <feff0033002e00320030002e00200053006500720076006900630065>
-/Parent 731 0 R
+<< /Title <feff0033002e00310039002e00200053006500720076006900630065>
+/Parent 712 0 R
 /Count 0
-/Prev 750 0 R
-/Dest [308 0 R /XYZ 0 382.67999999999995 null]
+/Prev 730 0 R
+/Dest [296 0 R /XYZ 0 119.52000000000004 null]
 >>
 endobj
-752 0 obj
+732 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (iii)
@@ -50199,19 +48632,17 @@ endobj
 >> 21 << /P (17)
 >> 22 << /P (18)
 >> 23 << /P (19)
->> 25 << /P (21)
+>> 24 << /P (20)
 >> 26 << /P (22)
 >> 27 << /P (23)
 >> 28 << /P (24)
 >> 29 << /P (25)
 >> 30 << /P (26)
 >> 31 << /P (27)
->> 32 << /P (28)
->> 33 << /P (29)
 >>]
 >>
 endobj
-753 0 obj
+733 0 obj
 << /Length1 12112
 /Length 7776
 /Filter [/FlateDecode]
@@ -50244,10 +48675,10 @@ G)Dz
 ”a•dç4äf�t†#Ë�e=<¥òª¦'½ýcÞɕߪù‘좼pNƒ/(i€�À$
šVô·(ý.½°Œÿ¾>Ö½t`jxp\5=àÛàÛ¥¬›Ž³€×X©wÚ«šŸ�	rèWõΪVÙö‡°-…/M³sœ
6C,”é€C¬ÁÐT¨Ä«6Ó¿˜¡éé‰|³¹Ïß?`dUlêó�™'ÌÄof]q¾ŸÑÄ÷³\LÀcM§&–>÷'àÚÆä¼sçNÓXpZ,ë©é™þaÿ:Î;Ù?p¹õï) Í€tð¡šá¾�ñ)ÐØÌxÿÀ¤jzh@åžðöÁ%x'Cµâ�Y&DÕaà2|§‚bôØÏú$£‡!V;n�ç…ç£;¿“
”õ>œÅøpȽ,“rÐ<@1e®ÙTRV×TfdPl<_oˆTpž�šA«¡Ò§€RŽWÙ¢Y,JVz ¿"Ìwnú_is[£þ‡ˆà±aì�Ÿ’¬\!ï¢ðox½(P®°Çÿ�û/’
 endstream
 endobj
-754 0 obj
+734 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAA+NotoSerif
-/FontFile2 753 0 R
+/FontFile2 733 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -50258,7 +48689,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-755 0 obj
+735 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -50268,10 +48699,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-756 0 obj
+736 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 1000 559 1000 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-757 0 obj
+737 0 obj
 << /Length1 11308
 /Length 7514
 /Filter [/FlateDecode]
@@ -50302,10 +48733,10 @@ f
 \�ïLBCŒXÇdô0Âj§äõÁsñ«ÕïØ€²Ö‘ÝŒ#¯Xc‹À19=ìŒÆQÌ8ë*ªš;ªìŠ[¯·o…Tpž�:A«+¥Ï¥¯jG3Ä\„,+�ÍfXîÿÍü–´¢ÿ„Ȧ·‹W—-}B½E‚>“¡ùK¥ìÿ
—(\(
 endstream
 endobj
-758 0 obj
+738 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAB+NotoSerif-Bold
-/FontFile2 757 0 R
+/FontFile2 737 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -50316,7 +48747,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-759 0 obj
+739 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -50326,10 +48757,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-760 0 obj
+740 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 1000 1000 1000 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-761 0 obj
+741 0 obj
 << /Length1 5116
 /Length 3170
 /Filter [/FlateDecode]
@@ -50349,10 +48780,10 @@ a
 ÿ:´2õ]Û^Ô5 w,¥Âº*›Ó‹Œ58«mÖg·±nkÞÄ7cÙÞB4èÆa¯ÅÊD[NaéU‹<V¥Éó`ØÉ@V�΋š{KÙÀ—r¿­�ËS«¯ ðêó3³§e'ó(�×ÚÏ«-{�S}`-õy÷¢¦/²±ò‹ð79à]èp$xrë’¤ÏÊÃ'ý›"ZÞé³/izïþ›]’Wâ~ ïÝ–þ&ÌÁT
 endstream
 endobj
-762 0 obj
+742 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAC+NotoSerif-Italic
-/FontFile2 761 0 R
+/FontFile2 741 0 R
 /FontBBox [-254 -250 1238 1047]
 /Flags 70
 /StemV 0
@@ -50363,7 +48794,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-763 0 obj
+743 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -50373,10 +48804,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-764 0 obj
+744 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-765 0 obj
+745 0 obj
 << /Length1 3280
 /Length 2112
 /Filter [/FlateDecode]
@@ -50391,10 +48822,10 @@ x
 ˆ‡¶�€$W´¦ö"k8À
Vš­Ûi<êí!‹§–N..ðͶ&W+uXœ¶—¨:‹’j³†Z;Ù×cžOÎ-/²UFN¤ÓÉ6»][§)å%ÛÒâr*Ÿf©Ûf“R�ÓTó6°Óß<Qsäz‰B�–Ó^"KD/“çùŸÞ)ƒ�~™’¹T¾^õ‡i9šít-Ñ£\î‚céúìw='4‡î‚9÷F|ðÂBìßëV�bCAÿWAþö}½‚[Ï‹¸
1?¾ˆøbä¢Oe›Dm$ BD<yBT™'ÂÑ`Á"BY@Ü‹þS„ÃU´n�H²g#ü‡"–Ùª¬"Zø›b±Ù*r–@(Ü+DLVQa9YÅ‹Þ Áz#VQia¦&ÁôLøOÆßDŒ¤~`ü{Ä(˜Ä<sXô�ŠH‘áåYJ&Ƭ¢Êr±WÉ;¿:1a�`Ô–‹
’È»#Ê·èuü
»U,°ðÏ2'W	†»^T6úE†3ñL”gD«ÑdŠ3ÊqÌaa.:­Qk"Ä"CJ§ØÂÛE5„çû_t–óS“9¦WÂ<“k>Ã÷e|Q!ÃgÉ�ÀÀE/iR~L zãŒ!›RÉSûz•Édä×3T2 hŽÊ±™$5�Eà×eçŒM"FÂJh@È|f #D™A΄-VQËŽAOqëXŒÐÿG¶ÑÙ§΄™–Y(‰Ì÷YÙüSBF-òÁð!ãû´c°¼^ôvuaàŠ–Ú[š™òÑ0›Caa’¢ºŒ´ ÐE•÷†Â—¨¯»c]—�GZD>&VÇk·}•[D’R]h²²ß‘zÖóé?+wú_½î“ä
 endstream
 endobj
-766 0 obj
+746 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAD+mplus1mn-regular
-/FontFile2 765 0 R
+/FontFile2 745 0 R
 /FontBBox [0 -230 1000 860]
 /Flags 4
 /StemV 0
@@ -50405,7 +48836,7 @@ endobj
 /XHeight 0
 >>
 endobj
-767 0 obj
+747 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -50415,785 +48846,765 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-768 0 obj
+748 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 500 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
 xref
-0 769
+0 749
 0000000000 65535 f 
 0000000015 00000 n 
 0000000264 00000 n 
 0000000467 00000 n 
-0000000778 00000 n 
-0000000829 00000 n 
-0000000983 00000 n 
-0000001227 00000 n 
-0000001405 00000 n 
-0000001572 00000 n 
-0000032826 00000 n 
-0000033604 00000 n 
-0000066044 00000 n 
-0000066842 00000 n 
-0000098961 00000 n 
-0000099759 00000 n 
-0000127913 00000 n 
-0000128631 00000 n 
-0000131063 00000 n 
-0000131300 00000 n 
-0000131343 00000 n 
-0000131392 00000 n 
-0000131514 00000 n 
-0000131687 00000 n 
-0000131742 00000 n 
-0000131917 00000 n 
-0000131961 00000 n 
-0000144139 00000 n 
-0000144400 00000 n 
-0000144443 00000 n 
-0000144498 00000 n 
-0000144541 00000 n 
-0000144706 00000 n 
-0000144761 00000 n 
-0000144936 00000 n 
-0000144992 00000 n 
-0000145047 00000 n 
-0000145220 00000 n 
-0000145275 00000 n 
-0000145330 00000 n 
-0000145386 00000 n 
-0000145442 00000 n 
-0000145497 00000 n 
-0000161972 00000 n 
-0000162253 00000 n 
-0000162296 00000 n 
-0000162452 00000 n 
-0000162507 00000 n 
-0000162562 00000 n 
-0000162617 00000 n 
-0000162772 00000 n 
-0000162827 00000 n 
-0000162985 00000 n 
-0000163040 00000 n 
-0000163095 00000 n 
-0000163389 00000 n 
-0000163698 00000 n 
-0000163754 00000 n 
-0000163810 00000 n 
-0000182095 00000 n 
-0000182376 00000 n 
-0000182419 00000 n 
-0000182474 00000 n 
-0000182529 00000 n 
-0000182584 00000 n 
-0000182741 00000 n 
-0000182796 00000 n 
-0000182851 00000 n 
-0000182907 00000 n 
-0000183063 00000 n 
-0000183119 00000 n 
-0000183277 00000 n 
-0000183333 00000 n 
-0000199061 00000 n 
-0000199311 00000 n 
-0000199354 00000 n 
-0000199409 00000 n 
-0000199464 00000 n 
-0000199519 00000 n 
-0000199574 00000 n 
-0000199630 00000 n 
-0000199686 00000 n 
-0000199741 00000 n 
-0000200020 00000 n 
-0000200076 00000 n 
-0000217524 00000 n 
-0000217791 00000 n 
-0000217834 00000 n 
-0000217878 00000 n 
-0000218195 00000 n 
-0000218250 00000 n 
-0000218305 00000 n 
-0000218360 00000 n 
-0000218415 00000 n 
-0000218578 00000 n 
-0000218633 00000 n 
-0000218689 00000 n 
-0000218744 00000 n 
-0000235350 00000 n 
-0000235626 00000 n 
-0000235669 00000 n 
-0000235725 00000 n 
-0000235781 00000 n 
-0000235837 00000 n 
-0000236000 00000 n 
-0000236056 00000 n 
-0000236112 00000 n 
-0000236169 00000 n 
-0000236225 00000 n 
-0000236389 00000 n 
-0000236446 00000 n 
-0000252606 00000 n 
-0000252884 00000 n 
-0000252929 00000 n 
-0000252975 00000 n 
-0000253032 00000 n 
-0000253194 00000 n 
-0000253251 00000 n 
-0000253309 00000 n 
-0000253366 00000 n 
-0000253423 00000 n 
-0000253803 00000 n 
-0000253965 00000 n 
-0000254023 00000 n 
-0000254081 00000 n 
-0000254139 00000 n 
-0000272975 00000 n 
-0000273245 00000 n 
-0000273302 00000 n 
-0000273464 00000 n 
-0000273521 00000 n 
-0000273578 00000 n 
-0000273636 00000 n 
-0000273694 00000 n 
-0000273751 00000 n 
-0000273809 00000 n 
-0000273867 00000 n 
-0000289067 00000 n 
-0000289353 00000 n 
-0000289398 00000 n 
-0000289560 00000 n 
-0000289617 00000 n 
-0000289674 00000 n 
-0000289731 00000 n 
-0000289886 00000 n 
-0000289943 00000 n 
-0000290105 00000 n 
-0000290163 00000 n 
-0000290221 00000 n 
-0000290521 00000 n 
-0000290578 00000 n 
-0000290636 00000 n 
-0000291106 00000 n 
-0000310918 00000 n 
-0000311212 00000 n 
-0000311355 00000 n 
-0000311412 00000 n 
-0000311568 00000 n 
-0000311614 00000 n 
-0000311672 00000 n 
-0000311730 00000 n 
-0000311787 00000 n 
-0000311945 00000 n 
-0000312002 00000 n 
-0000312166 00000 n 
-0000312224 00000 n 
-0000325802 00000 n 
-0000326080 00000 n 
-0000326125 00000 n 
-0000326182 00000 n 
-0000326239 00000 n 
-0000326296 00000 n 
-0000326459 00000 n 
-0000326516 00000 n 
-0000326573 00000 n 
-0000326631 00000 n 
-0000326790 00000 n 
-0000326848 00000 n 
-0000326906 00000 n 
-0000327481 00000 n 
-0000327539 00000 n 
-0000346468 00000 n 
-0000346738 00000 n 
-0000346795 00000 n 
-0000346852 00000 n 
-0000346909 00000 n 
-0000346967 00000 n 
-0000347025 00000 n 
-0000347184 00000 n 
-0000347241 00000 n 
-0000347299 00000 n 
-0000347357 00000 n 
-0000363917 00000 n 
-0000364195 00000 n 
-0000364252 00000 n 
-0000364608 00000 n 
-0000364767 00000 n 
-0000364824 00000 n 
-0000364881 00000 n 
-0000364939 00000 n 
-0000364996 00000 n 
-0000365167 00000 n 
-0000365224 00000 n 
-0000365281 00000 n 
-0000365338 00000 n 
-0000365396 00000 n 
-0000373381 00000 n 
-0000373651 00000 n 
-0000373696 00000 n 
-0000373742 00000 n 
-0000373799 00000 n 
-0000373969 00000 n 
-0000374026 00000 n 
-0000374332 00000 n 
-0000390148 00000 n 
-0000390387 00000 n 
-0000390432 00000 n 
-0000390489 00000 n 
-0000390535 00000 n 
-0000390593 00000 n 
-0000411864 00000 n 
-0000412121 00000 n 
-0000412277 00000 n 
-0000412335 00000 n 
-0000431719 00000 n 
-0000431984 00000 n 
-0000432127 00000 n 
-0000432184 00000 n 
-0000432345 00000 n 
-0000432403 00000 n 
-0000432461 00000 n 
-0000432778 00000 n 
-0000454439 00000 n 
-0000454728 00000 n 
-0000454876 00000 n 
-0000455023 00000 n 
-0000455192 00000 n 
-0000455343 00000 n 
-0000455482 00000 n 
-0000455540 00000 n 
-0000478196 00000 n 
-0000478485 00000 n 
-0000478633 00000 n 
-0000478780 00000 n 
-0000478929 00000 n 
-0000479080 00000 n 
-0000479219 00000 n 
-0000501185 00000 n 
-0000501474 00000 n 
-0000501531 00000 n 
-0000501699 00000 n 
-0000501866 00000 n 
-0000502036 00000 n 
-0000502208 00000 n 
-0000502368 00000 n 
-0000523947 00000 n 
-0000524220 00000 n 
-0000524277 00000 n 
-0000524446 00000 n 
-0000524615 00000 n 
-0000524784 00000 n 
-0000546317 00000 n 
-0000546590 00000 n 
-0000546741 00000 n 
-0000546880 00000 n 
-0000546937 00000 n 
-0000547109 00000 n 
-0000570140 00000 n 
-0000570437 00000 n 
-0000570586 00000 n 
-0000570732 00000 n 
-0000570883 00000 n 
-0000571040 00000 n 
-0000571201 00000 n 
-0000571378 00000 n 
-0000571436 00000 n 
-0000592277 00000 n 
-0000592550 00000 n 
-0000592699 00000 n 
-0000592887 00000 n 
-0000592945 00000 n 
-0000593110 00000 n 
-0000593167 00000 n 
-0000613767 00000 n 
-0000614048 00000 n 
-0000614215 00000 n 
-0000614355 00000 n 
-0000614400 00000 n 
-0000614577 00000 n 
-0000614750 00000 n 
-0000636082 00000 n 
-0000636355 00000 n 
-0000636400 00000 n 
-0000636569 00000 n 
-0000636729 00000 n 
-0000636895 00000 n 
-0000655255 00000 n 
-0000655552 00000 n 
-0000655695 00000 n 
-0000655752 00000 n 
-0000656133 00000 n 
-0000656190 00000 n 
-0000656359 00000 n 
-0000656528 00000 n 
-0000656693 00000 n 
-0000656868 00000 n 
-0000657033 00000 n 
-0000657090 00000 n 
-0000676480 00000 n 
-0000676753 00000 n 
-0000676929 00000 n 
-0000676987 00000 n 
-0000677157 00000 n 
-0000677328 00000 n 
-0000677472 00000 n 
-0000677617 00000 n 
-0000677782 00000 n 
-0000677938 00000 n 
-0000678096 00000 n 
-0000678243 00000 n 
-0000678405 00000 n 
-0000678547 00000 n 
-0000678712 00000 n 
-0000678856 00000 n 
-0000679013 00000 n 
-0000679159 00000 n 
-0000679315 00000 n 
-0000679460 00000 n 
-0000679625 00000 n 
-0000679769 00000 n 
-0000679928 00000 n 
-0000680076 00000 n 
-0000680234 00000 n 
-0000680381 00000 n 
-0000680537 00000 n 
-0000680682 00000 n 
-0000680842 00000 n 
-0000680991 00000 n 
-0000681149 00000 n 
-0000681296 00000 n 
-0000681451 00000 n 
-0000681596 00000 n 
-0000681756 00000 n 
-0000681905 00000 n 
-0000682065 00000 n 
-0000682214 00000 n 
-0000682369 00000 n 
-0000682514 00000 n 
-0000682682 00000 n 
-0000682829 00000 n 
-0000682988 00000 n 
-0000683136 00000 n 
-0000683292 00000 n 
-0000683438 00000 n 
-0000683598 00000 n 
-0000683747 00000 n 
-0000683939 00000 n 
-0000684110 00000 n 
-0000684270 00000 n 
-0000684419 00000 n 
-0000684577 00000 n 
-0000684724 00000 n 
-0000684916 00000 n 
-0000685087 00000 n 
-0000685259 00000 n 
-0000685410 00000 n 
-0000685569 00000 n 
-0000685717 00000 n 
-0000685875 00000 n 
-0000686022 00000 n 
-0000686191 00000 n 
-0000686350 00000 n 
-0000686522 00000 n 
-0000686673 00000 n 
-0000686834 00000 n 
-0000686984 00000 n 
-0000687143 00000 n 
-0000687292 00000 n 
-0000687452 00000 n 
-0000687601 00000 n 
-0000687767 00000 n 
-0000687912 00000 n 
-0000688082 00000 n 
-0000688231 00000 n 
-0000688390 00000 n 
-0000688538 00000 n 
-0000688684 00000 n 
-0000688819 00000 n 
-0000689010 00000 n 
-0000689180 00000 n 
-0000689339 00000 n 
-0000689477 00000 n 
-0000689625 00000 n 
-0000689763 00000 n 
-0000689932 00000 n 
-0000690080 00000 n 
-0000690245 00000 n 
-0000690389 00000 n 
-0000690559 00000 n 
-0000690708 00000 n 
-0000690867 00000 n 
-0000691016 00000 n 
-0000691178 00000 n 
-0000691321 00000 n 
-0000691491 00000 n 
-0000691640 00000 n 
-0000691799 00000 n 
-0000691948 00000 n 
-0000692117 00000 n 
-0000692265 00000 n 
-0000692419 00000 n 
-0000692562 00000 n 
-0000692721 00000 n 
-0000692870 00000 n 
-0000693040 00000 n 
-0000693189 00000 n 
-0000693344 00000 n 
-0000693489 00000 n 
-0000693660 00000 n 
-0000693810 00000 n 
-0000693969 00000 n 
-0000694118 00000 n 
-0000694287 00000 n 
-0000694435 00000 n 
-0000694590 00000 n 
-0000694734 00000 n 
-0000694906 00000 n 
-0000695057 00000 n 
-0000695217 00000 n 
-0000695367 00000 n 
-0000695536 00000 n 
-0000695684 00000 n 
-0000695849 00000 n 
-0000695993 00000 n 
-0000696165 00000 n 
-0000696316 00000 n 
-0000696476 00000 n 
-0000696626 00000 n 
-0000696796 00000 n 
-0000696945 00000 n 
-0000697099 00000 n 
-0000697243 00000 n 
+0000000770 00000 n 
+0000000821 00000 n 
+0000000975 00000 n 
+0000001219 00000 n 
+0000001397 00000 n 
+0000001564 00000 n 
+0000032747 00000 n 
+0000033525 00000 n 
+0000066036 00000 n 
+0000066834 00000 n 
+0000098936 00000 n 
+0000099734 00000 n 
+0000124484 00000 n 
+0000125138 00000 n 
+0000127570 00000 n 
+0000127807 00000 n 
+0000127850 00000 n 
+0000127899 00000 n 
+0000128005 00000 n 
+0000128178 00000 n 
+0000128233 00000 n 
+0000128408 00000 n 
+0000128452 00000 n 
+0000140633 00000 n 
+0000140894 00000 n 
+0000140937 00000 n 
+0000140992 00000 n 
+0000141035 00000 n 
+0000141207 00000 n 
+0000141262 00000 n 
+0000141437 00000 n 
+0000141493 00000 n 
+0000141548 00000 n 
+0000141603 00000 n 
+0000141659 00000 n 
+0000141714 00000 n 
+0000141872 00000 n 
+0000141927 00000 n 
+0000141983 00000 n 
+0000158343 00000 n 
+0000158617 00000 n 
+0000158660 00000 n 
+0000158814 00000 n 
+0000158869 00000 n 
+0000159025 00000 n 
+0000159080 00000 n 
+0000159136 00000 n 
+0000159191 00000 n 
+0000159246 00000 n 
+0000159301 00000 n 
+0000159611 00000 n 
+0000159920 00000 n 
+0000159975 00000 n 
+0000160031 00000 n 
+0000178188 00000 n 
+0000178469 00000 n 
+0000178512 00000 n 
+0000178668 00000 n 
+0000178723 00000 n 
+0000178778 00000 n 
+0000178833 00000 n 
+0000178987 00000 n 
+0000179042 00000 n 
+0000179198 00000 n 
+0000179254 00000 n 
+0000179310 00000 n 
+0000179365 00000 n 
+0000179420 00000 n 
+0000194743 00000 n 
+0000194993 00000 n 
+0000195036 00000 n 
+0000195091 00000 n 
+0000195146 00000 n 
+0000195201 00000 n 
+0000195257 00000 n 
+0000195312 00000 n 
+0000195368 00000 n 
+0000195424 00000 n 
+0000195480 00000 n 
+0000196149 00000 n 
+0000214016 00000 n 
+0000214283 00000 n 
+0000214327 00000 n 
+0000214382 00000 n 
+0000214695 00000 n 
+0000214750 00000 n 
+0000214912 00000 n 
+0000214968 00000 n 
+0000215023 00000 n 
+0000215078 00000 n 
+0000215133 00000 n 
+0000215189 00000 n 
+0000215245 00000 n 
+0000231409 00000 n 
+0000231684 00000 n 
+0000231727 00000 n 
+0000231888 00000 n 
+0000231944 00000 n 
+0000232000 00000 n 
+0000232056 00000 n 
+0000232113 00000 n 
+0000232275 00000 n 
+0000232331 00000 n 
+0000232388 00000 n 
+0000232445 00000 n 
+0000232502 00000 n 
+0000251626 00000 n 
+0000251912 00000 n 
+0000252064 00000 n 
+0000252121 00000 n 
+0000252178 00000 n 
+0000252235 00000 n 
+0000252293 00000 n 
+0000252715 00000 n 
+0000252878 00000 n 
+0000252935 00000 n 
+0000252993 00000 n 
+0000253051 00000 n 
+0000253109 00000 n 
+0000253272 00000 n 
+0000269554 00000 n 
+0000269824 00000 n 
+0000269869 00000 n 
+0000269926 00000 n 
+0000269983 00000 n 
+0000270040 00000 n 
+0000270097 00000 n 
+0000270397 00000 n 
+0000270454 00000 n 
+0000270512 00000 n 
+0000270570 00000 n 
+0000270734 00000 n 
+0000270791 00000 n 
+0000290488 00000 n 
+0000290782 00000 n 
+0000290827 00000 n 
+0000290873 00000 n 
+0000291028 00000 n 
+0000291085 00000 n 
+0000291248 00000 n 
+0000291305 00000 n 
+0000291362 00000 n 
+0000291420 00000 n 
+0000291477 00000 n 
+0000291642 00000 n 
+0000291699 00000 n 
+0000291876 00000 n 
+0000307386 00000 n 
+0000307664 00000 n 
+0000307709 00000 n 
+0000307766 00000 n 
+0000307823 00000 n 
+0000307880 00000 n 
+0000308038 00000 n 
+0000308095 00000 n 
+0000308258 00000 n 
+0000308316 00000 n 
+0000308779 00000 n 
+0000308836 00000 n 
+0000308894 00000 n 
+0000308951 00000 n 
+0000325425 00000 n 
+0000325703 00000 n 
+0000325748 00000 n 
+0000325910 00000 n 
+0000325967 00000 n 
+0000326024 00000 n 
+0000326081 00000 n 
+0000326242 00000 n 
+0000326299 00000 n 
+0000326356 00000 n 
+0000326414 00000 n 
+0000326471 00000 n 
+0000326529 00000 n 
+0000344640 00000 n 
+0000344918 00000 n 
+0000344963 00000 n 
+0000345009 00000 n 
+0000345066 00000 n 
+0000345225 00000 n 
+0000345282 00000 n 
+0000345340 00000 n 
+0000345397 00000 n 
+0000345455 00000 n 
+0000345857 00000 n 
+0000346018 00000 n 
+0000346076 00000 n 
+0000346134 00000 n 
+0000362705 00000 n 
+0000362983 00000 n 
+0000363028 00000 n 
+0000363074 00000 n 
+0000363244 00000 n 
+0000363301 00000 n 
+0000363653 00000 n 
+0000363710 00000 n 
+0000363767 00000 n 
+0000363824 00000 n 
+0000363882 00000 n 
+0000363939 00000 n 
+0000363996 00000 n 
+0000364167 00000 n 
+0000364225 00000 n 
+0000380362 00000 n 
+0000380619 00000 n 
+0000380664 00000 n 
+0000380721 00000 n 
+0000380767 00000 n 
+0000380944 00000 n 
+0000381002 00000 n 
+0000401355 00000 n 
+0000401620 00000 n 
+0000401784 00000 n 
+0000401842 00000 n 
+0000402025 00000 n 
+0000402082 00000 n 
+0000424068 00000 n 
+0000424357 00000 n 
+0000424414 00000 n 
+0000424582 00000 n 
+0000424749 00000 n 
+0000424919 00000 n 
+0000425091 00000 n 
+0000425251 00000 n 
+0000446818 00000 n 
+0000447091 00000 n 
+0000447148 00000 n 
+0000447317 00000 n 
+0000447486 00000 n 
+0000447655 00000 n 
+0000468873 00000 n 
+0000469138 00000 n 
+0000469289 00000 n 
+0000469428 00000 n 
+0000469486 00000 n 
+0000491197 00000 n 
+0000491486 00000 n 
+0000491654 00000 n 
+0000491801 00000 n 
+0000491950 00000 n 
+0000492101 00000 n 
+0000492240 00000 n 
+0000492298 00000 n 
+0000492848 00000 n 
+0000515593 00000 n 
+0000515882 00000 n 
+0000516050 00000 n 
+0000516197 00000 n 
+0000516346 00000 n 
+0000516497 00000 n 
+0000516636 00000 n 
+0000540028 00000 n 
+0000540333 00000 n 
+0000540390 00000 n 
+0000540560 00000 n 
+0000540731 00000 n 
+0000540899 00000 n 
+0000541072 00000 n 
+0000541251 00000 n 
+0000541413 00000 n 
+0000541591 00000 n 
+0000562286 00000 n 
+0000562551 00000 n 
+0000562608 00000 n 
+0000562777 00000 n 
+0000562966 00000 n 
+0000563024 00000 n 
+0000584729 00000 n 
+0000585002 00000 n 
+0000585165 00000 n 
+0000585222 00000 n 
+0000585409 00000 n 
+0000585571 00000 n 
+0000606379 00000 n 
+0000606660 00000 n 
+0000606717 00000 n 
+0000606892 00000 n 
+0000607064 00000 n 
+0000607122 00000 n 
+0000607292 00000 n 
+0000607461 00000 n 
+0000628119 00000 n 
+0000628424 00000 n 
+0000628599 00000 n 
+0000628763 00000 n 
+0000628927 00000 n 
+0000628984 00000 n 
+0000629041 00000 n 
+0000629211 00000 n 
+0000629381 00000 n 
+0000629546 00000 n 
+0000629721 00000 n 
+0000649135 00000 n 
+0000649400 00000 n 
+0000649564 00000 n 
+0000649621 00000 n 
+0000649798 00000 n 
+0000649856 00000 n 
+0000657174 00000 n 
+0000657439 00000 n 
+0000657588 00000 n 
+0000657737 00000 n 
+0000657881 00000 n 
+0000658026 00000 n 
+0000658191 00000 n 
+0000658347 00000 n 
+0000658505 00000 n 
+0000658652 00000 n 
+0000658814 00000 n 
+0000658956 00000 n 
+0000659121 00000 n 
+0000659265 00000 n 
+0000659422 00000 n 
+0000659568 00000 n 
+0000659724 00000 n 
+0000659869 00000 n 
+0000660024 00000 n 
+0000660168 00000 n 
+0000660327 00000 n 
+0000660475 00000 n 
+0000660633 00000 n 
+0000660780 00000 n 
+0000660935 00000 n 
+0000661080 00000 n 
+0000661240 00000 n 
+0000661389 00000 n 
+0000661547 00000 n 
+0000661694 00000 n 
+0000661849 00000 n 
+0000661994 00000 n 
+0000662163 00000 n 
+0000662311 00000 n 
+0000662472 00000 n 
+0000662622 00000 n 
+0000662778 00000 n 
+0000662924 00000 n 
+0000663082 00000 n 
+0000663229 00000 n 
+0000663420 00000 n 
+0000663590 00000 n 
+0000663750 00000 n 
+0000663899 00000 n 
+0000664059 00000 n 
+0000664208 00000 n 
+0000664399 00000 n 
+0000664569 00000 n 
+0000664740 00000 n 
+0000664890 00000 n 
+0000665049 00000 n 
+0000665197 00000 n 
+0000665357 00000 n 
+0000665506 00000 n 
+0000665677 00000 n 
+0000665838 00000 n 
+0000666008 00000 n 
+0000666157 00000 n 
+0000666316 00000 n 
+0000666464 00000 n 
+0000666621 00000 n 
+0000666768 00000 n 
+0000666928 00000 n 
+0000667077 00000 n 
+0000667244 00000 n 
+0000667390 00000 n 
+0000667562 00000 n 
+0000667713 00000 n 
+0000667874 00000 n 
+0000668024 00000 n 
+0000668183 00000 n 
+0000668331 00000 n 
+0000668523 00000 n 
+0000668704 00000 n 
+0000668874 00000 n 
+0000669023 00000 n 
+0000669170 00000 n 
+0000669306 00000 n 
+0000669453 00000 n 
+0000669589 00000 n 
+0000669743 00000 n 
+0000669876 00000 n 
+0000670035 00000 n 
+0000670173 00000 n 
+0000670332 00000 n 
+0000670481 00000 n 
+0000670644 00000 n 
+0000670788 00000 n 
+0000670958 00000 n 
+0000671107 00000 n 
+0000671266 00000 n 
+0000671415 00000 n 
+0000671584 00000 n 
+0000671732 00000 n 
+0000671887 00000 n 
+0000672031 00000 n 
+0000672190 00000 n 
+0000672339 00000 n 
+0000672508 00000 n 
+0000672656 00000 n 
+0000672810 00000 n 
+0000672954 00000 n 
+0000673124 00000 n 
+0000673273 00000 n 
+0000673433 00000 n 
+0000673583 00000 n 
+0000673753 00000 n 
+0000673902 00000 n 
+0000674058 00000 n 
+0000674203 00000 n 
+0000674373 00000 n 
+0000674522 00000 n 
+0000674681 00000 n 
+0000674830 00000 n 
+0000675000 00000 n 
+0000675149 00000 n 
+0000675316 00000 n 
+0000675462 00000 n 
+0000675634 00000 n 
+0000675785 00000 n 
+0000675944 00000 n 
+0000676093 00000 n 
+0000676262 00000 n 
+0000676410 00000 n 
+0000676565 00000 n 
+0000676710 00000 n 
+0000676882 00000 n 
+0000677033 00000 n 
+0000677193 00000 n 
+0000677343 00000 n 
+0000677512 00000 n 
+0000677660 00000 n 
+0000677827 00000 n 
+0000677973 00000 n 
+0000678146 00000 n 
+0000678298 00000 n 
+0000678459 00000 n 
+0000678610 00000 n 
+0000678781 00000 n 
+0000678931 00000 n 
+0000679087 00000 n 
+0000679233 00000 n 
+0000679406 00000 n 
+0000679558 00000 n 
+0000679719 00000 n 
+0000679870 00000 n 
+0000680040 00000 n 
+0000680189 00000 n 
+0000680350 00000 n 
+0000680492 00000 n 
+0000680663 00000 n 
+0000680813 00000 n 
+0000680960 00000 n 
+0000681097 00000 n 
+0000681255 00000 n 
+0000681392 00000 n 
+0000681544 00000 n 
+0000681676 00000 n 
+0000681836 00000 n 
+0000681974 00000 n 
+0000682133 00000 n 
+0000682281 00000 n 
+0000682439 00000 n 
+0000682585 00000 n 
+0000682754 00000 n 
+0000682901 00000 n 
+0000683066 00000 n 
+0000683209 00000 n 
+0000683380 00000 n 
+0000683529 00000 n 
+0000683688 00000 n 
+0000683836 00000 n 
+0000683994 00000 n 
+0000684140 00000 n 
+0000684309 00000 n 
+0000684456 00000 n 
+0000684618 00000 n 
+0000684761 00000 n 
+0000684932 00000 n 
+0000685081 00000 n 
+0000685241 00000 n 
+0000685390 00000 n 
+0000685549 00000 n 
+0000685696 00000 n 
+0000685866 00000 n 
+0000686014 00000 n 
+0000686169 00000 n 
+0000686312 00000 n 
+0000686483 00000 n 
+0000686632 00000 n 
+0000686792 00000 n 
+0000686941 00000 n 
+0000687112 00000 n 
+0000687261 00000 n 
+0000687425 00000 n 
+0000687569 00000 n 
+0000687728 00000 n 
+0000687876 00000 n 
+0000688045 00000 n 
+0000688192 00000 n 
+0000688394 00000 n 
+0000688576 00000 n 
+0000688748 00000 n 
+0000688898 00000 n 
+0000689058 00000 n 
+0000689207 00000 n 
+0000689376 00000 n 
+0000689523 00000 n 
+0000689723 00000 n 
+0000689901 00000 n 
+0000690074 00000 n 
+0000690225 00000 n 
+0000690386 00000 n 
+0000690536 00000 n 
+0000690707 00000 n 
+0000690856 00000 n 
+0000691023 00000 n 
+0000691168 00000 n 
+0000691341 00000 n 
+0000691492 00000 n 
+0000691653 00000 n 
+0000691803 00000 n 
+0000691962 00000 n 
+0000692109 00000 n 
+0000692276 00000 n 
+0000692421 00000 n 
+0000692576 00000 n 
+0000692719 00000 n 
+0000692866 00000 n 
+0000693002 00000 n 
+0000693160 00000 n 
+0000693296 00000 n 
+0000693454 00000 n 
+0000693601 00000 n 
+0000693749 00000 n 
+0000693886 00000 n 
+0000694055 00000 n 
+0000694202 00000 n 
+0000694389 00000 n 
+0000694554 00000 n 
+0000694725 00000 n 
+0000694874 00000 n 
+0000695033 00000 n 
+0000695181 00000 n 
+0000695350 00000 n 
+0000695497 00000 n 
+0000695666 00000 n 
+0000695813 00000 n 
+0000695986 00000 n 
+0000696137 00000 n 
+0000696295 00000 n 
+0000696441 00000 n 
+0000696606 00000 n 
+0000696759 00000 n 
+0000696923 00000 n 
+0000697076 00000 n 
+0000697257 00000 n 
 0000697416 00000 n 
-0000697568 00000 n 
-0000697729 00000 n 
-0000697880 00000 n 
-0000698051 00000 n 
-0000698201 00000 n 
-0000698368 00000 n 
-0000698514 00000 n 
-0000698687 00000 n 
-0000698839 00000 n 
-0000699000 00000 n 
-0000699151 00000 n 
-0000699322 00000 n 
-0000699472 00000 n 
-0000699626 00000 n 
-0000699770 00000 n 
-0000699939 00000 n 
-0000700087 00000 n 
-0000700246 00000 n 
-0000700395 00000 n 
-0000700552 00000 n 
-0000700688 00000 n 
-0000700840 00000 n 
-0000700973 00000 n 
-0000701133 00000 n 
-0000701272 00000 n 
-0000701420 00000 n 
-0000701557 00000 n 
-0000701726 00000 n 
-0000701873 00000 n 
-0000702035 00000 n 
-0000702177 00000 n 
-0000702348 00000 n 
-0000702497 00000 n 
-0000702656 00000 n 
-0000702804 00000 n 
-0000702962 00000 n 
-0000703108 00000 n 
-0000703277 00000 n 
-0000703424 00000 n 
-0000703588 00000 n 
-0000703730 00000 n 
-0000703901 00000 n 
-0000704050 00000 n 
-0000704209 00000 n 
-0000704357 00000 n 
-0000704515 00000 n 
-0000704661 00000 n 
-0000704831 00000 n 
-0000704979 00000 n 
-0000705141 00000 n 
-0000705284 00000 n 
-0000705456 00000 n 
-0000705606 00000 n 
-0000705765 00000 n 
-0000705913 00000 n 
-0000706071 00000 n 
-0000706217 00000 n 
-0000706387 00000 n 
-0000706535 00000 n 
-0000706691 00000 n 
-0000706835 00000 n 
-0000707007 00000 n 
-0000707157 00000 n 
-0000707316 00000 n 
-0000707464 00000 n 
-0000707633 00000 n 
-0000707780 00000 n 
-0000707944 00000 n 
-0000708088 00000 n 
-0000708248 00000 n 
-0000708397 00000 n 
-0000708567 00000 n 
-0000708715 00000 n 
-0000708916 00000 n 
-0000709097 00000 n 
-0000709270 00000 n 
-0000709421 00000 n 
-0000709582 00000 n 
-0000709732 00000 n 
-0000709903 00000 n 
-0000710052 00000 n 
-0000710252 00000 n 
-0000710430 00000 n 
-0000710603 00000 n 
-0000710754 00000 n 
-0000710915 00000 n 
-0000711065 00000 n 
-0000711236 00000 n 
-0000711385 00000 n 
-0000711551 00000 n 
-0000711695 00000 n 
-0000711864 00000 n 
-0000712011 00000 n 
-0000712170 00000 n 
-0000712318 00000 n 
-0000712464 00000 n 
-0000712598 00000 n 
-0000712756 00000 n 
-0000712892 00000 n 
-0000713036 00000 n 
-0000713168 00000 n 
-0000713316 00000 n 
-0000713453 00000 n 
-0000713622 00000 n 
-0000713769 00000 n 
-0000713938 00000 n 
-0000714096 00000 n 
-0000714255 00000 n 
-0000714403 00000 n 
-0000714572 00000 n 
-0000714719 00000 n 
-0000714906 00000 n 
-0000715071 00000 n 
-0000715242 00000 n 
-0000715391 00000 n 
-0000715550 00000 n 
-0000715698 00000 n 
-0000715867 00000 n 
-0000716014 00000 n 
-0000716183 00000 n 
-0000716330 00000 n 
-0000716503 00000 n 
-0000716654 00000 n 
-0000716821 00000 n 
-0000716966 00000 n 
-0000717125 00000 n 
-0000717272 00000 n 
-0000717438 00000 n 
-0000717592 00000 n 
-0000717756 00000 n 
-0000717909 00000 n 
-0000718089 00000 n 
-0000718247 00000 n 
-0000718415 00000 n 
-0000718561 00000 n 
-0000718729 00000 n 
-0000718875 00000 n 
-0000719044 00000 n 
-0000719191 00000 n 
-0000719362 00000 n 
-0000719511 00000 n 
-0000719673 00000 n 
-0000719813 00000 n 
-0000719977 00000 n 
-0000720130 00000 n 
-0000720296 00000 n 
-0000720440 00000 n 
-0000720611 00000 n 
-0000720760 00000 n 
-0000720944 00000 n 
-0000721108 00000 n 
-0000721286 00000 n 
-0000721442 00000 n 
-0000721608 00000 n 
-0000721752 00000 n 
-0000721929 00000 n 
-0000722084 00000 n 
-0000722255 00000 n 
-0000722404 00000 n 
-0000722571 00000 n 
-0000722716 00000 n 
-0000723001 00000 n 
-0000723080 00000 n 
-0000723244 00000 n 
-0000723435 00000 n 
-0000723663 00000 n 
-0000723880 00000 n 
-0000724050 00000 n 
-0000724268 00000 n 
-0000724522 00000 n 
-0000724695 00000 n 
-0000724876 00000 n 
-0000725137 00000 n 
-0000725322 00000 n 
-0000725503 00000 n 
-0000725767 00000 n 
-0000725953 00000 n 
-0000726135 00000 n 
-0000726391 00000 n 
-0000726564 00000 n 
-0000726745 00000 n 
-0000727001 00000 n 
-0000727190 00000 n 
-0000727389 00000 n 
-0000727584 00000 n 
-0000727765 00000 n 
-0000728086 00000 n 
-0000728272 00000 n 
-0000728441 00000 n 
-0000728765 00000 n 
-0000728954 00000 n 
-0000729153 00000 n 
-0000729334 00000 n 
-0000729618 00000 n 
-0000729808 00000 n 
-0000730008 00000 n 
-0000730204 00000 n 
-0000730373 00000 n 
-0000730669 00000 n 
-0000730858 00000 n 
-0000731057 00000 n 
-0000731238 00000 n 
-0000731623 00000 n 
-0000731817 00000 n 
-0000732020 00000 n 
-0000732206 00000 n 
-0000732502 00000 n 
-0000732684 00000 n 
+0000697584 00000 n 
+0000697730 00000 n 
+0000697897 00000 n 
+0000698042 00000 n 
+0000698210 00000 n 
+0000698356 00000 n 
+0000698516 00000 n 
+0000698665 00000 n 
+0000698828 00000 n 
+0000698969 00000 n 
+0000699134 00000 n 
+0000699288 00000 n 
+0000699454 00000 n 
+0000699598 00000 n 
+0000699768 00000 n 
+0000699916 00000 n 
+0000700100 00000 n 
+0000700264 00000 n 
+0000700441 00000 n 
+0000700596 00000 n 
+0000700761 00000 n 
+0000700904 00000 n 
+0000701080 00000 n 
+0000701234 00000 n 
+0000701403 00000 n 
+0000701550 00000 n 
+0000701717 00000 n 
+0000701862 00000 n 
+0000702147 00000 n 
+0000702226 00000 n 
+0000702390 00000 n 
+0000702581 00000 n 
+0000702809 00000 n 
+0000703026 00000 n 
+0000703196 00000 n 
+0000703414 00000 n 
+0000703660 00000 n 
+0000703833 00000 n 
+0000704014 00000 n 
+0000704279 00000 n 
+0000704464 00000 n 
+0000704645 00000 n 
+0000704902 00000 n 
+0000705087 00000 n 
+0000705268 00000 n 
+0000705525 00000 n 
+0000705702 00000 n 
+0000705901 00000 n 
+0000706096 00000 n 
+0000706278 00000 n 
+0000706598 00000 n 
+0000706783 00000 n 
+0000706964 00000 n 
+0000707288 00000 n 
+0000707478 00000 n 
+0000707665 00000 n 
+0000707846 00000 n 
+0000708130 00000 n 
+0000708319 00000 n 
+0000708518 00000 n 
+0000708714 00000 n 
+0000708896 00000 n 
+0000709192 00000 n 
+0000709381 00000 n 
+0000709568 00000 n 
+0000709749 00000 n 
+0000710129 00000 n 
+0000710318 00000 n 
+0000710518 00000 n 
+0000710699 00000 n 
+0000711008 00000 n 
+0000711202 00000 n 
+0000711392 00000 n 
+0000711689 00000 n 
+0000711882 00000 n 
+0000712085 00000 n 
+0000712271 00000 n 
+0000712555 00000 n 
+0000712744 00000 n 
+0000712929 00000 n 
+0000713250 00000 n 
+0000713444 00000 n 
+0000713635 00000 n 
+0000713820 00000 n 
+0000714204 00000 n 
+0000714397 00000 n 
+0000714601 00000 n 
+0000714786 00000 n 
+0000715099 00000 n 
+0000715293 00000 n 
+0000715497 00000 n 
+0000715683 00000 n 
+0000715984 00000 n 
+0000716178 00000 n 
+0000716383 00000 n 
+0000716569 00000 n 
+0000716879 00000 n 
+0000717074 00000 n 
+0000717279 00000 n 
+0000717453 00000 n 
+0000717806 00000 n 
+0000718000 00000 n 
+0000718204 00000 n 
+0000718390 00000 n 
+0000718707 00000 n 
+0000718902 00000 n 
+0000719107 00000 n 
+0000719293 00000 n 
+0000719658 00000 n 
+0000719841 00000 n 
+0000720045 00000 n 
+0000720245 00000 n 
+0000720431 00000 n 
+0000720817 00000 n 
+0000721011 00000 n 
+0000721215 00000 n 
+0000721403 00000 n 
+0000721589 00000 n 
+0000721978 00000 n 
+0000722172 00000 n 
+0000722376 00000 n 
+0000722577 00000 n 
+0000722763 00000 n 
+0000723045 00000 n 
+0000723239 00000 n 
+0000723431 00000 n 
+0000723617 00000 n 
+0000723906 00000 n 
+0000724096 00000 n 
+0000724282 00000 n 
+0000724663 00000 n 
+0000724858 00000 n 
+0000725062 00000 n 
+0000725249 00000 n 
+0000725598 00000 n 
+0000725781 00000 n 
+0000725985 00000 n 
+0000726171 00000 n 
+0000726533 00000 n 
+0000726727 00000 n 
+0000726932 00000 n 
+0000727133 00000 n 
+0000727320 00000 n 
+0000727565 00000 n 
+0000727744 00000 n 
+0000727930 00000 n 
+0000728211 00000 n 
+0000728401 00000 n 
+0000728587 00000 n 
+0000728891 00000 n 
+0000729085 00000 n 
+0000729289 00000 n 
+0000729476 00000 n 
+0000729704 00000 n 
+0000729906 00000 n 
+0000730091 00000 n 
+0000730316 00000 n 
+0000730541 00000 n 
+0000730785 00000 n 
+0000730977 00000 n 
+0000731165 00000 n 
+0000731362 00000 n 
+0000731571 00000 n 
+0000731747 00000 n 
+0000731971 00000 n 
+0000732160 00000 n 
+0000732368 00000 n 
+0000732640 00000 n 
 0000732873 00000 n 
-0000733181 00000 n 
-0000733374 00000 n 
-0000733577 00000 n 
-0000733762 00000 n 
-0000734047 00000 n 
-0000734236 00000 n 
-0000734409 00000 n 
-0000734729 00000 n 
-0000734922 00000 n 
-0000735125 00000 n 
-0000735310 00000 n 
-0000735694 00000 n 
-0000735888 00000 n 
-0000736091 00000 n 
-0000736277 00000 n 
-0000736578 00000 n 
-0000736761 00000 n 
-0000736965 00000 n 
-0000737151 00000 n 
-0000737453 00000 n 
-0000737647 00000 n 
-0000737851 00000 n 
-0000738038 00000 n 
-0000738348 00000 n 
-0000738543 00000 n 
-0000738747 00000 n 
-0000738933 00000 n 
-0000739286 00000 n 
-0000739481 00000 n 
-0000739686 00000 n 
-0000739872 00000 n 
-0000740190 00000 n 
-0000740385 00000 n 
-0000740577 00000 n 
-0000740763 00000 n 
-0000741140 00000 n 
-0000741334 00000 n 
-0000741538 00000 n 
-0000741739 00000 n 
-0000741926 00000 n 
-0000742311 00000 n 
-0000742506 00000 n 
-0000742710 00000 n 
-0000742899 00000 n 
-0000743086 00000 n 
-0000743476 00000 n 
-0000743670 00000 n 
-0000743874 00000 n 
-0000744075 00000 n 
-0000744249 00000 n 
-0000744530 00000 n 
-0000744724 00000 n 
-0000744928 00000 n 
-0000745114 00000 n 
-0000745403 00000 n 
-0000745594 00000 n 
-0000745781 00000 n 
-0000746163 00000 n 
-0000746358 00000 n 
-0000746562 00000 n 
-0000746748 00000 n 
-0000747109 00000 n 
-0000747304 00000 n 
-0000747509 00000 n 
-0000747695 00000 n 
-0000748057 00000 n 
-0000748252 00000 n 
-0000748456 00000 n 
-0000748656 00000 n 
-0000748842 00000 n 
-0000749100 00000 n 
-0000749290 00000 n 
-0000749476 00000 n 
-0000749757 00000 n 
-0000749947 00000 n 
-0000750134 00000 n 
-0000750425 00000 n 
-0000750608 00000 n 
-0000750812 00000 n 
-0000750998 00000 n 
-0000751226 00000 n 
-0000751428 00000 n 
-0000751605 00000 n 
-0000751802 00000 n 
-0000752027 00000 n 
-0000752251 00000 n 
-0000752496 00000 n 
-0000752689 00000 n 
-0000752878 00000 n 
-0000753074 00000 n 
-0000753286 00000 n 
-0000753462 00000 n 
-0000753687 00000 n 
-0000753876 00000 n 
-0000754084 00000 n 
-0000754344 00000 n 
-0000754564 00000 n 
-0000754748 00000 n 
-0000754976 00000 n 
-0000755180 00000 n 
-0000755355 00000 n 
-0000755927 00000 n 
-0000763795 00000 n 
-0000764011 00000 n 
-0000765374 00000 n 
-0000766443 00000 n 
-0000774049 00000 n 
-0000774270 00000 n 
-0000775633 00000 n 
-0000776712 00000 n 
-0000779973 00000 n 
-0000780199 00000 n 
-0000781562 00000 n 
-0000782678 00000 n 
-0000784881 00000 n 
-0000785095 00000 n 
-0000786458 00000 n 
+0000733057 00000 n 
+0000733285 00000 n 
+0000733489 00000 n 
+0000733664 00000 n 
+0000734202 00000 n 
+0000742070 00000 n 
+0000742286 00000 n 
+0000743649 00000 n 
+0000744718 00000 n 
+0000752324 00000 n 
+0000752545 00000 n 
+0000753908 00000 n 
+0000754987 00000 n 
+0000758248 00000 n 
+0000758474 00000 n 
+0000759837 00000 n 
+0000760953 00000 n 
+0000763156 00000 n 
+0000763370 00000 n 
+0000764733 00000 n 
 trailer
-<< /Size 769
+<< /Size 749
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-787583
+765858
 %%EOF
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index 0cd2e035f..dccbf4d10 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -53,7 +53,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `hibernate_sequence` WRITE;
 /*!40000 ALTER TABLE `hibernate_sequence` DISABLE KEYS */;
-INSERT INTO `hibernate_sequence` VALUES (4);
+INSERT INTO `hibernate_sequence` VALUES (11);
 /*!40000 ALTER TABLE `hibernate_sequence` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-19 15:16:21.107439','','2020-02-19 15:16:22.017835',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-23 14:57:36.261603','','2020-02-23 14:57:37.442867',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_QIfdq_v1_0_ResourceInstanceName1_tca','','2020-02-19 15:16:21.571592','','2020-02-19 15:16:21.571592','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-7aec6c68-df86-4f02-a48f-5d383d813fd4',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-b548b729-9646-40d4-825b-348fe357c742\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a1ac8a3f-8879-4ac7-8ab5-a6a5b9edacf2\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_QIfdq_v1_0_ResourceInstanceName1_tca_3','','2020-02-19 15:16:21.363011','','2020-02-19 15:16:21.363011','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-01671aaa-75e6-42bc-a83e-b9ff897aec5d',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-619cce6e-3b20-4050-bf96-b234977b8bcd\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-b04c2639-5eb7-48ac-95b5-49de51180d4e\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_QIfdq_v1_0_ResourceInstanceName2_tca_2','','2020-02-19 15:16:21.057572','','2020-02-19 15:16:21.057572','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-b1b12323-0d48-48b9-bb5f-f9b336d268fe',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-e7d67214-4b9a-4c7c-8713-389a6c19b07b\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4ce85a88-0f48-461f-92d9-188fb2e0057a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ZYR0u_v1_0_ResourceInstanceName1_tca','','2020-02-23 14:57:37.354531','','2020-02-23 14:57:37.354531','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-6ac9e72b-6c6d-4760-95be-aff793676402',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-69d98326-0cc6-4644-a663-42da12480c09\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-689b910d-d8cb-4191-a431-81c7ebde9431\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ZYR0u_v1_0_ResourceInstanceName1_tca_3','','2020-02-23 14:57:36.902139','','2020-02-23 14:57:36.902139','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-0802f17e-d2da-4b17-8f93-aa4dec49f804',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-69adc543-5792-44bd-b5dd-42276d5264d4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-8245ac9b-82ae-4281-80c3-86a12162585a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ZYR0u_v1_0_ResourceInstanceName2_tca_2','','2020-02-23 14:57:36.199438','','2020-02-23 14:57:36.199438','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-90abf19f-7ad7-483e-bacc-6c8ba0cf0b72',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-612c4472-9394-4ee3-8390-78a31bd7c6a1\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-f0f10851-e052-4334-88ec-39fd27fad04f\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_QIfdq_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_QIfdq_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_QIfdq_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ZYR0u_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ZYR0u_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ZYR0u_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,15 +152,15 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','','2020-02-19 15:16:32.550573','','2020-02-19 15:16:32.550573','Guard','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','','2020-02-19 15:16:32.674581','','2020-02-19 15:16:32.674581','Blacklist','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','','2020-02-19 15:16:32.580634','','2020-02-19 15:16:32.580634','FrequencyLimiter','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','','2020-02-19 15:16:32.550894','','2020-02-19 15:16:32.550894','MinMax','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','','2020-02-19 15:16:32.689085','','2020-02-19 15:16:32.689085','Operational','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','','2020-02-19 15:16:32.661448','','2020-02-19 15:16:32.661448','Apex','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','','2020-02-19 15:16:32.553673','','2020-02-19 15:16:32.553673','Drools','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','','2020-02-19 15:16:32.738454','','2020-02-19 15:16:32.738454','Monitoring','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','','2020-02-19 15:16:21.136405','','2020-02-19 15:16:21.136405','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','','2020-02-23 14:58:01.969345','','2020-02-23 14:58:01.969345','Guard','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','','2020-02-23 14:58:02.079228','','2020-02-23 14:58:02.079228','Blacklist','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','','2020-02-23 14:58:01.975474','','2020-02-23 14:58:01.975474','FrequencyLimiter','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','','2020-02-23 14:58:01.969411','','2020-02-23 14:58:01.969411','MinMax','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','','2020-02-23 14:58:02.104332','','2020-02-23 14:58:02.104332','Operational','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','','2020-02-23 14:58:02.101837','','2020-02-23 14:58:02.101837','Apex','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','','2020-02-23 14:58:01.972542','','2020-02-23 14:58:01.972542','Drools','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','','2020-02-23 14:58:02.205009','','2020-02-23 14:58:02.205009','Monitoring','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','','2020-02-23 14:57:36.291005','','2020-02-23 14:57:36.291005','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -182,4 +182,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-19 23:17:54
+-- Dump completed on 2020-02-23 22:59:28
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
index d06cb8cff..fd0110c79 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
@@ -65,7 +65,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
      */
     @Id
     @Expose
-    @Column(name = "version")
+    @Column(name = "version",nullable = false)
     private String version;
 
     @Column(columnDefinition = "MEDIUMTEXT", name = "policy_tosca")
@@ -179,7 +179,10 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
         this.policyModelType = policyType;
         this.policyModelTosca = policyModelTosca;
         this.version = version;
-        this.policyAcronym = policyAcronym;
+        this.policyAcronym=policyAcronym;
+        if (this.policyAcronym == null) {
+            this.policyAcronym = createDefaultPolicyAcronym(policyType);
+        }
     }
 
     /**
@@ -190,7 +193,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
      * @param version          the version like 1.0.0
      */
     public PolicyModel(String policyType, String policyModelTosca, String version) {
-        this(policyType, policyModelTosca, version, createDefaultPolicyAcronym(policyType));
+        this(policyType, policyModelTosca, version, null);
     }
 
     public static String createDefaultPolicyAcronym(String policyType) {
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
index 0a09dd8d7..ad9ce7078 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
@@ -24,6 +24,8 @@
 package org.onap.clamp.loop.template;
 
 import com.google.gson.JsonObject;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.onap.clamp.clds.tosca.ToscaSchemaConstants;
 import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
@@ -38,7 +40,7 @@ public class PolicyModelsService {
 
     @Autowired
     public PolicyModelsService(PolicyModelsRepository policyModelrepo,
-        ToscaYamlToJsonConvertor convertor) {
+                               ToscaYamlToJsonConvertor convertor) {
         policyModelsRepository = policyModelrepo;
         toscaYamlToJsonConvertor = convertor;
     }
@@ -48,35 +50,45 @@ public class PolicyModelsService {
     }
 
     /**
-     * Creates or updates the Tosca Policy Model.
+     * Creates the Tosca Policy Model from a policy tosca file,
+     * if the same type already exists in database, it increases the version automatically.
      *
-     * @param policyModelType
-     *        The policyModeltype in Tosca yaml
-     * @param policyModel
-     *        The Policymodel object
-     * @return The Policy Model
+     * @param policyModelType  The policyModeltype in Tosca yaml
+     * @param policyModelTosca The Policymodel object
+     * @return The Policy Model created
      */
-    public PolicyModel saveOrUpdateByPolicyModelType(String policyModelType,
-        String policyModelTosca) {
+    public PolicyModel createNewPolicyModelFromTosca(String policyModelType,
+                                                     String policyModelTosca) {
         JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
+        String policyModelTypeFromTosca = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+                ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
+        String policyModelTypeToUse = policyModelTypeFromTosca != null ? policyModelTypeFromTosca : policyModelType;
+        Iterable<PolicyModel> models = getAllPolicyModelsByType(policyModelTypeToUse);
+        Collections.sort((List<PolicyModel>) models);
+        PolicyModel newPolicyModel = new PolicyModel(policyModelTypeToUse, policyModelTosca,
+                SemanticVersioning.incrementMajorVersion(
+                        ((ArrayList) models).isEmpty() ? null : ((ArrayList<PolicyModel>) models).get(0).getVersion()),
+                toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+                        ToscaSchemaConstants.METADATA_ACRONYM));
+        return saveOrUpdatePolicyModel(newPolicyModel);
+    }
 
-        String policyModelTypeName = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
-            ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
-        String acronym = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
-            ToscaSchemaConstants.METADATA_ACRONYM);
-        PolicyModel model = getPolicyModelByType(
-            policyModelTypeName != null ? policyModelTypeName : policyModelType);
-
-        if (model == null) {
-            model = new PolicyModel(policyModelTypeName, policyModelTosca,
-                SemanticVersioning.incrementMajorVersion(null), acronym);
-        } else {
-            model.setVersion(SemanticVersioning
-                .incrementMajorVersion(model.getVersion() != null ? model.getVersion() : null));
-            model.setPolicyModelType(policyModelTypeName);
-            model.setPolicyAcronym(acronym);
-        }
-        return saveOrUpdatePolicyModel(model);
+    /**
+     * Update an existing Tosca Policy Model.
+     *
+     * @param policyModelType    The policy Model type in Tosca yaml
+     * @param policyModelVersion The policy Version to update
+     * @param policyModelTosca   The Policy Model tosca
+     * @return The Policy Model updated
+     */
+    public PolicyModel updatePolicyModelTosca(String policyModelType, String policyModelVersion,
+                                              String policyModelTosca) {
+        JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
+        PolicyModel thePolicyModel = getPolicyModelByType(policyModelType, policyModelVersion);
+        thePolicyModel.setPolicyAcronym(toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+                ToscaSchemaConstants.METADATA_ACRONYM));
+        thePolicyModel.setPolicyModelTosca(policyModelTosca);
+        return saveOrUpdatePolicyModel(thePolicyModel);
     }
 
     public List<String> getAllPolicyModelTypes() {
@@ -95,19 +107,19 @@ public class PolicyModelsService {
         return policyModelsRepository.findByPolicyModelType(type);
     }
 
-    public PolicyModel getPolicyModelByType(String type) {
-        List<PolicyModel> list = policyModelsRepository.findByPolicyModelType(type);
-        return list.stream().sorted().findFirst().orElse(null);
+    public PolicyModel getPolicyModelByType(String type, String version) {
+        return policyModelsRepository.findById(new PolicyModelId(type, version)).orElse(null);
     }
 
     /**
      * Retrieves the Tosca model Yaml string.
      *
-     * @param type The PolicyModelType
+     * @param type    The Policy Model Type
+     * @param version The policy model version
      * @return The Tosca model Yaml string
      */
-    public String getPolicyModelTosca(String type) {
-        PolicyModel policyModel = getPolicyModelByType(type);
-        return policyModel != null ? policyModel.getPolicyModelTosca() : null;
+    public String getPolicyModelTosca(String type, String version) {
+        return policyModelsRepository.findById(new PolicyModelId(type, version)).orElse(new PolicyModel())
+                .getPolicyModelTosca();
     }
 }
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 4d351126f..74322f36b 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,217 +444,211 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route30">2.1. GET /v1/clds/cldsInfo</a>
+<li><a href="#_route92">2.1. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route31">2.2. GET /v1/healthcheck</a>
+<li><a href="#_route93">2.2. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route32">2.3. GET /v1/user/getUser</a>
+<li><a href="#_route80">2.3. GET /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route18">2.4. GET /v2/dictionary</a>
+<li><a href="#_route82">2.4. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
-<li><a href="#_responses_4">2.4.1. Responses</a></li>
-<li><a href="#_produces_4">2.4.2. Produces</a></li>
+<li><a href="#_parameters">2.4.1. Parameters</a></li>
+<li><a href="#_responses_4">2.4.2. Responses</a></li>
+<li><a href="#_consumes">2.4.3. Consumes</a></li>
+<li><a href="#_produces_4">2.4.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route20">2.5. PUT /v2/dictionary</a>
+<li><a href="#_v2_dictionary_secondary_names_get">2.5. GET /v2/dictionary/secondary/names</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters">2.5.1. Parameters</a></li>
-<li><a href="#_responses_5">2.5.2. Responses</a></li>
-<li><a href="#_consumes">2.5.3. Consumes</a></li>
-<li><a href="#_produces_5">2.5.4. Produces</a></li>
+<li><a href="#_responses_5">2.5.1. Responses</a></li>
+<li><a href="#_produces_5">2.5.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_dictionary_secondary_names_get">2.6. GET /v2/dictionary/secondary/names</a>
+<li><a href="#_v2_dictionary_dictionaryname_get">2.6. GET /v2/dictionary/{dictionaryName}</a>
 <ul class="sectlevel3">
-<li><a href="#_responses_6">2.6.1. Responses</a></li>
-<li><a href="#_produces_6">2.6.2. Produces</a></li>
+<li><a href="#_parameters_2">2.6.1. Parameters</a></li>
+<li><a href="#_responses_6">2.6.2. Responses</a></li>
+<li><a href="#_produces_6">2.6.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_dictionary_dictionaryname_get">2.7. GET /v2/dictionary/{dictionaryName}</a>
+<li><a href="#_v2_dictionary_name_put">2.7. PUT /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_2">2.7.1. Parameters</a></li>
+<li><a href="#_parameters_3">2.7.1. Parameters</a></li>
 <li><a href="#_responses_7">2.7.2. Responses</a></li>
-<li><a href="#_produces_7">2.7.3. Produces</a></li>
+<li><a href="#_consumes_2">2.7.3. Consumes</a></li>
+<li><a href="#_produces_7">2.7.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_dictionary_name_put">2.8. PUT /v2/dictionary/{name}</a>
+<li><a href="#_route84">2.8. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_3">2.8.1. Parameters</a></li>
+<li><a href="#_parameters_4">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
-<li><a href="#_consumes_2">2.8.3. Consumes</a></li>
-<li><a href="#_produces_8">2.8.4. Produces</a></li>
+<li><a href="#_produces_8">2.8.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route22">2.9. DELETE /v2/dictionary/{name}</a>
+<li><a href="#_v2_dictionary_name_elements_shortname_delete">2.9. DELETE /v2/dictionary/{name}/elements/{shortName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_4">2.9.1. Parameters</a></li>
+<li><a href="#_parameters_5">2.9.1. Parameters</a></li>
 <li><a href="#_responses_9">2.9.2. Responses</a></li>
 <li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_dictionary_name_elements_shortname_delete">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a>
+<li><a href="#_route76">2.10. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_5">2.10.1. Parameters</a></li>
+<li><a href="#_parameters_6">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
-<li><a href="#_produces_10">2.10.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route14">2.11. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route70">2.11. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_6">2.11.1. Parameters</a></li>
+<li><a href="#_parameters_7">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
+<li><a href="#_produces_10">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route8">2.12. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route64">2.12. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_7">2.12.1. Parameters</a></li>
-<li><a href="#_responses_12">2.12.2. Responses</a></li>
-<li><a href="#_produces_11">2.12.3. Produces</a></li>
+<li><a href="#_responses_12">2.12.1. Responses</a></li>
+<li><a href="#_produces_11">2.12.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route2">2.13. GET /v2/loop/getAllNames</a>
+<li><a href="#_route77">2.13. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_responses_13">2.13.1. Responses</a></li>
-<li><a href="#_produces_12">2.13.2. Produces</a></li>
+<li><a href="#_parameters_8">2.13.1. Parameters</a></li>
+<li><a href="#_responses_13">2.13.2. Responses</a></li>
+<li><a href="#_produces_12">2.13.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route15">2.14. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route71">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_8">2.14.1. Parameters</a></li>
+<li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route9">2.15. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
+<li><a href="#_route74">2.15. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_9">2.15.1. Parameters</a></li>
+<li><a href="#_parameters_10">2.15.1. Parameters</a></li>
 <li><a href="#_responses_15">2.15.2. Responses</a></li>
 <li><a href="#_produces_14">2.15.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route12">2.16. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route73">2.16. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_10">2.16.1. Parameters</a></li>
+<li><a href="#_parameters_11">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route11">2.17. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route75">2.17. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_11">2.17.1. Parameters</a></li>
+<li><a href="#_parameters_12">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
 <li><a href="#_produces_16">2.17.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route13">2.18. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route66">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_12">2.18.1. Parameters</a></li>
+<li><a href="#_parameters_13">2.18.1. Parameters</a></li>
 <li><a href="#_responses_18">2.18.2. Responses</a></li>
 <li><a href="#_produces_17">2.18.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route4">2.19. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route72">2.19. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_13">2.19.1. Parameters</a></li>
+<li><a href="#_parameters_14">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
 <li><a href="#_produces_18">2.19.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route10">2.20. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route67">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_14">2.20.1. Parameters</a></li>
+<li><a href="#_parameters_15">2.20.1. Parameters</a></li>
 <li><a href="#_responses_20">2.20.2. Responses</a></li>
-<li><a href="#_produces_19">2.20.3. Produces</a></li>
+<li><a href="#_consumes_3">2.20.3. Consumes</a></li>
+<li><a href="#_produces_19">2.20.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route5">2.21. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route69">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_15">2.21.1. Parameters</a></li>
+<li><a href="#_parameters_16">2.21.1. Parameters</a></li>
 <li><a href="#_responses_21">2.21.2. Responses</a></li>
-<li><a href="#_consumes_3">2.21.3. Consumes</a></li>
+<li><a href="#_consumes_4">2.21.3. Consumes</a></li>
 <li><a href="#_produces_20">2.21.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route7">2.22. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route68">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_16">2.22.1. Parameters</a></li>
+<li><a href="#_parameters_17">2.22.1. Parameters</a></li>
 <li><a href="#_responses_22">2.22.2. Responses</a></li>
-<li><a href="#_consumes_4">2.22.3. Consumes</a></li>
+<li><a href="#_consumes_5">2.22.3. Consumes</a></li>
 <li><a href="#_produces_21">2.22.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route6">2.23. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route65">2.23. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_17">2.23.1. Parameters</a></li>
+<li><a href="#_parameters_18">2.23.1. Parameters</a></li>
 <li><a href="#_responses_23">2.23.2. Responses</a></li>
-<li><a href="#_consumes_5">2.23.3. Consumes</a></li>
-<li><a href="#_produces_22">2.23.4. Produces</a></li>
+<li><a href="#_produces_22">2.23.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route3">2.24. GET /v2/loop/{loopName}</a>
+<li><a href="#_route87">2.24. GET /v2/policyToscaModels</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_18">2.24.1. Parameters</a></li>
-<li><a href="#_responses_24">2.24.2. Responses</a></li>
-<li><a href="#_produces_23">2.24.3. Produces</a></li>
+<li><a href="#_responses_24">2.24.1. Responses</a></li>
+<li><a href="#_produces_23">2.24.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route25">2.25. GET /v2/policyToscaModels</a>
+<li><a href="#_v2_policytoscamodels_yaml_policymodeltype_get">2.25. GET /v2/policyToscaModels/yaml/{policyModelType}</a>
 <ul class="sectlevel3">
-<li><a href="#_responses_25">2.25.1. Responses</a></li>
-<li><a href="#_produces_24">2.25.2. Produces</a></li>
+<li><a href="#_parameters_19">2.25.1. Parameters</a></li>
+<li><a href="#_responses_25">2.25.2. Responses</a></li>
+<li><a href="#_produces_24">2.25.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_policytoscamodels_yaml_policymodeltype_get">2.26. GET /v2/policyToscaModels/yaml/{policyModelType}</a>
+<li><a href="#_v2_policytoscamodels_policymodeltype_get">2.26. GET /v2/policyToscaModels/{policyModelType}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_19">2.26.1. Parameters</a></li>
+<li><a href="#_parameters_20">2.26.1. Parameters</a></li>
 <li><a href="#_responses_26">2.26.2. Responses</a></li>
 <li><a href="#_produces_25">2.26.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_policytoscamodels_policymodeltype_get">2.27. GET /v2/policyToscaModels/{policyModelType}</a>
+<li><a href="#_route88">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_20">2.27.1. Parameters</a></li>
+<li><a href="#_parameters_21">2.27.1. Parameters</a></li>
 <li><a href="#_responses_27">2.27.2. Responses</a></li>
-<li><a href="#_produces_26">2.27.3. Produces</a></li>
+<li><a href="#_consumes_6">2.27.3. Consumes</a></li>
+<li><a href="#_produces_26">2.27.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route26">2.28. PUT /v2/policyToscaModels/{policyModelType}</a>
+<li><a href="#_route91">2.28. GET /v2/templates</a>
 <ul class="sectlevel3">
-<li><a href="#_parameters_21">2.28.1. Parameters</a></li>
-<li><a href="#_responses_28">2.28.2. Responses</a></li>
-<li><a href="#_consumes_6">2.28.3. Consumes</a></li>
-<li><a href="#_produces_27">2.28.4. Produces</a></li>
+<li><a href="#_responses_28">2.28.1. Responses</a></li>
+<li><a href="#_produces_27">2.28.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route29">2.29. GET /v2/templates</a>
+<li><a href="#_v2_templates_names_get">2.29. GET /v2/templates/names</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_29">2.29.1. Responses</a></li>
 <li><a href="#_produces_28">2.29.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_v2_templates_names_get">2.30. GET /v2/templates/names</a>
+<li><a href="#_v2_templates_templatename_get">2.30. GET /v2/templates/{templateName}</a>
 <ul class="sectlevel3">
-<li><a href="#_responses_30">2.30.1. Responses</a></li>
-<li><a href="#_produces_29">2.30.2. Produces</a></li>
-</ul>
-</li>
-<li><a href="#_v2_templates_templatename_get">2.31. GET /v2/templates/{templateName}</a>
-<ul class="sectlevel3">
-<li><a href="#_parameters_22">2.31.1. Parameters</a></li>
-<li><a href="#_responses_31">2.31.2. Responses</a></li>
-<li><a href="#_produces_30">2.31.3. Produces</a></li>
+<li><a href="#_parameters_22">2.30.1. Parameters</a></li>
+<li><a href="#_responses_30">2.30.2. Responses</a></li>
+<li><a href="#_produces_29">2.30.3. Produces</a></li>
 </ul>
 </li>
 </ul>
@@ -662,25 +656,24 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_definitions">3. Definitions</a>
 <ul class="sectlevel2">
 <li><a href="#_cldshealthcheck">3.1. CldsHealthCheck</a></li>
-<li><a href="#_cldsinfo">3.2. CldsInfo</a></li>
-<li><a href="#_dictionary">3.3. Dictionary</a></li>
-<li><a href="#_dictionaryelement">3.4. DictionaryElement</a></li>
-<li><a href="#_externalcomponent">3.5. ExternalComponent</a></li>
-<li><a href="#_externalcomponentstate">3.6. ExternalComponentState</a></li>
-<li><a href="#_jsonarray">3.7. JsonArray</a></li>
-<li><a href="#_jsonnull">3.8. JsonNull</a></li>
-<li><a href="#_jsonobject">3.9. JsonObject</a></li>
-<li><a href="#_jsonprimitive">3.10. JsonPrimitive</a></li>
-<li><a href="#_loop">3.11. Loop</a></li>
-<li><a href="#_loopelementmodel">3.12. LoopElementModel</a></li>
-<li><a href="#_looplog">3.13. LoopLog</a></li>
-<li><a href="#_looptemplate">3.14. LoopTemplate</a></li>
-<li><a href="#_looptemplateloopelementmodel">3.15. LoopTemplateLoopElementModel</a></li>
-<li><a href="#_microservicepolicy">3.16. MicroServicePolicy</a></li>
-<li><a href="#_number">3.17. Number</a></li>
-<li><a href="#_operationalpolicy">3.18. OperationalPolicy</a></li>
-<li><a href="#_policymodel">3.19. PolicyModel</a></li>
-<li><a href="#_service">3.20. Service</a></li>
+<li><a href="#_dictionary">3.2. Dictionary</a></li>
+<li><a href="#_dictionaryelement">3.3. DictionaryElement</a></li>
+<li><a href="#_externalcomponent">3.4. ExternalComponent</a></li>
+<li><a href="#_externalcomponentstate">3.5. ExternalComponentState</a></li>
+<li><a href="#_jsonarray">3.6. JsonArray</a></li>
+<li><a href="#_jsonnull">3.7. JsonNull</a></li>
+<li><a href="#_jsonobject">3.8. JsonObject</a></li>
+<li><a href="#_jsonprimitive">3.9. JsonPrimitive</a></li>
+<li><a href="#_loop">3.10. Loop</a></li>
+<li><a href="#_loopelementmodel">3.11. LoopElementModel</a></li>
+<li><a href="#_looplog">3.12. LoopLog</a></li>
+<li><a href="#_looptemplate">3.13. LoopTemplate</a></li>
+<li><a href="#_looptemplateloopelementmodel">3.14. LoopTemplateLoopElementModel</a></li>
+<li><a href="#_microservicepolicy">3.15. MicroServicePolicy</a></li>
+<li><a href="#_number">3.16. Number</a></li>
+<li><a href="#_operationalpolicy">3.17. OperationalPolicy</a></li>
+<li><a href="#_policymodel">3.18. PolicyModel</a></li>
+<li><a href="#_service">3.19. Service</a></li>
 </ul>
 </li>
 </ul>
@@ -699,7 +692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:33699<br>
+<p><em>Host</em> : localhost:33631<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -710,7 +703,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.1. GET /v1/clds/cldsInfo</a></h3>
+<h3 id="_route92"><a class="anchor" href="#_route92"></a><a class="link" href="#_route92">2.1. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -730,7 +723,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_cldsinfo">CldsInfo</a></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_cldshealthcheck">CldsHealthCheck</a></p></td>
 </tr>
 </tbody>
 </table>
@@ -747,48 +740,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.2. GET /v1/healthcheck</a></h3>
+<h3 id="_route93"><a class="anchor" href="#_route93"></a><a class="link" href="#_route93">2.2. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
-<col style="width: 10%;">
-<col style="width: 70%;">
-<col style="width: 20%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-middle">HTTP Code</th>
-<th class="tableblock halign-left valign-middle">Description</th>
-<th class="tableblock halign-left valign-middle">Schema</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>200</strong></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">Output type</p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_cldshealthcheck">CldsHealthCheck</a></p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_produces_2"><a class="anchor" href="#_produces_2"></a><a class="link" href="#_produces_2">2.2.2. Produces</a></h4>
-<div class="ulist">
-<ul>
-<li>
-<p><code>application/json</code></p>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_route32"><a class="anchor" href="#_route32"></a><a class="link" href="#_route32">2.3. GET /v1/user/getUser</a></h3>
-<div class="sect3">
-<h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
-<table class="tableblock frame-all grid-all stretch">
-<colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 66.6667%;">
 </colgroup>
@@ -807,7 +763,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_3"><a class="anchor" href="#_produces_3"></a><a class="link" href="#_produces_3">2.3.2. Produces</a></h4>
+<h4 id="_produces_2"><a class="anchor" href="#_produces_2"></a><a class="link" href="#_produces_2">2.2.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -818,9 +774,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.4. GET /v2/dictionary</a></h3>
+<h3 id="_route80"><a class="anchor" href="#_route80"></a><a class="link" href="#_route80">2.3. GET /v2/dictionary</a></h3>
 <div class="sect3">
-<h4 id="_responses_4"><a class="anchor" href="#_responses_4"></a><a class="link" href="#_responses_4">2.4.1. Responses</a></h4>
+<h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -844,7 +800,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_4"><a class="anchor" href="#_produces_4"></a><a class="link" href="#_produces_4">2.4.2. Produces</a></h4>
+<h4 id="_produces_3"><a class="anchor" href="#_produces_3"></a><a class="link" href="#_produces_3">2.3.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -855,9 +811,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.5. PUT /v2/dictionary</a></h3>
+<h3 id="_route82"><a class="anchor" href="#_route82"></a><a class="link" href="#_route82">2.4. PUT /v2/dictionary</a></h3>
 <div class="sect3">
-<h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.5.1. Parameters</a></h4>
+<h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.4.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -882,7 +838,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_5"><a class="anchor" href="#_responses_5"></a><a class="link" href="#_responses_5">2.5.2. Responses</a></h4>
+<h4 id="_responses_4"><a class="anchor" href="#_responses_4"></a><a class="link" href="#_responses_4">2.4.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -906,7 +862,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes"><a class="anchor" href="#_consumes"></a><a class="link" href="#_consumes">2.5.3. Consumes</a></h4>
+<h4 id="_consumes"><a class="anchor" href="#_consumes"></a><a class="link" href="#_consumes">2.4.3. Consumes</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -916,7 +872,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect3">
-<h4 id="_produces_5"><a class="anchor" href="#_produces_5"></a><a class="link" href="#_produces_5">2.5.4. Produces</a></h4>
+<h4 id="_produces_4"><a class="anchor" href="#_produces_4"></a><a class="link" href="#_produces_4">2.4.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -927,9 +883,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_dictionary_secondary_names_get"><a class="anchor" href="#_v2_dictionary_secondary_names_get"></a><a class="link" href="#_v2_dictionary_secondary_names_get">2.6. GET /v2/dictionary/secondary/names</a></h3>
+<h3 id="_v2_dictionary_secondary_names_get"><a class="anchor" href="#_v2_dictionary_secondary_names_get"></a><a class="link" href="#_v2_dictionary_secondary_names_get">2.5. GET /v2/dictionary/secondary/names</a></h3>
 <div class="sect3">
-<h4 id="_responses_6"><a class="anchor" href="#_responses_6"></a><a class="link" href="#_responses_6">2.6.1. Responses</a></h4>
+<h4 id="_responses_5"><a class="anchor" href="#_responses_5"></a><a class="link" href="#_responses_5">2.5.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -953,7 +909,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_6"><a class="anchor" href="#_produces_6"></a><a class="link" href="#_produces_6">2.6.2. Produces</a></h4>
+<h4 id="_produces_5"><a class="anchor" href="#_produces_5"></a><a class="link" href="#_produces_5">2.5.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -964,9 +920,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_dictionary_dictionaryname_get"><a class="anchor" href="#_v2_dictionary_dictionaryname_get"></a><a class="link" href="#_v2_dictionary_dictionaryname_get">2.7. GET /v2/dictionary/{dictionaryName}</a></h3>
+<h3 id="_v2_dictionary_dictionaryname_get"><a class="anchor" href="#_v2_dictionary_dictionaryname_get"></a><a class="link" href="#_v2_dictionary_dictionaryname_get">2.6. GET /v2/dictionary/{dictionaryName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_2"><a class="anchor" href="#_parameters_2"></a><a class="link" href="#_parameters_2">2.7.1. Parameters</a></h4>
+<h4 id="_parameters_2"><a class="anchor" href="#_parameters_2"></a><a class="link" href="#_parameters_2">2.6.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -991,7 +947,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_7"><a class="anchor" href="#_responses_7"></a><a class="link" href="#_responses_7">2.7.2. Responses</a></h4>
+<h4 id="_responses_6"><a class="anchor" href="#_responses_6"></a><a class="link" href="#_responses_6">2.6.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1015,7 +971,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_7"><a class="anchor" href="#_produces_7"></a><a class="link" href="#_produces_7">2.7.3. Produces</a></h4>
+<h4 id="_produces_6"><a class="anchor" href="#_produces_6"></a><a class="link" href="#_produces_6">2.6.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1026,9 +982,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_dictionary_name_put"><a class="anchor" href="#_v2_dictionary_name_put"></a><a class="link" href="#_v2_dictionary_name_put">2.8. PUT /v2/dictionary/{name}</a></h3>
+<h3 id="_v2_dictionary_name_put"><a class="anchor" href="#_v2_dictionary_name_put"></a><a class="link" href="#_v2_dictionary_name_put">2.7. PUT /v2/dictionary/{name}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_3"><a class="anchor" href="#_parameters_3"></a><a class="link" href="#_parameters_3">2.8.1. Parameters</a></h4>
+<h4 id="_parameters_3"><a class="anchor" href="#_parameters_3"></a><a class="link" href="#_parameters_3">2.7.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1059,7 +1015,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_8"><a class="anchor" href="#_responses_8"></a><a class="link" href="#_responses_8">2.8.2. Responses</a></h4>
+<h4 id="_responses_7"><a class="anchor" href="#_responses_7"></a><a class="link" href="#_responses_7">2.7.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1083,7 +1039,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_2"><a class="anchor" href="#_consumes_2"></a><a class="link" href="#_consumes_2">2.8.3. Consumes</a></h4>
+<h4 id="_consumes_2"><a class="anchor" href="#_consumes_2"></a><a class="link" href="#_consumes_2">2.7.3. Consumes</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1093,7 +1049,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect3">
-<h4 id="_produces_8"><a class="anchor" href="#_produces_8"></a><a class="link" href="#_produces_8">2.8.4. Produces</a></h4>
+<h4 id="_produces_7"><a class="anchor" href="#_produces_7"></a><a class="link" href="#_produces_7">2.7.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1104,9 +1060,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.9. DELETE /v2/dictionary/{name}</a></h3>
+<h3 id="_route84"><a class="anchor" href="#_route84"></a><a class="link" href="#_route84">2.8. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.9.1. Parameters</a></h4>
+<h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1131,7 +1087,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_9"><a class="anchor" href="#_responses_9"></a><a class="link" href="#_responses_9">2.9.2. Responses</a></h4>
+<h4 id="_responses_8"><a class="anchor" href="#_responses_8"></a><a class="link" href="#_responses_8">2.8.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 33.3333%;">
@@ -1152,7 +1108,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_9"><a class="anchor" href="#_produces_9"></a><a class="link" href="#_produces_9">2.9.3. Produces</a></h4>
+<h4 id="_produces_8"><a class="anchor" href="#_produces_8"></a><a class="link" href="#_produces_8">2.8.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1163,9 +1119,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_dictionary_name_elements_shortname_delete"><a class="anchor" href="#_v2_dictionary_name_elements_shortname_delete"></a><a class="link" href="#_v2_dictionary_name_elements_shortname_delete">2.10. DELETE /v2/dictionary/{name}/elements/{shortName}</a></h3>
+<h3 id="_v2_dictionary_name_elements_shortname_delete"><a class="anchor" href="#_v2_dictionary_name_elements_shortname_delete"></a><a class="link" href="#_v2_dictionary_name_elements_shortname_delete">2.9. DELETE /v2/dictionary/{name}/elements/{shortName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_5"><a class="anchor" href="#_parameters_5"></a><a class="link" href="#_parameters_5">2.10.1. Parameters</a></h4>
+<h4 id="_parameters_5"><a class="anchor" href="#_parameters_5"></a><a class="link" href="#_parameters_5">2.9.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1196,7 +1152,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_10"><a class="anchor" href="#_responses_10"></a><a class="link" href="#_responses_10">2.10.2. Responses</a></h4>
+<h4 id="_responses_9"><a class="anchor" href="#_responses_9"></a><a class="link" href="#_responses_9">2.9.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 33.3333%;">
@@ -1217,7 +1173,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_10"><a class="anchor" href="#_produces_10"></a><a class="link" href="#_produces_10">2.10.3. Produces</a></h4>
+<h4 id="_produces_9"><a class="anchor" href="#_produces_9"></a><a class="link" href="#_produces_9">2.9.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1228,9 +1184,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.11. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route76"><a class="anchor" href="#_route76"></a><a class="link" href="#_route76">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.11.1. Parameters</a></h4>
+<h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1255,7 +1211,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_11"><a class="anchor" href="#_responses_11"></a><a class="link" href="#_responses_11">2.11.2. Responses</a></h4>
+<h4 id="_responses_10"><a class="anchor" href="#_responses_10"></a><a class="link" href="#_responses_10">2.10.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 33.3333%;">
@@ -1277,9 +1233,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.12. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route70"><a class="anchor" href="#_route70"></a><a class="link" href="#_route70">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.12.1. Parameters</a></h4>
+<h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1304,7 +1260,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_12"><a class="anchor" href="#_responses_12"></a><a class="link" href="#_responses_12">2.12.2. Responses</a></h4>
+<h4 id="_responses_11"><a class="anchor" href="#_responses_11"></a><a class="link" href="#_responses_11">2.11.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1328,7 +1284,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_11"><a class="anchor" href="#_produces_11"></a><a class="link" href="#_produces_11">2.12.3. Produces</a></h4>
+<h4 id="_produces_10"><a class="anchor" href="#_produces_10"></a><a class="link" href="#_produces_10">2.11.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1339,9 +1295,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.13. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route64"><a class="anchor" href="#_route64"></a><a class="link" href="#_route64">2.12. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
-<h4 id="_responses_13"><a class="anchor" href="#_responses_13"></a><a class="link" href="#_responses_13">2.13.1. Responses</a></h4>
+<h4 id="_responses_12"><a class="anchor" href="#_responses_12"></a><a class="link" href="#_responses_12">2.12.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1365,7 +1321,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_12"><a class="anchor" href="#_produces_12"></a><a class="link" href="#_produces_12">2.13.2. Produces</a></h4>
+<h4 id="_produces_11"><a class="anchor" href="#_produces_11"></a><a class="link" href="#_produces_11">2.12.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1376,9 +1332,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.14. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route77"><a class="anchor" href="#_route77"></a><a class="link" href="#_route77">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.14.1. Parameters</a></h4>
+<h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.13.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1403,7 +1359,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_14"><a class="anchor" href="#_responses_14"></a><a class="link" href="#_responses_14">2.14.2. Responses</a></h4>
+<h4 id="_responses_13"><a class="anchor" href="#_responses_13"></a><a class="link" href="#_responses_13">2.13.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1427,7 +1383,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_13"><a class="anchor" href="#_produces_13"></a><a class="link" href="#_produces_13">2.14.3. Produces</a></h4>
+<h4 id="_produces_12"><a class="anchor" href="#_produces_12"></a><a class="link" href="#_produces_12">2.13.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1438,9 +1394,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.15. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
+<h3 id="_route71"><a class="anchor" href="#_route71"></a><a class="link" href="#_route71">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.15.1. Parameters</a></h4>
+<h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1465,7 +1421,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_15"><a class="anchor" href="#_responses_15"></a><a class="link" href="#_responses_15">2.15.2. Responses</a></h4>
+<h4 id="_responses_14"><a class="anchor" href="#_responses_14"></a><a class="link" href="#_responses_14">2.14.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1489,7 +1445,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_14"><a class="anchor" href="#_produces_14"></a><a class="link" href="#_produces_14">2.15.3. Produces</a></h4>
+<h4 id="_produces_13"><a class="anchor" href="#_produces_13"></a><a class="link" href="#_produces_13">2.14.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1500,9 +1456,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.16. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route74"><a class="anchor" href="#_route74"></a><a class="link" href="#_route74">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.16.1. Parameters</a></h4>
+<h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.15.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1527,7 +1483,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_16"><a class="anchor" href="#_responses_16"></a><a class="link" href="#_responses_16">2.16.2. Responses</a></h4>
+<h4 id="_responses_15"><a class="anchor" href="#_responses_15"></a><a class="link" href="#_responses_15">2.15.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1551,7 +1507,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_15"><a class="anchor" href="#_produces_15"></a><a class="link" href="#_produces_15">2.16.3. Produces</a></h4>
+<h4 id="_produces_14"><a class="anchor" href="#_produces_14"></a><a class="link" href="#_produces_14">2.15.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1562,9 +1518,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.17. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route73"><a class="anchor" href="#_route73"></a><a class="link" href="#_route73">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.17.1. Parameters</a></h4>
+<h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1589,7 +1545,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_17"><a class="anchor" href="#_responses_17"></a><a class="link" href="#_responses_17">2.17.2. Responses</a></h4>
+<h4 id="_responses_16"><a class="anchor" href="#_responses_16"></a><a class="link" href="#_responses_16">2.16.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1613,7 +1569,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_16"><a class="anchor" href="#_produces_16"></a><a class="link" href="#_produces_16">2.17.3. Produces</a></h4>
+<h4 id="_produces_15"><a class="anchor" href="#_produces_15"></a><a class="link" href="#_produces_15">2.16.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1624,9 +1580,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.18. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route75"><a class="anchor" href="#_route75"></a><a class="link" href="#_route75">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.18.1. Parameters</a></h4>
+<h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1651,7 +1607,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_18"><a class="anchor" href="#_responses_18"></a><a class="link" href="#_responses_18">2.18.2. Responses</a></h4>
+<h4 id="_responses_17"><a class="anchor" href="#_responses_17"></a><a class="link" href="#_responses_17">2.17.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1675,7 +1631,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_17"><a class="anchor" href="#_produces_17"></a><a class="link" href="#_produces_17">2.18.3. Produces</a></h4>
+<h4 id="_produces_16"><a class="anchor" href="#_produces_16"></a><a class="link" href="#_produces_16">2.17.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1686,9 +1642,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.19. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route66"><a class="anchor" href="#_route66"></a><a class="link" href="#_route66">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.19.1. Parameters</a></h4>
+<h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.18.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1713,7 +1669,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_19"><a class="anchor" href="#_responses_19"></a><a class="link" href="#_responses_19">2.19.2. Responses</a></h4>
+<h4 id="_responses_18"><a class="anchor" href="#_responses_18"></a><a class="link" href="#_responses_18">2.18.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1737,7 +1693,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_18"><a class="anchor" href="#_produces_18"></a><a class="link" href="#_produces_18">2.19.3. Produces</a></h4>
+<h4 id="_produces_17"><a class="anchor" href="#_produces_17"></a><a class="link" href="#_produces_17">2.18.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1748,9 +1704,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.20. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route72"><a class="anchor" href="#_route72"></a><a class="link" href="#_route72">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.20.1. Parameters</a></h4>
+<h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1775,7 +1731,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_20"><a class="anchor" href="#_responses_20"></a><a class="link" href="#_responses_20">2.20.2. Responses</a></h4>
+<h4 id="_responses_19"><a class="anchor" href="#_responses_19"></a><a class="link" href="#_responses_19">2.19.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1799,7 +1755,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_19"><a class="anchor" href="#_produces_19"></a><a class="link" href="#_produces_19">2.20.3. Produces</a></h4>
+<h4 id="_produces_18"><a class="anchor" href="#_produces_18"></a><a class="link" href="#_produces_18">2.19.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1810,9 +1766,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.21. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route67"><a class="anchor" href="#_route67"></a><a class="link" href="#_route67">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.21.1. Parameters</a></h4>
+<h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.20.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1843,7 +1799,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_21"><a class="anchor" href="#_responses_21"></a><a class="link" href="#_responses_21">2.21.2. Responses</a></h4>
+<h4 id="_responses_20"><a class="anchor" href="#_responses_20"></a><a class="link" href="#_responses_20">2.20.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1867,7 +1823,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_3"><a class="anchor" href="#_consumes_3"></a><a class="link" href="#_consumes_3">2.21.3. Consumes</a></h4>
+<h4 id="_consumes_3"><a class="anchor" href="#_consumes_3"></a><a class="link" href="#_consumes_3">2.20.3. Consumes</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1877,7 +1833,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect3">
-<h4 id="_produces_20"><a class="anchor" href="#_produces_20"></a><a class="link" href="#_produces_20">2.21.4. Produces</a></h4>
+<h4 id="_produces_19"><a class="anchor" href="#_produces_19"></a><a class="link" href="#_produces_19">2.20.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1888,9 +1844,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.22. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route69"><a class="anchor" href="#_route69"></a><a class="link" href="#_route69">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.22.1. Parameters</a></h4>
+<h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.21.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1921,7 +1877,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_22"><a class="anchor" href="#_responses_22"></a><a class="link" href="#_responses_22">2.22.2. Responses</a></h4>
+<h4 id="_responses_21"><a class="anchor" href="#_responses_21"></a><a class="link" href="#_responses_21">2.21.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -1945,7 +1901,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_4"><a class="anchor" href="#_consumes_4"></a><a class="link" href="#_consumes_4">2.22.3. Consumes</a></h4>
+<h4 id="_consumes_4"><a class="anchor" href="#_consumes_4"></a><a class="link" href="#_consumes_4">2.21.3. Consumes</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1955,7 +1911,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect3">
-<h4 id="_produces_21"><a class="anchor" href="#_produces_21"></a><a class="link" href="#_produces_21">2.22.4. Produces</a></h4>
+<h4 id="_produces_20"><a class="anchor" href="#_produces_20"></a><a class="link" href="#_produces_20">2.21.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -1966,9 +1922,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.23. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route68"><a class="anchor" href="#_route68"></a><a class="link" href="#_route68">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.23.1. Parameters</a></h4>
+<h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.22.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -1999,7 +1955,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_23"><a class="anchor" href="#_responses_23"></a><a class="link" href="#_responses_23">2.23.2. Responses</a></h4>
+<h4 id="_responses_22"><a class="anchor" href="#_responses_22"></a><a class="link" href="#_responses_22">2.22.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2023,7 +1979,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_5"><a class="anchor" href="#_consumes_5"></a><a class="link" href="#_consumes_5">2.23.3. Consumes</a></h4>
+<h4 id="_consumes_5"><a class="anchor" href="#_consumes_5"></a><a class="link" href="#_consumes_5">2.22.3. Consumes</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2033,7 +1989,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect3">
-<h4 id="_produces_22"><a class="anchor" href="#_produces_22"></a><a class="link" href="#_produces_22">2.23.4. Produces</a></h4>
+<h4 id="_produces_21"><a class="anchor" href="#_produces_21"></a><a class="link" href="#_produces_21">2.22.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2044,9 +2000,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.24. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route65"><a class="anchor" href="#_route65"></a><a class="link" href="#_route65">2.23. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.24.1. Parameters</a></h4>
+<h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.23.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -2071,7 +2027,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_24"><a class="anchor" href="#_responses_24"></a><a class="link" href="#_responses_24">2.24.2. Responses</a></h4>
+<h4 id="_responses_23"><a class="anchor" href="#_responses_23"></a><a class="link" href="#_responses_23">2.23.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2095,7 +2051,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_23"><a class="anchor" href="#_produces_23"></a><a class="link" href="#_produces_23">2.24.3. Produces</a></h4>
+<h4 id="_produces_22"><a class="anchor" href="#_produces_22"></a><a class="link" href="#_produces_22">2.23.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2106,9 +2062,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.25. GET /v2/policyToscaModels</a></h3>
+<h3 id="_route87"><a class="anchor" href="#_route87"></a><a class="link" href="#_route87">2.24. GET /v2/policyToscaModels</a></h3>
 <div class="sect3">
-<h4 id="_responses_25"><a class="anchor" href="#_responses_25"></a><a class="link" href="#_responses_25">2.25.1. Responses</a></h4>
+<h4 id="_responses_24"><a class="anchor" href="#_responses_24"></a><a class="link" href="#_responses_24">2.24.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2132,7 +2088,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_24"><a class="anchor" href="#_produces_24"></a><a class="link" href="#_produces_24">2.25.2. Produces</a></h4>
+<h4 id="_produces_23"><a class="anchor" href="#_produces_23"></a><a class="link" href="#_produces_23">2.24.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2143,9 +2099,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_policytoscamodels_yaml_policymodeltype_get"><a class="anchor" href="#_v2_policytoscamodels_yaml_policymodeltype_get"></a><a class="link" href="#_v2_policytoscamodels_yaml_policymodeltype_get">2.26. GET /v2/policyToscaModels/yaml/{policyModelType}</a></h3>
+<h3 id="_v2_policytoscamodels_yaml_policymodeltype_get"><a class="anchor" href="#_v2_policytoscamodels_yaml_policymodeltype_get"></a><a class="link" href="#_v2_policytoscamodels_yaml_policymodeltype_get">2.25. GET /v2/policyToscaModels/yaml/{policyModelType}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_19"><a class="anchor" href="#_parameters_19"></a><a class="link" href="#_parameters_19">2.26.1. Parameters</a></h4>
+<h4 id="_parameters_19"><a class="anchor" href="#_parameters_19"></a><a class="link" href="#_parameters_19">2.25.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -2170,7 +2126,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_26"><a class="anchor" href="#_responses_26"></a><a class="link" href="#_responses_26">2.26.2. Responses</a></h4>
+<h4 id="_responses_25"><a class="anchor" href="#_responses_25"></a><a class="link" href="#_responses_25">2.25.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2194,7 +2150,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_25"><a class="anchor" href="#_produces_25"></a><a class="link" href="#_produces_25">2.26.3. Produces</a></h4>
+<h4 id="_produces_24"><a class="anchor" href="#_produces_24"></a><a class="link" href="#_produces_24">2.25.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2205,9 +2161,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_policytoscamodels_policymodeltype_get"><a class="anchor" href="#_v2_policytoscamodels_policymodeltype_get"></a><a class="link" href="#_v2_policytoscamodels_policymodeltype_get">2.27. GET /v2/policyToscaModels/{policyModelType}</a></h3>
+<h3 id="_v2_policytoscamodels_policymodeltype_get"><a class="anchor" href="#_v2_policytoscamodels_policymodeltype_get"></a><a class="link" href="#_v2_policytoscamodels_policymodeltype_get">2.26. GET /v2/policyToscaModels/{policyModelType}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_20"><a class="anchor" href="#_parameters_20"></a><a class="link" href="#_parameters_20">2.27.1. Parameters</a></h4>
+<h4 id="_parameters_20"><a class="anchor" href="#_parameters_20"></a><a class="link" href="#_parameters_20">2.26.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -2232,7 +2188,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_27"><a class="anchor" href="#_responses_27"></a><a class="link" href="#_responses_27">2.27.2. Responses</a></h4>
+<h4 id="_responses_26"><a class="anchor" href="#_responses_26"></a><a class="link" href="#_responses_26">2.26.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2256,7 +2212,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_26"><a class="anchor" href="#_produces_26"></a><a class="link" href="#_produces_26">2.27.3. Produces</a></h4>
+<h4 id="_produces_25"><a class="anchor" href="#_produces_25"></a><a class="link" href="#_produces_25">2.26.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2267,9 +2223,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.28. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
+<h3 id="_route88"><a class="anchor" href="#_route88"></a><a class="link" href="#_route88">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.28.1. Parameters</a></h4>
+<h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.27.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -2300,7 +2256,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_28"><a class="anchor" href="#_responses_28"></a><a class="link" href="#_responses_28">2.28.2. Responses</a></h4>
+<h4 id="_responses_27"><a class="anchor" href="#_responses_27"></a><a class="link" href="#_responses_27">2.27.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2324,7 +2280,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_consumes_6"><a class="anchor" href="#_consumes_6"></a><a class="link" href="#_consumes_6">2.28.3. Consumes</a></h4>
+<h4 id="_consumes_6"><a class="anchor" href="#_consumes_6"></a><a class="link" href="#_consumes_6">2.27.3. Consumes</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2334,7 +2290,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect3">
-<h4 id="_produces_27"><a class="anchor" href="#_produces_27"></a><a class="link" href="#_produces_27">2.28.4. Produces</a></h4>
+<h4 id="_produces_26"><a class="anchor" href="#_produces_26"></a><a class="link" href="#_produces_26">2.27.4. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2345,9 +2301,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.29. GET /v2/templates</a></h3>
+<h3 id="_route91"><a class="anchor" href="#_route91"></a><a class="link" href="#_route91">2.28. GET /v2/templates</a></h3>
 <div class="sect3">
-<h4 id="_responses_29"><a class="anchor" href="#_responses_29"></a><a class="link" href="#_responses_29">2.29.1. Responses</a></h4>
+<h4 id="_responses_28"><a class="anchor" href="#_responses_28"></a><a class="link" href="#_responses_28">2.28.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2371,7 +2327,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_28"><a class="anchor" href="#_produces_28"></a><a class="link" href="#_produces_28">2.29.2. Produces</a></h4>
+<h4 id="_produces_27"><a class="anchor" href="#_produces_27"></a><a class="link" href="#_produces_27">2.28.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2382,9 +2338,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_templates_names_get"><a class="anchor" href="#_v2_templates_names_get"></a><a class="link" href="#_v2_templates_names_get">2.30. GET /v2/templates/names</a></h3>
+<h3 id="_v2_templates_names_get"><a class="anchor" href="#_v2_templates_names_get"></a><a class="link" href="#_v2_templates_names_get">2.29. GET /v2/templates/names</a></h3>
 <div class="sect3">
-<h4 id="_responses_30"><a class="anchor" href="#_responses_30"></a><a class="link" href="#_responses_30">2.30.1. Responses</a></h4>
+<h4 id="_responses_29"><a class="anchor" href="#_responses_29"></a><a class="link" href="#_responses_29">2.29.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2408,7 +2364,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_29"><a class="anchor" href="#_produces_29"></a><a class="link" href="#_produces_29">2.30.2. Produces</a></h4>
+<h4 id="_produces_28"><a class="anchor" href="#_produces_28"></a><a class="link" href="#_produces_28">2.29.2. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2419,9 +2375,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_v2_templates_templatename_get"><a class="anchor" href="#_v2_templates_templatename_get"></a><a class="link" href="#_v2_templates_templatename_get">2.31. GET /v2/templates/{templateName}</a></h3>
+<h3 id="_v2_templates_templatename_get"><a class="anchor" href="#_v2_templates_templatename_get"></a><a class="link" href="#_v2_templates_templatename_get">2.30. GET /v2/templates/{templateName}</a></h3>
 <div class="sect3">
-<h4 id="_parameters_22"><a class="anchor" href="#_parameters_22"></a><a class="link" href="#_parameters_22">2.31.1. Parameters</a></h4>
+<h4 id="_parameters_22"><a class="anchor" href="#_parameters_22"></a><a class="link" href="#_parameters_22">2.30.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 22.2222%;">
@@ -2446,7 +2402,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_responses_31"><a class="anchor" href="#_responses_31"></a><a class="link" href="#_responses_31">2.31.2. Responses</a></h4>
+<h4 id="_responses_30"><a class="anchor" href="#_responses_30"></a><a class="link" href="#_responses_30">2.30.2. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 10%;">
@@ -2470,7 +2426,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect3">
-<h4 id="_produces_30"><a class="anchor" href="#_produces_30"></a><a class="link" href="#_produces_30">2.31.3. Produces</a></h4>
+<h4 id="_produces_29"><a class="anchor" href="#_produces_29"></a><a class="link" href="#_produces_29">2.30.3. Produces</a></h4>
 <div class="ulist">
 <ul>
 <li>
@@ -2518,64 +2474,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_cldsinfo"><a class="anchor" href="#_cldsinfo"></a><a class="link" href="#_cldsinfo">3.2. CldsInfo</a></h3>
-<table class="tableblock frame-all grid-all stretch">
-<colgroup>
-<col style="width: 42.8571%;">
-<col style="width: 57.1429%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-middle">Name</th>
-<th class="tableblock halign-left valign-middle">Schema</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>cldsVersion</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadCl</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadTemplate</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionReadTosca</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateCl</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateTemplate</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>permissionUpdateTosca</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>userName</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect2">
-<h3 id="_dictionary"><a class="anchor" href="#_dictionary"></a><a class="link" href="#_dictionary">3.3. Dictionary</a></h3>
+<h3 id="_dictionary"><a class="anchor" href="#_dictionary"></a><a class="link" href="#_dictionary">3.2. Dictionary</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2632,7 +2531,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_dictionaryelement"><a class="anchor" href="#_dictionaryelement"></a><a class="link" href="#_dictionaryelement">3.4. DictionaryElement</a></h3>
+<h3 id="_dictionaryelement"><a class="anchor" href="#_dictionaryelement"></a><a class="link" href="#_dictionaryelement">3.3. DictionaryElement</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2699,7 +2598,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_externalcomponent"><a class="anchor" href="#_externalcomponent"></a><a class="link" href="#_externalcomponent">3.5. ExternalComponent</a></h3>
+<h3 id="_externalcomponent"><a class="anchor" href="#_externalcomponent"></a><a class="link" href="#_externalcomponent">3.4. ExternalComponent</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2726,7 +2625,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_externalcomponentstate"><a class="anchor" href="#_externalcomponentstate"></a><a class="link" href="#_externalcomponentstate">3.6. ExternalComponentState</a></h3>
+<h3 id="_externalcomponentstate"><a class="anchor" href="#_externalcomponentstate"></a><a class="link" href="#_externalcomponentstate">3.5. ExternalComponentState</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2758,7 +2657,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonarray"><a class="anchor" href="#_jsonarray"></a><a class="link" href="#_jsonarray">3.7. JsonArray</a></h3>
+<h3 id="_jsonarray"><a class="anchor" href="#_jsonarray"></a><a class="link" href="#_jsonarray">3.6. JsonArray</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2875,7 +2774,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonnull"><a class="anchor" href="#_jsonnull"></a><a class="link" href="#_jsonnull">3.8. JsonNull</a></h3>
+<h3 id="_jsonnull"><a class="anchor" href="#_jsonnull"></a><a class="link" href="#_jsonnull">3.7. JsonNull</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -2992,7 +2891,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonobject"><a class="anchor" href="#_jsonobject"></a><a class="link" href="#_jsonobject">3.9. JsonObject</a></h3>
+<h3 id="_jsonobject"><a class="anchor" href="#_jsonobject"></a><a class="link" href="#_jsonobject">3.8. JsonObject</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3109,7 +3008,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_jsonprimitive"><a class="anchor" href="#_jsonprimitive"></a><a class="link" href="#_jsonprimitive">3.10. JsonPrimitive</a></h3>
+<h3 id="_jsonprimitive"><a class="anchor" href="#_jsonprimitive"></a><a class="link" href="#_jsonprimitive">3.9. JsonPrimitive</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3241,7 +3140,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_loop"><a class="anchor" href="#_loop"></a><a class="link" href="#_loop">3.11. Loop</a></h3>
+<h3 id="_loop"><a class="anchor" href="#_loop"></a><a class="link" href="#_loop">3.10. Loop</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3338,7 +3237,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_loopelementmodel"><a class="anchor" href="#_loopelementmodel"></a><a class="link" href="#_loopelementmodel">3.12. LoopElementModel</a></h3>
+<h3 id="_loopelementmodel"><a class="anchor" href="#_loopelementmodel"></a><a class="link" href="#_loopelementmodel">3.11. LoopElementModel</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3410,7 +3309,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_looplog"><a class="anchor" href="#_looplog"></a><a class="link" href="#_looplog">3.13. LoopLog</a></h3>
+<h3 id="_looplog"><a class="anchor" href="#_looplog"></a><a class="link" href="#_looplog">3.12. LoopLog</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3457,7 +3356,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_looptemplate"><a class="anchor" href="#_looptemplate"></a><a class="link" href="#_looptemplate">3.14. LoopTemplate</a></h3>
+<h3 id="_looptemplate"><a class="anchor" href="#_looptemplate"></a><a class="link" href="#_looptemplate">3.13. LoopTemplate</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3539,7 +3438,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_looptemplateloopelementmodel"><a class="anchor" href="#_looptemplateloopelementmodel"></a><a class="link" href="#_looptemplateloopelementmodel">3.15. LoopTemplateLoopElementModel</a></h3>
+<h3 id="_looptemplateloopelementmodel"><a class="anchor" href="#_looptemplateloopelementmodel"></a><a class="link" href="#_looptemplateloopelementmodel">3.14. LoopTemplateLoopElementModel</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3571,7 +3470,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_microservicepolicy"><a class="anchor" href="#_microservicepolicy"></a><a class="link" href="#_microservicepolicy">3.16. MicroServicePolicy</a></h3>
+<h3 id="_microservicepolicy"><a class="anchor" href="#_microservicepolicy"></a><a class="link" href="#_microservicepolicy">3.15. MicroServicePolicy</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3635,11 +3534,6 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loopelementmodel">LoopElementModel</a></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>modelType</strong><br>
-<em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
-</tr>
-<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>name</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
@@ -3650,9 +3544,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyTosca</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModel</strong><br>
 <em>optional</em></p></td>
-<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>shared</strong><br>
@@ -3678,13 +3572,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_number"><a class="anchor" href="#_number"></a><a class="link" href="#_number">3.17. Number</a></h3>
+<h3 id="_number"><a class="anchor" href="#_number"></a><a class="link" href="#_number">3.16. Number</a></h3>
 <div class="paragraph">
 <p><em>Type</em> : object</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_operationalpolicy"><a class="anchor" href="#_operationalpolicy"></a><a class="link" href="#_operationalpolicy">3.18. OperationalPolicy</a></h3>
+<h3 id="_operationalpolicy"><a class="anchor" href="#_operationalpolicy"></a><a class="link" href="#_operationalpolicy">3.17. OperationalPolicy</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3756,7 +3650,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_policymodel"><a class="anchor" href="#_policymodel"></a><a class="link" href="#_policymodel">3.19. PolicyModel</a></h3>
+<h3 id="_policymodel"><a class="anchor" href="#_policymodel"></a><a class="link" href="#_policymodel">3.18. PolicyModel</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
@@ -3818,7 +3712,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </table>
 </div>
 <div class="sect2">
-<h3 id="_service"><a class="anchor" href="#_service"></a><a class="link" href="#_service">3.20. Service</a></h3>
+<h3 id="_service"><a class="anchor" href="#_service"></a><a class="link" href="#_service">3.19. Service</a></h3>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
 <col style="width: 42.8571%;">
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index f2db72cb8..d62a0c289 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -569,6 +569,50 @@
 			</route>
 		</get>
 
+		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}"
+			 outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						 message="ADD OperationalPolicy request for loop: ${header.loopName}" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'ADD OperationalPolicy request')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','write')" />
+					<to uri="direct:load-loop" />
+					<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request','INFO',${exchangeProperty[loopObject]})" />
+					<doTry>
+						<to
+								uri="bean:org.onap.clamp.loop.LoopService?method=addOperationalPolicy(${loopName},${policyType},${policyVersion})" />
+
+						<to
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					</doTry>
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="ADD OperationalPolicy request failed for loop: ${header.loopName}" />
+						<to
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+					<doFinally>
+						<setBody>
+							<simple>${exchangeProperty[loopObject]}</simple>
+						</setBody>
+					</doFinally>
+				</doTry>
+			</route>
+		</put>
+
 		<get uri="/v2/dictionary"
 			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
 			<route>
@@ -782,19 +826,19 @@
 				</doTry>
 			</route>
 		</get>
-		<get uri="/v2/policyToscaModels/{policyModelType}"
+		<get uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
 			outType="org.onap.clamp.loop.template.PolicyModel"
 			produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
-					excludePattern="policyModelType" />
+					excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name')" />
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model by Name/Version')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType})" />
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelByType(${header.policyModelType},${header.policyModelVersion})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
@@ -814,18 +858,18 @@
 				</doTry>
 			</route>
 		</get>
-		<get uri="/v2/policyToscaModels/yaml/{policyModelType}"
+		<get uri="/v2/policyToscaModels/yaml/{policyModelType}/{policyModelVersion}"
 			outType="java.lang.String" produces="application/json">
 			<route>
 				<removeHeaders pattern="*"
-					excludePattern="policyModelType" />
+					excludePattern="policyModelType|policyModelVersion" />
 				<doTry>
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name')" />
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Tosca Policy Model Yaml String by Name/Version')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType})" />
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=getPolicyModelTosca(${header.policyModelType},${header.policyModelVersion})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
@@ -846,7 +890,7 @@
 			</route>
 		</get>
 
-		<put uri="/v2/policyToscaModels/{policyModelType}"
+		<post uri="/v2/policyToscaModels/{policyModelType}"
 			type="java.lang.String"
 			outType="org.onap.clamp.loop.template.PolicyModel"
 			consumes="plain/text" produces="application/json">
@@ -858,11 +902,11 @@
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
-					<setProperty propertyName="PolicyModelObject">
+					<setProperty propertyName="PolicyModelTosca">
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=saveOrUpdateByPolicyModelType(${header.policyModelType},${exchangeProperty[PolicyModelObject]})" />
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${header.policyModelType},${exchangeProperty[PolicyModelTosca]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
@@ -881,9 +925,44 @@
 					</doCatch>
 				</doTry>
 			</route>
+		</post>
+		<put uri="/v2/policyToscaModels/{policyModelType}/{policyModelVersion}"
+			  type="java.lang.String"
+			  outType="org.onap.clamp.loop.template.PolicyModel"
+			  consumes="plain/text" produces="application/json">
+			<route>
+				<removeHeaders pattern="*"
+							   excludePattern="policyModelType|policyModelVersion" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')" />
+					<setProperty propertyName="PolicyModelTosca">
+						<simple>${body}</simple>
+					</setProperty>
+					<to
+							uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=updatePolicyModelTosca(${header.policyModelType},${policyModelVersion},${exchangeProperty[PolicyModelTosca]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>404</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+						</transform>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
 		</put>
 
-
 		<get uri="/v2/templates"
 			outType="org.onap.clamp.loop.template.LoopTemplate"
 			produces="application/json">
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index b76f26400..7f07f3438 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -38,6 +38,7 @@ import LoopActionService from './api/LoopActionService';
 
 import { Route } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
+import ModifyLoopModal from './components/dialogs/Loop/ModifyLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
 import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
@@ -257,6 +258,8 @@ export default class LoopUI extends React.Component {
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/modifyLoop" render={(routeProps) => (<ModifyLoopModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+
 				<Route path="/userInfo" render={(routeProps) => (<UserInfoModal {...routeProps} />)} />
 				<Route path="/closeLoop" render={this.closeLoop} />
 				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 98f1a460b..98f802df8 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -32,6 +32,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/loopProperties"
     render={[Function]}
   />
+  <Route
+    path="/modifyLoop"
+    render={[Function]}
+  />
   <Route
     path="/userInfo"
     render={[Function]}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 59a6fd45e..35951caa4 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -57,6 +57,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/loopProperties"
       render={[Function]}
     />
+    <Route
+      path="/modifyLoop"
+      render={[Function]}
+    />
     <Route
       path="/userInfo"
       render={[Function]}
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index ead2cf80c..432eabecd 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -175,4 +175,27 @@ export default class LoopService {
 				return {};
 			});
 	}
+
+		static addOperationalPolicyType(loopName, policyType, policyVersion) {
+    		return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+    			method: 'PUT',
+    			headers: {
+    				"Content-Type": "application/json"
+    			},
+    			credentials: 'same-origin'
+    		})
+                .then(function (response) {
+                    console.debug("Add Operational Policy response received: ", response.status);
+    				if (response.ok) {
+    					return response.json();
+    				} else {
+    					console.error("Add Operational Policy query failed");
+    					return {};
+    				}
+    			})
+    			.catch(function (error) {
+    				console.error("Add Operational Policy error received", error);
+    				return {};
+    			});
+    	}
 }
diff --git a/ui-react/src/api/PolicyToscaService.js b/ui-react/src/api/PolicyToscaService.js
new file mode 100644
index 000000000..52e68fac4
--- /dev/null
+++ b/ui-react/src/api/PolicyToscaService.js
@@ -0,0 +1,136 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class PolicyToscaService {
+  static getToscaPolicyModels() {
+    return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
+      .then(function (response) {
+        console.debug("getToscaPolicyModels response received: ", response.status);
+        if (response.ok) {
+          return response.json();
+        } else {
+          console.error("getToscaPolicyModels query failed");
+          return {};
+        }
+      })
+      .catch(function (error) {
+        console.error("getToscaPolicyModels error received", error);
+        return {};
+      });
+  }
+
+  static getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
+		return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType + "/" + policyModelVersion, {
+			method: 'GET',
+			credentials: 'same-origin'
+		})
+			.then(function (response) {
+				console.debug("getToscaPolicyModelYaml response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("getToscaPolicyModelYaml query failed");
+					return "";
+				}
+			})
+			.catch(function (error) {
+				console.error("getToscaPolicyModelYaml error received", error);
+				return "";
+			});
+ }
+
+ static getToscaPolicyModel(policyModelType, policyModelVersion) {
+ 		return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + "/" + policyModelVersion, {
+ 			method: 'GET',
+ 			credentials: 'same-origin'
+ 		})
+ 			.then(function (response) {
+ 				console.debug("getToscaPolicyModel response received: ", response.status);
+ 				if (response.ok) {
+ 					return response.json();
+ 				} else {
+ 					console.error("getToscaPolicyModel query failed");
+ 					return "";
+ 				}
+ 			})
+ 			.catch(function (error) {
+ 				console.error("getToscaPolicyModel error received", error);
+ 				return "";
+ 			});
+  }
+
+  static createPolicyModelFromToscaModel(policyModelType, jsonData) {
+       return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, {
+           method: 'POST',
+           credentials: 'same-origin',
+           headers: {
+             "Content-Type": "a",
+           },
+           body: JSON.stringify(jsonData)
+         })
+         .then(function(response) {
+           console.debug("createPolicyModelFromToscaModel response received: ", response.status);
+           if (response.ok) {
+             var message = {
+               status: response.status,
+               message: 'Tosca Policy Model successfully uploaded'
+             };
+             return message;
+           } else {
+             console.error("createPolicyModelFromToscaModel failed");
+             return response.text();
+           }
+         })
+         .catch(function(error) {
+           console.error("createPolicyModelFromToscaModel error received", error);
+           return "";
+         });
+     }
+
+     static updatePolicyModelTosca(policyModelType, policyModelVersion, jsonData) {
+         return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, {
+             method: 'PUT',
+             credentials: 'same-origin',
+             headers: {
+               "Content-Type": "a",
+             },
+             body: JSON.stringify(jsonData)
+           })
+           .then(function(response) {
+             console.debug("updatePolicyModelTosca response received: ", response.status);
+             if (response.ok) {
+               var message = {
+                 status: response.status,
+                 message: 'Tosca Policy Model successfully uploaded'
+               };
+               return message;
+             } else {
+               console.error("updatePolicyModelTosca failed");
+               return response.text();
+             }
+           })
+           .catch(function(error) {
+             console.error("updatePolicyModelTosca error received", error);
+             return "";
+           });
+       }
+}
diff --git a/ui-react/src/api/TemplateMenuService.js b/ui-react/src/api/TemplateMenuService.js
deleted file mode 100644
index 0dabebdd1..000000000
--- a/ui-react/src/api/TemplateMenuService.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-export default class TemplateMenuService {
-  static getToscaPolicyModels() {
-    return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
-      .then(function (response) {
-        console.debug("getToscaPolicyModels response received: ", response.status);
-        if (response.ok) {
-          return response.json();
-        } else {
-          console.error("getToscaPolicyModels query failed");
-          return {};
-        }
-      })
-      .catch(function (error) {
-        console.error("getToscaPolicyModels error received", error);
-        return {};
-      });
-  }
-
-	static getToscaPolicyModelYaml(policyModelType) {
-		return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType, {
-			method: 'GET',
-			credentials: 'same-origin'
-		})
-			.then(function (response) {
-				console.debug("getToscaPolicyModelYaml response received: ", response.status);
-				if (response.ok) {
-					return response.json();
-				} else {
-					console.error("getToscaPolicyModelYaml query failed");
-					return "";
-				}
-			})
-			.catch(function (error) {
-				console.error("getToscaPolicyModelYaml error received", error);
-				return "";
-			});
-	}
-
-  static uploadToscaPolicyModal(policyModelType, jsonData) {
-    return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, {
-        method: 'PUT',
-        credentials: 'same-origin',
-        headers: {
-          "Content-Type": "a",
-        },
-        body: JSON.stringify(jsonData)
-      })
-      .then(function(response) {
-        console.debug("uploadToscaPolicyModal response received: ", response.status);
-        if (response.ok) {
-          var message = {
-            status: response.status,
-            message: 'Tosca Policy Model successfully uploaded'
-          };
-          return message;
-        } else {
-          console.error("uploadToscaPolicyModal failed");
-          return response.text();
-        }
-      })
-      .catch(function(error) {
-        console.error("uploadToscaPolicyModal error received", error);
-        return "";
-      });
-  }
-
-  static getBlueprintMicroServiceTemplates() {
-    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
-      .then(function (response) {
-        console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
-        if (response.ok) {
-          return response.json();
-        } else {
-          console.error("getBlueprintMicroServiceTemplates query failed");
-          return {};
-        }
-      })
-      .catch(function (error) {
-        console.error("getBlueprintMicroServiceTemplates error received", error);
-        return {};
-      });
-  }
-}
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
new file mode 100644
index 000000000..10e0b5427
--- /dev/null
+++ b/ui-react/src/api/TemplateService.js
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class TemplateService {
+
+  static getBlueprintMicroServiceTemplates() {
+    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
+      .then(function (response) {
+        console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
+        if (response.ok) {
+          return response.json();
+        } else {
+          console.error("getBlueprintMicroServiceTemplates query failed");
+          return {};
+        }
+      })
+      .catch(function (error) {
+        console.error("getBlueprintMicroServiceTemplates error received", error);
+        return {};
+      });
+  }
+}
diff --git a/ui-react/src/api/example.json b/ui-react/src/api/example.json
deleted file mode 100644
index 7b9a95a23..000000000
--- a/ui-react/src/api/example.json
+++ /dev/null
@@ -1,417 +0,0 @@
-{
-  "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-  "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
-  "globalPropertiesJson": {
-    "dcaeDeployParameters": {
-      "location_id": "",
-      "service_id": "",
-      "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
-    }
-  },
-  "modelService": {
-    "serviceDetails": {
-      "serviceType": "",
-      "namingPolicy": "",
-      "environmentContext": "General_Revenue-Bearing",
-      "serviceEcompNaming": "true",
-      "serviceRole": "",
-      "name": "vLoadBalancerMS",
-      "description": "vLBMS",
-      "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-      "ecompGeneratedNaming": "true",
-      "category": "Network L4+",
-      "type": "Service",
-      "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-      "instantiationType": "A-la-carte"
-    },
-    "resourceDetails": {
-      "CP": {},
-      "VL": {},
-      "VF": {
-        "vLoadBalancerMS 0": {
-          "resourceVendor": "Test",
-          "resourceVendorModelNumber": "",
-          "name": "vLoadBalancerMS",
-          "description": "vLBMS",
-          "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-          "subcategory": "Load Balancer",
-          "category": "Application L4+",
-          "type": "VF",
-          "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-          "version": "1.0",
-          "resourceVendorRelease": "1.0",
-          "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
-        }
-      },
-      "CR": {},
-      "VFC": {},
-      "PNF": {},
-      "Service": {},
-      "CVFC": {},
-      "Service Proxy": {},
-      "Configuration": {},
-      "AllottedResource": {},
-      "VFModule": {
-        "Vloadbalancerms..vpkg..module-1": {
-          "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-          "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vpkg",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        },
-        "Vloadbalancerms..vdns..module-3": {
-          "vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-          "vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-          "vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vdns",
-          "max_vf_module_instances": 50,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        },
-        "Vloadbalancerms..base_template..module-0": {
-          "vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-          "vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-          "vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-          "min_vf_module_instances": 1,
-          "vf_module_label": "base_template",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Base",
-          "isBase": true,
-          "initial_count": 1,
-          "volume_group": false
-        },
-        "Vloadbalancerms..vlb..module-2": {
-          "vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-          "vfModuleModelVersion": "1",
-          "vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-          "vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-          "vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-          "min_vf_module_instances": 0,
-          "vf_module_label": "vlb",
-          "max_vf_module_instances": 1,
-          "vf_module_type": "Expansion",
-          "isBase": false,
-          "initial_count": 0,
-          "volume_group": false
-        }
-      }
-    }
-  },
-  "lastComputedState": "DESIGN",
-  "components": {
-    "POLICY": {
-      "componentState": {
-        "stateName": "NOT_SENT",
-        "description": "The policies defined have NOT yet been created on the policy engine"
-      }
-    },
-    "DCAE": {
-      "componentState": {
-        "stateName": "BLUEPRINT_DEPLOYED",
-        "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
-      }
-    }
-  },
-  "operationalPolicies": [
-    {
-      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
-      "configurationsJson": {
-        "guard_policies": {
-          "guard.minmax.new": {
-            "recipe": "",
-            "clname": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
-            "actor": "",
-            "targets": "",
-            "min": "gg",
-            "max": "gg",
-            "limit": "",
-            "timeUnits": "",
-            "timeWindow": "",
-            "guardActiveStart": "00:00:00Z",
-            "guardActiveEnd": "00:00:01Z"
-          }
-        },
-        "operational_policy": {
-          "controlLoop": {
-            "trigger_policy": "new",
-            "timeout": "0",
-            "abatement": "false",
-            "controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
-          },
-          "policies": [
-            {
-              "id": "new",
-              "recipe": "",
-              "retry": "0",
-              "timeout": "0",
-              "actor": "",
-              "payload": "",
-              "success": "",
-              "failure": "",
-              "failure_timeout": "",
-              "failure_retries": "",
-              "failure_exception": "",
-              "failure_guard": "",
-              "target": {
-                "type": "VM",
-                "resourceID": ""
-              }
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "microServicePolicies": [
-    {
-      "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-      "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "properties": {
-        "domain": "measurementsForVfScaling",
-        "metricsPerEventName": [
-          {
-            "policyVersion": "ff",
-            "thresholds": [
-              {
-                "severity": "CRITICAL",
-                "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                "thresholdValue": 0,
-                "closedLoopEventStatus": "ONSET",
-                "closedLoopControlName": "ff",
-                "version": "ff",
-                "direction": "LESS"
-              }
-            ],
-            "policyName": "ff",
-            "controlLoopSchemaType": "VM",
-            "policyScope": "ff",
-            "eventName": "ff"
-          }
-        ]
-      },
-      "shared": false,
-      "jsonRepresentation": {
-        "schema": {
-          "uniqueItems": "true",
-          "format": "tabs-top",
-          "type": "array",
-          "title": "TCA Policy JSON",
-          "items": {
-            "type": "object",
-            "title": "TCA Policy JSON",
-            "required": [
-              "domain",
-              "metricsPerEventName"
-            ],
-            "properties": {
-              "domain": {
-                "propertyOrder": 1001,
-                "default": "measurementsForVfScaling",
-                "title": "Domain name to which TCA needs to be applied",
-                "type": "string"
-              },
-              "metricsPerEventName": {
-                "propertyOrder": 1002,
-                "uniqueItems": "true",
-                "format": "tabs-top",
-                "title": "Contains eventName and threshold details that need to be applied to given eventName",
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "required": [
-                    "controlLoopSchemaType",
-                    "eventName",
-                    "policyName",
-                    "policyScope",
-                    "policyVersion",
-                    "thresholds"
-                  ],
-                  "properties": {
-                    "policyVersion": {
-                      "propertyOrder": 1007,
-                      "title": "TCA Policy Scope Version",
-                      "type": "string"
-                    },
-                    "thresholds": {
-                      "propertyOrder": 1008,
-                      "uniqueItems": "true",
-                      "format": "tabs-top",
-                      "title": "Thresholds associated with eventName",
-                      "type": "array",
-                      "items": {
-                        "type": "object",
-                        "required": [
-                          "closedLoopControlName",
-                          "closedLoopEventStatus",
-                          "direction",
-                          "fieldPath",
-                          "severity",
-                          "thresholdValue",
-                          "version"
-                        ],
-                        "properties": {
-                          "severity": {
-                            "propertyOrder": 1013,
-                            "title": "Threshold Event Severity",
-                            "type": "string",
-                            "enum": [
-                              "CRITICAL",
-                              "MAJOR",
-                              "MINOR",
-                              "WARNING",
-                              "NORMAL"
-                            ]
-                          },
-                          "fieldPath": {
-                            "propertyOrder": 1012,
-                            "title": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                            "type": "string",
-                            "enum": [
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                              "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                              "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                              "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                              "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                            ]
-                          },
-                          "thresholdValue": {
-                            "propertyOrder": 1014,
-                            "title": "Threshold value for the field Path inside CEF message",
-                            "type": "integer"
-                          },
-                          "closedLoopEventStatus": {
-                            "propertyOrder": 1010,
-                            "title": "Closed Loop Event Status of the threshold",
-                            "type": "string",
-                            "enum": [
-                              "ONSET",
-                              "ABATED"
-                            ]
-                          },
-                          "closedLoopControlName": {
-                            "propertyOrder": 1009,
-                            "title": "Closed Loop Control Name associated with the threshold",
-                            "type": "string"
-                          },
-                          "version": {
-                            "propertyOrder": 1015,
-                            "title": "Version number associated with the threshold",
-                            "type": "string"
-                          },
-                          "direction": {
-                            "propertyOrder": 1011,
-                            "title": "Direction of the threshold",
-                            "type": "string",
-                            "enum": [
-                              "LESS",
-                              "LESS_OR_EQUAL",
-                              "GREATER",
-                              "GREATER_OR_EQUAL",
-                              "EQUAL"
-                            ]
-                          }
-                        }
-                      }
-                    },
-                    "policyName": {
-                      "propertyOrder": 1005,
-                      "title": "TCA Policy Scope Name",
-                      "type": "string"
-                    },
-                    "controlLoopSchemaType": {
-                      "propertyOrder": 1003,
-                      "title": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                      "type": "string",
-                      "enum": [
-                        "VM",
-                        "VNF"
-                      ]
-                    },
-                    "policyScope": {
-                      "propertyOrder": 1006,
-                      "title": "TCA Policy Scope",
-                      "type": "string"
-                    },
-                    "eventName": {
-                      "propertyOrder": 1004,
-                      "title": "Event name to which thresholds need to be applied",
-                      "type": "string"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  ],
-  "loopLogs": [
-    {
-      "id": 2,
-      "logType": "INFO",
-      "logComponent": "CLAMP",
-      "message": "Micro Service policies UPDATED",
-      "logInstant": "2019-07-08T09:44:53Z"
-    },
-    {
-      "id": 1,
-      "logType": "INFO",
-      "logComponent": "CLAMP",
-      "message": "Operational and Guard policies UPDATED",
-      "logInstant": "2019-07-08T09:44:37Z"
-    }
-  ]
-}
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
new file mode 100644
index 000000000..4cd21fdb5
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -0,0 +1,187 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import MaterialTable from "material-table";
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import PolicyToscaService from '../../../api/PolicyToscaService';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+import LoopService from '../../../api/LoopService';
+
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const TextModal = styled.textarea`
+	margin-top: 20px;
+	white-space:pre;
+	background-color: ${props => props.theme.toscaTextareaBackgroundColor};
+	text-align: justify;
+	font-size: ${props => props.theme.toscaTextareaFontSize};
+	width: 100%;
+	height: 300px;
+`
+const cellStyle = { border: '1px solid black' };
+const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ModifyLoopModal extends React.Component {
+
+	state = {
+		show: true,
+		loopCache: this.props.loopCache,
+		content: 'Please select Tosca model to view the details',
+		selectedRowData: {},
+		toscaPolicyModelsData: [],
+		toscaColumns: [
+			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Policy Model Type", field: "policyModelType",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Policy Acronym", field: "policyAcronym",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Version", field: "version",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Uploaded By", field: "updatedBy",
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+			{ title: "Uploaded Date", field: "updatedDate", editable: 'never',
+				cellStyle: cellStyle,
+				headerStyle: headerStyle
+			},
+             { title: "Add", field: "updatedDate", editable: 'never',
+             	cellStyle: cellStyle,
+             	headerStyle: headerStyle
+             }
+		],
+		tableIcons: {
+		    FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+		    LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+		    NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+		    PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+		    ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+		    Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+		    SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
+		}
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getPolicyToscaModels = this.getToscaPolicyModels.bind(this);
+		this.handleYamlContent = this.handleYamlContent.bind(this);
+		this.getToscaPolicyModelYaml = this.getToscaPolicyModelYaml.bind(this);
+		this.handleAdd = this.handleAdd.bind(this);
+		this.getToscaPolicyModels();
+	}
+
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopCache: newProps.loopCache,
+			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties()))
+		});
+	}
+
+	getToscaPolicyModels() {
+	    PolicyToscaService.getToscaPolicyModels().then(allToscaModels => {
+			this.setState({ toscaPolicyModelsData: allToscaModels});
+		});
+	}
+
+	getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
+		if (typeof policyModelType !== "undefined") {
+			PolicyToscaService.getToscaPolicyModelYaml(policyModelType, policyModelVersion).then(toscaYaml => {
+				if (toscaYaml.length !== 0) {
+					this.setState({content: toscaYaml})
+				} else {
+					this.setState({ content: 'No Tosca model Yaml available' })
+				}
+			});
+		} else {
+			this.setState({ content: 'Please select Tosca model to view the details' })
+		}
+	}
+
+	handleYamlContent(event) {
+		this.setState({ content: event.target.value });
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	handleAdd() {
+        LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
+        this.handleClose();
+        this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+	}
+
+	render() {
+		return (
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+				</Modal.Header>
+				<Modal.Body>
+					<MaterialTable
+					title={"View Tosca Policy Models"}
+					data={this.state.toscaPolicyModelsData}
+					columns={this.state.toscaColumns}
+					icons={this.state.tableIcons}
+					onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType, rowData.version);this.setState({selectedRowData: rowData})}}
+					options={{
+						headerStyle: rowHeaderStyle,
+						rowStyle: rowData => ({
+							backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
+						})
+					}}
+					/>
+					<div>
+						<TextModal value={this.state.content} onChange={this.handleYamlContent}/>
+					</div>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+					<Button variant="primary"  type="submit" onClick={this.handleAdd}>Add</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index fbfc727eb..4e8d97820 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -68,15 +68,16 @@ export default class OpenLoopModal extends React.Component {
 
 	getLoopNames() {
 		LoopService.getLoopNames().then(loopNames => {
-			const loopOptions = loopNames.map((loopName) => { return { label: loopName, value: loopName } });
-			this.setState({ loopNames: loopOptions })
+		    if (Object.entries(loopNames).length !== 0) {
+		        const loopOptions = loopNames.filter(loopName => loopName!=='undefined').map((loopName) => { return { label: loopName, value: loopName } });
+            	this.setState({ loopNames: loopOptions })
+		    }
 		});
 	}
 
 	handleOpen() {
 		console.info("Loop " + this.state.chosenLoopName + " is chosen");
-		this.setState({ show: false });
-		this.props.history.push('/');
+        this.handleClose();
 		this.props.loadLoopFunction(this.state.chosenLoopName);
 	}
 
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
index 76beca711..2e0460f61 100644
--- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
@@ -28,7 +28,7 @@ import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import styled from 'styled-components';
 import Alert from 'react-bootstrap/Alert';
-import TemplateMenuService from '../../../api/TemplateMenuService';
+import PolicyToscaService from '../../../api/PolicyToscaService';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -37,7 +37,7 @@ export default class UploadToscaPolicyModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 
-		this.handleUploadToscaPolicyModel = this.handleUploadToscaPolicyModel.bind(this);
+		this.handleCreateFromToscaPolicyModel = this.handleCreateFromToscaPolicyModel.bind(this);
 		this.handleClose = this.handleClose.bind(this);
 		this.handlePolicyModelType = this.handlePolicyModelType.bind(this);
 		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
@@ -55,16 +55,10 @@ export default class UploadToscaPolicyModal extends React.Component {
 		fileSelectedHandler = (event) => {
 				if (event.target.files && event.target.files[0]) {
 					const scope = this;
-  				let reader = new FileReader();
+  				    let reader = new FileReader();
 					this.setState({policyModelType: '', policyModelTosca: '' });
 					reader.onload = function(e) {
-					 	var lines = reader.result.split('\n');
-					 	for (var line = 0; line < lines.length; line++) {
-							if(lines[line].trim().slice(0, 24) === 'onap.policies.monitoring') {
-								var microsvc = lines[line].trim().slice(0, -1);
-								scope.setState({ policyModelType: microsvc, policyModelTosca:  reader.result});
-							}
-					  }
+					    scope.setState({ policyModelTosca:  reader.result});
 					};
 					console.log("Filename is", event.target.files[0]);
 					reader.readAsText(event.target.files[0]);
@@ -77,11 +71,11 @@ export default class UploadToscaPolicyModal extends React.Component {
 		this.props.history.push('/');
 	}
 
-	handleUploadToscaPolicyModel(e) {
-    e.preventDefault();
+	handleCreateFromToscaPolicyModel(e) {
+        e.preventDefault();
 		console.log("Policy Model Type is", this.state.policyModelType);
 		if(this.state.policyModelType && this.state.policyModelTosca) {
- 		TemplateMenuService.uploadToscaPolicyModal(this.state.policyModelType, this.state.policyModelTosca).then(resp => {
+ 		PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelType, this.state.policyModelTosca).then(resp => {
 			if(resp.status === 200) {
 			this.setState({apiResponseStatus: resp.status, apiResponseMessage: resp.message, upldBtnClicked: true});
 		} else {
@@ -103,7 +97,7 @@ export default class UploadToscaPolicyModal extends React.Component {
 		return (
 			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
-					<Modal.Title>Upload Tosca Modal</Modal.Title>
+					<Modal.Title>Upload Tosca Model</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
 					<Form.Group as={Row} controlId="formPlaintextEmail">
@@ -114,7 +108,7 @@ export default class UploadToscaPolicyModal extends React.Component {
 							<Alert variant="secondary">
 								<p>{this.state.selectedFile.name}</p>
 							</Alert>
-							<Form.Label column sm="2">Micro Service Name:</Form.Label>
+							<Form.Label column sm="2">Policy Model Type:</Form.Label>
 							<input type="text" style={{width: '50%'}}
 								value={this.state.policyModelType}
 								onChange={this.handlePolicyModelType}
@@ -124,7 +118,7 @@ export default class UploadToscaPolicyModal extends React.Component {
 				</Modal.Body>
 				<Modal.Footer>
 					{!this.state.apiResponseStatus?<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>:""}
-				  {!this.state.apiResponseStatus?<Button disabled={!this.state.selectedFile.name || this.state.upldBtnClicked} variant="primary" type="submit" onClick={this.handleUploadToscaPolicyModel.bind(this)}>Upload</Button>:""}
+				  {!this.state.apiResponseStatus?<Button disabled={!this.state.selectedFile.name || this.state.upldBtnClicked} variant="primary" type="submit" onClick={this.handleCreateFromToscaPolicyModel.bind(this)}>Create</Button>:""}
 					{this.state.apiResponseStatus?<Alert variant={this.state.apiResponseStatus === 200?"success":"danger"}>
 							<p>{this.state.apiResponseMessage}</p>
 								<Button onClick={this.handleClose} variant={this.state.apiResponseStatus === 200?"outline-success":"danger"}>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index a78d454ff..89e5697c9 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -25,7 +25,7 @@ import React, { forwardRef } from 'react'
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateMenuService';
+import TemplateService from '../../../api/TemplateService';
 import ArrowUpward from '@material-ui/icons/ArrowUpward';
 import ChevronLeft from '@material-ui/icons/ChevronLeft';
 import ChevronRight from '@material-ui/icons/ChevronRight';
@@ -103,7 +103,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
 	}
 
 	getBlueprintMicroServiceTemplates() {
-		TemplateMenuService.getBlueprintMicroServiceTemplates().then(loopTemplateData => {
+		TemplateService.getBlueprintMicroServiceTemplates().then(loopTemplateData => {
 		this.setState({ loopTemplateData: loopTemplateData })
 		});
 	}
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
index 5b66a25c0..650080520 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
@@ -26,7 +26,7 @@ import MaterialTable from "material-table";
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateMenuService';
+import PolicyToscaService from '../../../api/PolicyToscaService';
 import ArrowUpward from '@material-ui/icons/ArrowUpward';
 import ChevronLeft from '@material-ui/icons/ChevronLeft';
 import ChevronRight from '@material-ui/icons/ChevronRight';
@@ -109,14 +109,14 @@ export default class ViewToscalPolicyModal extends React.Component {
 	}
 
 	getToscaPolicyModels() {
-	    TemplateMenuService.getToscaPolicyModels().then(toscaPolicyModelNames => {
+	    PolicyToscaService.getToscaPolicyModels().then(toscaPolicyModelNames => {
 			this.setState({ toscaPolicyModelNames: toscaPolicyModelNames });
 		});
 	}
 
-	getToscaPolicyModelYaml(policyModelType) {
+	getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
 		if (typeof policyModelType !== "undefined") {
-			TemplateMenuService.getToscaPolicyModelYaml(policyModelType).then(toscaYaml => {
+			PolicyToscaService.getToscaPolicyModelYaml(policyModelType, policyModelVersion).then(toscaYaml => {
 				if (toscaYaml.length !== 0) {
 					this.setState({content: toscaYaml})
 				} else {
@@ -148,7 +148,7 @@ export default class ViewToscalPolicyModal extends React.Component {
 					data={this.state.toscaPolicyModelNames}
 					columns={this.state.toscaColumns}
 					icons={this.state.tableIcons}
-					onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType);this.setState({selectedRow: rowData.tableData.id})}}
+					onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType,rowData.version);this.setState({selectedRow: rowData.tableData.id})}}
 					options={{
 						headerStyle: rowHeaderStyle,
 						rowStyle: rowData => ({
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
index 1b5cd82a8..8e801367b 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
@@ -11,7 +11,7 @@ exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
     closeLabel="Close"
   >
     <ModalTitle>
-      Upload Tosca Modal
+      Upload Tosca Model
     </ModalTitle>
   </ModalHeader>
   <ModalBody>
@@ -72,7 +72,7 @@ exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
           sm="2"
           srOnly={false}
         >
-          Micro Service Name:
+          Policy Model Type:
         </FormLabel>
         <input
           onChange={[Function]}
@@ -104,7 +104,7 @@ exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
       type="submit"
       variant="primary"
     >
-      Upload
+      Create
     </Button>
   </ModalFooter>
 </Styled(Bootstrap(Modal))>
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 98c7bffcf..c1a7ac3bb 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -87,27 +87,28 @@ export default class MenuBar extends React.Component {
 		return (
 
 				<Navbar.Collapse>
-					<StyledNavDropdown title="Template">
-					<NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Policy Model</NavDropdown.Item>
-					<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Policy Models</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View Loop Templates</NavDropdown.Item>
+					<StyledNavDropdown title="Loop Templates">
+							<NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View All Templates</NavDropdown.Item>
 					</StyledNavDropdown>
-					<StyledNavDropdown title="Closed Loop">
-							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties CL</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close Model</NavDropdown.Item>
-					</StyledNavDropdown>
-					<StyledNavDropdown title="Manage">
-							<NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Submit</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Stop</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>Restart</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy</NavDropdown.Item>
-					</StyledNavDropdown>
-					<StyledNavDropdown title="View">
+					<StyledNavDropdown title="Policy Models">
+                    	    <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Model</NavDropdown.Item>
+                    		<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item>
+                    </StyledNavDropdown>
+					<StyledNavDropdown title="Loop Instance">
+							<NavDropdown.Item as={StyledLink} to="/openLoop">Open Loop</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/modifyLoop" >Modify</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
 					</StyledNavDropdown>
+					<StyledNavDropdown title="Loop Operations">
+							<NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Create and deploy to Policy Engine(SUBMIT)</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Undeploy from Policy Engine (STOP)</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>ReDeploy to Policy Engine (RESTART)</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete loop instance (DELETE)</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy to DCAE (DEPLOY)</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy to DCAE (UNDEPLOY)</NavDropdown.Item>
+					</StyledNavDropdown>
 					<StyledNavDropdown title="Help">
 							<StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>
 							<StyledNavLink href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavLink>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 14030f012..a7e66eddd 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Verify MenuBar Test the render method 1`] = `
 <NavbarCollapse>
   <Styled(NavDropdown)
-    title="Template"
+    title="Loop Templates"
   >
     <DropdownItem
       as={
@@ -52,10 +52,14 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={false}
-      to="/uploadToscaPolicyModal"
+      to="/ViewLoopTemplatesModal"
     >
-      Upload Tosca Policy Model
+      View All Templates
     </DropdownItem>
+  </Styled(NavDropdown)>
+  <Styled(NavDropdown)
+    title="Policy Models"
+  >
     <DropdownItem
       as={
         Object {
@@ -103,9 +107,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={false}
-      to="/viewToscaPolicyModal"
+      to="/uploadToscaPolicyModal"
     >
-      View Tosca Policy Models
+      Upload Tosca Model
     </DropdownItem>
     <DropdownItem
       as={
@@ -154,13 +158,13 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={false}
-      to="/ViewLoopTemplatesModal"
+      to="/viewToscaPolicyModal"
     >
-      View Loop Templates
+      View Tosca Models
     </DropdownItem>
   </Styled(NavDropdown)>
   <Styled(NavDropdown)
-    title="Closed Loop"
+    title="Loop Instance"
   >
     <DropdownItem
       as={
@@ -211,7 +215,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
       disabled={false}
       to="/openLoop"
     >
-      Open CL
+      Open Loop
     </DropdownItem>
     <DropdownItem
       as={
@@ -262,7 +266,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
       disabled={true}
       to="/loopProperties"
     >
-      Properties CL
+      Properties
     </DropdownItem>
     <DropdownItem
       as={
@@ -313,12 +317,59 @@ exports[`Verify MenuBar Test the render method 1`] = `
       disabled={true}
       to="/closeLoop"
     >
-      Close Model
+      Close
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-bdVaJa",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-bdVaJa",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/modifyLoop"
+    >
+      Modify
     </DropdownItem>
-  </Styled(NavDropdown)>
-  <Styled(NavDropdown)
-    title="Manage"
-  >
     <DropdownItem
       as={
         Object {
@@ -366,10 +417,14 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/submit"
+      to="/refreshStatus"
     >
-      Submit
+      Refresh Status
     </DropdownItem>
+  </Styled(NavDropdown)>
+  <Styled(NavDropdown)
+    title="Loop Operations"
+  >
     <DropdownItem
       as={
         Object {
@@ -417,9 +472,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/stop"
+      to="/submit"
     >
-      Stop
+      Create and deploy to Policy Engine(SUBMIT)
     </DropdownItem>
     <DropdownItem
       as={
@@ -468,9 +523,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/restart"
+      to="/stop"
     >
-      Restart
+      Undeploy from Policy Engine (STOP)
     </DropdownItem>
     <DropdownItem
       as={
@@ -519,9 +574,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/delete"
+      to="/restart"
     >
-      Delete
+      ReDeploy to Policy Engine (RESTART)
     </DropdownItem>
     <DropdownItem
       as={
@@ -570,9 +625,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/deploy"
+      to="/delete"
     >
-      Deploy
+      Delete loop instance (DELETE)
     </DropdownItem>
     <DropdownItem
       as={
@@ -621,14 +676,10 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/undeploy"
+      to="/deploy"
     >
-      UnDeploy
+      Deploy to DCAE (DEPLOY)
     </DropdownItem>
-  </Styled(NavDropdown)>
-  <Styled(NavDropdown)
-    title="View"
-  >
     <DropdownItem
       as={
         Object {
@@ -676,9 +727,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/refreshStatus"
+      to="/undeploy"
     >
-      Refresh Status
+      UnDeploy to DCAE (UNDEPLOY)
     </DropdownItem>
   </Styled(NavDropdown)>
   <Styled(NavDropdown)
-- 
cgit 1.2.3-korg


From 7658007d67c5c2bc1d81bff4bf972b315cb5bea6 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Sun, 23 Feb 2020 09:31:04 -0800
Subject: Simplify the user management

Simplify the user management and fix a bug in the server, crashing when no user are logged and an operation is requested, and also previous user still stored in the securitycontext when admin is logged (due to static variable)

Issue-ID: CLAMP-651

Change-Id: I57523bc2c3afaf5ca5a3acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../authorization/AuthorizationController.java     |  63 +++++-
 .../org/onap/clamp/authorization/CldsUser.java     |  97 +++++++++
 .../authorization/SecureServicePermission.java     | 203 +++++++++++++++++
 .../SecureServicePermissionDeserializer.java       |  46 ++++
 .../org/onap/clamp/authorization/UserService.java  |  47 ++++
 .../java/org/onap/clamp/clds/ClampServlet.java     |   2 +-
 .../clamp/clds/config/CldsUserJsonDecoder.java     |   2 +-
 .../clds/config/DefaultUserConfiguration.java      |   2 +-
 .../onap/clamp/clds/model/ClampInformation.java    |  62 ++++++
 .../java/org/onap/clamp/clds/model/CldsInfo.java   | 110 ----------
 .../onap/clamp/clds/service/CldsInfoProvider.java  |  52 -----
 .../org/onap/clamp/clds/service/CldsService.java   | 180 ----------------
 .../java/org/onap/clamp/clds/service/CldsUser.java |  97 ---------
 .../clamp/clds/service/DefaultUserNameHandler.java |  43 ----
 .../onap/clamp/clds/service/SecureServiceBase.java | 226 -------------------
 .../clds/service/SecureServicePermission.java      | 203 -----------------
 .../SecureServicePermissionDeserializer.java       |  45 ----
 .../onap/clamp/clds/service/UserNameHandler.java   |  31 ---
 .../org/onap/clamp/clds/service/UserService.java   |  48 -----
 .../java/org/onap/clamp/clds/util/JsonUtils.java   |   4 +-
 .../org/onap/clamp/clds/util/LoggingUtils.java     |   9 +-
 .../org/onap/clamp/tosca/DictionaryService.java    |   3 +-
 .../java/org/onap/clamp/util/PrincipalUtils.java   |  89 --------
 .../resources/clds/camel/rest/clamp-api-v2.xml     |   5 +
 .../resources/clds/camel/rest/clds-services.xml    |   7 +-
 .../clamp/clds/config/CldsUserJsonDecoderTest.java |   6 +-
 .../clds/it/AuthorizationControllerItCase.java     |  91 +++++---
 .../org/onap/clamp/clds/it/CldsServiceItCase.java  | 240 ---------------------
 .../clamp/clds/it/PermissionTestDefaultHelper.java |  51 -----
 .../onap/clamp/clds/it/PermissionTestHelper.java   |  79 -------
 .../clamp/clds/service/CldsInfoProviderTest.java   |  60 ------
 ui-react/src/api/UserService.js                    |   6 +-
 ui-react/src/components/dialogs/UserInfoModal.js   |  66 ++----
 .../src/components/dialogs/UserInfoModal.test.js   |  18 +-
 .../__snapshots__/UserInfoModal.test.js.snap       |  24 +--
 35 files changed, 607 insertions(+), 1710 deletions(-)
 create mode 100644 src/main/java/org/onap/clamp/authorization/CldsUser.java
 create mode 100644 src/main/java/org/onap/clamp/authorization/SecureServicePermission.java
 create mode 100644 src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java
 create mode 100644 src/main/java/org/onap/clamp/authorization/UserService.java
 create mode 100644 src/main/java/org/onap/clamp/clds/model/ClampInformation.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/model/CldsInfo.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/CldsService.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/CldsUser.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/SecureServiceBase.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/SecureServicePermission.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/SecureServicePermissionDeserializer.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/UserNameHandler.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/UserService.java
 delete mode 100644 src/main/java/org/onap/clamp/util/PrincipalUtils.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/it/PermissionTestDefaultHelper.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/it/PermissionTestHelper.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/service/CldsInfoProviderTest.java

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/authorization/AuthorizationController.java b/src/main/java/org/onap/clamp/authorization/AuthorizationController.java
index b49be86bb..e4a03fd38 100644
--- a/src/main/java/org/onap/clamp/authorization/AuthorizationController.java
+++ b/src/main/java/org/onap/clamp/authorization/AuthorizationController.java
@@ -27,19 +27,18 @@ package org.onap.clamp.authorization;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-
 import java.util.Date;
-
 import org.apache.camel.Exchange;
 import org.onap.clamp.clds.config.ClampProperties;
 import org.onap.clamp.clds.exception.NotAuthorizedException;
-import org.onap.clamp.clds.service.SecureServiceBase;
-import org.onap.clamp.clds.service.SecureServicePermission;
+import org.onap.clamp.clds.model.ClampInformation;
 import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.util.PrincipalUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
 /**
@@ -48,7 +47,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class AuthorizationController {
 
-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SecureServiceBase.class);
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(AuthorizationController.class);
     protected static final EELFLogger auditLogger = EELFManager.getInstance().getMetricsLogger();
     protected static final EELFLogger securityLogger = EELFManager.getInstance().getSecurityLogger();
 
@@ -56,9 +55,36 @@ public class AuthorizationController {
     @Autowired
     private ClampProperties refProp;
 
+    private SecurityContext securityContext = SecurityContextHolder.getContext();
+
     public static final String PERM_PREFIX = "security.permission.type.";
     private static final String PERM_INSTANCE = "security.permission.instance";
 
+    private static String retrieveUserName(SecurityContext securityContext) {
+        if (securityContext == null || securityContext.getAuthentication() == null) {
+            return null;
+        }
+        if ((securityContext.getAuthentication().getPrincipal()) instanceof String) {
+            // anonymous case
+            return ((String)securityContext.getAuthentication().getPrincipal());
+        } else {
+            return ((UserDetails) securityContext.getAuthentication().getPrincipal()).getUsername();
+        }
+    }
+    /**
+     * Get the principal name.
+     *
+     * @return The principal name
+     */
+    public static String getPrincipalName(SecurityContext securityContext) {
+        String principal = AuthorizationController.retrieveUserName(securityContext);
+        String name = "Not found";
+        if (principal != null) {
+            name = principal;
+        }
+        return name;
+    }
+
     /**
      * Insert authorize the api based on the permission.
      *
@@ -78,7 +104,7 @@ public class AuthorizationController {
         if (null != instanceVar && !instanceVar.isEmpty()) {
             instance = instanceVar;
         }
-        String principalName = PrincipalUtils.getPrincipalName();
+        String principalName = AuthorizationController.getPrincipalName(this.securityContext);
         SecureServicePermission perm = SecureServicePermission.create(type, instance, action);
         Date startTime = new Date();
         LoggingUtils.setTargetContext("Clamp", "authorize");
@@ -101,7 +127,7 @@ public class AuthorizationController {
      */
     public boolean isUserPermitted(SecureServicePermission inPermission) {
 
-        String principalName = PrincipalUtils.getPrincipalName();
+        String principalName = AuthorizationController.getPrincipalName(this.securityContext);
         // check if the user has the permission key or the permission key with a
         // combination of all instance and/or all action.
         if (hasRole(inPermission.getKey()) || hasRole(inPermission.getKeyAllInstance())) {
@@ -124,7 +150,7 @@ public class AuthorizationController {
     }
 
     protected boolean hasRole(String role) {
-        Authentication authentication = PrincipalUtils.getSecurityContext().getAuthentication();
+        Authentication authentication = securityContext.getAuthentication();
         if (authentication == null) {
             return false;
         }
@@ -136,4 +162,23 @@ public class AuthorizationController {
         return false;
     }
 
+    /**
+     * Gets clds info. CLDS IFO service will return 3 things 1. User Name 2. CLDS
+     * code version that is currently installed from pom.xml file 3. User
+     * permissions
+     *
+     * @return the clds info
+     */
+    public ClampInformation getClampInformation() {
+        ClampInformation clampInfo = new ClampInformation();
+        Authentication authentication = securityContext.getAuthentication();
+        if (authentication == null) {
+            return new ClampInformation();
+        }
+        clampInfo.setUserName(AuthorizationController.getPrincipalName(this.securityContext));
+        for (GrantedAuthority auth : authentication.getAuthorities()) {
+            clampInfo.getAllPermissions().add(auth.getAuthority());
+        }
+        return clampInfo;
+    }
 }
diff --git a/src/main/java/org/onap/clamp/authorization/CldsUser.java b/src/main/java/org/onap/clamp/authorization/CldsUser.java
new file mode 100644
index 000000000..b50f50cb2
--- /dev/null
+++ b/src/main/java/org/onap/clamp/authorization/CldsUser.java
@@ -0,0 +1,97 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * 
+ */
+
+package org.onap.clamp.authorization;
+
+import java.util.Arrays;
+
+/**
+ * The class represents the CldsUser that can be extracted from cldsusers.json.
+ */
+public class CldsUser {
+
+    private String user;
+    private String password;
+    private SecureServicePermission[] permissions;
+
+    /**
+     * Returns the user.
+     * 
+     * @return the user
+     */
+    public String getUser() {
+        return user;
+    }
+
+    /**
+     * Sets the user.
+     * 
+     * @param user
+     *            the user to set
+     */
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    /**
+     * Returns the password.
+     * 
+     * @return the password
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the password.
+     * 
+     * @param password
+     *            the password to set
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /**
+     * Returns the permissions.
+     * 
+     * @return the permissions
+     */
+    public SecureServicePermission[] getPermissions() {
+        return Arrays.copyOf(permissions, permissions.length);
+    }
+
+    public String[] getPermissionsString() {
+        return Arrays.stream(getPermissions()).map(SecureServicePermission::getKey).toArray(String[]::new);
+    }
+
+    /**
+     * Sets the permissions.
+     *
+     * @param permissionsArray
+     *            the permissions to set
+     */
+    public void setPermissions(SecureServicePermission[] permissionsArray) {
+        this.permissions = Arrays.copyOf(permissionsArray, permissionsArray.length);
+    }
+}
diff --git a/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java b/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java
new file mode 100644
index 000000000..374aab90c
--- /dev/null
+++ b/src/main/java/org/onap/clamp/authorization/SecureServicePermission.java
@@ -0,0 +1,203 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.authorization;
+
+/**
+ * Permission class that can be instantiated easily using constructor or factory
+ * methods.
+ */
+public class SecureServicePermission {
+    public static final String ALL = "*";
+
+    private String             type;
+    private String             instance;
+    private String             action;
+
+    /**
+     * Factory method to create permission given type, instance, and action.
+     *
+     * @param type type of the permission
+     * @param instance instance of the permission
+     * @param action action of the permission
+     * @return instance of SecureServicePermission with type, instance and action
+     */
+    public static SecureServicePermission create(String type, String instance, String action) {
+        return new SecureServicePermission(type, instance, action);
+    }
+
+    /**
+     * Factory method to create permission given type and instance. Default
+     * action to ALL/*.
+     *
+     * @param type type of the permission
+     * @param instance instance of the permission
+     * @return instance of SecureServicePermission with type, instance and default action
+     */
+    public static SecureServicePermission create(String type, String instance) {
+        return new SecureServicePermission(type, instance, ALL);
+    }
+
+    /**
+     * Factory method to create permission given type. Default instance and
+     * action to ALL/*.
+     *
+     * @param type type of the permission
+     * @return instance of SecureServicePermission with type and default instance and action
+     */
+    public static SecureServicePermission create(String type) {
+        return new SecureServicePermission(type, ALL, ALL);
+    }
+
+    /**
+     * Instantiate permission given type, instance, and action.
+     *
+     * @param type type of the permission
+     * @param instance instance of the permission
+     * @param action action of the permission
+     */
+    public SecureServicePermission(String type, String instance, String action) {
+        this.type = type;
+        this.instance = instance;
+        this.action = action;
+    }
+
+    /**
+     * Instantiate permission given type from concatenated string
+     *
+     * @param concatenatedString
+     *            the string type|instance|action, less than 3 params can be
+     *            provided (e.g. "permission-type-cl", "permission-type-cl|dev",
+     *            "permission-type-cl|dev|update" )
+     */
+    public SecureServicePermission(String concatenatedString) {
+        String[] userInfo = concatenatedString.split("[|]");
+        // We should have at least 1 string
+        this.type = userInfo[0];
+        this.instance = (userInfo.length > 1 ? userInfo[1] : ALL);
+        this.action = (userInfo.length > 2 ? userInfo[2] : ALL);
+    }
+
+    /**
+     * Override toString - return permission in key format.
+     */
+    @Override
+    public String toString() {
+        return getKey();
+    }
+
+    /**
+     * Return Permission in Key format = type, instance, and action separate by
+     * pipe character.
+     *
+     * @return permission in key format
+     */
+    public String getKey() {
+        return type + "|" + instance + "|" + action;
+    }
+
+    /**
+     * Return Permission in Key format = type, all instance, and action separate
+     * by pipe character.
+     *
+     * @return permission in key format
+     */
+    public String getKeyAllInstance() {
+        return type + "|" + ALL + "|" + action;
+    }
+
+    /**
+     * Return Permission in Key format = type, all instance, and all action
+     * separate by pipe character.
+     *
+     * @return permission in key format
+     */
+    public String getKeyAllInstanceAction() {
+        return type + "|" + ALL + "|" + ALL;
+    }
+
+    /**
+     * Return Permission in Key format = type, instance, and all action separate
+     * by pipe character.
+     *
+     * @return permission in key format
+     */
+    public String getKeyAllAction() {
+        return type + "|" + instance + "|" + ALL;
+    }
+
+    /**
+     * Returns the permission type.
+     *
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type of permission.
+     *
+     * @param type the type to set
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Returns the instance of permission.
+     *
+     * @return the instance
+     */
+    public String getInstance() {
+        return instance;
+    }
+
+    /**
+     * Sets the instance of permission.
+     *
+     * @param instance the instance to set
+     */
+    public void setInstance(String instance) {
+        this.instance = instance;
+    }
+
+    /**
+     * Returns the action of permission.
+     *
+     * @return the action
+     */
+    public String getAction() {
+        return action;
+    }
+
+    /**
+     * Sets the action of permission.
+     *
+     * @param action the action to set
+     */
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+}
diff --git a/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java b/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java
new file mode 100644
index 000000000..026ee802c
--- /dev/null
+++ b/src/main/java/org/onap/clamp/authorization/SecureServicePermissionDeserializer.java
@@ -0,0 +1,46 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.authorization;
+
+
+import com.google.gson.Gson;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+
+public class SecureServicePermissionDeserializer implements JsonDeserializer<SecureServicePermission> {
+
+    @Override
+    public SecureServicePermission deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+        throws JsonParseException {
+        if (json.isJsonPrimitive()) {
+            return new SecureServicePermission(json.getAsString());
+        } else {
+            // if not string try default deserialization
+            return new Gson().fromJson(json, SecureServicePermission.class);
+        }
+    }
+}
diff --git a/src/main/java/org/onap/clamp/authorization/UserService.java b/src/main/java/org/onap/clamp/authorization/UserService.java
new file mode 100644
index 000000000..b4f51c95b
--- /dev/null
+++ b/src/main/java/org/onap/clamp/authorization/UserService.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ */
+
+package org.onap.clamp.authorization;
+
+
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Controller;
+
+/**
+ * User service used for authorization verification at the login page. Do not
+ * remove this class.
+ */
+@Controller
+public class UserService {
+
+    private SecurityContext securityContext = SecurityContextHolder.getContext();
+
+    /**
+     * REST service that returns the username.
+     *
+     * @return the user name
+     */
+    public String getUser() {
+        return AuthorizationController.getPrincipalName(securityContext);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/clds/ClampServlet.java b/src/main/java/org/onap/clamp/clds/ClampServlet.java
index 54aa95e5d..5908201fd 100644
--- a/src/main/java/org/onap/clamp/clds/ClampServlet.java
+++ b/src/main/java/org/onap/clamp/clds/ClampServlet.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
-import org.onap.clamp.clds.service.SecureServicePermission;
+import org.onap.clamp.authorization.SecureServicePermission;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java b/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
index 876acc83f..626227e20 100644
--- a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
+++ b/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
@@ -33,7 +33,7 @@ import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.io.IOUtils;
 import org.onap.clamp.clds.exception.CldsUsersException;
-import org.onap.clamp.clds.service.CldsUser;
+import org.onap.clamp.authorization.CldsUser;
 import org.onap.clamp.clds.util.JsonUtils;
 
 public class CldsUserJsonDecoder {
diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
index 6a539c7ef..a4515860e 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 
 import org.onap.clamp.clds.exception.CldsConfigException;
 import org.onap.clamp.clds.exception.CldsUsersException;
-import org.onap.clamp.clds.service.CldsUser;
+import org.onap.clamp.authorization.CldsUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/clamp/clds/model/ClampInformation.java b/src/main/java/org/onap/clamp/clds/model/ClampInformation.java
new file mode 100644
index 000000000..d73e94204
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/model/ClampInformation.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.model;
+
+import com.google.gson.annotations.Expose;
+import java.util.ArrayList;
+import java.util.List;
+import org.onap.clamp.clds.util.ClampVersioning;
+
+public class ClampInformation {
+    @Expose
+    private String userName;
+    @Expose
+    private String cldsVersion = ClampVersioning.getCldsVersionFromProps();
+    @Expose
+    List<String> allPermissions = new ArrayList<>();
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getCldsVersion() {
+        return cldsVersion;
+    }
+
+    public void setCldsVersion(String cldsVersion) {
+        this.cldsVersion = cldsVersion;
+    }
+
+    public List<String> getAllPermissions() {
+        return allPermissions;
+    }
+
+    public void setAllPermissions(List<String> allPermissions) {
+        this.allPermissions = allPermissions;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/model/CldsInfo.java b/src/main/java/org/onap/clamp/clds/model/CldsInfo.java
deleted file mode 100644
index f3cf6ed19..000000000
--- a/src/main/java/org/onap/clamp/clds/model/CldsInfo.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.model;
-
-import com.google.gson.annotations.Expose;
-
-public class CldsInfo {
-    @Expose
-    private String userName;
-    @Expose
-    private String cldsVersion;
-    @Expose
-    private boolean permissionReadCl;
-    @Expose
-    private boolean permissionUpdateCl;
-    @Expose
-    private boolean permissionReadTemplate;
-    @Expose
-    private boolean permissionUpdateTemplate;
-    @Expose
-    private boolean permissionReadTosca;
-    @Expose
-    private boolean permissionUpdateTosca;
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getCldsVersion() {
-        return cldsVersion;
-    }
-
-    public void setCldsVersion(String cldsVersion) {
-        this.cldsVersion = cldsVersion;
-    }
-
-    public boolean isPermissionReadCl() {
-        return permissionReadCl;
-    }
-
-    public void setPermissionReadCl(boolean permissionReadCl) {
-        this.permissionReadCl = permissionReadCl;
-    }
-
-    public boolean isPermissionUpdateCl() {
-        return permissionUpdateCl;
-    }
-
-    public void setPermissionUpdateCl(boolean permissionUpdateCl) {
-        this.permissionUpdateCl = permissionUpdateCl;
-    }
-
-    public boolean isPermissionReadTemplate() {
-        return permissionReadTemplate;
-    }
-
-    public void setPermissionReadTemplate(boolean permissionReadTemplate) {
-        this.permissionReadTemplate = permissionReadTemplate;
-    }
-
-    public boolean isPermissionUpdateTemplate() {
-        return permissionUpdateTemplate;
-    }
-
-    public void setPermissionUpdateTemplate(boolean permissionUpdateTemplate) {
-        this.permissionUpdateTemplate = permissionUpdateTemplate;
-    }
-
-    public boolean isPermissionReadTosca() {
-        return permissionReadTosca;
-    }
-
-    public void setPermissionReadTosca(boolean permissionReadTosca) {
-        this.permissionReadTosca = permissionReadTosca;
-    }
-
-    public boolean isPermissionUpdateTosca() {
-        return permissionUpdateTosca;
-    }
-
-    public void setPermissionUpdateTosca(boolean permissionUpdateTosca) {
-        this.permissionUpdateTosca = permissionUpdateTosca;
-    }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java b/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java
deleted file mode 100644
index 7027cf1b5..000000000
--- a/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * Modifications copyright (c) 2018 Nokia
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import org.onap.clamp.clds.model.CldsInfo;
-import org.onap.clamp.clds.util.ClampVersioning;
-
-class CldsInfoProvider {
-
-
-    private final CldsService cldsService;
-
-    public CldsInfoProvider(CldsService cldsService) {
-        this.cldsService = cldsService;
-    }
-
-    public CldsInfo getCldsInfo() {
-        CldsInfo cldsInfo = new CldsInfo();
-        cldsInfo.setUserName(cldsService.getUserName());
-        cldsInfo.setCldsVersion(ClampVersioning.getCldsVersionFromProps());
-
-        cldsInfo.setPermissionReadCl(cldsService.isAuthorizedNoException(cldsService.permissionReadCl));
-        cldsInfo.setPermissionUpdateCl(cldsService.isAuthorizedNoException(cldsService.permissionUpdateCl));
-        cldsInfo.setPermissionReadTemplate(cldsService.isAuthorizedNoException(cldsService.permissionReadTemplate));
-        cldsInfo.setPermissionUpdateTemplate(cldsService.isAuthorizedNoException(cldsService.permissionUpdateTemplate));
-        cldsInfo.setPermissionReadTosca(cldsService.isAuthorizedNoException(cldsService.permissionReadTosca));
-        cldsInfo.setPermissionUpdateTosca(cldsService.isAuthorizedNoException(cldsService.permissionUpdateTosca));
-        return cldsInfo;
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java
deleted file mode 100644
index 3b84e360c..000000000
--- a/src/main/java/org/onap/clamp/clds/service/CldsService.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * Modifications copyright (c) 2018 Nokia
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.onap.clamp.clds.model.CldsInfo;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
-import org.slf4j.event.Level;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * Service to save and retrieve the CLDS model attributes.
- */
-@Component
-public class CldsService extends SecureServiceBase {
-
-    /**
-     * The constant securityLogger.
-     */
-    protected static final EELFLogger securityLogger = EELFManager.getInstance().getSecurityLogger();
-    /**
-     * The constant logger.
-     */
-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsService.class);
-
-    private final String cldsPermissionTypeFilterVf;
-    private final String cldsPermissionInstance;
-    /**
-     * The Permission read cl.
-     */
-    final SecureServicePermission permissionReadCl;
-    /**
-     * The Permission update cl.
-     */
-    final SecureServicePermission permissionUpdateCl;
-    /**
-     * The Permission read template.
-     */
-    final SecureServicePermission permissionReadTemplate;
-    /**
-     * The Permission update template.
-     */
-    final SecureServicePermission permissionUpdateTemplate;
-    /**
-     * The Permission read tosca.
-     */
-    final SecureServicePermission permissionReadTosca;
-    /**
-     * The Permission update tosca.
-     */
-    final SecureServicePermission permissionUpdateTosca;
-
-    private LoggingUtils util = new LoggingUtils(logger);
-
-    @Autowired
-    private HttpServletRequest request;
-
-    /**
-     * Instantiates a new Clds service.
-     *
-     * @param cldsPersmissionTypeCl      the clds persmission type cl
-     * @param cldsPermissionTypeClManage the clds permission type cl manage
-     * @param cldsPermissionTypeClEvent  the clds permission type cl event
-     * @param cldsPermissionTypeFilterVf the clds permission type filter vf
-     * @param cldsPermissionTypeTemplate the clds permission type template
-     * @param cldsPermissionTypeTosca    the clds permission type tosca
-     * @param cldsPermissionInstance     the clds permission instance
-     */
-    @Autowired
-    public CldsService(
-            @Value("${clamp.config.security.permission.type.cl:permission-type-cl}") String cldsPersmissionTypeCl,
-            @Value("${clamp.config.security.permission.type.cl.manage:permission-type-cl-manage}")
-                    String cldsPermissionTypeClManage,
-            @Value("${clamp.config.security.permission.type.cl.event:permission-type-cl-event}")
-                    String cldsPermissionTypeClEvent,
-            @Value("${clamp.config.security.permission.type.filter.vf:permission-type-filter-vf}")
-                    String cldsPermissionTypeFilterVf,
-            @Value("${clamp.config.security.permission.type.template:permission-type-template}")
-                    String cldsPermissionTypeTemplate,
-            @Value("${clamp.config.security.permission.type.tosca:permission-type-tosca}")
-                    String cldsPermissionTypeTosca,
-            @Value("${clamp.config.security.permission.instance:dev}") String cldsPermissionInstance) {
-        this.cldsPermissionTypeFilterVf = cldsPermissionTypeFilterVf;
-        this.cldsPermissionInstance = cldsPermissionInstance;
-        permissionReadCl = SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "read");
-        permissionUpdateCl = SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "update");
-        permissionReadTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
-                "read");
-        permissionUpdateTemplate = SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance,
-                "update");
-        permissionReadTosca = SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance, "read");
-        permissionUpdateTosca = SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance,
-                "update");
-    }
-
-    /**
-     * Gets clds info. CLDS IFO service will return 3 things 1. User Name 2. CLDS
-     * code version that is currently installed from pom.xml file 3. User
-     * permissions
-     *
-     * @return the clds info
-     */
-    public CldsInfo getCldsInfo() {
-        util.entering(request, "CldsService: GET cldsInfo");
-        final Date startTime = new Date();
-        LoggingUtils.setTimeContext(startTime, new Date());
-
-        CldsInfoProvider cldsInfoProvider = new CldsInfoProvider(this);
-        final CldsInfo cldsInfo = cldsInfoProvider.getCldsInfo();
-
-        // audit log
-        LoggingUtils.setTimeContext(startTime, new Date());
-        securityLogger.info("GET cldsInfo completed");
-        util.exiting("200", "Get cldsInfo success", Level.INFO, OnapLogConstants.ResponseStatus.COMPLETED);
-        return cldsInfo;
-    }
-
-    /**
-     * Determine if the user is authorized for a particular VF by its invariant
-     * UUID.
-     *
-     * @param vfInvariantUuid the vf invariant uuid
-     * @return boolean or throws NotAuthorizedException
-     */
-    public boolean isAuthorizedForVf(String vfInvariantUuid) {
-        if (cldsPermissionTypeFilterVf != null && !cldsPermissionTypeFilterVf.isEmpty()) {
-            SecureServicePermission permission = SecureServicePermission.create(cldsPermissionTypeFilterVf,
-                    cldsPermissionInstance, vfInvariantUuid);
-            return isAuthorized(permission);
-        } else {
-            // if CLDS_PERMISSION_TYPE_FILTER_VF property is not provided, then
-            // VF filtering is turned off
-            logger.warn("VF filtering turned off");
-            return true;
-        }
-    }
-
-    /**
-     * Sets logging util.
-     *
-     * @param utilP the util p
-     */
-    // Created for the integration test
-    public void setLoggingUtil(LoggingUtils utilP) {
-        util = utilP;
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/CldsUser.java b/src/main/java/org/onap/clamp/clds/service/CldsUser.java
deleted file mode 100644
index 82b7727bd..000000000
--- a/src/main/java/org/onap/clamp/clds/service/CldsUser.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * 
- */
-
-package org.onap.clamp.clds.service;
-
-import java.util.Arrays;
-
-/**
- * The class represents the CldsUser that can be extracted from cldsusers.json.
- */
-public class CldsUser {
-
-    private String user;
-    private String password;
-    private SecureServicePermission[] permissions;
-
-    /**
-     * Returns the user.
-     * 
-     * @return the user
-     */
-    public String getUser() {
-        return user;
-    }
-
-    /**
-     * Sets the user.
-     * 
-     * @param user
-     *            the user to set
-     */
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    /**
-     * Returns the password.
-     * 
-     * @return the password
-     */
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * Sets the password.
-     * 
-     * @param password
-     *            the password to set
-     */
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    /**
-     * Returns the permissions.
-     * 
-     * @return the permissions
-     */
-    public SecureServicePermission[] getPermissions() {
-        return Arrays.copyOf(permissions, permissions.length);
-    }
-
-    public String[] getPermissionsString() {
-        return Arrays.stream(getPermissions()).map(SecureServicePermission::getKey).toArray(String[]::new);
-    }
-
-    /**
-     * Sets the permissions.
-     *
-     * @param permissionsArray
-     *            the permissions to set
-     */
-    public void setPermissions(SecureServicePermission[] permissionsArray) {
-        this.permissions = Arrays.copyOf(permissionsArray, permissionsArray.length);
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java b/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java
deleted file mode 100644
index 543dd4a92..000000000
--- a/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.userdetails.UserDetails;
-
-
-
-public class DefaultUserNameHandler implements UserNameHandler {
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.onap.clamp.clds.service.PrincipalNameHandler#handleName(SecurityContext)
-     */
-    @Override
-    public String retrieveUserName(SecurityContext securityContext) {
-        return ((UserDetails)securityContext.getAuthentication().getPrincipal()).getUsername();
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/SecureServiceBase.java b/src/main/java/org/onap/clamp/clds/service/SecureServiceBase.java
deleted file mode 100644
index debd687c5..000000000
--- a/src/main/java/org/onap/clamp/clds/service/SecureServiceBase.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
-import java.util.Date;
-import javax.ws.rs.NotAuthorizedException;
-
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.onap.clamp.clds.util.OnapLogConstants;
-import org.slf4j.event.Level;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-
-/**
- * Base/abstract Service class. Implements shared security methods.
- */
-public abstract class SecureServiceBase {
-    protected static final EELFLogger logger          = EELFManager.getInstance().getLogger(SecureServiceBase.class);
-    protected static final EELFLogger auditLogger     = EELFManager.getInstance().getAuditLogger();
-    protected static final EELFLogger securityLogger  = EELFManager.getInstance().getSecurityLogger();
-
-    // By default we'll set it to a default handler
-    private static UserNameHandler    userNameHandler = new DefaultUserNameHandler();
-
-
-    private SecurityContext           securityContext = SecurityContextHolder.getContext();
-
-    /**
-     * Get the userId from AAF/CSP.
-     *
-     * @return user ID
-     */
-    public String getUserId() {
-        return getUserName();
-    }
-
-    /**
-     * Get the Full name.
-     *
-     * @return user name
-     */
-    public String getUserName() {
-        String name = userNameHandler.retrieveUserName(securityContext);
-        Date startTime = new Date();
-        LoggingUtils.setTargetContext("CLDS", "getUserName");
-        LoggingUtils.setTimeContext(startTime, new Date());
-        securityLogger.debug("User logged into the CLDS system={}", name);
-        return name;
-    }
-
-    /**
-     * Get the principal name.
-     *
-     * @return the principal name
-     */
-    public String getPrincipalName() {
-        String principal = ((UserDetails)securityContext.getAuthentication().getPrincipal()).getUsername();
-        String name = "Not found";
-        if (principal != null) {
-            name = principal;
-        }
-        logger.debug("userPrincipal.getName()={}", name);
-        return name;
-    }
-
-    /**
-     * Check if user is authorized for the given the permission. Allow matches
-     * if user has a permission with an "*" in permission instance or permission
-     * action even if the permission to check has a specific value in those
-     * fields. For example: if the user has this permission: app-perm-type|*|*
-     * it will be authorized if the inPermission to check is:
-     * app-perm-type|dev|read
-     *
-     * @param inPermission
-     *            The permission to validate
-     * @return A boolean to indicate if the user has the permission to do
-     *         execute the inPermission
-     * @throws NotAuthorizedException
-     *             In case of issues with the permission test, error is returned
-     *             in this exception
-     */
-    public boolean isAuthorized(SecureServicePermission inPermission) throws NotAuthorizedException {
-        Date startTime = new Date();
-        LoggingUtils.setTargetContext("CLDS", "isAuthorized");
-        LoggingUtils.setTimeContext(startTime, new Date());
-        securityLogger.debug("checking if {} has permission: {}", getPrincipalName(), inPermission);
-        try {
-            return isUserPermitted(inPermission);
-        } catch (NotAuthorizedException nae) {
-            String msg = getPrincipalName() + " does not have permission: " + inPermission;
-            LoggingUtils.setErrorContext("100", "Authorization Error");
-            securityLogger.warn(msg);
-            throw new NotAuthorizedException(msg);
-        }
-    }
-
-    /**
-     * Check if user is authorized for the given aaf permission. Allow matches
-     * if user has a permission with an "*" in permission instance or permission
-     * action even if the permission to check has a specific value in those
-     * fields. For example: if the user has this permission: app-perm-type|*|*
-     * it will be authorized if the inPermission to check is:
-     * app-perm-type|dev|read
-     *
-     * @param inPermission
-     *            The permission to validate
-     * @return A boolean to indicate if the user has the permission to do
-     *         execute the inPermission
-     */
-    public boolean isAuthorizedNoException(SecureServicePermission inPermission) {
-        securityLogger.debug("checking if {} has permission: {}", getPrincipalName(), inPermission);
-        Date startTime = new Date();
-        LoggingUtils.setTargetContext("CLDS", "isAuthorizedNoException");
-        LoggingUtils.setTimeContext(startTime, new Date());
-        try {
-            return isUserPermitted(inPermission);
-        } catch (NotAuthorizedException nae) {
-            String msg = getPrincipalName() + " does not have permission: " + inPermission;
-            LoggingUtils.setErrorContext("100", "Authorization Error");
-            securityLogger.warn(msg);
-        }
-        return false;
-    }
-
-    /**
-     * This method can be used by the Application.class to set the
-     * UserNameHandler that must be used in this class. The UserNameHandler
-     * where to get the User name
-     *
-     * @param handler
-     *            The Handler impl to use
-     */
-    public static final void setUserNameHandler(UserNameHandler handler) {
-        if (handler != null) {
-            userNameHandler = handler;
-        }
-    }
-
-    public void setSecurityContext(SecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
-
-    private boolean isUserPermitted(SecureServicePermission inPermission) {
-        boolean authorized = false;
-        // check if the user has the permission key or the permission key with a
-        // combination of  all instance and/or all action.
-        if (hasRole(inPermission.getKey())) {
-            securityLogger.info("{} authorized for permission: {}", getPrincipalName(), inPermission.getKey());
-            authorized = true;
-            // the rest of these don't seem to be required - isUserInRole method
-            // appears to take * as a wildcard
-        } else if (hasRole(inPermission.getKeyAllInstance())) {
-            securityLogger.info("{} authorized because user has permission with * for instance: {}",
-                                getPrincipalName(), inPermission.getKey());
-            authorized = true;
-        } else if (hasRole(inPermission.getKeyAllInstanceAction())) {
-            securityLogger.info("{} authorized because user has permission with * for instance and * for action: {}",
-                                getPrincipalName(), inPermission.getKey());
-            authorized = true;
-        } else if (hasRole(inPermission.getKeyAllAction())) {
-            securityLogger.info("{} authorized because user has permission with * for action: {}",
-                                getPrincipalName(), inPermission.getKey());
-            authorized = true;
-        } else {
-            throw new NotAuthorizedException("");
-        }
-        return authorized;
-    }
-
-    protected boolean hasRole(String role) {
-        Authentication authentication = securityContext.getAuthentication();
-        if (authentication == null) {
-            return false;
-        }
-
-        for (GrantedAuthority auth : authentication.getAuthorities()) {
-            if (role.equals(auth.getAuthority())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    protected void auditLogInfo(LoggingUtils util, String actionDescription, Date startTime) {
-        LoggingUtils.setTimeContext(startTime, new Date());
-        auditLogger.info(actionDescription + " completed");
-        util.exiting("200", actionDescription + " success", Level.INFO,
-            OnapLogConstants.ResponseStatus.COMPLETED);
-    }
-
-    protected void auditLogInfo(String actionDescription, Date startTime) {
-
-        LoggingUtils.setTimeContext(startTime, new Date());
-        LoggingUtils.setResponseContext("0", actionDescription + " success",
-            this.getClass().getName());
-        auditLogger.info(actionDescription + " completed");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/clds/service/SecureServicePermission.java b/src/main/java/org/onap/clamp/clds/service/SecureServicePermission.java
deleted file mode 100644
index a93732c3b..000000000
--- a/src/main/java/org/onap/clamp/clds/service/SecureServicePermission.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-/**
- * Permission class that can be instantiated easily using constructor or factory
- * methods.
- */
-public class SecureServicePermission {
-    public static final String ALL = "*";
-
-    private String             type;
-    private String             instance;
-    private String             action;
-
-    /**
-     * Factory method to create permission given type, instance, and action.
-     *
-     * @param type type of the permission
-     * @param instance instance of the permission
-     * @param action action of the permission
-     * @return instance of SecureServicePermission with type, instance and action
-     */
-    public static SecureServicePermission create(String type, String instance, String action) {
-        return new SecureServicePermission(type, instance, action);
-    }
-
-    /**
-     * Factory method to create permission given type and instance. Default
-     * action to ALL/*.
-     *
-     * @param type type of the permission
-     * @param instance instance of the permission
-     * @return instance of SecureServicePermission with type, instance and default action
-     */
-    public static SecureServicePermission create(String type, String instance) {
-        return new SecureServicePermission(type, instance, ALL);
-    }
-
-    /**
-     * Factory method to create permission given type. Default instance and
-     * action to ALL/*.
-     *
-     * @param type type of the permission
-     * @return instance of SecureServicePermission with type and default instance and action
-     */
-    public static SecureServicePermission create(String type) {
-        return new SecureServicePermission(type, ALL, ALL);
-    }
-
-    /**
-     * Instantiate permission given type, instance, and action.
-     *
-     * @param type type of the permission
-     * @param instance instance of the permission
-     * @param action action of the permission
-     */
-    public SecureServicePermission(String type, String instance, String action) {
-        this.type = type;
-        this.instance = instance;
-        this.action = action;
-    }
-
-    /**
-     * Instantiate permission given type from concatenated string
-     *
-     * @param concatenatedString
-     *            the string type|instance|action, less than 3 params can be
-     *            provided (e.g. "permission-type-cl", "permission-type-cl|dev",
-     *            "permission-type-cl|dev|update" )
-     */
-    public SecureServicePermission(String concatenatedString) {
-        String[] userInfo = concatenatedString.split("[|]");
-        // We should have at least 1 string
-        this.type = userInfo[0];
-        this.instance = (userInfo.length > 1 ? userInfo[1] : ALL);
-        this.action = (userInfo.length > 2 ? userInfo[2] : ALL);
-    }
-
-    /**
-     * Override toString - return permission in key format.
-     */
-    @Override
-    public String toString() {
-        return getKey();
-    }
-
-    /**
-     * Return Permission in Key format = type, instance, and action separate by
-     * pipe character.
-     *
-     * @return permission in key format
-     */
-    public String getKey() {
-        return type + "|" + instance + "|" + action;
-    }
-
-    /**
-     * Return Permission in Key format = type, all instance, and action separate
-     * by pipe character.
-     *
-     * @return permission in key format
-     */
-    public String getKeyAllInstance() {
-        return type + "|" + ALL + "|" + action;
-    }
-
-    /**
-     * Return Permission in Key format = type, all instance, and all action
-     * separate by pipe character.
-     *
-     * @return permission in key format
-     */
-    public String getKeyAllInstanceAction() {
-        return type + "|" + ALL + "|" + ALL;
-    }
-
-    /**
-     * Return Permission in Key format = type, instance, and all action separate
-     * by pipe character.
-     *
-     * @return permission in key format
-     */
-    public String getKeyAllAction() {
-        return type + "|" + instance + "|" + ALL;
-    }
-
-    /**
-     * Returns the permission type.
-     *
-     * @return the type
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the type of permission.
-     *
-     * @param type the type to set
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * Returns the instance of permission.
-     *
-     * @return the instance
-     */
-    public String getInstance() {
-        return instance;
-    }
-
-    /**
-     * Sets the instance of permission.
-     *
-     * @param instance the instance to set
-     */
-    public void setInstance(String instance) {
-        this.instance = instance;
-    }
-
-    /**
-     * Returns the action of permission.
-     *
-     * @return the action
-     */
-    public String getAction() {
-        return action;
-    }
-
-    /**
-     * Sets the action of permission.
-     *
-     * @param action the action to set
-     */
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/SecureServicePermissionDeserializer.java b/src/main/java/org/onap/clamp/clds/service/SecureServicePermissionDeserializer.java
deleted file mode 100644
index 9cbf711c9..000000000
--- a/src/main/java/org/onap/clamp/clds/service/SecureServicePermissionDeserializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import java.lang.reflect.Type;
-
-public class SecureServicePermissionDeserializer implements JsonDeserializer<SecureServicePermission> {
-
-    @Override
-    public SecureServicePermission deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-        throws JsonParseException {
-        if (json.isJsonPrimitive()) {
-            return new SecureServicePermission(json.getAsString());
-        } else {
-            // if not string try default deserialization
-            return new Gson().fromJson(json, SecureServicePermission.class);
-        }
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/UserNameHandler.java b/src/main/java/org/onap/clamp/clds/service/UserNameHandler.java
deleted file mode 100644
index d48700f6a..000000000
--- a/src/main/java/org/onap/clamp/clds/service/UserNameHandler.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import org.springframework.security.core.context.SecurityContext;
-
-public interface UserNameHandler {
-
-    public String retrieveUserName(SecurityContext securityContext);
-}
diff --git a/src/main/java/org/onap/clamp/clds/service/UserService.java b/src/main/java/org/onap/clamp/clds/service/UserService.java
deleted file mode 100644
index cf8f66309..000000000
--- a/src/main/java/org/onap/clamp/clds/service/UserService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- */
-
-package org.onap.clamp.clds.service;
-
-
-
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Controller;
-
-/**
- * User service used for authorization verification at the login page. Do not
- * remove this class.
- */
-@Controller
-public class UserService {
-
-    private SecurityContext           securityContext = SecurityContextHolder.getContext();
-
-    /**
-     * REST service that returns the username.
-     *
-     * @return the user name
-     */
-    public String getUser() {
-        return new DefaultUserNameHandler().retrieveUserName(securityContext);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/clds/util/JsonUtils.java b/src/main/java/org/onap/clamp/clds/util/JsonUtils.java
index 704d3ac37..8024331f2 100644
--- a/src/main/java/org/onap/clamp/clds/util/JsonUtils.java
+++ b/src/main/java/org/onap/clamp/clds/util/JsonUtils.java
@@ -30,8 +30,8 @@ import com.google.gson.GsonBuilder;
 
 import java.time.Instant;
 
-import org.onap.clamp.clds.service.SecureServicePermission;
-import org.onap.clamp.clds.service.SecureServicePermissionDeserializer;
+import org.onap.clamp.authorization.SecureServicePermission;
+import org.onap.clamp.authorization.SecureServicePermissionDeserializer;
 import org.onap.clamp.dao.model.gson.converter.InstantDeserializer;
 import org.onap.clamp.dao.model.gson.converter.InstantSerializer;
 
diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
index 1a6cca6b8..a471b411b 100644
--- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
+++ b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
@@ -25,7 +25,6 @@ package org.onap.clamp.clds.util;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.net.URLConnection;
@@ -39,12 +38,10 @@ import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.UUID;
-
 import javax.net.ssl.HttpsURLConnection;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotNull;
-
-import org.onap.clamp.clds.service.DefaultUserNameHandler;
+import org.onap.clamp.authorization.AuthorizationController;
 import org.slf4j.MDC;
 import org.slf4j.event.Level;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -188,8 +185,8 @@ public class LoggingUtils {
 
         // Default the partner name to the user name used to login to clamp
         if (partnerName.equalsIgnoreCase(EMPTY_MESSAGE)) {
-            MDC.put(OnapLogConstants.Mdcs.PARTNER_NAME, new DefaultUserNameHandler()
-                    .retrieveUserName(SecurityContextHolder.getContext()));
+            MDC.put(OnapLogConstants.Mdcs.PARTNER_NAME,
+                    AuthorizationController.getPrincipalName(SecurityContextHolder.getContext()));
         }
 
         // Set standard MDCs. Override this entire method if you want to set
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryService.java b/src/main/java/org/onap/clamp/tosca/DictionaryService.java
index 21ca1f7f7..5b24def98 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryService.java
+++ b/src/main/java/org/onap/clamp/tosca/DictionaryService.java
@@ -27,12 +27,11 @@ import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.Set;
 import javax.persistence.EntityNotFoundException;
-import org.onap.clamp.clds.service.SecureServiceBase;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class DictionaryService extends SecureServiceBase {
+public class DictionaryService {
 
     private final DictionaryRepository dictionaryRepository;
     private final DictionaryElementsRepository dictionaryElementsRepository;
diff --git a/src/main/java/org/onap/clamp/util/PrincipalUtils.java b/src/main/java/org/onap/clamp/util/PrincipalUtils.java
deleted file mode 100644
index d6dfacbdb..000000000
--- a/src/main/java/org/onap/clamp/util/PrincipalUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * Modifications copyright (c) 2018 Nokia
- * ===================================================================
- *
- */
-
-package org.onap.clamp.util;
-
-import java.util.Date;
-
-import org.onap.clamp.clds.service.DefaultUserNameHandler;
-import org.onap.clamp.clds.service.UserNameHandler;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-
-public class PrincipalUtils {
-    private static UserNameHandler userNameHandler = new DefaultUserNameHandler();
-    private static SecurityContext securityContext = SecurityContextHolder.getContext();
-
-    /**
-     * Private constructor to avoid creating instances of util class.
-     */
-    private PrincipalUtils(){
-    }
-
-    /**
-     * Get the Full name.
-     *
-     * @return The user name
-     */
-    public static String getUserName() {
-        String name = userNameHandler.retrieveUserName(securityContext);
-        Date startTime = new Date();
-        LoggingUtils.setTargetContext("CLDS", "getUserName");
-        LoggingUtils.setTimeContext(startTime, new Date());
-        return name;
-    }
-
-    /**
-     * Get the userId from AAF/CSP.
-     *
-     * @return The user ID
-     */
-    public static String getUserId() {
-        return getUserName();
-    }
-
-    /**
-     * Get the principal name.
-     *
-     * @return The principal name
-     */
-    public static String getPrincipalName() {
-        String principal = ((UserDetails)securityContext.getAuthentication().getPrincipal()).getUsername();
-        String name = "Not found";
-        if (principal != null) {
-            name = principal;
-        }
-        return name;
-    }
-
-    public static void setSecurityContext(SecurityContext securityContext) {
-        PrincipalUtils.securityContext = securityContext;
-    }
-
-    public static SecurityContext getSecurityContext() {
-        return securityContext;
-    }
-}
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index d62a0c289..1f927267c 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -1050,5 +1050,10 @@
 				</doTry>
 			</route>
 		</get>
+		<get uri="/v2/clampInformation" outType="org.onap.clamp.clds.model.ClampInformation"
+			 produces="application/json">
+			<to
+					uri="bean:org.onap.clamp.authorization.AuthorizationController?method=getClampInformation()" />
+		</get>
 	</rest>
 </rests>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index dd3a4bfdc..ce52f31d6 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -1,10 +1,5 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
 	<rest>
-		<get uri="/v1/clds/cldsInfo" outType="org.onap.clamp.clds.model.CldsInfo"
-			produces="application/json">
-			<to
-				uri="bean:org.onap.clamp.clds.service.CldsService?method=getCldsInfo()" />
-		</get>
 		<get uri="/v1/healthcheck" produces="application/json"
 			outType="org.onap.clamp.clds.model.CldsHealthCheck">
 			<route>
@@ -23,7 +18,7 @@
 		</get>
 
 		<get uri="/v1/user/getUser" produces="text/plain">
-			<to uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
+			<to uri="bean:org.onap.clamp.authorization.UserService?method=getUser()" />
 		</get>
 	</rest>
 </rests>
diff --git a/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java b/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
index a94804212..5a1292210 100644
--- a/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
+++ b/src/test/java/org/onap/clamp/clds/config/CldsUserJsonDecoderTest.java
@@ -26,11 +26,11 @@
 
 package org.onap.clamp.clds.config;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
+import org.onap.clamp.authorization.CldsUser;
 import org.onap.clamp.clds.exception.CldsUsersException;
-import org.onap.clamp.clds.service.CldsUser;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class CldsUserJsonDecoderTest {
 
diff --git a/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java b/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
index 49f173644..3406042c1 100644
--- a/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/AuthorizationControllerItCase.java
@@ -25,27 +25,27 @@
 
 package org.onap.clamp.clds.it;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
 
+import java.util.Arrays;
+import java.util.Collection;
 import org.apache.camel.Exchange;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.onap.clamp.authorization.AuthorizationController;
+import org.onap.clamp.authorization.SecureServicePermission;
 import org.onap.clamp.clds.exception.NotAuthorizedException;
-import org.onap.clamp.clds.service.SecureServicePermission;
-import org.onap.clamp.util.PrincipalUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
@@ -53,33 +53,67 @@ import org.springframework.test.context.junit4.SpringRunner;
  * and stored procedures.
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class AuthorizationControllerItCase {
 
-    private PermissionTestDefaultHelper permissionTestHelper = new PermissionTestDefaultHelper();
-
-    // @Spy
-    // MockEnvironment env;
-
     @Autowired
     private AuthorizationController auth;
 
+    private static SecurityContext sc = SecurityContextHolder.getContext();
+
     /**
      * Setup the variable before the tests execution.
      */
-    @Before
-    public void setupBefore() {
-        // permissionTestHelper.setupMockEnv(env);
-        List<GrantedAuthority> authList = permissionTestHelper.getAuthList();
-
-        SecurityContext securityContext = Mockito.mock(SecurityContext.class);
-        Mockito.when(securityContext.getAuthentication())
-                .thenReturn(new UsernamePasswordAuthenticationToken(new User("admin", "", authList), "", authList));
-        PrincipalUtils.setSecurityContext(securityContext);
+    @BeforeClass
+    public static void setupBefore() {
+
+        sc.setAuthentication(new Authentication() {
+            @Override
+            public Collection<? extends GrantedAuthority> getAuthorities() {
+                return Arrays.asList(new SimpleGrantedAuthority(
+                                new SecureServicePermission("permission-type-cl", "dev", "read").getKey()),
+                        new SimpleGrantedAuthority(new SecureServicePermission("permission-type-cl-manage", "dev",
+                                "DEPLOY").getKey()),
+                        new SimpleGrantedAuthority(new SecureServicePermission("permission-type-filter-vf", "dev",
+                                "12345-55555-55555-5555").getKey()));
+            }
+
+            @Override
+            public Object getCredentials() {
+                return null;
+            }
+
+            @Override
+            public Object getDetails() {
+                return null;
+            }
+
+            @Override
+            public Object getPrincipal() {
+                return "admin";
+            }
+
+            @Override
+            public boolean isAuthenticated() {
+                return true;
+            }
+
+            @Override
+            public void setAuthenticated(boolean authenticatedFlag) throws IllegalArgumentException {
+
+            }
+
+            @Override
+            public String getName() {
+                return "admin";
+            }
+        });
+
     }
 
     @Test
     public void testIsUserPermitted() {
+        assertEquals(AuthorizationController.getPrincipalName(sc),"admin");
         assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl", "dev", "read")));
         assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl-manage", "dev", "DEPLOY")));
         assertTrue(auth.isUserPermitted(
@@ -87,17 +121,6 @@ public class AuthorizationControllerItCase {
         assertFalse(auth.isUserPermitted(new SecureServicePermission("permission-type-cl", "test", "read")));
     }
 
-    @Test
-    public void testIfUserAuthorize() {
-        Exchange ex = Mockito.mock(Exchange.class);
-        try {
-            permissionTestHelper
-                    .doActionOnAllPermissions(((type, instance, action) -> auth.authorize(ex, type, instance, action)));
-        } catch (NotAuthorizedException e) {
-            fail(e.getMessage());
-        }
-    }
-
     @Test(expected = NotAuthorizedException.class)
     public void testIfAuthorizeThrowException() {
         Exchange ex = Mockito.mock(Exchange.class);
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java b/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
deleted file mode 100644
index 40cc0650e..000000000
--- a/src/test/java/org/onap/clamp/clds/it/CldsServiceItCase.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.it;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.NotAuthorizedException;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-import org.onap.clamp.clds.model.CldsInfo;
-import org.onap.clamp.clds.service.CldsService;
-import org.onap.clamp.clds.util.LoggingUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * Test HTTP and HTTPS settings + redirection of HTTP to HTTPS.
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class CldsServiceItCase {
-
-    @Autowired
-    private CldsService cldsService;
-
-    private LoggingUtils util;
-    private SecurityContext securityContext = mock(SecurityContext.class);
-    private Authentication auth = Mockito.mock(Authentication.class);
-    private UserDetails userDetails = Mockito.mock(UserDetails.class);
-    private List<GrantedAuthority> authorityList = new LinkedList<GrantedAuthority>();
-    /**
-     * Setup the variable before the tests execution.
-     *
-     * @throws IOException In case of issues when opening the files
-     */
-    @Before
-    public void setupBefore() throws IOException {
-        util = Mockito.mock(LoggingUtils.class);
-        Mockito.doNothing().when(util).entering(Matchers.any(HttpServletRequest.class), Matchers.any(String.class));
-        cldsService.setLoggingUtil(util);
-
-    }
-
-    @Test
-    public void testCldsInfoNotAuthorized() {
-        Mockito.when(userDetails.getUsername()).thenReturn("admin");
-        Mockito.when(securityContext.getAuthentication()).thenReturn(auth);
-        Mockito.when(auth.getPrincipal()).thenReturn(userDetails);
-
-        cldsService.setSecurityContext(securityContext);
-        CldsInfo cldsInfo = cldsService.getCldsInfo();
-        assertFalse(cldsInfo.isPermissionReadCl());
-        assertFalse(cldsInfo.isPermissionReadTemplate());
-        assertFalse(cldsInfo.isPermissionUpdateCl());
-        assertFalse(cldsInfo.isPermissionUpdateTemplate());
-    }
-
-    @Test
-    public void testCldsInfoAuthorized() throws Exception {
-        List<GrantedAuthority> authList = new LinkedList<GrantedAuthority>();
-        authList.add(new SimpleGrantedAuthority("permission-type-cl-manage|dev|*"));
-        authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|read"));
-        authList.add(new SimpleGrantedAuthority("permission-type-cl|dev|update"));
-        authList.add(new SimpleGrantedAuthority("permission-type-template|dev|read"));
-        authList.add(new SimpleGrantedAuthority("permission-type-template|dev|update"));
-        authList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|*"));
-        authList.add(new SimpleGrantedAuthority("permission-type-cl-event|dev|*"));
-        Authentication authentication;
-        authentication = new UsernamePasswordAuthenticationToken(new User("admin", "", authList), "", authList);
-
-        Mockito.when(securityContext.getAuthentication()).thenReturn(authentication);
-
-        cldsService.setSecurityContext(securityContext);
-        CldsInfo cldsInfo = cldsService.getCldsInfo();
-        assertTrue(cldsInfo.isPermissionReadCl());
-        assertTrue(cldsInfo.isPermissionReadTemplate());
-        assertTrue(cldsInfo.isPermissionUpdateCl());
-        assertTrue(cldsInfo.isPermissionUpdateTemplate());
-        Properties prop = new Properties();
-        InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("clds-version.properties");
-        prop.load(in);
-        assertNotNull(in);
-        in.close();
-        assertEquals(cldsInfo.getCldsVersion(), prop.getProperty("clds.version"));
-        assertEquals(cldsInfo.getUserName(), "admin");
-    }
-
-    @Test(expected = NotAuthorizedException.class)
-    public void isAuthorizedForVfTestNotAuthorized1() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test(expected = NotAuthorizedException.class)
-    public void isAuthorizedForVfTestNotAuthorized2() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|prod|*"));
-        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test(expected = NotAuthorizedException.class)
-    public void isAuthorizedForVfTestNotAuthorized3() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|testId2"));
-        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void isAuthorizedForVfTestNotAuthorized4() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        when(securityContext.getAuthentication()).thenReturn(null);
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test
-    public void isAuthorizedForVfTest1() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|*|*"));
-        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test
-    public void isAuthorizedForVfTest2() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|*"));
-        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test
-    public void isAuthorizedForVfTest3() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|dev|testId"));
-        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test
-    public void isAuthorizedForVfTest4() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        authorityList.add(new SimpleGrantedAuthority("permission-type-filter-vf|*|testId"));
-        when((List<GrantedAuthority>)auth.getAuthorities()).thenReturn(authorityList);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-
-        cldsService.setSecurityContext(securityContext);
-        boolean res = cldsService.isAuthorizedForVf("testId");
-        assertThat(res).isTrue();
-    }
-
-    @Test
-    public void getUserIdTest() throws Exception {
-        when(userDetails.getUsername()).thenReturn("testName");
-        when(auth.getPrincipal()).thenReturn(userDetails);
-        when(securityContext.getAuthentication()).thenReturn(auth);
-
-        cldsService.setSecurityContext(securityContext);
-        assertThat(cldsService.getUserId()).isEqualTo("testName");
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/it/PermissionTestDefaultHelper.java b/src/test/java/org/onap/clamp/clds/it/PermissionTestDefaultHelper.java
deleted file mode 100644
index 1830115f8..000000000
--- a/src/test/java/org/onap/clamp/clds/it/PermissionTestDefaultHelper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Samsung. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.it;
-
-import com.google.common.collect.ImmutableMap;
-
-import java.util.Map;
-
-public class PermissionTestDefaultHelper extends PermissionTestHelper {
-
-    private static final String[] ALL_ACTION = new String[] { "*" };
-    private static final String[] READ_UPDATE_ACTION = new String[] { "read", "update" };
-
-    private static final String DEV_INSTANCE = "dev";
-    private static final String TEST_INSTANCE = "test";
-
-    private static final Map<String, Map<?, ?>> defaultPermission = ImmutableMap.of("permission-type-cl",
-            ImmutableMap.of(DEV_INSTANCE, ALL_ACTION), "permission-type-cl-event",
-            ImmutableMap.of(DEV_INSTANCE, ALL_ACTION, TEST_INSTANCE, READ_UPDATE_ACTION), "permission-type-cl-manage",
-            ImmutableMap.of(DEV_INSTANCE, ALL_ACTION, TEST_INSTANCE, READ_UPDATE_ACTION), "permission-type-filter-vf",
-            ImmutableMap.of(DEV_INSTANCE, ALL_ACTION, TEST_INSTANCE, READ_UPDATE_ACTION), "permission-type-template",
-            ImmutableMap.of(DEV_INSTANCE, ALL_ACTION, TEST_INSTANCE, READ_UPDATE_ACTION));
-
-    /**
-     * Permission test default helper constructor. This class setup the default
-     * permission in the parent PermissionTestHelper class.
-     */
-    public PermissionTestDefaultHelper() {
-        super(defaultPermission);
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/it/PermissionTestHelper.java b/src/test/java/org/onap/clamp/clds/it/PermissionTestHelper.java
deleted file mode 100644
index 905b7f702..000000000
--- a/src/test/java/org/onap/clamp/clds/it/PermissionTestHelper.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Samsung. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.it;
-
-import static org.onap.clamp.authorization.AuthorizationController.PERM_PREFIX;
-import static org.onap.clamp.clds.config.ClampProperties.CONFIG_PREFIX;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.mock.env.MockEnvironment;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-
-public class PermissionTestHelper {
-
-    private static final String securityPrefix = CONFIG_PREFIX + PERM_PREFIX;
-    private final Map<String, Map<?, ?>> permission;
-    private static final List<GrantedAuthority> authList = new LinkedList<>();
-
-    /**
-     * Permission Test Helper constructor. Generate authList base on general
-     * permission collection.
-     */
-    public PermissionTestHelper(Map<String, Map<?, ?>> permission) {
-        this.permission = permission;
-        this.createAuthList();
-    }
-
-    private void createAuthList() {
-        permission.forEach((type, instanceMap) -> instanceMap.forEach((instance, actionList) -> {
-            for (String action : (String[]) actionList) {
-                authList.add(new SimpleGrantedAuthority(type + "|" + instance + "|" + action));
-            }
-        }));
-    }
-
-    List<GrantedAuthority> getAuthList() {
-        return authList;
-    }
-
-    void setupMockEnv(MockEnvironment env) {
-        permission.forEach((type, instanceMap) -> env.withProperty(securityPrefix + type, type));
-    }
-
-    void doActionOnAllPermissions(PermissionAction action) {
-        permission.forEach((type, instanceMap) -> instanceMap.forEach((instance, actionList) -> {
-            for (String actionName : (String[]) actionList) {
-                action.doAction(type, (String) instance, actionName);
-            }
-        }));
-    }
-
-    @FunctionalInterface
-    public interface PermissionAction {
-        void doAction(String type, String instance, String action);
-    }
-}
diff --git a/src/test/java/org/onap/clamp/clds/service/CldsInfoProviderTest.java b/src/test/java/org/onap/clamp/clds/service/CldsInfoProviderTest.java
deleted file mode 100644
index fa898c7a2..000000000
--- a/src/test/java/org/onap/clamp/clds/service/CldsInfoProviderTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 Nokia Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.onap.clamp.clds.model.CldsInfo;
-
-
-public class CldsInfoProviderTest {
-
-    private static final String TEST_USERNAME = "TEST_USERNAME";
-
-    @Test
-    public void shouldProvideCldsInfoFromContext() throws Exception {
-
-        // given
-        CldsService serviceBase = mock(CldsService.class);
-        when(serviceBase.getUserName()).thenReturn(TEST_USERNAME);
-        when(serviceBase.isAuthorizedNoException(any())).thenReturn(true);
-        CldsInfoProvider cldsInfoProvider = new CldsInfoProvider(serviceBase);
-
-        // when
-        CldsInfo cldsInfo = cldsInfoProvider.getCldsInfo();
-
-        // then
-        assertThat(cldsInfo.getUserName()).isEqualTo(TEST_USERNAME);
-        assertThat(cldsInfo.isPermissionReadCl()).isTrue();
-        assertThat(cldsInfo.isPermissionReadTemplate()).isTrue();
-        assertThat(cldsInfo.isPermissionUpdateCl()).isTrue();
-        assertThat(cldsInfo.isPermissionUpdateTemplate()).isTrue();
-        assertThat(cldsInfo.isPermissionReadTosca()).isTrue();
-        assertThat(cldsInfo.isPermissionUpdateTosca()).isTrue();
-    }
-}
\ No newline at end of file
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 8da6e3a71..5703fdcc7 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -74,7 +74,7 @@ export default class UserService {
 	}
 
 	static getUserInfo() {
-		return fetch('/restservices/clds/v1/clds/cldsInfo', {
+		return fetch('/restservices/clds/v2/clampInformation', {
 				method: 'GET',
 				credentials: 'same-origin'
 			})
@@ -82,6 +82,8 @@ export default class UserService {
 			console.debug("getUserInfo response received, status code:", response.status);
 			if (response.ok) {
 				return response.json();
+			} else {
+			    return {}
 			}
 		})
 		.then(function (data) {
@@ -91,7 +93,7 @@ export default class UserService {
 		.catch(function(error) {
 			console.warn("getUserInfo error received, user set to: ",UserService.notLoggedUserName);
 			console.error("getUserInfo error:",error);
-			return;
+			return {};
 		});
 	}
 }
diff --git a/ui-react/src/components/dialogs/UserInfoModal.js b/ui-react/src/components/dialogs/UserInfoModal.js
index 1273d87c0..4b779dece 100644
--- a/ui-react/src/components/dialogs/UserInfoModal.js
+++ b/ui-react/src/components/dialogs/UserInfoModal.js
@@ -39,12 +39,7 @@ export default class UserInfoModal extends React.Component {
 		super(props, context);
 
 		this.handleClose = this.handleClose.bind(this);
-		this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this);
-		this.renderReadModelPermission = this.renderReadModelPermission.bind(this);
-		this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this);
-		this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this);
-		this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this);
-		this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this);
+	    this.renderPermissions = this.renderPermissions.bind(this);
 		this.renderUserName = this.renderUserName.bind(this);
 		this.state = {
 			show: true,
@@ -60,48 +55,16 @@ export default class UserInfoModal extends React.Component {
 	handleClose() {
 			this.props.history.push('/');
 	}
-	renderReadTemplatePermission() {
-		if (this.state.userInfo["permissionReadTemplate"]) {
-			return <Form.Control plaintext readOnly defaultValue="Read Template" />
-		} else  {
-			return;
-		}
-	}
-	renderReadModelPermission() {
-		if (this.state.userInfo["permissionReadCl"]) {
-			return <Form.Control plaintext readOnly defaultValue="Read Model" />
-		} else  {
-			return;
-		}
-	}
-	renderReadToscaPermission() {
-		if (this.state.userInfo["permissionReadTosca"]) {
-			return <Form.Control plaintext readOnly defaultValue="Read Tosca" />
-		} else  {
-			return;
-		}
-	}
-	renderUpdateTemplatePermission() {
-		if (this.state.userInfo["permissionUpdateTemplate"]) {
-			return <Form.Control plaintext readOnly defaultValue="Edit Template" />
-		} else  {
-			return;
-		}
-	}
-	renderUpdateModelPermission() {
-		if (this.state.userInfo["permissionUpdateCl"]) {
-			return <Form.Control plaintext readOnly defaultValue="Edit Model" />
-		} else  {
-			return;
-		}
-	}
-	renderUpdateToscaPermission() {
-		if (this.state.userInfo["permissionUpdateTosca"]) {
-			return <Form.Control plaintext readOnly defaultValue="Edit Tosca" />
-		} else  {
-			return;
-		}
-	}
+	renderPermissions() {
+          if (this.state.userInfo["allPermissions"]) {
+	        var listOfPermissions = this.state.userInfo["allPermissions"].map(function(perm) {
+	            return <Form.Control plaintext readOnly defaultValue={perm} />;
+	        })
+		    return listOfPermissions;
+		  } else {
+		    return;
+		  }
+ 	}
 	renderUserName() {
 		if (this.state.userInfo["userName"]) {
 			return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["userName"]} />
@@ -134,12 +97,7 @@ export default class UserInfoModal extends React.Component {
 					<Form.Group as={Row} controlId="userPermissions">
 						<Form.Label column sm="3">User Permissions:</Form.Label>
 						<Col>
-							{this.renderReadTemplatePermission()}
-							{this.renderReadModelPermission()}
-							{this.renderReadToscaPermission()}
-							{this.renderUpdateTemplatePermission()}
-							{this.renderUpdateModelPermission()}
-							{this.renderUpdateToscaPermission()}
+							{this.renderPermissions()}
 						</Col>
 					</Form.Group>
 				</Modal.Body>
diff --git a/ui-react/src/components/dialogs/UserInfoModal.test.js b/ui-react/src/components/dialogs/UserInfoModal.test.js
index b5a2b272e..f5ed0ae10 100644
--- a/ui-react/src/components/dialogs/UserInfoModal.test.js
+++ b/ui-react/src/components/dialogs/UserInfoModal.test.js
@@ -46,12 +46,7 @@ describe('Verify UserInfoModal', () => {
 		component.setState({ userInfo: {
 			"userName": "test",
 			"cldsVersion": "1.0.0",
-			"permissionReadCl": true,
-			"permissionReadTemplate" : true,
-			"permissionReadTosca" : true,
-			"permissionUpdateTemplate" : true,
-			"permissionUpdateCl" : true,
-			"permissionUpdateTosca": true
+			"allPermissions": ["permission1","permission2"]
 		}});
 		expect(component).toMatchSnapshot();
 	});
@@ -69,18 +64,15 @@ describe('Verify UserInfoModal', () => {
 		component.setState({ userInfo: {
 			"userName": "test",
 			"cldsVersion": "1.0.0",
-			"permissionReadCl": true,
-			"permissionReadTemplate" : true,
-			"permissionReadTosca" : true
+			"allPermissions": ["permission1","permission2"]
 		}});
 
-		expect(component.find('FormControl').length).toEqual(5);
+		expect(component.find('FormControl').length).toEqual(4);
 
 		const forms = component.find('FormControl');
 		expect(forms.get(0).props.defaultValue).toEqual("test");
 		expect(forms.get(1).props.defaultValue).toEqual("1.0.0");
-		expect(forms.get(2).props.defaultValue).toEqual("Read Template");
-		expect(forms.get(3).props.defaultValue).toEqual("Read Model");
-		expect(forms.get(4).props.defaultValue).toEqual("Read Tosca");
+		expect(forms.get(2).props.defaultValue).toEqual("permission1");
+		expect(forms.get(3).props.defaultValue).toEqual("permission2");
 	});
 });
diff --git a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap b/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
index fdb24a430..bd05e8635 100644
--- a/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
+++ b/ui-react/src/components/dialogs/__snapshots__/UserInfoModal.test.js.snap
@@ -90,32 +90,12 @@ exports[`Verify UserInfoModal Test the render method full permission 1`] = `
       </FormLabel>
       <Col>
         <FormControl
-          defaultValue="Read Template"
+          defaultValue="permission1"
           plaintext={true}
           readOnly={true}
         />
         <FormControl
-          defaultValue="Read Model"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Read Tosca"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Edit Template"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Edit Model"
-          plaintext={true}
-          readOnly={true}
-        />
-        <FormControl
-          defaultValue="Edit Tosca"
+          defaultValue="permission2"
           plaintext={true}
           readOnly={true}
         />
-- 
cgit 1.2.3-korg


From c11160ecfdce03091917e2728f80848f4d8feb95 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 25 Feb 2020 15:13:31 -0800
Subject: Add new dialog for policy

Add a new dialog component for tosca based policy, config/op should use that dialog now.

Issue-ID: CLAMP-653

Change-Id: I57523bc2d4bfbf5ca5a3acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 extra/sql/dump/test-data.sql                       |  34 ++---
 ui-react/src/LoopUI.js                             |   3 +-
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   6 +-
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   6 +-
 ui-react/src/api/LoopCache.js                      |  27 ++++
 .../ConfigurationPolicyModal.js                    |  12 +-
 .../ConfigurationPolicyModal.test.js               |   4 +-
 .../src/components/dialogs/Policy/PolicyModal.js   | 145 +++++++++++++++++++++
 .../loop_viewer/svg/LoopComponentConverter.js      |   9 +-
 .../src/components/loop_viewer/svg/LoopSvg.test.js |   8 +-
 10 files changed, 219 insertions(+), 35 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/Policy/PolicyModal.js

(limited to 'ui-react/src')

diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index b8ab159ba..dd79eff9e 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-25 13:21:18.566845','Not found','2020-02-25 13:21:19.048341',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-26 04:12:57.965164','Not found','2020-02-26 04:12:58.942851',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_KHp4o_v1_0_ResourceInstanceName1_tca','Not found','2020-02-25 13:21:18.979726','Not found','2020-02-25 13:21:18.979726','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-9c871f41-fc81-4ca6-a7ab-c018524031b0',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-33dbf6b3-3966-4592-9d35-05fedc331a0f\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-b40a311e-e199-4bdd-b7e8-b3cfb00edf8e\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_KHp4o_v1_0_ResourceInstanceName1_tca_3','Not found','2020-02-25 13:21:18.834745','Not found','2020-02-25 13:21:18.834745','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-060d6a13-9d1d-491d-86e1-0eb50b7d426f',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-1041bba3-3d78-4da0-87e5-8e4eb885b09f\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-82e17725-f631-41ff-8810-3f304efb075b\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_KHp4o_v1_0_ResourceInstanceName2_tca_2','Not found','2020-02-25 13:21:18.512550','Not found','2020-02-25 13:21:18.512550','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-6d128e76-a840-4079-9afb-b6aabfeac7ea',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-f38910d3-22fd-495f-a064-6dbbb5d54d33\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4ded5128-1553-4625-b2cf-6d2d18b844e8\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca','Not found','2020-02-26 04:12:58.533953','Not found','2020-02-26 04:12:58.533953','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-88bbf402-1252-419f-a115-7bad5c78f150',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-c77ad93c-11f4-42b3-8ee4-587086fe3f7d\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-56bb4fd3-6354-4d81-813f-9d495ed81773\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca_3','Not found','2020-02-26 04:12:58.264588','Not found','2020-02-26 04:12:58.264588','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-f5efa9dc-a7ad-4c64-a765-bc91d9a55211',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-981b9707-f880-4e4f-ae5f-79a76dbdaab2\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-54008f91-e57b-4990-8c1e-71be596f0298\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName2_tca_2','Not found','2020-02-26 04:12:57.917717','Not found','2020-02-26 04:12:57.917717','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-73b380f7-c715-47c8-bf42-90aef749701c',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4636db5f-4f0b-4d2e-9fef-69387f5961c3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-af706c28-e283-4e73-a283-ba92b28fb028\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_KHp4o_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_KHp4o_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_KHp4o_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,15 +152,15 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','Not found','2020-02-25 13:21:41.446782','Not found','2020-02-25 13:21:41.446782','Guard','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-02-25 13:21:41.248875','Not found','2020-02-25 13:21:41.248875','Blacklist','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-02-25 13:21:41.352835','Not found','2020-02-25 13:21:41.352835','FrequencyLimiter','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','Not found','2020-02-25 13:21:41.249225','Not found','2020-02-25 13:21:41.249225','MinMax','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','Not found','2020-02-25 13:21:41.501394','Not found','2020-02-25 13:21:41.501394','Operational','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','Not found','2020-02-25 13:21:41.483497','Not found','2020-02-25 13:21:41.483497','Apex','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','Not found','2020-02-25 13:21:41.283907','Not found','2020-02-25 13:21:41.283907','Drools','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','Not found','2020-02-25 13:21:41.726649','Not found','2020-02-25 13:21:41.726649','Monitoring','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-02-25 13:21:18.582197','Not found','2020-02-25 13:21:18.582197','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','Not found','2020-02-26 04:13:02.073313','Not found','2020-02-26 04:13:02.073313','Guard','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-02-26 04:13:02.320782','Not found','2020-02-26 04:13:02.320782','Blacklist','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-02-26 04:13:02.008960','Not found','2020-02-26 04:13:02.008960','FrequencyLimiter','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','Not found','2020-02-26 04:13:01.997505','Not found','2020-02-26 04:13:01.997505','MinMax','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','Not found','2020-02-26 04:13:02.471738','Not found','2020-02-26 04:13:02.471738','Operational','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','Not found','2020-02-26 04:13:02.380152','Not found','2020-02-26 04:13:02.380152','Apex','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','Not found','2020-02-26 04:13:02.001488','Not found','2020-02-26 04:13:02.001488','Drools','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','Not found','2020-02-26 04:13:02.553548','Not found','2020-02-26 04:13:02.553548','Monitoring','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-02-26 04:12:57.983305','Not found','2020-02-26 04:12:57.983305','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -182,4 +182,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-25 21:22:50
+-- Dump completed on 2020-02-26 12:14:24
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 7f07f3438..95106702e 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -255,7 +255,8 @@ export default class LoopUI extends React.Component {
 				<Route path="/ViewLoopTemplatesModal" render={(routeProps) => (<ViewLoopTemplatesModal {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/configurationPolicyModal/:policyName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/modifyLoop" render={(routeProps) => (<ModifyLoopModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 98f802df8..3d0137c15 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -21,7 +21,11 @@ exports[`Verify LoopUI Test the render method 1`] = `
     render={[Function]}
   />
   <Route
-    path="/configurationPolicyModal/:componentName"
+    path="/policyModal/:policyInstanceType/:policyName"
+    render={[Function]}
+  />
+  <Route
+    path="/configurationPolicyModal/:policyName"
     render={[Function]}
   />
   <Route
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 35951caa4..1c456e19c 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -46,7 +46,11 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       render={[Function]}
     />
     <Route
-      path="/configurationPolicyModal/:componentName"
+      path="/policyModal/:policyInstanceType/:policyName"
+      render={[Function]}
+    />
+    <Route
+      path="/configurationPolicyModal/:policyName"
       render={[Function]}
     />
     <Route
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index c73ed62b5..b17723089 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -78,6 +78,33 @@ export default class LoopCache {
 		return this.loopJsonCache["microServicePolicies"];
 	}
 
+	getOperationalPolicyForName(name) {
+		var opProperties=this.getOperationalPolicies();
+		for (var policy in opProperties) {
+			if (opProperties[policy]["name"] === name) {
+				return opProperties[policy];
+			}
+		}
+		return null;
+	}
+
+	getOperationalPolicyPropertiesForName(name) {
+		var opConfig = this.getOperationalPolicyForName(name);
+		if (opConfig !== null) {
+			return opConfig["properties"];
+		}
+		return null;
+	}
+
+	getOperationalPolicyJsonRepresentationForName(name) {
+    	var opConfig = this.getOperationalPolicyForName(name);
+    	if (opConfig !== null) {
+    		return opConfig["jsonRepresentation"];
+    	}
+    	return null;
+    }
+
+
 	getMicroServiceForName(name) {
 		var msProperties=this.getMicroServicePolicies();
 		for (var policy in msProperties) {
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index b0f601ec2..3fa0c0ca2 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -38,7 +38,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 		show: true,
 		loopCache: this.props.loopCache,
 		jsonEditor: null,
-		componentName: this.props.match.params.componentName
+		policyName: this.props.match.params.policyName
 	};
 
 	constructor(props, context) {
@@ -59,8 +59,8 @@ export default class ConfigurationPolicyModal extends React.Component {
 		}
 		else {
 			console.info("NO validation errors found in config policy data");
-			this.state.loopCache.updateMicroServiceProperties(this.state.componentName, editorData[0]);
-			LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.componentName)).then(resp => {
+			this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
+			LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
 				this.setState({ show: false });
 				this.props.history.push('/');
 				this.props.loadLoopFunction(this.state.loopCache.getLoopName());
@@ -78,12 +78,12 @@ export default class ConfigurationPolicyModal extends React.Component {
 	}
 
 	renderJsonEditor() {
-		console.debug("Rendering ConfigurationPolicyModal ", this.state.componentName);
-		var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.componentName);
+		console.debug("Rendering ConfigurationPolicyModal ", this.state.policyName);
+		var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
 		if (toscaModel == null) {
 			return;
 		}
-		var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.componentName);
+		var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
 
 		JSONEditor.defaults.options.theme = 'bootstrap4';
 		//JSONEditor.defaults.options.iconlib = 'bootstrap2';
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
index 4fa08e680..4d527b71c 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
@@ -48,7 +48,7 @@ describe('Verify ConfigurationPolicyModal', () => {
         }]
     });
     const historyMock = { push: jest.fn() };
-    const matchMock = { params:{ componentName: "TCA_h2NMX_v1_0_ResourceInstanceName1_tca" } } 
+    const matchMock = { params:{ policyName: "TCA_h2NMX_v1_0_ResourceInstanceName1_tca" } } 
     const flushPromises = () => new Promise(setImmediate);
 	
     it('Test handleClose', () => {
@@ -73,7 +73,7 @@ describe('Verify ConfigurationPolicyModal', () => {
 
         expect(handleSave).toHaveBeenCalledTimes(1);
         expect(component.state('show')).toEqual(false);
-        expect(component.state('componentName')).toEqual("TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
+        expect(component.state('policyName')).toEqual("TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
         expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
     });
 });
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
new file mode 100644
index 000000000..75ac2c49d
--- /dev/null
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -0,0 +1,145 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import LoopService from '../../../api/LoopService';
+import JSONEditor from '@json-editor/json-editor';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class PolicyModal extends React.Component {
+
+	state = {
+		show: true,
+		loopCache: this.props.loopCache,
+		jsonEditor: null,
+		policyName: this.props.match.params.policyName,
+		// This is to indicate whether it's an operational or config policy (in terms of loop instance)
+		policyInstanceType: this.props.match.params.policyInstanceType
+	};
+
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleSave = this.handleSave.bind(this);
+		this.renderJsonEditor = this.renderJsonEditor.bind(this);
+	}
+
+	handleSave() {
+		var errors = this.state.jsonEditor.validate();
+		var editorData = this.state.jsonEditor.getValue();
+
+		if (errors.length !== 0) {
+			console.error("Errors detected during policy data validation ", errors);
+			this.setState({ show: false });
+			this.props.history.push('/');
+		}
+		else {
+			console.info("NO validation errors found in policy data");
+			if (policyInstanceType === 'MICRO-SERVICE-POLICY') {
+                this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
+                LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
+                    this.setState({ show: false });
+                    this.props.history.push('/');
+                    this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+                });
+			} else if (policyInstanceType === 'OPERATIONAL-POLICY') {
+			    this.state.loopCache.updateOperationalPolicyProperties(editorData);
+            	LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicyForName(this.state.policyName)).then(resp => {
+            		this.setState({ show: false });
+            		this.props.history.push('/');
+            		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+            	});
+			}
+		}
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	componentDidMount() {
+		this.renderJsonEditor();
+	}
+
+	renderJsonEditor() {
+		console.debug("Rendering PolicyModal ", this.state.policyName);
+		var toscaModel = {};
+	    var editorData = {};
+	    if (policyInstanceType === 'MICRO-SERVICE-POLICY') {
+            toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
+            editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
+        } else if (policyInstanceType === 'OPERATIONAL-POLICY') {
+            toscaModel = this.state.loopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
+            editorData = this.state.loopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
+        }
+
+		if (toscaModel == null) {
+			return;
+		}
+
+		JSONEditor.defaults.options.theme = 'bootstrap4';
+		//JSONEditor.defaults.options.iconlib = 'bootstrap2';
+		JSONEditor.defaults.options.object_layout = 'grid';
+		JSONEditor.defaults.options.disable_properties = true;
+		JSONEditor.defaults.options.disable_edit_json = false;
+		JSONEditor.defaults.options.disable_array_reorder = true;
+		JSONEditor.defaults.options.disable_array_delete_last_row = true;
+		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
+		JSONEditor.defaults.options.show_errors = 'always';
+
+		this.setState({
+			jsonEditor: new JSONEditor(document.getElementById("editor"),
+				{ schema: toscaModel.schema, startval: editorData })
+		})
+	}
+
+	render() {
+		return (
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Configuration policies</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<div id="editor" />
+
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" onClick={this.handleClose}>
+						Close
+				</Button>
+					<Button variant="primary" onClick={this.handleSave}>
+						Save Changes
+	            </Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
\ No newline at end of file
diff --git a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
index a409d2cd0..5b0dc1e01 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
@@ -4,15 +4,18 @@ export default class LoopComponentConverter {
 		var componentsMap = new Map([]);
 		if (typeof (loopCache.getMicroServicePolicies()) !== "undefined") {
 			loopCache.getMicroServicePolicies().forEach(ms => {
-				componentsMap.set(ms.name, "/configurationPolicyModal/"+ms.name);
+				componentsMap.set(ms.name, "/policyModal/MICRO-SERVICE-POLICY/"+ms.name);
 			})
 		}
 		if (typeof (loopCache.getOperationalPolicies()) !== "undefined") {
 			loopCache.getOperationalPolicies().forEach(op => {
-				componentsMap.set(op.name, "/operationalPolicyModal");
+				if (op.name.includes("legacy")) {
+					componentsMap.set(op.name,"/operationalPolicyModal");
+				} else {
+					componentsMap.set(op.name, "/policyModal/OPERATIONAL-POLICY/"+op.name);
+				}
 			})
 		}
-		componentsMap.set("OperationalPolicy","/operationalPolicyModal");
 		return componentsMap;
 	}
 }
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
index 635185463..17f4b3563 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
@@ -99,7 +99,7 @@ describe('Verify LoopSvg', () => {
         component.simulate('click', event);
         component.update();
 
-        expect(historyMock.push.mock.calls[0]).toEqual([ '/configurationPolicyModal/TCA_h2NMX_v1_0_ResourceInstanceName1_tca']);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/policyModal/MICRO-SERVICE-POLICY/TCA_h2NMX_v1_0_ResourceInstanceName1_tca']);
 
         //click operational policy
         dummyElement.setAttribute("data-element-id","OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca");
@@ -108,7 +108,7 @@ describe('Verify LoopSvg', () => {
         component.simulate('click', event2);
         component.update();
 
-        expect(historyMock.push.mock.calls[1]).toEqual([ '/operationalPolicyModal']);
+        expect(historyMock.push.mock.calls[1]).toEqual([ '/policyModal/OPERATIONAL-POLICY/OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca']);
     });
 
     it('Test componentWillReceiveProps method', () => {
@@ -125,9 +125,9 @@ describe('Verify LoopSvg', () => {
             <LoopSvg.WrappedComponent loopCache={localLoopCache}/>
         );
 
-        expect(component.state('componentModalMapping').size).toEqual(2);
+        expect(component.state('componentModalMapping').size).toEqual(1);
 
         component.setProps({loopCache: loopCache});
-        expect(component.state('componentModalMapping').size).toEqual(3);
+        expect(component.state('componentModalMapping').size).toEqual(2);
     });
 });
-- 
cgit 1.2.3-korg


From d2a4df0b62b6a32c42bac45b4bee344016faa8fb Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 26 Feb 2020 15:47:30 -0800
Subject: Add Create loop dialog

Add create loop dialog and backend part associated (this is based on this PR https://gerrit.onap.org/r/c/clamp/+/102156)

Issue-ID: CLAMP-587

Change-Id: I58524bc2d5bfbf5ca5a3acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 docs/swagger/swagger.pdf                           |   4 +-
 .../clamp/clds/client/PolicyEngineServices.java    |  37 +++---
 .../clamp/clds/config/CldsUserJsonDecoder.java     |   4 +-
 .../clds/config/DefaultUserConfiguration.java      |   4 +-
 .../clamp/clds/util/drawing/ClampGraphBuilder.java |   6 +-
 .../org/onap/clamp/clds/util/drawing/Painter.java  |   2 +-
 src/main/java/org/onap/clamp/loop/Loop.java        |  23 ++++
 .../java/org/onap/clamp/loop/LoopController.java   |  14 ++-
 src/main/java/org/onap/clamp/loop/LoopService.java |  17 ++-
 .../clamp/loop/template/LoopTemplatesService.java  |  11 ++
 .../org/onap/clamp/loop/template/PolicyModel.java  |  15 ++-
 .../clamp/loop/template/PolicyModelsService.java   |  12 +-
 .../policy/microservice/MicroServicePolicy.java    |  24 ++--
 .../microservice/MicroServicePolicyService.java    |   6 +-
 .../policy/operational/OperationalPolicy.java      |  11 +-
 .../operational/OperationalPolicyService.java      |   2 +-
 src/main/resources/META-INF/resources/swagger.html |   2 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |  59 ++++++++-
 .../clds/util/drawing/ClampGraphBuilderTest.java   |   2 +-
 .../clds/util/drawing/SvgLoopGeneratorTest.java    |   8 +-
 .../org/onap/clamp/loop/DcaeComponentTest.java     |   3 +-
 .../org/onap/clamp/loop/DeployFlowTestItCase.java  |   3 +-
 .../onap/clamp/loop/LoopRepositoriesItCase.java    |   5 +-
 .../org/onap/clamp/loop/LoopServiceTestItCase.java |  13 +-
 .../java/org/onap/clamp/loop/LoopToJsonTest.java   |  19 ++-
 .../onap/clamp/loop/PolicyModelServiceItCase.java  |  32 +++--
 .../microservice/MicroServicePayloadTest.java      |   3 +-
 .../microservice/OperationalPolicyPayloadTest.java |   6 +-
 ui-react/src/LoopUI.js                             |   3 +
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   4 +
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   4 +
 ui-react/src/api/LoopService.js                    |  18 +++
 ui-react/src/api/TemplateService.js                |  16 +++
 .../src/components/dialogs/Loop/CreateLoopModal.js | 133 +++++++++++++++++++++
 .../src/components/dialogs/Policy/PolicyModal.js   |   8 +-
 ui-react/src/components/menu/MenuBar.js            |   5 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        |  55 ++++++++-
 37 files changed, 468 insertions(+), 125 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/Loop/CreateLoopModal.js

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index d9acf9d7e..18a6316d7 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200226131758+01'00')
-/ModDate (D:20200226131758+01'00')
+/CreationDate (D:20200226154251-08'00')
+/ModDate (D:20200226154251-08'00')
 >>
 endobj
 2 0 obj
diff --git a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java b/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
index b3fcb6f18..44abc9dde 100644
--- a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
@@ -25,10 +25,8 @@ package org.onap.clamp.clds.client;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -38,27 +36,21 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.ExchangeBuilder;
-import org.json.simple.parser.ParseException;
 import org.onap.clamp.clds.config.ClampProperties;
 import org.onap.clamp.clds.sdc.controller.installer.BlueprintMicroService;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.loop.template.PolicyModel;
-import org.onap.clamp.loop.template.PolicyModelId;
 import org.onap.clamp.loop.template.PolicyModelsService;
 import org.onap.clamp.policy.pdpgroup.PdpGroup;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
 
-
-
 /**
  * The class implements the communication with the Policy Engine to retrieve
  * policy models (tosca). It mainly delegates the physical calls to Camel
  * engine.
- *
  */
 @Component
 public class PolicyEngineServices {
@@ -76,16 +68,15 @@ public class PolicyEngineServices {
     /**
      * Default constructor.
      *
-     * @param camelContext Camel context bean
-     * @param clampProperties ClampProperties bean
-     * @param policyModelsSService policyModel repository bean
+     * @param camelContext        Camel context bean
+     * @param clampProperties     ClampProperties bean
      * @param policyModelsService policyModel service
      */
     @Autowired
     public PolicyEngineServices(CamelContext camelContext, ClampProperties clampProperties,
-                                PolicyModelsService policyModelsSService) {
+                                PolicyModelsService policyModelsService) {
         this.camelContext = camelContext;
-        this.policyModelsService = policyModelsSService;
+        this.policyModelsService = policyModelsService;
         if (clampProperties.getStringValue(POLICY_RETRY_LIMIT) != null) {
             retryLimit = Integer.parseInt(clampProperties.getStringValue(POLICY_RETRY_LIMIT));
         }
@@ -97,7 +88,7 @@ public class PolicyEngineServices {
     /**
      * This method query Policy engine and create a PolicyModel object with type and version.
      *
-     * @param policyType The policyType id
+     * @param policyType    The policyType id
      * @param policyVersion The policy version of that type
      * @return A PolicyModel created from policyEngine data
      */
@@ -130,7 +121,8 @@ public class PolicyEngineServices {
         List<LinkedHashMap<String, Object>> policyTypesList = (List<LinkedHashMap<String, Object>>) loadedYaml
                 .get("policy_types");
         policyTypesList.parallelStream().forEach(policyType -> {
-            Map.Entry<String, Object> policyTypeEntry = (Map.Entry<String, Object>) new ArrayList(policyType.entrySet()).get(0);
+            Map.Entry<String, Object> policyTypeEntry =
+                    (Map.Entry<String, Object>) new ArrayList(policyType.entrySet()).get(0);
 
             policyModelsService.createPolicyInDbIfNeeded(
                     createPolicyModelFromPolicyEngine(policyTypeEntry.getKey(),
@@ -141,31 +133,34 @@ public class PolicyEngineServices {
     /**
      * This method can be used to download all policy types + data types defined in
      * policy engine.
-     * 
+     *
      * @return A yaml containing all policy Types and all data types
      */
     public String downloadAllPolicies() {
-        return callCamelRoute(ExchangeBuilder.anExchange(camelContext).build(), "direct:get-all-policy-models", "Get all policies");
+        return callCamelRoute(ExchangeBuilder.anExchange(camelContext).build(), "direct:get-all-policy-models",
+                "Get all policies");
     }
 
     /**
      * This method can be used to download a policy tosca model on the engine.
-     * 
+     *
      * @param policyType    The policy type (id)
      * @param policyVersion The policy version
      * @return A string with the whole policy tosca model
      */
     public String downloadOnePolicy(String policyType, String policyVersion) {
         return callCamelRoute(ExchangeBuilder.anExchange(camelContext).withProperty("policyModelName", policyType)
-                .withProperty("policyModelVersion", policyVersion).build(), "direct:get-policy-model", "Get one policy");
+                        .withProperty("policyModelVersion", policyVersion).build(), "direct:get-policy-model",
+                "Get one policy");
     }
 
     /**
      * This method can be used to download all Pdp Groups data from policy engine.
-     * 
      */
     public void downloadPdpGroups() {
-        String responseBody = callCamelRoute(ExchangeBuilder.anExchange(camelContext).build(), "direct:get-all-pdp-groups", "Get Pdp Groups");
+        String responseBody =
+                callCamelRoute(ExchangeBuilder.anExchange(camelContext).build(), "direct:get-all-pdp-groups",
+                        "Get Pdp Groups");
 
         if (responseBody == null || responseBody.isEmpty()) {
             logger.warn("getPdpGroups returned by policy engine could not be decoded, as it's null or empty");
diff --git a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java b/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
index 626227e20..a7ef10738 100644
--- a/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
+++ b/src/main/java/org/onap/clamp/clds/config/CldsUserJsonDecoder.java
@@ -26,14 +26,12 @@
 package org.onap.clamp.clds.config;
 
 import com.google.gson.JsonParseException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.commons.io.IOUtils;
-import org.onap.clamp.clds.exception.CldsUsersException;
 import org.onap.clamp.authorization.CldsUser;
+import org.onap.clamp.clds.exception.CldsUsersException;
 import org.onap.clamp.clds.util.JsonUtils;
 
 public class CldsUserJsonDecoder {
diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
index a4515860e..1261a5e95 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
@@ -27,12 +27,10 @@ package org.onap.clamp.clds.config;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-
 import java.io.IOException;
-
+import org.onap.clamp.authorization.CldsUser;
 import org.onap.clamp.clds.exception.CldsConfigException;
 import org.onap.clamp.clds.exception.CldsUsersException;
-import org.onap.clamp.authorization.CldsUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java b/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
index 7edf6c1a4..8e3b06a46 100755
--- a/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
@@ -88,12 +88,10 @@ public class ClampGraphBuilder {
     public ClampGraphBuilder addLoopElementModel(LoopElementModel loopElementModel) {
         if (LoopElementModel.MICRO_SERVICE_TYPE.equals(loopElementModel.getLoopElementType())) {
             microServices.add(new MicroServicePolicy(loopElementModel.getName(),
-                    loopElementModel.getPolicyModels().first(),
-                    false,
-                    null));
+                    loopElementModel.getPolicyModels().first(), false, loopElementModel));
         } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(loopElementModel.getLoopElementType())) {
             policies.add(new OperationalPolicy(loopElementModel.getName(), null, null,
-                    loopElementModel.getPolicyModels().first()));
+                    loopElementModel.getPolicyModels().first(), loopElementModel));
         }
         return this;
     }
diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
index af62d84a8..5ec59dbaf 100755
--- a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
@@ -83,7 +83,7 @@ public class Painter {
 
         for (MicroServicePolicy ms : microServices) {
             ib.arrow().rectangle(ms.getName(),
-                    RectTypes.MICROSERVICE, ms.getPolicyModel().getPolicyAcronym());
+                    RectTypes.MICROSERVICE, ms.getPolicyModel().getPolicyAcronym()).arrow();
         }
         for (OperationalPolicy policy : policies) {
             ib.arrow().rectangle(policy.getName(), RectTypes.POLICY, policy.getPolicyModel().getPolicyAcronym())
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index 676626a1f..b3fe58f9c 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -60,6 +60,7 @@ import org.onap.clamp.loop.components.external.ExternalComponent;
 import org.onap.clamp.loop.components.external.PolicyComponent;
 import org.onap.clamp.loop.log.LoopLog;
 import org.onap.clamp.loop.service.Service;
+import org.onap.clamp.loop.template.LoopElementModel;
 import org.onap.clamp.loop.template.LoopTemplate;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
@@ -155,6 +156,28 @@ public class Loop extends AuditEntity implements Serializable {
         initializeExternalComponents();
     }
 
+    /**
+     * This constructor creates a loop from a loop template.
+     *
+     * @param name         The loop name
+     * @param loopTemplate The loop template from which a new loop instance must be created
+     */
+    public Loop(String name, LoopTemplate loopTemplate) {
+        this(name,"");
+        this.setLoopTemplate(loopTemplate);
+        this.setModelService(loopTemplate.getModelService());
+        loopTemplate.getLoopElementModelsUsed().forEach(element -> {
+            if (LoopElementModel.MICRO_SERVICE_TYPE.equals(element.getLoopElementModel().getLoopElementType())) {
+                this.addMicroServicePolicy(new MicroServicePolicy(name,
+                        element.getLoopElementModel().getPolicyModels().first(), false, element.getLoopElementModel()));
+            } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
+                    .equals(element.getLoopElementModel().getLoopElementType())) {
+                this.addOperationalPolicy(new OperationalPolicy(name, null, new JsonObject(),
+                        element.getLoopElementModel().getPolicyModels().first(), element.getLoopElementModel()));
+            }
+        });
+    }
+
     public String getName() {
         return name;
     }
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index c161c550e..7b037da6d 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -40,16 +40,22 @@ import org.springframework.stereotype.Controller;
 public class LoopController {
 
     private final LoopService loopService;
-    private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {}
-        .getType();
-    private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {}
-        .getType();
+    private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {
+    }
+            .getType();
+    private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {
+    }
+            .getType();
 
     @Autowired
     public LoopController(LoopService loopService) {
         this.loopService = loopService;
     }
 
+    public Loop createLoop(String loopName, String templateName) {
+        return loopService.createLoopFromTemplate(loopName, templateName);
+    }
+
     public List<String> getLoopNames() {
         return loopService.getClosedLoopNames();
     }
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index 6ea412c00..34be2038e 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Set;
 import javax.persistence.EntityNotFoundException;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.onap.clamp.loop.template.LoopTemplatesService;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.loop.template.PolicyModelsService;
 import org.onap.clamp.policy.Policy;
@@ -53,6 +54,9 @@ public class LoopService {
     @Autowired
     private PolicyModelsService policyModelsService;
 
+    @Autowired
+    private LoopTemplatesService loopTemplateService;
+
     Loop saveOrUpdateLoop(Loop loop) {
         return loopsRepository.save(loop);
     }
@@ -69,6 +73,17 @@ public class LoopService {
         loopsRepository.deleteById(loopName);
     }
 
+    /**
+     * Creates a Loop Instance from Loop Template Name.
+     *
+     * @param loopName Name of the Loop to be created
+     * @param templateName Loop Template to used for Loop
+     * @return Loop Instance
+     */
+    public Loop createLoopFromTemplate(String loopName, String templateName) {
+        return loopsRepository.save(new Loop(loopName,loopTemplateService.getLoopTemplate(templateName)));
+    }
+
     /**
      * This method is used to refresh the DCAE deployment status fields.
      *
@@ -96,7 +111,7 @@ public class LoopService {
         loop.addOperationalPolicy(
                 new OperationalPolicy(Policy.generatePolicyName("OPERATIONAL", loop.getModelService().getName(),
                         loop.getModelService().getVersion(), RandomStringUtils.randomAlphanumeric(3),
-                        RandomStringUtils.randomAlphanumeric(4)), loop, null, policyModel));
+                        RandomStringUtils.randomAlphanumeric(4)), loop, null, policyModel, null));
         return loopsRepository.save(loop);
     }
 
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java b/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
index 29382137e..09bc80f89 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopTemplatesService.java
@@ -49,6 +49,17 @@ public class LoopTemplatesService {
         return loopTemplatesRepository.save(loopTemplate);
     }
 
+
+    /**
+     * Get the SVG representation of the loopTemplate.
+     *
+     * @param templateName The loopTemplate name
+     * @return The SVG representation in xml
+     */
+    public String getSvgRepresentation(String templateName) {
+        return loopTemplatesRepository.findById(templateName).orElse(new LoopTemplate()).getSvgRepresentation();
+    }
+
     public List<String> getLoopTemplateNames() {
         return loopTemplatesRepository.getAllLoopTemplateNames();
     }
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
index 7334eceb8..66b05f65f 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
@@ -35,7 +35,6 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
@@ -72,7 +71,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
      */
     @Id
     @Expose
-    @Column(name = "version",nullable = false)
+    @Column(name = "version", nullable = false)
     private String version;
 
     @Column(columnDefinition = "MEDIUMTEXT", name = "policy_tosca")
@@ -198,17 +197,17 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
     /**
      * Constructor.
      *
-     * @param policyType The policyType (referenced in the blueprint
+     * @param policyType       The policyType (referenced in the blueprint
      * @param policyModelTosca The policy tosca model in yaml
-     * @param version the version like 1.0.0
-     * @param policyAcronym Subtype for policy if it exists (could be used by UI)
+     * @param version          the version like 1.0.0
+     * @param policyAcronym    Subtype for policy if it exists (could be used by UI)
      */
     public PolicyModel(String policyType, String policyModelTosca, String version,
-        String policyAcronym) {
+                       String policyAcronym) {
         this.policyModelType = policyType;
         this.policyModelTosca = policyModelTosca;
         this.version = version;
-        this.policyAcronym=policyAcronym;
+        this.policyAcronym = policyAcronym;
         if (this.policyAcronym == null) {
             this.policyAcronym = createDefaultPolicyAcronym(policyType);
         }
@@ -216,7 +215,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
 
     /**
      * Constructor with acronym generated by default from policyType.
-     * 
+     *
      * @param policyType       The policyType (referenced in the blueprint
      * @param policyModelTosca The policy tosca model in yaml
      * @param version          the version like 1.0.0
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
index b38be942e..7e21cc390 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
@@ -52,8 +52,7 @@ public class PolicyModelsService {
     /**
      * Save or Update Policy Model.
      *
-     * @param policyModel
-     *        The policyModel
+     * @param policyModel The policyModel
      * @return The Policy Model
      */
     public PolicyModel saveOrUpdatePolicyModel(PolicyModel policyModel) {
@@ -63,8 +62,7 @@ public class PolicyModelsService {
     /**
      * Verify whether Policy Model exist by ID.
      *
-     * @param policyModelId
-     *        The policyModel Id
+     * @param policyModelId The policyModel Id
      * @return The flag indicates whether Policy Model exist
      */
     public boolean existsById(PolicyModelId policyModelId) {
@@ -157,14 +155,14 @@ public class PolicyModelsService {
         }
     }
 
-     /**
+    /**
      * Update the Pdp Group info in Policy Model DB.
      *
      * @param pdpGroupList The list of Pdp Group info received from Policy Engine
      */
     public void updatePdpGroupInfo(List<PdpGroup> pdpGroupList) {
         List<PolicyModel> policyModelList = policyModelsRepository.findAll();
-        for (PolicyModel policyModel :  policyModelList) {
+        for (PolicyModel policyModel : policyModelList) {
             JsonArray supportedPdpGroups = new JsonArray();
             for (PdpGroup pdpGroup : pdpGroupList) {
                 JsonObject supportedPdpGroup = pdpGroup.getSupportedSubgroups(policyModel.getPolicyModelType(),
@@ -175,7 +173,7 @@ public class PolicyModelsService {
             }
 
             if (supportedPdpGroups.size() > 0) {
-                JsonObject supportedPdpJson = new JsonObject ();
+                JsonObject supportedPdpJson = new JsonObject();
                 supportedPdpJson.add("supportedPdpGroups", supportedPdpGroups);
                 policyModel.setPolicyPdpGroup(supportedPdpJson);
                 policyModelsRepository.save(policyModel);
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index 8d9017eae..75efca769 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -51,6 +51,7 @@ import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
+import org.onap.clamp.loop.template.LoopElementModel;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.policy.Policy;
 import org.yaml.snakeyaml.Yaml;
@@ -110,23 +111,17 @@ public class MicroServicePolicy extends Policy implements Serializable {
     }
 
     /**
-     * The constructor that create the json representation from the policyTosca
+     * The constructor that creates the json representation from the policyTosca
      * using the ToscaYamlToJsonConvertor.
      *
      * @param name        The name of the MicroService
      * @param policyModel The policy model of the MicroService
      * @param shared      The flag indicate whether the MicroService is shared
-     * @param usedByLoops The list of loops that uses this MicroService
      */
-    public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared,
-                              Set<Loop> usedByLoops) {
-        this.name = name;
-        this.policyModel = policyModel;
-        this.shared = shared;
-        this.setJsonRepresentation(JsonUtils.GSON_JPA_MODEL
+    public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared, LoopElementModel loopElementModel) {
+        this(name,policyModel,shared,JsonUtils.GSON_JPA_MODEL
                 .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
-                        policyModel.getPolicyModelType()), JsonObject.class));
-        this.usedByLoops = usedByLoops;
+                        policyModel.getPolicyModelType()), JsonObject.class),loopElementModel);
     }
 
     private JsonObject createJsonFromPolicyTosca() {
@@ -138,21 +133,20 @@ public class MicroServicePolicy extends Policy implements Serializable {
     /**
      * The constructor that does not make use of ToscaYamlToJsonConvertor but take
      * the jsonRepresentation instead.
-     *
      * @param name               The name of the MicroService
      * @param policyModel        The policy model type of the MicroService
      * @param shared             The flag indicate whether the MicroService is
-     *                           shared
+ *                           shared
      * @param jsonRepresentation The UI representation in json format
-     * @param usedByLoops        The list of loops that uses this MicroService
+     * @param loopElementModel The loop element model from which this instance should be created
      */
     public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared,
-                              JsonObject jsonRepresentation, Set<Loop> usedByLoops) {
+                              JsonObject jsonRepresentation, LoopElementModel loopElementModel) {
         this.name = name;
         this.policyModel = policyModel;
         this.shared = shared;
-        this.usedByLoops = usedByLoops;
         this.setJsonRepresentation(jsonRepresentation);
+        this.setLoopElementModel(loopElementModel);
     }
 
     @Override
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
index b17bf1ac4..2af8ec720 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
@@ -23,12 +23,9 @@
 
 package org.onap.clamp.policy.microservice;
 
-import com.google.common.collect.Sets;
-
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.policy.PolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +63,7 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
         return repository.save(
                 repository.findById(policy.getName()).map(p -> updateMicroservicePolicyProperties(p, policy, loop))
                         .orElse(new MicroServicePolicy(policy.getName(), policy.getPolicyModel(),
-                                policy.getShared(), policy.getJsonRepresentation(), Sets.newHashSet(loop))));
+                                policy.getShared(), policy.getJsonRepresentation(),null)));
     }
 
     private MicroServicePolicy updateMicroservicePolicyProperties(MicroServicePolicy oldPolicy,
@@ -84,7 +81,6 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
      * @param microServicePolicy The micro service policy
      * @param deploymentId       The deployment ID as returned by DCAE
      * @param deploymentUrl      The Deployment URL as returned by DCAE
-     * @throws MicroServicePolicy doesn't exist in DB
      */
     public void updateDcaeDeploymentFields(MicroServicePolicy microServicePolicy, String deploymentId,
             String deploymentUrl) {
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 0825ea9e5..52b877208 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -55,6 +55,7 @@ import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
+import org.onap.clamp.loop.template.LoopElementModel;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.policy.Policy;
 import org.yaml.snakeyaml.DumperOptions;
@@ -93,18 +94,20 @@ public class OperationalPolicy extends Policy implements Serializable {
 
     /**
      * The constructor.
-     *
-     * @param name               The name of the operational policy
+     *  @param name               The name of the operational policy
      * @param loop               The loop that uses this operational policy
      * @param configurationsJson The operational policy property in the format of
-     *                           json
+ *                           json
      * @param policyModel        The policy model associated if any, can be null
+     * @param loopElementModel The loop element from which this instance is supposed to be created
      */
-    public OperationalPolicy(String name, Loop loop, JsonObject configurationsJson, PolicyModel policyModel) {
+    public OperationalPolicy(String name, Loop loop, JsonObject configurationsJson, PolicyModel policyModel,
+                             LoopElementModel loopElementModel) {
         this.name = name;
         this.loop = loop;
         this.setPolicyModel(policyModel);
         this.setConfigurationsJson(configurationsJson);
+        this.setLoopElementModel(loopElementModel);
         LegacyOperationalPolicy.preloadConfiguration(configurationsJson, loop);
         try {
             this.setJsonRepresentation(
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
index 174912b22..cc636babb 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
@@ -52,7 +52,7 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
                                 .map(p -> setConfigurationJson(p, policy.getConfigurationsJson()))
                                 .orElse(new OperationalPolicy(policy.getName(), loop,
                                         policy.getConfigurationsJson(),
-                                        policy.getPolicyModel())))
+                                        policy.getPolicyModel(), null)))
                 .collect(Collectors.toSet());
     }
 
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 0138d9a30..74322f36b 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -3758,7 +3758,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2019-05-27 14:30:20 CEST
+Last updated 2020-02-12 02:20:53 PST
 </div>
 </div>
 </body>
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 1f927267c..280b808c3 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -612,7 +612,40 @@
 				</doTry>
 			</route>
 		</put>
-
+		<post
+				uri="/v2/loop/create/{loopName}?templateName={templateName}"
+				outType="org.onap.clamp.loop.Loop" consumes="application/json"
+				produces="application/json">
+			<route>
+				<removeHeaders
+						pattern="*"
+						excludePattern="loopName|templateName" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Create Loop')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to
+							uri="bean:org.onap.clamp.loop.LoopController?method=createLoop(${header.loopName}, ${header.templateName})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>true</constant>
+						</handled>
+						<setHeader headerName="CamelHttpResponseCode">
+							<constant>500</constant>
+						</setHeader>
+						<transform>
+							<simple>ERROR: ${exception.message}</simple>
+					</transform>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</post>
 		<get uri="/v2/dictionary"
 			outType="org.onap.clamp.tosca.Dictionary" produces="application/json">
 			<route>
@@ -1050,6 +1083,30 @@
 				</doTry>
 			</route>
 		</get>
+		<get uri="/v2/templates/{templateName}/svgRepresentation"
+			 outType="java.lang.String" produces="application/xml">
+			<route>
+				<removeHeaders pattern="*" excludePattern="templateName" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Get SVG Representation for Loop template')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'template','','read')" />
+					<to
+							uri="bean:org.onap.clamp.loop.template.LoopTemplatesService?method=getSvgRepresentation(${header.templateName})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+					</doCatch>
+				</doTry>
+			</route>
+		</get>
 		<get uri="/v2/clampInformation" outType="org.onap.clamp.clds.model.ClampInformation"
 			 produces="application/json">
 			<to
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
index 63209e9f9..2ccecf3e8 100644
--- a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
@@ -70,7 +70,7 @@ public class ClampGraphBuilderTest {
                 null);
 
         OperationalPolicy opPolicy = new OperationalPolicy("OperationalPolicy", new Loop(), new JsonObject(),
-                new PolicyModel("org.onap.opolicy", null, "1.0.0", "opolicy1"));
+                new PolicyModel("org.onap.opolicy", null, "1.0.0", "opolicy1"), null);
         final Set<OperationalPolicy> opPolicies = Set.of(opPolicy);
         final Set<MicroServicePolicy> microServices = Set.of(ms1, ms2);
 
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
index aad11adb2..7b83a4c35 100644
--- a/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
@@ -24,10 +24,8 @@
 package org.onap.clamp.clds.util.drawing;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.gson.JsonObject;
 import java.io.IOException;
-import java.util.HashSet;
 import javax.xml.parsers.ParserConfigurationException;
 import org.junit.Test;
 import org.onap.clamp.loop.Loop;
@@ -41,12 +39,12 @@ public class SvgLoopGeneratorTest {
         MicroServicePolicy ms1 =
                 new MicroServicePolicy("ms1", new PolicyModel("org.onap.ms1", "", "1.0.0", "short.ms1"),
                         false,
-                        new HashSet<Loop>());
+                        null);
         MicroServicePolicy ms2 =
                 new MicroServicePolicy("ms2", new PolicyModel("org.onap.ms2", "", "1.0.0", "short.ms2"),
-                        false, new HashSet<Loop>());
+                        false, null);
         OperationalPolicy opPolicy = new OperationalPolicy("OperationalPolicy", new Loop(), new JsonObject(),
-                new PolicyModel("org.onap.opolicy", null, "1.0.0", "short.OperationalPolicy"));
+                new PolicyModel("org.onap.opolicy", null, "1.0.0", "short.OperationalPolicy"), null);
         Loop loop = new Loop();
         loop.addMicroServicePolicy(ms1);
         loop.addMicroServicePolicy(ms2);
diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
index 57e99a3da..50e2e8d39 100644
--- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -55,7 +54,7 @@ public class DcaeComponentTest {
 
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", new PolicyModel("policy1",
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0","1.0.0"), true,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), new HashSet<>());
+                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null);
         microServicePolicy.setConfigurationsJson(new Gson().fromJson("{\"param1\":\"value1\"}", JsonObject.class));
 
         loopTest.addMicroServicePolicy(microServicePolicy);
diff --git a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
index 4fd78d18a..3c2ce17ed 100644
--- a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
@@ -29,7 +29,6 @@ import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.Set;
 import javax.transaction.Transactional;
 import org.apache.camel.CamelContext;
@@ -298,7 +297,7 @@ public class DeployFlowTestItCase {
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy microService = new MicroServicePolicy(name, policyModel,
                 shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), new HashSet<>());
+                gson.fromJson(jsonRepresentation, JsonObject.class), null);
 
         microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
         return microService;
diff --git a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
index fa4909cb4..acde66d9a 100644
--- a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
@@ -31,7 +31,6 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import java.time.Instant;
-import java.util.HashSet;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
@@ -91,7 +90,7 @@ public class LoopRepositoriesItCase {
     }
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name, PolicyModel policyModel) {
-        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel);
+        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel, null);
     }
 
     private LoopElementModel getLoopElementModel(String yaml, String name, String policyType, String createdBy,
@@ -131,7 +130,7 @@ public class LoopRepositoriesItCase {
     private MicroServicePolicy getMicroServicePolicy(String name, String jsonRepresentation, String jsonProperties,
                                                      boolean shared, PolicyModel policyModel) {
         MicroServicePolicy microService = new MicroServicePolicy(name, policyModel, shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), new HashSet<>());
+                gson.fromJson(jsonRepresentation, JsonObject.class), null);
         microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
         return microService;
     }
diff --git a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
index 5eca90c7f..849ca5cfe 100644
--- a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
@@ -46,7 +46,6 @@ import org.onap.clamp.policy.operational.OperationalPolicy;
 import org.onap.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.Commit;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
@@ -102,7 +101,7 @@ public class LoopServiceTestItCase {
         // given
         saveTestLoopToDb();
         OperationalPolicy operationalPolicy = new OperationalPolicy("policyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
 
         // when
         Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
@@ -233,11 +232,11 @@ public class LoopServiceTestItCase {
         JsonObject newJsonConfiguration = JsonUtils.GSON.fromJson("{}", JsonObject.class);
 
         OperationalPolicy firstOperationalPolicy = new OperationalPolicy("firstPolicyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
         loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstOperationalPolicy));
 
         OperationalPolicy secondOperationalPolicy = new OperationalPolicy("secondPolicyName", null,
-                newJsonConfiguration, null);
+                newJsonConfiguration, null, null);
 
         // when
         firstOperationalPolicy.setConfigurationsJson(newJsonConfiguration);
@@ -264,11 +263,11 @@ public class LoopServiceTestItCase {
         saveTestLoopToDb();
 
         OperationalPolicy firstOperationalPolicy = new OperationalPolicy("firstPolicyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
         loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstOperationalPolicy));
 
         OperationalPolicy secondOperationalPolicy = new OperationalPolicy("policyName", null,
-                JsonUtils.GSON.fromJson("{}", JsonObject.class), null);
+                JsonUtils.GSON.fromJson("{}", JsonObject.class), null, null);
 
         // when
         Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
@@ -320,7 +319,7 @@ public class LoopServiceTestItCase {
         loop = loopService.saveOrUpdateLoop(loop);
         // Add op policy
         OperationalPolicy operationalPolicy = new OperationalPolicy("opPolicy", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
         loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(operationalPolicy));
 
         PolicyModel policyModel = new PolicyModel("org.policies.microPolicy",
diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
index a2a4536ff..34d524a6d 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
@@ -33,7 +33,6 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.Random;
 import org.junit.Test;
 import org.onap.clamp.clds.util.JsonUtils;
@@ -55,7 +54,7 @@ public class LoopToJsonTest {
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name) {
         return new OperationalPolicy(name, null, gson.fromJson(configJson, JsonObject.class),
-                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"));
+                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"), null);
     }
 
     private Loop getLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
@@ -73,7 +72,7 @@ public class LoopToJsonTest {
                                                      String policyTosca, String jsonProperties, boolean shared) {
         MicroServicePolicy microService = new MicroServicePolicy(name, new PolicyModel(modelType, policyTosca, "1.0.0"),
                 shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), new HashSet<>());
+                gson.fromJson(jsonRepresentation, JsonObject.class), null);
         microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
         return microService;
     }
@@ -106,6 +105,10 @@ public class LoopToJsonTest {
         return log;
     }
 
+    /**
+     * This tests a GSON encode/decode.
+     * @throws IOException In case of failure
+     */
     @Test
     public void loopGsonTest() throws IOException {
         Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
@@ -146,6 +149,11 @@ public class LoopToJsonTest {
         assertThat(loopTestDeserialized.getLoopTemplate()).isEqualTo(loopTemplate);
     }
 
+    /**
+     * This tests the service object GSON encode/decode.
+     *
+     * @throws IOException In case of issues
+     */
     @Test
     public void loopServiceTest() throws IOException {
         Loop loopTest2 = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
@@ -166,6 +174,11 @@ public class LoopToJsonTest {
                 "blueprint", "components");
     }
 
+    /**
+     * This tests the GSON encode/decode of pdpGroup.
+     *
+     * @throws IOException In case of issues
+     */
     @Test
     public void createPoliciesPayloadPdpGroupTest() throws IOException {
         Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
diff --git a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
index f8aadbad5..80545c112 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
@@ -25,6 +25,7 @@ package org.onap.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.gson.JsonObject;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.SortedSet;
@@ -46,8 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.google.gson.JsonObject;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class PolicyModelServiceItCase {
@@ -68,7 +67,7 @@ public class PolicyModelServiceItCase {
     private static final String POLICY_MODEL_TYPE_2_VERSION_2 = "2.0.0";
 
     private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, String policyAcronym,
-            String policyVariant, String createdBy) {
+                                       String policyVariant, String createdBy) {
         PolicyModel policyModel = new PolicyModel();
         policyModel.setCreatedBy(createdBy);
         policyModel.setPolicyAcronym(policyAcronym);
@@ -110,6 +109,9 @@ public class PolicyModelServiceItCase {
                 .isEqualToIgnoringGivenFields(policyModel, "createdDate", "updatedDate", "createdBy", "updatedBy");
     }
 
+    /**
+     * This tests a getAllPolicyModelTypes get.
+     */
     @Test
     @Transactional
     public void shouldReturnAllPolicyModelTypes() {
@@ -125,6 +127,9 @@ public class PolicyModelServiceItCase {
         assertThat(policyModelTypesList).contains(policyModel1.getPolicyModelType(), policyModel2.getPolicyModelType());
     }
 
+    /**
+     * This tests a getAllPolicyModels get.
+     */
     @Test
     @Transactional
     public void shouldReturnAllPolicyModels() {
@@ -138,6 +143,9 @@ public class PolicyModelServiceItCase {
         assertThat(policyModelsService.getAllPolicyModels()).contains(policyModel1, policyModel2);
     }
 
+    /**
+     * This tests a getAllPolicyModelsByType get.
+     */
     @Test
     @Transactional
     public void shouldReturnAllModelsByType() {
@@ -152,6 +160,9 @@ public class PolicyModelServiceItCase {
                 policyModel2);
     }
 
+    /**
+     * This tests the sorting of policyModel.
+     */
     @Test
     @Transactional
     public void shouldReturnSortedSet() {
@@ -167,14 +178,17 @@ public class PolicyModelServiceItCase {
 
         SortedSet<PolicyModel> sortedSet = new TreeSet<>();
         policyModelsService.getAllPolicyModels().forEach(sortedSet::add);
-        List<PolicyModel> listToCheck = sortedSet.stream().filter(
-            policy -> policy.equals(policyModel3) || policy.equals(policyModel2) || policy.equals(policyModel1))
-                .collect(Collectors.toList());
+        List<PolicyModel> listToCheck = sortedSet.stream()
+                .filter(policy -> policy.equals(policyModel3) || policy.equals(policyModel2)
+                        || policy.equals(policyModel1)).collect(Collectors.toList());
         assertThat(listToCheck.get(0)).isEqualByComparingTo(policyModel2);
         assertThat(listToCheck.get(1)).isEqualByComparingTo(policyModel1);
         assertThat(listToCheck.get(2)).isEqualByComparingTo(policyModel3);
     }
 
+    /**
+     * This tests the pdpgroup GSON encode/decode and saving.
+     */
     @Test
     @Transactional
     public void shouldAddPdpGroupInfo() {
@@ -229,12 +243,14 @@ public class PolicyModelServiceItCase {
         policyModelsService.updatePdpGroupInfo(pdpGroupList);
 
         JsonObject res1 = policyModelsService.getPolicyModel("org.onap.testos", "1.0.0").getPolicyPdpGroup();
-        String expectedRes1 = "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\"]}]}";
+        String expectedRes1 =
+                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\"]}]}";
         JsonObject expectedJson1 = JsonUtils.GSON.fromJson(expectedRes1, JsonObject.class);
         assertThat(res1).isEqualTo(expectedJson1);
 
         JsonObject res2 = policyModelsService.getPolicyModel("org.onap.testos2", "2.0.0").getPolicyPdpGroup();
-        String expectedRes2 = "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\",\"subGroup2\"]}]}";
+        String expectedRes2 =
+                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\",\"subGroup2\"]}]}";
         JsonObject expectedJson2 = JsonUtils.GSON.fromJson(expectedRes2, JsonObject.class);
         assertThat(res2).isEqualTo(expectedJson2);
 
diff --git a/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
index 3911494f4..ea1218206 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/MicroServicePayloadTest.java
@@ -25,7 +25,6 @@ package org.onap.clamp.policy.microservice;
 
 import com.google.gson.JsonObject;
 import java.io.IOException;
-import java.util.HashSet;
 import org.junit.Test;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.ResourceFileUtil;
@@ -38,7 +37,7 @@ public class MicroServicePayloadTest {
     public void testPayloadConstruction() throws IOException {
         MicroServicePolicy policy = new MicroServicePolicy("testPolicy", new PolicyModel(
                 "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml"),"1.0.0"), false, new HashSet<>());
+            ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml"),"1.0.0"), false, null);
         policy.setConfigurationsJson(JsonUtils.GSON.fromJson(
             ResourceFileUtil.getResourceAsString("tosca/micro-service-policy-properties.json"), JsonObject.class));
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/micro-service-policy-payload.json"),
diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
index f42bbc1c0..bdc7e80de 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
@@ -41,7 +41,7 @@ public class OperationalPolicyPayloadTest {
     public void testOperationalPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null);
 
         assertThat(policy.createPolicyPayloadYaml())
                 .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.yaml"));
@@ -63,7 +63,7 @@ public class OperationalPolicyPayloadTest {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-no-guard-properties.json"),
                 JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null);
         Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
         assertThat(guardsMap).isEmpty();
         assertThat(guardsMap.entrySet()).isEmpty();
@@ -73,7 +73,7 @@ public class OperationalPolicyPayloadTest {
     public void testGuardPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null);
 
         Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
 
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 95106702e..471e87200 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -37,10 +37,12 @@ import LoopCache from './api/LoopCache';
 import LoopActionService from './api/LoopActionService';
 
 import { Route } from 'react-router-dom'
+import CreateLoopModal from './components/dialogs/Loop/CreateLoopModal';
 import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
 import ModifyLoopModal from './components/dialogs/Loop/ModifyLoopModal';
 import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
 import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
+import PolicyModal from './components/dialogs/Policy/PolicyModal';
 import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
 import UserInfoModal from './components/dialogs/UserInfoModal';
 import LoopService from './api/LoopService';
@@ -257,6 +259,7 @@ export default class LoopUI extends React.Component {
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/configurationPolicyModal/:policyName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+				<Route path="/createLoop" render={(routeProps) => (<CreateLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/modifyLoop" render={(routeProps) => (<ModifyLoopModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 3d0137c15..7d2c4467e 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -28,6 +28,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/configurationPolicyModal/:policyName"
     render={[Function]}
   />
+  <Route
+    path="/createLoop"
+    render={[Function]}
+  />
   <Route
     path="/openLoop"
     render={[Function]}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 1c456e19c..e195523b9 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -53,6 +53,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/configurationPolicyModal/:policyName"
       render={[Function]}
     />
+    <Route
+      path="/createLoop"
+      render={[Function]}
+    />
     <Route
       path="/openLoop"
       render={[Function]}
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 432eabecd..d665f8148 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -38,6 +38,24 @@ export default class LoopService {
 			});
 	}
 
+	static createLoop(loopName, templateName) {
+		return fetch('/restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, {
+			method: 'POST',
+			headers: {
+				"Content-Type": "application/json"
+			},
+			credentials: 'same-origin'
+		})
+			.then(function (response) {
+				console.debug("CreateLoop response received: ", response.status);
+				return response.json();
+			})
+			.catch(function (error) {
+				console.error("CreateLoop error received", error);
+				return "";
+			});
+	}
+
 	static getLoop(loopName) {
 		return fetch('/restservices/clds/v2/loop/' + loopName, {
 			method: 'GET',
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index 10e0b5427..6a65d9a04 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -21,6 +21,22 @@
  */
 
 export default class TemplateService {
+	static getTemplateNames() {
+		return fetch('/restservices/clds/v2/templates/names', { method: 'GET', credentials: 'same-origin' })
+			.then(function (response) {
+				console.debug("GetTemplateNames response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("GetTemplateNames query failed");
+					return {};
+				}
+			})
+			.catch(function (error) {
+				console.error("GetTemplateNames error received", error);
+				return {};
+			});
+	}
 
   static getBlueprintMicroServiceTemplates() {
     return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
new file mode 100644
index 000000000..d6c5e3579
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -0,0 +1,133 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Select from 'react-select';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import styled from 'styled-components';
+import LoopService from '../../../api/LoopService';
+import TemplateService from '../../../api/TemplateService';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+
+export default class CreateLoopModal extends React.Component {
+	constructor(props, context) {
+		super(props, context);
+
+		this.getTemplateNames = this.getTemplateNames.bind(this);
+		this.handleCreate = this.handleCreate.bind(this);
+		this.handleModelName = this.handleModelName.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.state = {
+			show: true,
+			chosenTemplateName: '',
+			modelName: '',
+			templateNames: []
+		};
+	}
+
+	componentWillMount() {
+		this.getTemplateNames();
+	}
+
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
+
+	handleDropdownListChange(e) {
+		this.setState({ chosenTemplateName: e.value });
+	}
+
+	getTemplateNames() {
+		TemplateService.getTemplateNames().then(templateNames => {
+			const templateOptions = templateNames.map((templateName) => { return { label: templateName, value: templateName } });
+			this.setState({ templateNames: templateOptions })
+		});
+	}
+
+	handleCreate() {
+		if (!this.state.modelName) {
+			alert("A model name is required");
+			return;
+		}
+		console.info("Create Model " + this.state.modelName + ", Template " + this.state.chosenTemplateName + " is chosen");
+		this.setState({ show: false });
+		LoopService.createLoop("LOOP_" + this.state.modelName, this.state.chosenTemplateName).then(text => {
+			console.debug("CreateLoop response received: ", text);
+			try {
+				this.props.history.push('/');
+				this.props.loadLoopFunction("LOOP_" + this.state.modelName);
+			} catch(err) {
+				alert(text);
+				this.props.history.push('/');
+			}
+		})
+		.catch(error => {
+			console.debug("Create Loop failed");
+		});
+
+	}
+
+	handleModelName = event => {
+    	this.setState({
+      		modelName: event.target.value
+    	})
+	}
+
+	render() {
+		return (
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+				<Modal.Header closeButton>
+					<Modal.Title>Create Model</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Form.Label column sm="2">Template Name</Form.Label>
+						<Col sm="10">
+							<Select onChange={this.handleDropdownListChange} options={this.state.templateNames} />
+						</Col>
+					</Form.Group>
+					<Form.Group controlId="formPlaintextEmail">
+						<Form.Label column sm="2">Model Name:</Form.Label>
+						<input type="text" style={{width: '50%'}}
+							value={this.state.modelName}
+							onChange={this.handleModelName}
+						/>
+					</Form.Group>
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+					<Button variant="primary" type="submit" onClick={this.handleCreate}>Create</Button>
+				</Modal.Footer>
+			</ModalStyled>
+
+		);
+	}
+}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 75ac2c49d..51a6464c3 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -61,14 +61,14 @@ export default class PolicyModal extends React.Component {
 		}
 		else {
 			console.info("NO validation errors found in policy data");
-			if (policyInstanceType === 'MICRO-SERVICE-POLICY') {
+			if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
                 this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
                 LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
                     this.setState({ show: false });
                     this.props.history.push('/');
                     this.props.loadLoopFunction(this.state.loopCache.getLoopName());
                 });
-			} else if (policyInstanceType === 'OPERATIONAL-POLICY') {
+			} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
 			    this.state.loopCache.updateOperationalPolicyProperties(editorData);
             	LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicyForName(this.state.policyName)).then(resp => {
             		this.setState({ show: false });
@@ -92,10 +92,10 @@ export default class PolicyModal extends React.Component {
 		console.debug("Rendering PolicyModal ", this.state.policyName);
 		var toscaModel = {};
 	    var editorData = {};
-	    if (policyInstanceType === 'MICRO-SERVICE-POLICY') {
+	    if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
             toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
             editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
-        } else if (policyInstanceType === 'OPERATIONAL-POLICY') {
+        } else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
             toscaModel = this.state.loopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
             editorData = this.state.loopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
         }
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index c1a7ac3bb..2f13cfe32 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -95,10 +95,11 @@ export default class MenuBar extends React.Component {
                     		<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item>
                     </StyledNavDropdown>
 					<StyledNavDropdown title="Loop Instance">
-							<NavDropdown.Item as={StyledLink} to="/openLoop">Open Loop</NavDropdown.Item>
+					        <NavDropdown.Item as={StyledLink} to="/createLoop">Create</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/openLoop">Open</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/modifyLoop" >Modify</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/modifyLoop" disabled={this.state.disabled}>Modify</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
 					</StyledNavDropdown>
 					<StyledNavDropdown title="Loop Operations">
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index a7e66eddd..63d3f6543 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -199,6 +199,57 @@ exports[`Verify MenuBar Test the render method 1`] = `
               [Function],
               ";
 	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-bdVaJa",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/createLoop"
+    >
+      Create
+    </DropdownItem>
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-bdVaJa",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
 ",
             ],
           },
@@ -215,7 +266,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
       disabled={false}
       to="/openLoop"
     >
-      Open Loop
+      Open
     </DropdownItem>
     <DropdownItem
       as={
@@ -365,7 +416,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
           "withComponent": [Function],
         }
       }
-      disabled={false}
+      disabled={true}
       to="/modifyLoop"
     >
       Modify
-- 
cgit 1.2.3-korg


From 58135b810746267b300fbd5b1483e9920166c221 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 27 Feb 2020 11:39:50 -0800
Subject: Fix the loopCache

Fix the loop cache so that the micro service configuration are well read.

Issue-ID: CLAMP-653

Change-Id: I68524bd3d5bfbf5ca5a3acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 ui-react/src/api/LoopCache.js                     | 6 +++---
 ui-react/src/api/LoopCache.test.js                | 2 +-
 ui-react/src/api/LoopCache_mokeLoopJsonCache.json | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index b17723089..03cec9fa6 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -31,7 +31,7 @@ export default class LoopCache {
 	updateMicroServiceProperties(name, newMsProperties) {
 			for (var policy in this.loopJsonCache["microServicePolicies"]) {
 				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === name) {
-					this.loopJsonCache["microServicePolicies"][policy]["properties"] = newMsProperties;
+					this.loopJsonCache["microServicePolicies"][policy]["configurationsJson"] = newMsProperties;
 				}
 			}
 	}
@@ -91,7 +91,7 @@ export default class LoopCache {
 	getOperationalPolicyPropertiesForName(name) {
 		var opConfig = this.getOperationalPolicyForName(name);
 		if (opConfig !== null) {
-			return opConfig["properties"];
+			return opConfig["configurationsJson"];
 		}
 		return null;
 	}
@@ -118,7 +118,7 @@ export default class LoopCache {
 	getMicroServicePropertiesForName(name) {
 		var msConfig = this.getMicroServiceForName(name);
 		if (msConfig !== null) {
-			return msConfig["properties"];
+			return msConfig["configurationsJson"];
 		}
 		return null;
 	}
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index 471fa4d71..97c09fa36 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -103,7 +103,7 @@ describe('Verify LoopCache functions', () => {
       const msJson = {
           "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
           "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-          "properties": {"domain": "measurementsForVfScaling"},
+          "configurationsJson": {"domain": "measurementsForVfScaling"},
           "shared": false,
           "jsonRepresentation": {"schema": {}}
       };
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index 087ab5d45..23ea354ea 100644
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -103,7 +103,7 @@
     {
       "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
       "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "properties": {"domain": "measurementsForVfScaling"},
+      "configurationsJson": {"domain": "measurementsForVfScaling"},
       "shared": false,
       "jsonRepresentation": {"schema": {}}
     }
-- 
cgit 1.2.3-korg


From 393bbb59b975747723c6801da2a5b151c542a0b5 Mon Sep 17 00:00:00 2001
From: Ashwin Sharma <ashwin.shyam.sharma@att.com>
Date: Thu, 27 Feb 2020 17:24:52 +0000
Subject: Upload Tosca Model changes to remove policy model type parsing from
 UI. Dictionary API fix to allow bulk create or update of dictionary elements.

Issue-ID: CLAMP-656
Change-Id: I6a0a36a6be40a098d917c45462872d31b7f47dd2
Signed-off-by: Ashwin Sharma <ashwin.shyam.sharma@att.com>
---
 .../clamp/loop/template/PolicyModelsService.java   |  43 +++---
 src/main/java/org/onap/clamp/tosca/Dictionary.java |  13 +-
 .../org/onap/clamp/tosca/DictionaryService.java    |  26 ++--
 .../resources/clds/camel/rest/clamp-api-v2.xml     |   7 +-
 .../tosca/ToscaYamlToJsonConvertorTestItCase.java  |   6 +-
 .../clamp/loop/LoopTemplatesServiceItCase.java     |  13 ++
 .../onap/clamp/loop/PolicyModelServiceItCase.java  | 143 ++++++++++++------
 src/test/resources/tosca/tosca_with_metadata.yaml  | 162 +++++++++++++++++++++
 ui-react-lib/libIndex.js                           |   2 +
 ui-react/src/api/PolicyToscaService.js             |   4 +-
 .../dialogs/Tosca/UploadToscaPolicyModal.js        |  20 +--
 .../dialogs/Tosca/UploadToscaPolicyModal.test.js   |  16 --
 .../UploadToscaPolicyModal.test.js.snap            | 111 --------------
 13 files changed, 328 insertions(+), 238 deletions(-)
 create mode 100644 src/test/resources/tosca/tosca_with_metadata.yaml
 delete mode 100644 ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
index 7e21cc390..aeea55dbb 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModelsService.java
@@ -44,7 +44,7 @@ public class PolicyModelsService {
 
     @Autowired
     public PolicyModelsService(PolicyModelsRepository policyModelrepo,
-                               ToscaYamlToJsonConvertor convertor) {
+        ToscaYamlToJsonConvertor convertor) {
         policyModelsRepository = policyModelrepo;
         toscaYamlToJsonConvertor = convertor;
     }
@@ -72,40 +72,37 @@ public class PolicyModelsService {
     /**
      * Creates or updates the Tosca Policy Model.
      *
-     * @param policyModelType  The policyModeltype in Tosca yaml
      * @param policyModelTosca The Policymodel object
      * @return The Policy Model created
      */
-    public PolicyModel createNewPolicyModelFromTosca(String policyModelType,
-                                                     String policyModelTosca) {
+    public PolicyModel createNewPolicyModelFromTosca(String policyModelTosca) {
         JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
         String policyModelTypeFromTosca = toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
-                ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
-        String policyModelTypeToUse = policyModelTypeFromTosca != null ? policyModelTypeFromTosca : policyModelType;
-        Iterable<PolicyModel> models = getAllPolicyModelsByType(policyModelTypeToUse);
+            ToscaSchemaConstants.METADATA_POLICY_MODEL_TYPE);
+        Iterable<PolicyModel> models = getAllPolicyModelsByType(policyModelTypeFromTosca);
         Collections.sort((List<PolicyModel>) models);
-        PolicyModel newPolicyModel = new PolicyModel(policyModelTypeToUse, policyModelTosca,
-                SemanticVersioning.incrementMajorVersion(
-                        ((ArrayList) models).isEmpty() ? null : ((ArrayList<PolicyModel>) models).get(0).getVersion()),
-                toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
-                        ToscaSchemaConstants.METADATA_ACRONYM));
+        PolicyModel newPolicyModel = new PolicyModel(policyModelTypeFromTosca, policyModelTosca,
+            SemanticVersioning.incrementMajorVersion(((ArrayList) models).isEmpty() ? null
+                : ((ArrayList<PolicyModel>) models).get(0).getVersion()),
+            toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
+                ToscaSchemaConstants.METADATA_ACRONYM));
         return saveOrUpdatePolicyModel(newPolicyModel);
     }
 
     /**
      * Update an existing Tosca Policy Model.
      *
-     * @param policyModelType    The policy Model type in Tosca yaml
+     * @param policyModelType The policy Model type in Tosca yaml
      * @param policyModelVersion The policy Version to update
-     * @param policyModelTosca   The Policy Model tosca
+     * @param policyModelTosca The Policy Model tosca
      * @return The Policy Model updated
      */
     public PolicyModel updatePolicyModelTosca(String policyModelType, String policyModelVersion,
-                                              String policyModelTosca) {
+        String policyModelTosca) {
         JsonObject jsonObject = toscaYamlToJsonConvertor.validateAndConvertToJson(policyModelTosca);
         PolicyModel thePolicyModel = getPolicyModelByType(policyModelType, policyModelVersion);
         thePolicyModel.setPolicyAcronym(toscaYamlToJsonConvertor.getValueFromMetadata(jsonObject,
-                ToscaSchemaConstants.METADATA_ACRONYM));
+            ToscaSchemaConstants.METADATA_ACRONYM));
         thePolicyModel.setPolicyModelTosca(policyModelTosca);
         return saveOrUpdatePolicyModel(thePolicyModel);
     }
@@ -133,13 +130,13 @@ public class PolicyModelsService {
     /**
      * Retrieves the Tosca model Yaml string.
      *
-     * @param type    The Policy Model Type
+     * @param type The Policy Model Type
      * @param version The policy model version
      * @return The Tosca model Yaml string
      */
     public String getPolicyModelTosca(String type, String version) {
-        return policyModelsRepository.findById(new PolicyModelId(type, version)).orElse(new PolicyModel())
-                .getPolicyModelTosca();
+        return policyModelsRepository.findById(new PolicyModelId(type, version))
+            .orElse(new PolicyModel()).getPolicyModelTosca();
     }
 
     /**
@@ -149,8 +146,8 @@ public class PolicyModelsService {
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void createPolicyInDbIfNeeded(PolicyModel policyModel) {
-        if (!policyModelsRepository
-                .existsById(new PolicyModelId(policyModel.getPolicyModelType(), policyModel.getVersion()))) {
+        if (!policyModelsRepository.existsById(
+            new PolicyModelId(policyModel.getPolicyModelType(), policyModel.getVersion()))) {
             policyModelsRepository.save(policyModel);
         }
     }
@@ -165,8 +162,8 @@ public class PolicyModelsService {
         for (PolicyModel policyModel : policyModelList) {
             JsonArray supportedPdpGroups = new JsonArray();
             for (PdpGroup pdpGroup : pdpGroupList) {
-                JsonObject supportedPdpGroup = pdpGroup.getSupportedSubgroups(policyModel.getPolicyModelType(),
-                        policyModel.getVersion());
+                JsonObject supportedPdpGroup = pdpGroup.getSupportedSubgroups(
+                    policyModel.getPolicyModelType(), policyModel.getVersion());
                 if (supportedPdpGroup != null) {
                     supportedPdpGroups.add(supportedPdpGroup);
                 }
diff --git a/src/main/java/org/onap/clamp/tosca/Dictionary.java b/src/main/java/org/onap/clamp/tosca/Dictionary.java
index 44b5b6f68..cf514c4bd 100644
--- a/src/main/java/org/onap/clamp/tosca/Dictionary.java
+++ b/src/main/java/org/onap/clamp/tosca/Dictionary.java
@@ -65,9 +65,7 @@ public class Dictionary extends AuditEntity implements Serializable {
     private String subDictionaryType;
 
     @Expose
-    @ManyToMany(
-        fetch = FetchType.EAGER,
-        cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
     @JoinTable(
         name = "dictionary_to_dictionaryelements",
         joinColumns = @JoinColumn(name = "dictionary_name", referencedColumnName = "name"),
@@ -149,6 +147,15 @@ public class Dictionary extends AuditEntity implements Serializable {
         dictionaryElement.getUsedByDictionaries().add(this);
     }
 
+    /**
+     * Method to set dictionaryElements.
+     *
+     * @param dictionaryElements The dictionary elements set
+     */
+    public void setDictionaryElements(Set<DictionaryElement> dictionaryElements) {
+        this.dictionaryElements = dictionaryElements;
+    }
+
     /**
      * Method to delete a dictionaryElement from the list.
      *
diff --git a/src/main/java/org/onap/clamp/tosca/DictionaryService.java b/src/main/java/org/onap/clamp/tosca/DictionaryService.java
index 5b24def98..98e3516fa 100644
--- a/src/main/java/org/onap/clamp/tosca/DictionaryService.java
+++ b/src/main/java/org/onap/clamp/tosca/DictionaryService.java
@@ -26,6 +26,7 @@ package org.onap.clamp.tosca;
 import com.google.common.collect.Sets;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import javax.persistence.EntityNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,20 +64,19 @@ public class DictionaryService {
 
         Set<DictionaryElement> newDictionaryElements = dictionary.getDictionaryElements();
 
-        for (DictionaryElement dictionaryElement : newDictionaryElements) {
-            if (dict.getDictionaryElements().contains(dictionaryElement)) {
-                // Update the Dictionary Element
-                getAndUpdateDictionaryElement(dict, dictionaryElement);
-            } else {
-                // Create the Dictionary Element
-                dict.addDictionaryElements(getAndUpdateDictionaryElement(dict, dictionaryElement));
-                dictionaryRepository.save(dict);
-            }
+        if (newDictionaryElements != null && !newDictionaryElements.isEmpty()) {
+            Set<DictionaryElement> updatedDictionaryElements = newDictionaryElements.stream()
+                .map(dictionaryElement -> getAndUpdateDictionaryElement(dict, dictionaryElement))
+                .collect(Collectors.toSet());
+
+            dict.getDictionaryElements().forEach(dictElement -> {
+                if (!updatedDictionaryElements.contains(dictElement)) {
+                    updatedDictionaryElements.add(dictElement);
+                }
+            });
+            dict.setDictionaryElements(updatedDictionaryElements);
         }
-
-        // Fetch again to get Dictionary with most recent updates.
-        return dictionaryRepository.findById(dictionaryName).orElseThrow(
-            () -> new EntityNotFoundException("Couldn't find Dictionary named: " + dictionaryName));
+        return dictionaryRepository.save(dict);
 
     }
 
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 280b808c3..ce76d300c 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -923,13 +923,12 @@
 			</route>
 		</get>
 
-		<post uri="/v2/policyToscaModels/{policyModelType}"
+		<post uri="/v2/policyToscaModels"
 			type="java.lang.String"
 			outType="org.onap.clamp.loop.template.PolicyModel"
 			consumes="plain/text" produces="application/json">
 			<route>
-				<removeHeaders pattern="*"
-					excludePattern="policyModelType" />
+				<removeHeaders pattern="*"/>
 				<doTry>
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
@@ -939,7 +938,7 @@
 						<simple>${body}</simple>
 					</setProperty>
 					<to
-						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${header.policyModelType},${exchangeProperty[PolicyModelTosca]})" />
+						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
index f426c7625..db6fd5c03 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTestItCase.java
@@ -24,6 +24,9 @@
 
 package org.onap.clamp.clds.tosca;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.google.gson.JsonObject;
 import java.io.IOException;
 import javax.transaction.Transactional;
@@ -39,9 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = Application.class)
 public class ToscaYamlToJsonConvertorTestItCase {
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
index 3a36a5d82..cabc778b8 100644
--- a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
@@ -130,6 +130,19 @@ public class LoopTemplatesServiceItCase {
             .isEqualTo("microService1");
         assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())
             .isEqualTo("TemplateName");
+        assertNull(actualLoopTemplate.getBlueprint());
+        assertNull(actualLoopTemplate.getModelService());
+    }
+
+    @Test
+    @Transactional
+    public void shouldReturnLoopemplateSvg() {
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);
+        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);
+        String svgRepresentation = loopTemplatesService.getSvgRepresentation("TemplateName");
+
+        assertNotNull(svgRepresentation);
+        assertThat(svgRepresentation).isEqualTo(loopTemplate.getSvgRepresentation());
     }
 
     @Test
diff --git a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
index 80545c112..d918a8e6d 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
@@ -26,6 +26,7 @@ package org.onap.clamp.loop;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.JsonObject;
+import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.SortedSet;
@@ -36,6 +37,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
 import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.loop.template.PolicyModelId;
 import org.onap.clamp.loop.template.PolicyModelsRepository;
@@ -66,8 +68,8 @@ public class PolicyModelServiceItCase {
     private static final String POLICY_MODEL_TYPE_3_VERSION_1 = "1.0.0";
     private static final String POLICY_MODEL_TYPE_2_VERSION_2 = "2.0.0";
 
-    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, String policyAcronym,
-                                       String policyVariant, String createdBy) {
+    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,
+        String policyAcronym, String policyVariant, String createdBy) {
         PolicyModel policyModel = new PolicyModel();
         policyModel.setCreatedBy(createdBy);
         policyModel.setPolicyAcronym(policyAcronym);
@@ -85,8 +87,8 @@ public class PolicyModelServiceItCase {
     @Transactional
     public void shouldCreatePolicyModel() {
         // given
-        PolicyModel policyModel = getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", POLICY_MODEL_TYPE_1_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel = getPolicyModel(POLICY_MODEL_TYPE_1, "yaml",
+            POLICY_MODEL_TYPE_1_VERSION_1, "TEST", "VARIANT", "user");
 
         // when
         PolicyModel actualPolicyModel = policyModelsService.saveOrUpdatePolicyModel(policyModel);
@@ -94,19 +96,63 @@ public class PolicyModelServiceItCase {
         // then
         assertThat(actualPolicyModel).isNotNull();
         assertThat(actualPolicyModel).isEqualTo(policyModelsRepository
-                .findById(new PolicyModelId(actualPolicyModel.getPolicyModelType(), actualPolicyModel.getVersion()))
-                .get());
-        assertThat(actualPolicyModel.getPolicyModelType()).isEqualTo(policyModel.getPolicyModelType());
+            .findById(new PolicyModelId(actualPolicyModel.getPolicyModelType(),
+                actualPolicyModel.getVersion()))
+            .get());
+        assertThat(actualPolicyModel.getPolicyModelType())
+            .isEqualTo(policyModel.getPolicyModelType());
         assertThat(actualPolicyModel.getCreatedBy()).isEqualTo("Not found");
         assertThat(actualPolicyModel.getCreatedDate()).isNotNull();
         assertThat(actualPolicyModel.getPolicyAcronym()).isEqualTo(policyModel.getPolicyAcronym());
-        assertThat(actualPolicyModel.getPolicyModelTosca()).isEqualTo(policyModel.getPolicyModelTosca());
+        assertThat(actualPolicyModel.getPolicyModelTosca())
+            .isEqualTo(policyModel.getPolicyModelTosca());
         assertThat(actualPolicyModel.getUpdatedBy()).isEqualTo("Not found");
         assertThat(actualPolicyModel.getUpdatedDate()).isNotNull();
         assertThat(actualPolicyModel.getVersion()).isEqualTo(policyModel.getVersion());
 
-        assertThat(policyModelsService.getPolicyModel(POLICY_MODEL_TYPE_1, POLICY_MODEL_TYPE_1_VERSION_1))
-                .isEqualToIgnoringGivenFields(policyModel, "createdDate", "updatedDate", "createdBy", "updatedBy");
+        assertThat(
+            policyModelsService.getPolicyModel(POLICY_MODEL_TYPE_1, POLICY_MODEL_TYPE_1_VERSION_1))
+                .isEqualToIgnoringGivenFields(policyModel, "createdDate", "updatedDate",
+                    "createdBy", "updatedBy");
+    }
+
+    /**
+     * This tests a create Policy Model from Tosca.
+     *
+     * @throws IOException
+     */
+    @Test
+    @Transactional
+    public void shouldCreatePolicyModelFromTosca() throws IOException {
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca_with_metadata.yaml");
+        PolicyModel policyModel = policyModelsService.createNewPolicyModelFromTosca(toscaModelYaml);
+
+        assertThat(policyModelsService.getAllPolicyModels()).contains(policyModel);
+
+        assertThat(policyModelsService.getPolicyModelTosca(policyModel.getPolicyModelType(),
+            policyModel.getVersion())).contains(toscaModelYaml);
+    }
+
+    /**
+     * This tests a update Policy Model.
+     *
+     * @throws IOException
+     */
+    @Test
+    @Transactional
+    public void shouldUpdatePolicyModel() throws IOException {
+        String toscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca_with_metadata.yaml");
+        PolicyModel policyModel = policyModelsService.createNewPolicyModelFromTosca(toscaModelYaml);
+        String newToscaModelYaml =
+            ResourceFileUtil.getResourceAsString("tosca/tosca_metadata_clamp_possible_values.yaml");
+
+        PolicyModel updatedPolicyModel = policyModelsService.updatePolicyModelTosca(
+            policyModel.getPolicyModelType(), policyModel.getVersion(), newToscaModelYaml);
+
+        assertThat(updatedPolicyModel.getPolicyModelTosca()).isEqualTo(newToscaModelYaml);
+
     }
 
     /**
@@ -116,15 +162,16 @@ public class PolicyModelServiceItCase {
     @Transactional
     public void shouldReturnAllPolicyModelTypes() {
         // given
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_2, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
         List<String> policyModelTypesList = policyModelsService.getAllPolicyModelTypes();
 
-        assertThat(policyModelTypesList).contains(policyModel1.getPolicyModelType(), policyModel2.getPolicyModelType());
+        assertThat(policyModelTypesList).contains(policyModel1.getPolicyModelType(),
+            policyModel2.getPolicyModelType());
     }
 
     /**
@@ -133,11 +180,11 @@ public class PolicyModelServiceItCase {
     @Test
     @Transactional
     public void shouldReturnAllPolicyModels() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_2, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
 
         assertThat(policyModelsService.getAllPolicyModels()).contains(policyModel1, policyModel2);
@@ -149,15 +196,15 @@ public class PolicyModelServiceItCase {
     @Test
     @Transactional
     public void shouldReturnAllModelsByType() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_2, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
 
-        assertThat(policyModelsService.getAllPolicyModelsByType(POLICY_MODEL_TYPE_2)).contains(policyModel1,
-                policyModel2);
+        assertThat(policyModelsService.getAllPolicyModelsByType(POLICY_MODEL_TYPE_2))
+            .contains(policyModel1, policyModel2);
     }
 
     /**
@@ -166,21 +213,23 @@ public class PolicyModelServiceItCase {
     @Test
     @Transactional
     public void shouldReturnSortedSet() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_2, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-        PolicyModel policyModel3 = getPolicyModel(POLICY_MODEL_TYPE_3, "yaml", POLICY_MODEL_TYPE_3_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel3 = getPolicyModel(POLICY_MODEL_TYPE_3, "yaml",
+            POLICY_MODEL_TYPE_3_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel3);
 
         SortedSet<PolicyModel> sortedSet = new TreeSet<>();
         policyModelsService.getAllPolicyModels().forEach(sortedSet::add);
-        List<PolicyModel> listToCheck = sortedSet.stream()
-                .filter(policy -> policy.equals(policyModel3) || policy.equals(policyModel2)
-                        || policy.equals(policyModel1)).collect(Collectors.toList());
+        List<PolicyModel> listToCheck =
+            sortedSet
+                .stream().filter(policy -> policy.equals(policyModel3)
+                    || policy.equals(policyModel2) || policy.equals(policyModel1))
+                .collect(Collectors.toList());
         assertThat(listToCheck.get(0)).isEqualByComparingTo(policyModel2);
         assertThat(listToCheck.get(1)).isEqualByComparingTo(policyModel1);
         assertThat(listToCheck.get(2)).isEqualByComparingTo(policyModel3);
@@ -192,17 +241,16 @@ public class PolicyModelServiceItCase {
     @Test
     @Transactional
     public void shouldAddPdpGroupInfo() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", POLICY_MODEL_TYPE_1_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_1, "yaml",
+            POLICY_MODEL_TYPE_1_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml", POLICY_MODEL_TYPE_2_VERSION_2, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
+            POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-        PolicyModel policyModel3 = getPolicyModel(POLICY_MODEL_TYPE_3, "yaml", POLICY_MODEL_TYPE_3_VERSION_1, "TEST",
-                "VARIANT", "user");
+        PolicyModel policyModel3 = getPolicyModel(POLICY_MODEL_TYPE_3, "yaml",
+            POLICY_MODEL_TYPE_3_VERSION_1, "TEST", "VARIANT", "user");
         policyModelsService.saveOrUpdatePolicyModel(policyModel3);
 
-
         PolicyModelKey type1 = new PolicyModelKey("org.onap.testos", "1.0.0");
         PolicyModelKey type2 = new PolicyModelKey("org.onap.testos2", "2.0.0");
 
@@ -242,19 +290,22 @@ public class PolicyModelServiceItCase {
         pdpGroupList.add(pdpGroup2);
         policyModelsService.updatePdpGroupInfo(pdpGroupList);
 
-        JsonObject res1 = policyModelsService.getPolicyModel("org.onap.testos", "1.0.0").getPolicyPdpGroup();
+        JsonObject res1 =
+            policyModelsService.getPolicyModel("org.onap.testos", "1.0.0").getPolicyPdpGroup();
         String expectedRes1 =
-                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\"]}]}";
+            "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\"]}]}";
         JsonObject expectedJson1 = JsonUtils.GSON.fromJson(expectedRes1, JsonObject.class);
         assertThat(res1).isEqualTo(expectedJson1);
 
-        JsonObject res2 = policyModelsService.getPolicyModel("org.onap.testos2", "2.0.0").getPolicyPdpGroup();
+        JsonObject res2 =
+            policyModelsService.getPolicyModel("org.onap.testos2", "2.0.0").getPolicyPdpGroup();
         String expectedRes2 =
-                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\",\"subGroup2\"]}]}";
+            "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\",\"subGroup2\"]}]}";
         JsonObject expectedJson2 = JsonUtils.GSON.fromJson(expectedRes2, JsonObject.class);
         assertThat(res2).isEqualTo(expectedJson2);
 
-        JsonObject res3 = policyModelsService.getPolicyModel("org.onap.testos3", "1.0.0").getPolicyPdpGroup();
+        JsonObject res3 =
+            policyModelsService.getPolicyModel("org.onap.testos3", "1.0.0").getPolicyPdpGroup();
         assertThat(res3).isNull();
     }
 }
diff --git a/src/test/resources/tosca/tosca_with_metadata.yaml b/src/test/resources/tosca/tosca_with_metadata.yaml
new file mode 100644
index 000000000..5967d1569
--- /dev/null
+++ b/src/test/resources/tosca/tosca_with_metadata.yaml
@@ -0,0 +1,162 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+policy_types:
+    onap.policies.Monitoring:
+        derived_from: tosca.policies.Root
+        description: a base policy type for all policies that governs monitoring provisioning
+    onap.policies.monitoring.cdap.tca.hi.lo.app:
+        derived_from: onap.policies.Monitoring
+        version: 1.0.0
+        properties:
+            tca_policy:
+                type: map
+                description: TCA Policy JSON
+                entry_schema:
+                    type: onap.datatypes.monitoring.tca_policy
+        metadata:
+            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
+            acronym: tca
+            
+data_types:
+    onap.datatypes.monitoring.metricsPerEventName:
+        derived_from: tosca.datatypes.Root
+        properties:
+            controlLoopSchemaType:
+                type: string
+                required: true
+                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
+                constraints:
+                  - valid_values:
+                      - VM
+                      - VNF
+            eventName:
+                type: string
+                required: true
+                description: Event name to which thresholds need to be applied
+            policyName:
+                type: string
+                required: true
+                description: TCA Policy Scope Name
+            policyScope:
+                type: string
+                required: true
+                description: TCA Policy Scope
+            policyVersion:
+                type: string
+                required: true
+                description: TCA Policy Scope Version
+            thresholds:
+                type: list
+                required: true
+                description: Thresholds associated with eventName
+                entry_schema:
+                    type: onap.datatypes.monitoring.thresholds
+    onap.datatypes.monitoring.tca_policy:
+        derived_from: tosca.datatypes.Root
+        properties:
+            domain:
+                type: string
+                required: true
+                description: Domain name to which TCA needs to be applied
+                default: measurementsForVfScaling
+                constraints:
+                  - equal: measurementsForVfScaling
+            metricsPerEventName:
+                type: list
+                required: true
+                description: Contains eventName and threshold details that need to be applied to given eventName
+                entry_schema:
+                    type: onap.datatypes.monitoring.metricsPerEventName
+    onap.datatypes.monitoring.thresholds:
+        derived_from: tosca.datatypes.Root
+        properties:
+            closedLoopControlName:
+                type: string
+                required: true
+                description: Closed Loop Control Name associated with the threshold
+            closedLoopEventStatus:
+                type: string
+                required: true
+                description: Closed Loop Event Status of the threshold
+                constraints:
+                  - valid_values:
+                      - ONSET
+                      - ABATED
+            direction:
+                type: string
+                required: true
+                description: Direction of the threshold
+                constraints:
+                  - valid_values:
+                      - LESS
+                      - LESS_OR_EQUAL
+                      - GREATER
+                      - GREATER_OR_EQUAL
+                      - EQUAL
+            fieldPath:
+                type: string
+                required: true
+                description: Json field Path as per CEF message which needs to be analyzed for TCA
+                constraints:
+                  - valid_values:
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
+                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
+                      - $.event.measurementsForVfScalingFields.meanRequestLatency
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
+                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
+                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
+            severity:
+                type: string
+                required: true
+                description: Threshold Event Severity
+                constraints:
+                  - valid_values:
+                      - CRITICAL
+                      - MAJOR
+                      - MINOR
+                      - WARNING
+                      - NORMAL
+            thresholdValue:
+                type: integer
+                required: true
+                description: Threshold value for the field Path inside CEF message
+            version:
+                type: string
+                required: true
+                description: Version number associated with the threshold
diff --git a/ui-react-lib/libIndex.js b/ui-react-lib/libIndex.js
index 89bf831d9..20dc074e3 100755
--- a/ui-react-lib/libIndex.js
+++ b/ui-react-lib/libIndex.js
@@ -22,6 +22,7 @@
  */
 
 export { default as ConfigurationPolicyModal } from './src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
+export { default as PolicyModal } from './src/components/dialogs/Policy/PolicyModal';
 export { default as DeployLoopModal } from './src/components/dialogs/Loop/DeployLoopModal';
 export { default as LoopActionService } from './src/api/LoopActionService';
 export { default as LoopCache }  from './src/api/LoopCache';
@@ -35,6 +36,7 @@ export { default as LoopUI } from './src/LoopUI';
 export { default as MenuBar } from './src/components/menu/MenuBar';
 export { default as NotFound } from './src/NotFound';
 export { default as OpenLoopModal } from './src/components/dialogs/Loop/OpenLoopModal';
+export { default as CreateLoopModal } from './src/components/dialogs/Loop/CreateLoopModal';
 export { default as OperationalPolicyModal } from './src/components/dialogs/OperationalPolicy/OperationalPolicyModal';
 export { default as PerformActions } from './src/components/dialogs/PerformActions';
 export { default as RefreshStatus } from './src/components/dialogs/RefreshStatus';
diff --git a/ui-react/src/api/PolicyToscaService.js b/ui-react/src/api/PolicyToscaService.js
index 52e68fac4..610a11418 100644
--- a/ui-react/src/api/PolicyToscaService.js
+++ b/ui-react/src/api/PolicyToscaService.js
@@ -78,8 +78,8 @@ export default class PolicyToscaService {
  			});
   }
 
-  static createPolicyModelFromToscaModel(policyModelType, jsonData) {
-       return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, {
+  static createPolicyModelFromToscaModel(jsonData) {
+       return fetch('/restservices/clds/v2/policyToscaModels', {
            method: 'POST',
            credentials: 'same-origin',
            headers: {
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
index 2e0460f61..1937485b0 100644
--- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
@@ -39,12 +39,10 @@ export default class UploadToscaPolicyModal extends React.Component {
 
 		this.handleCreateFromToscaPolicyModel = this.handleCreateFromToscaPolicyModel.bind(this);
 		this.handleClose = this.handleClose.bind(this);
-		this.handlePolicyModelType = this.handlePolicyModelType.bind(this);
 		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
 		this.state = {
 				show: true,
 				selectedFile: '',
-				policyModelType: '',
 				policyModelTosca: [],
 				apiResponseStatus: '',
 				apiResponseMessage: '',
@@ -56,7 +54,7 @@ export default class UploadToscaPolicyModal extends React.Component {
 				if (event.target.files && event.target.files[0]) {
 					const scope = this;
   				    let reader = new FileReader();
-					this.setState({policyModelType: '', policyModelTosca: '' });
+					this.setState({policyModelTosca: '' });
 					reader.onload = function(e) {
 					    scope.setState({ policyModelTosca:  reader.result});
 					};
@@ -73,9 +71,8 @@ export default class UploadToscaPolicyModal extends React.Component {
 
 	handleCreateFromToscaPolicyModel(e) {
         e.preventDefault();
-		console.log("Policy Model Type is", this.state.policyModelType);
-		if(this.state.policyModelType && this.state.policyModelTosca) {
- 		PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelType, this.state.policyModelTosca).then(resp => {
+		if(this.state.policyModelTosca) {
+ 		PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelTosca).then(resp => {
 			if(resp.status === 200) {
 			this.setState({apiResponseStatus: resp.status, apiResponseMessage: resp.message, upldBtnClicked: true});
 		} else {
@@ -87,12 +84,6 @@ export default class UploadToscaPolicyModal extends React.Component {
 	}
 }
 
-	handlePolicyModelType = event => {
-    this.setState({
-      policyModelType: event.target.value
-    })
-  }
-
 	render() {
 		return (
 			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
@@ -108,11 +99,6 @@ export default class UploadToscaPolicyModal extends React.Component {
 							<Alert variant="secondary">
 								<p>{this.state.selectedFile.name}</p>
 							</Alert>
-							<Form.Label column sm="2">Policy Model Type:</Form.Label>
-							<input type="text" style={{width: '50%'}}
-								value={this.state.policyModelType}
-								onChange={this.handlePolicyModelType}
-							/>
 						</Col>
 					</Form.Group>
 				</Modal.Body>
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js
index dac8ac920..e4842062a 100644
--- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js
@@ -27,22 +27,6 @@ import UploadToscaPolicyModal from './UploadToscaPolicyModal';
 
 describe('Test Upload Tosca Policy Model', () => {
 
-      it('Test handleMicroServiceName', () => {
-
-      const component = shallow(<UploadToscaPolicyModal />);
-
-        const inputValue = 'TCA'
-
-        const button = component.find('input').at(1);
-
-        button.simulate('change', { target: { value: inputValue }});
-
-        expect(component.state('policyModelType')).toEqual(inputValue);
-
-        expect(component).toMatchSnapshot();
-
-    });
-
     it('Test handleUploadToscaPolicyModel for Tosca Model', () => {
 
       const component = shallow(<UploadToscaPolicyModal />);
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
deleted file mode 100644
index 8e801367b..000000000
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
+++ /dev/null
@@ -1,111 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
-<Styled(Bootstrap(Modal))
-  onHide={[Function]}
-  show={true}
-  size="lg"
->
-  <ModalHeader
-    closeButton={true}
-    closeLabel="Close"
-  >
-    <ModalTitle>
-      Upload Tosca Model
-    </ModalTitle>
-  </ModalHeader>
-  <ModalBody>
-    <FormGroup
-      as={
-        Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "noGutters": false,
-          },
-          "render": [Function],
-        }
-      }
-      controlId="formPlaintextEmail"
-    >
-      <Col
-        sm="10"
-      >
-        <input
-          accept=".yaml"
-          name="file"
-          onChange={[Function]}
-          style={
-            Object {
-              "display": "none",
-            }
-          }
-          type="file"
-        />
-        <button
-          onClick={[Function]}
-        >
-          Pick Tosca File
-        </button>
-        <Alert
-          closeLabel="Close alert"
-          show={true}
-          transition={
-            Object {
-              "$$typeof": Symbol(react.forward_ref),
-              "defaultProps": Object {
-                "appear": false,
-                "in": false,
-                "mountOnEnter": false,
-                "timeout": 300,
-                "unmountOnExit": false,
-              },
-              "displayName": "Fade",
-              "render": [Function],
-            }
-          }
-          variant="secondary"
-        >
-          <p />
-        </Alert>
-        <FormLabel
-          column={true}
-          sm="2"
-          srOnly={false}
-        >
-          Policy Model Type:
-        </FormLabel>
-        <input
-          onChange={[Function]}
-          style={
-            Object {
-              "width": "50%",
-            }
-          }
-          type="text"
-          value="TCA"
-        />
-      </Col>
-    </FormGroup>
-  </ModalBody>
-  <ModalFooter>
-    <Button
-      active={false}
-      disabled={false}
-      onClick={[Function]}
-      type="null"
-      variant="secondary"
-    >
-      Cancel
-    </Button>
-    <Button
-      active={false}
-      disabled={true}
-      onClick={[Function]}
-      type="submit"
-      variant="primary"
-    >
-      Create
-    </Button>
-  </ModalFooter>
-</Styled(Bootstrap(Modal))>
-`;
-- 
cgit 1.2.3-korg


From 2d28cbf6954c50de004a0d8f1a2ada7ec400fea3 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 27 Feb 2020 14:43:57 -0800
Subject: Fix bug in operational policy

Fix bugs in camel routes and operational policy due to changes done for op policy insertion/removal

Issue-ID: CLAMP-647

Change-Id: I68524bd3d5bfbf5dd7a4bcf6d59853df07fd4dd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 docs/swagger/swagger.json                          |  275 +-
 docs/swagger/swagger.pdf                           | 5360 +++++++++++---------
 extra/sql/dump/test-data.sql                       |   34 +-
 .../org/onap/clamp/clds/util/drawing/Painter.java  |    7 +-
 .../java/org/onap/clamp/loop/LoopController.java   |   13 +-
 .../operational/LegacyOperationalPolicy.java       |    2 +-
 .../policy/operational/OperationalPolicy.java      |   14 +-
 src/main/resources/META-INF/resources/swagger.html |  105 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |   33 +-
 .../resources/clds/camel/routes/loop-flows.xml     |    2 +-
 .../resources/clds/camel/routes/policy-flows.xml   |    8 +-
 ui-react/src/components/menu/MenuBar.js            |    1 +
 .../menu/__snapshots__/MenuBar.test.js.snap        |    3 +
 13 files changed, 3121 insertions(+), 2736 deletions(-)

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index a52fe8c10..64b43ab8c 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,13 +4,13 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:33631",
+  "host" : "localhost:37295",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route80",
+        "operationId" : "route18",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,11 +20,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route80"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route18"
       },
       "put" : {
-        "operationId" : "route82",
+        "operationId" : "route20",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -43,8 +43,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route82"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route20"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
@@ -64,7 +64,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       }
     },
@@ -93,11 +93,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       },
       "delete" : {
-        "operationId" : "route84",
+        "operationId" : "route22",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -108,8 +108,8 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route84"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route22"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
@@ -129,7 +129,7 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       }
     },
@@ -147,13 +147,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route65",
+        "operationId" : "route3",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -169,13 +169,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route65"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route3"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route76",
+        "operationId" : "route14",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -185,13 +185,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route76"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route14"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route70",
+        "operationId" : "route8",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -207,13 +207,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route70"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route8"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route64",
+        "operationId" : "route2",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -226,13 +226,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route64"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route2"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route77",
+        "operationId" : "route15",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -248,13 +248,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route77"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route15"
       }
     },
     "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : {
       "put" : {
-        "operationId" : "route71",
+        "operationId" : "route9",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -270,13 +270,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route71"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route9"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route74",
+        "operationId" : "route12",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -292,13 +292,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route74"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route12"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route73",
+        "operationId" : "route11",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -314,13 +314,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route73"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route11"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route75",
+        "operationId" : "route13",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -336,13 +336,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route75"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route13"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route66",
+        "operationId" : "route4",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -358,13 +358,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route66"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route4"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route72",
+        "operationId" : "route10",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -380,13 +380,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route72"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route10"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route67",
+        "operationId" : "route5",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -410,13 +410,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route67"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route5"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route69",
+        "operationId" : "route7",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -440,13 +440,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route69"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route7"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route68",
+        "operationId" : "route6",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -470,13 +470,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route68"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route6"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route87",
+        "operationId" : "route25",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -486,8 +486,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route87"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route25"
       }
     },
     "/v2/policyToscaModels/{policyModelType}" : {
@@ -507,11 +507,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       },
       "put" : {
-        "operationId" : "route88",
+        "operationId" : "route26",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -535,8 +535,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route88"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route26"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}" : {
@@ -556,13 +556,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route91",
+        "operationId" : "route29",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -572,8 +572,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route91"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route29"
       }
     },
     "/v2/templates/{templateName}" : {
@@ -593,7 +593,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       }
     },
@@ -611,13 +611,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
+        "x-camelContextId" : "camel-1",
         "x-routeId" : null
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route92",
+        "operationId" : "route30",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -627,19 +627,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route92"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route30"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route93",
+        "operationId" : "route31",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-3",
-        "x-routeId" : "route93"
+        "x-camelContextId" : "camel-1",
+        "x-routeId" : "route31"
       }
     }
   },
@@ -809,19 +809,20 @@
         "number" : {
           "type" : "boolean"
         },
-        "string" : {
-          "type" : "boolean"
-        },
-        "boolean" : {
-          "type" : "boolean"
-        },
         "asString" : {
           "type" : "string"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "asDouble" : {
           "type" : "number",
           "format" : "double"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
@@ -830,13 +831,6 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -854,6 +848,15 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "boolean" : {
+          "type" : "boolean"
+        },
+        "string" : {
+          "type" : "boolean"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
@@ -869,9 +872,6 @@
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
@@ -909,6 +909,9 @@
         "pdpGroup" : {
           "type" : "string"
         },
+        "pdpSubGroup" : {
+          "type" : "string"
+        },
         "name" : {
           "type" : "string"
         },
@@ -952,23 +955,14 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "asString" : {
           "type" : "string"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonArray" : {
           "type" : "boolean"
@@ -982,9 +976,6 @@
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
@@ -994,10 +985,22 @@
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1056,6 +1059,9 @@
           "items" : {
             "$ref" : "#/definitions/LoopElementModel"
           }
+        },
+        "policyPdpGroup" : {
+          "$ref" : "#/definitions/JsonObject"
         }
       },
       "x-className" : {
@@ -1127,6 +1133,9 @@
         "pdpGroup" : {
           "type" : "string"
         },
+        "pdpSubGroup" : {
+          "type" : "string"
+        },
         "name" : {
           "type" : "string"
         },
@@ -1144,23 +1153,14 @@
         "asBoolean" : {
           "type" : "boolean"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "asString" : {
           "type" : "string"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
         },
         "jsonArray" : {
           "type" : "boolean"
@@ -1174,9 +1174,6 @@
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
@@ -1186,10 +1183,22 @@
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1218,10 +1227,17 @@
         "asString" : {
           "type" : "string"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "asDouble" : {
           "type" : "number",
           "format" : "double"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
@@ -1230,13 +1246,6 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1254,6 +1263,9 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
@@ -1269,9 +1281,6 @@
         "jsonNull" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 18a6316d7..394b7c625 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,16 +4,16 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200226154251-08'00')
-/ModDate (D:20200226154251-08'00')
+/CreationDate (D:20200227150954-08'00')
+/ModDate (D:20200227150954-08'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 20 0 R
-/Outlines 588 0 R
-/PageLabels 732 0 R
+/Outlines 590 0 R
+/PageLabels 734 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 793.0]
 /ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 33
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 58 0 R 72 0 R 84 0 R 97 0 R 110 0 R 124 0 R 137 0 R 151 0 R 165 0 R 178 0 R 192 0 R 207 0 R 214 0 R 220 0 R 228 0 R 234 0 R 239 0 R 248 0 R 255 0 R 265 0 R 271 0 R 277 0 R 285 0 R 296 0 R 302 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 58 0 R 72 0 R 84 0 R 97 0 R 110 0 R 123 0 R 137 0 R 151 0 R 165 0 R 179 0 R 192 0 R 208 0 R 215 0 R 221 0 R 229 0 R 235 0 R 240 0 R 249 0 R 256 0 R 266 0 R 272 0 R 278 0 R 286 0 R 296 0 R 303 0 R]
 >>
 endobj
 4 0 obj
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 734 0 R
+/FontDescriptor 736 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 736 0 R
-/ToUnicode 735 0 R
+/Widths 738 0 R
+/ToUnicode 737 0 R
 >>
 endobj
 9 0 obj
@@ -1559,7 +1559,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [305 0 R 306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R]
+/Annots [307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R]
 >>
 endobj
 11 0 obj
@@ -3102,7 +3102,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [377 0 R 378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R]
+/Annots [379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R]
 >>
 endobj
 13 0 obj
@@ -4645,7 +4645,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R]
+/Annots [455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R]
 >>
 endobj
 15 0 obj
@@ -5810,7 +5810,7 @@ ET
 BT
 552.021 227.34599999999952 Td
 /F1.0 10.5 Tf
-<3237> Tj
+<3238> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -5828,7 +5828,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R]
+/Annots [531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R]
 >>
 endobj
 17 0 obj
@@ -5910,7 +5910,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3333363331> Tj
+<203a206c6f63616c686f73743a3337323935> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6011,7 +6011,7 @@ endobj
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 >>
@@ -6025,18 +6025,18 @@ endobj
 >>
 endobj
 21 0 obj
-<< /Kids [53 0 R 246 0 R 160 0 R 87 0 R 130 0 R 197 0 R 54 0 R 187 0 R 116 0 R 82 0 R]
+<< /Kids [53 0 R 247 0 R 160 0 R 87 0 R 130 0 R 198 0 R 54 0 R 128 0 R 195 0 R 82 0 R 170 0 R]
 >>
 endobj
 22 0 obj
 << /Type /Font
 /BaseFont /AAAAAB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 738 0 R
+/FontDescriptor 740 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 740 0 R
-/ToUnicode 739 0 R
+/Widths 742 0 R
+/ToUnicode 741 0 R
 >>
 endobj
 23 0 obj
@@ -6046,11 +6046,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAC+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 742 0 R
+/FontDescriptor 744 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 744 0 R
-/ToUnicode 743 0 R
+/Widths 746 0 R
+/ToUnicode 745 0 R
 >>
 endobj
 25 0 obj
@@ -6950,7 +6950,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [31 0 R 39 0 R]
@@ -6980,11 +6980,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 746 0 R
+/FontDescriptor 748 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 748 0 R
-/ToUnicode 747 0 R
+/Widths 750 0 R
+/ToUnicode 749 0 R
 >>
 endobj
 34 0 obj
@@ -8225,7 +8225,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [45 0 R 47 0 R]
@@ -8270,12 +8270,12 @@ endobj
 endobj
 53 0 obj
 << /Limits [(_cldshealthcheck) (_dictionaryelement)]
-/Names [(_cldshealthcheck) 209 0 R (_consumes) 48 0 R (_consumes_2) 67 0 R (_consumes_3) 143 0 R (_consumes_4) 152 0 R (_consumes_5) 159 0 R (_consumes_6) 189 0 R (_definitions) 208 0 R (_dictionary) 210 0 R (_dictionaryelement) 212 0 R]
+/Names [(_cldshealthcheck) 210 0 R (_consumes) 48 0 R (_consumes_2) 67 0 R (_consumes_3) 143 0 R (_consumes_4) 152 0 R (_consumes_5) 159 0 R (_consumes_6) 189 0 R (_definitions) 209 0 R (_dictionary) 211 0 R (_dictionaryelement) 213 0 R]
 >>
 endobj
 54 0 obj
-<< /Limits [(_responses_10) (_responses_19)]
-/Names [(_responses_10) 81 0 R (_responses_11) 88 0 R (_responses_12) 92 0 R (_responses_13) 98 0 R (_responses_14) 103 0 R (_responses_15) 108 0 R (_responses_16) 115 0 R (_responses_17) 121 0 R (_responses_18) 128 0 R (_responses_19) 133 0 R]
+<< /Limits [(_responses_10) (_responses_2)]
+/Names [(_responses_10) 81 0 R (_responses_11) 88 0 R (_responses_12) 92 0 R (_responses_13) 98 0 R (_responses_14) 103 0 R (_responses_15) 108 0 R (_responses_16) 115 0 R (_responses_17) 120 0 R (_responses_18) 127 0 R (_responses_19) 133 0 R (_responses_2) 35 0 R]
 >>
 endobj
 55 0 obj
@@ -9630,7 +9630,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [60 0 R 64 0 R 66 0 R]
@@ -10824,7 +10824,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 >>
@@ -10857,8 +10857,8 @@ endobj
 [72 0 R /XYZ 0 108.12000000000052 null]
 endobj
 82 0 obj
-<< /Limits [(_route77) (_version_information)]
-/Names [(_route77) 94 0 R (_route80) 37 0 R (_route82) 41 0 R (_route84) 69 0 R (_route87) 169 0 R (_route88) 184 0 R (_route91) 193 0 R (_route92) 29 0 R (_route93) 34 0 R (_service) 300 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R]
+<< /Limits [(_route15) (_route4)]
+/Names [(_route15) 94 0 R (_route18) 37 0 R (_route2) 91 0 R (_route20) 41 0 R (_route22) 69 0 R (_route25) 169 0 R (_route26) 185 0 R (_route29) 193 0 R (_route3) 162 0 R (_route30) 29 0 R (_route31) 34 0 R (_route4) 125 0 R]
 >>
 endobj
 83 0 obj
@@ -12192,7 +12192,7 @@ endobj
 /F3.0 24 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [89 0 R]
@@ -12206,7 +12206,7 @@ endobj
 endobj
 87 0 obj
 << /Limits [(_parameters_8) (_produces_15)]
-/Names [(_parameters_8) 95 0 R (_parameters_9) 102 0 R (_paths) 28 0 R (_policymodel) 298 0 R (_produces) 32 0 R (_produces_10) 90 0 R (_produces_11) 93 0 R (_produces_12) 100 0 R (_produces_13) 105 0 R (_produces_14) 112 0 R (_produces_15) 118 0 R]
+/Names [(_parameters_8) 95 0 R (_parameters_9) 102 0 R (_paths) 28 0 R (_policymodel) 299 0 R (_produces) 32 0 R (_produces_10) 90 0 R (_produces_11) 93 0 R (_produces_12) 100 0 R (_produces_13) 105 0 R (_produces_14) 112 0 R (_produces_15) 117 0 R]
 >>
 endobj
 88 0 obj
@@ -13432,7 +13432,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [99 0 R 104 0 R]
@@ -14902,10 +14902,10 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [111 0 R 117 0 R 122 0 R]
+/Annots [111 0 R 116 0 R 121 0 R]
 >>
 endobj
 111 0 obj
@@ -14929,11 +14929,6 @@ endobj
 [110 0 R /XYZ 0 481.68000000000046 null]
 endobj
 116 0 obj
-<< /Limits [(_responses_5) (_route76)]
-/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route64) 91 0 R (_route65) 162 0 R (_route66) 126 0 R (_route67) 138 0 R (_route68) 154 0 R (_route69) 145 0 R (_route70) 85 0 R (_route71) 101 0 R (_route72) 131 0 R (_route73) 113 0 R (_route74) 106 0 R (_route75) 119 0 R (_route76) 79 0 R]
->>
-endobj
-117 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -14941,19 +14936,19 @@ endobj
 /Type /Annot
 >>
 endobj
-118 0 obj
+117 0 obj
 [110 0 R /XYZ 0 376.5600000000004 null]
 endobj
-119 0 obj
+118 0 obj
 [110 0 R /XYZ 0 320.28000000000037 null]
 endobj
-120 0 obj
+119 0 obj
 [110 0 R /XYZ 0 280.20000000000033 null]
 endobj
-121 0 obj
+120 0 obj
 [110 0 R /XYZ 0 175.08000000000033 null]
 endobj
-122 0 obj
+121 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -14961,7 +14956,7 @@ endobj
 /Type /Annot
 >>
 endobj
-123 0 obj
+122 0 obj
 << /Length 16227
 >>
 stream
@@ -16151,51 +16146,56 @@ Q
 
 endstream
 endobj
-124 0 obj
+123 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 123 0 R
+/Contents 122 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [134 0 R]
 >>
 endobj
+124 0 obj
+[123 0 R /XYZ 0 792.0 null]
+endobj
 125 0 obj
-[124 0 R /XYZ 0 792.0 null]
+[123 0 R /XYZ 0 702.1200000000001 null]
 endobj
 126 0 obj
-[124 0 R /XYZ 0 702.1200000000001 null]
+[123 0 R /XYZ 0 662.0400000000002 null]
 endobj
 127 0 obj
-[124 0 R /XYZ 0 662.0400000000002 null]
+[123 0 R /XYZ 0 556.9200000000003 null]
 endobj
 128 0 obj
-[124 0 R /XYZ 0 556.9200000000003 null]
+<< /Limits [(_responses_20) (_responses_3)]
+/Names [(_responses_20) 141 0 R (_responses_21) 148 0 R (_responses_22) 157 0 R (_responses_23) 166 0 R (_responses_24) 171 0 R (_responses_25) 176 0 R (_responses_26) 182 0 R (_responses_27) 187 0 R (_responses_28) 194 0 R (_responses_29) 200 0 R (_responses_3) 38 0 R]
+>>
 endobj
 129 0 obj
-[124 0 R /XYZ 0 451.8000000000004 null]
+[123 0 R /XYZ 0 451.8000000000004 null]
 endobj
 130 0 obj
 << /Limits [(_produces_16) (_produces_24)]
-/Names [(_produces_16) 125 0 R (_produces_17) 129 0 R (_produces_18) 135 0 R (_produces_19) 144 0 R (_produces_2) 36 0 R (_produces_20) 153 0 R (_produces_21) 161 0 R (_produces_22) 168 0 R (_produces_23) 172 0 R (_produces_24) 176 0 R]
+/Names [(_produces_16) 124 0 R (_produces_17) 129 0 R (_produces_18) 135 0 R (_produces_19) 144 0 R (_produces_2) 36 0 R (_produces_20) 153 0 R (_produces_21) 161 0 R (_produces_22) 168 0 R (_produces_23) 173 0 R (_produces_24) 177 0 R]
 >>
 endobj
 131 0 obj
-[124 0 R /XYZ 0 395.5200000000004 null]
+[123 0 R /XYZ 0 395.5200000000004 null]
 endobj
 132 0 obj
-[124 0 R /XYZ 0 355.44000000000034 null]
+[123 0 R /XYZ 0 355.44000000000034 null]
 endobj
 133 0 obj
-[124 0 R /XYZ 0 250.32000000000033 null]
+[123 0 R /XYZ 0 250.32000000000033 null]
 endobj
 134 0 obj
 << /Border [0 0 0]
@@ -16206,7 +16206,7 @@ endobj
 >>
 endobj
 135 0 obj
-[124 0 R /XYZ 0 145.2000000000003 null]
+[123 0 R /XYZ 0 145.2000000000003 null]
 endobj
 136 0 obj
 << /Length 19642
@@ -17665,7 +17665,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [140 0 R 142 0 R 147 0 R 149 0 R]
@@ -18861,7 +18861,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
 /Annots [156 0 R 158 0 R]
@@ -18903,7 +18903,7 @@ endobj
 endobj
 160 0 obj
 << /Limits [(_parameters_13) (_parameters_7)]
-/Names [(_parameters_13) 127 0 R (_parameters_14) 132 0 R (_parameters_15) 139 0 R (_parameters_16) 146 0 R (_parameters_17) 155 0 R (_parameters_18) 163 0 R (_parameters_19) 174 0 R (_parameters_2) 56 0 R (_parameters_20) 180 0 R (_parameters_21) 185 0 R (_parameters_22) 202 0 R (_parameters_3) 63 0 R (_parameters_4) 70 0 R (_parameters_5) 76 0 R (_parameters_6) 80 0 R (_parameters_7) 86 0 R]
+/Names [(_parameters_13) 126 0 R (_parameters_14) 132 0 R (_parameters_15) 139 0 R (_parameters_16) 146 0 R (_parameters_17) 155 0 R (_parameters_18) 163 0 R (_parameters_19) 175 0 R (_parameters_2) 56 0 R (_parameters_20) 181 0 R (_parameters_21) 186 0 R (_parameters_22) 203 0 R (_parameters_3) 63 0 R (_parameters_4) 70 0 R (_parameters_5) 76 0 R (_parameters_6) 80 0 R (_parameters_7) 86 0 R]
 >>
 endobj
 161 0 obj
@@ -20130,10 +20130,10 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [167 0 R 171 0 R]
+/Annots [167 0 R 172 0 R]
 >>
 endobj
 166 0 obj
@@ -20154,9 +20154,14 @@ endobj
 [165 0 R /XYZ 0 597.0000000000003 null]
 endobj
 170 0 obj
-[165 0 R /XYZ 0 556.9200000000004 null]
+<< /Limits [(_route5) (_version_information)]
+/Names [(_route5) 138 0 R (_route6) 154 0 R (_route7) 145 0 R (_route8) 85 0 R (_route9) 101 0 R (_service) 304 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 180 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 174 0 R (_v2_templates_names_get) 199 0 R (_v2_templates_templatename_get) 202 0 R (_version_information) 23 0 R]
+>>
 endobj
 171 0 obj
+[165 0 R /XYZ 0 556.9200000000004 null]
+endobj
+172 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -20164,22 +20169,22 @@ endobj
 /Type /Annot
 >>
 endobj
-172 0 obj
+173 0 obj
 [165 0 R /XYZ 0 451.8000000000005 null]
 endobj
-173 0 obj
+174 0 obj
 [165 0 R /XYZ 0 395.5200000000005 null]
 endobj
-174 0 obj
+175 0 obj
 [165 0 R /XYZ 0 327.36000000000047 null]
 endobj
-175 0 obj
+176 0 obj
 [165 0 R /XYZ 0 222.2400000000004 null]
 endobj
-176 0 obj
+177 0 obj
 [165 0 R /XYZ 0 117.12000000000037 null]
 endobj
-177 0 obj
+178 0 obj
 << /Length 18056
 >>
 stream
@@ -21506,33 +21511,33 @@ Q
 
 endstream
 endobj
-178 0 obj
+179 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 177 0 R
+/Contents 178 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [182 0 R 188 0 R]
+/Annots [183 0 R 188 0 R]
 >>
 endobj
-179 0 obj
-[178 0 R /XYZ 0 792.0 null]
-endobj
 180 0 obj
-[178 0 R /XYZ 0 718.32 null]
+[179 0 R /XYZ 0 792.0 null]
 endobj
 181 0 obj
-[178 0 R /XYZ 0 613.2000000000003 null]
+[179 0 R /XYZ 0 718.32 null]
 endobj
 182 0 obj
+[179 0 R /XYZ 0 613.2000000000003 null]
+endobj
+183 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -21540,22 +21545,17 @@ endobj
 /Type /Annot
 >>
 endobj
-183 0 obj
-[178 0 R /XYZ 0 508.0800000000004 null]
-endobj
 184 0 obj
-[178 0 R /XYZ 0 451.80000000000035 null]
+[179 0 R /XYZ 0 508.0800000000004 null]
 endobj
 185 0 obj
-[178 0 R /XYZ 0 411.7200000000003 null]
+[179 0 R /XYZ 0 451.80000000000035 null]
 endobj
 186 0 obj
-[178 0 R /XYZ 0 269.04000000000025 null]
+[179 0 R /XYZ 0 411.7200000000003 null]
 endobj
 187 0 obj
-<< /Limits [(_responses_2) (_responses_4)]
-/Names [(_responses_2) 35 0 R (_responses_20) 141 0 R (_responses_21) 148 0 R (_responses_22) 157 0 R (_responses_23) 166 0 R (_responses_24) 170 0 R (_responses_25) 175 0 R (_responses_26) 181 0 R (_responses_27) 186 0 R (_responses_28) 194 0 R (_responses_29) 199 0 R (_responses_3) 38 0 R (_responses_30) 203 0 R (_responses_4) 46 0 R]
->>
+[179 0 R /XYZ 0 269.04000000000025 null]
 endobj
 188 0 obj
 << /Border [0 0 0]
@@ -21566,10 +21566,10 @@ endobj
 >>
 endobj
 189 0 obj
-[178 0 R /XYZ 0 163.92000000000024 null]
+[179 0 R /XYZ 0 163.92000000000024 null]
 endobj
 190 0 obj
-[178 0 R /XYZ 0 107.64000000000021 null]
+[179 0 R /XYZ 0 107.64000000000021 null]
 endobj
 191 0 obj
 << /Length 16516
@@ -22786,10 +22786,10 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [195 0 R 204 0 R]
+/Annots [196 0 R 205 0 R]
 >>
 endobj
 193 0 obj
@@ -22799,6 +22799,11 @@ endobj
 [192 0 R /XYZ 0 718.32 null]
 endobj
 195 0 obj
+<< /Limits [(_responses_30) (_route14)]
+/Names [(_responses_30) 204 0 R (_responses_4) 46 0 R (_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route10) 131 0 R (_route11) 113 0 R (_route12) 106 0 R (_route13) 118 0 R (_route14) 79 0 R]
+>>
+endobj
+196 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -22806,33 +22811,33 @@ endobj
 /Type /Annot
 >>
 endobj
-196 0 obj
+197 0 obj
 [192 0 R /XYZ 0 613.2000000000003 null]
 endobj
-197 0 obj
+198 0 obj
 << /Limits [(_produces_25) (_responses)]
-/Names [(_produces_25) 183 0 R (_produces_26) 190 0 R (_produces_27) 196 0 R (_produces_28) 200 0 R (_produces_29) 205 0 R (_produces_3) 40 0 R (_produces_4) 49 0 R (_produces_5) 52 0 R (_produces_6) 61 0 R (_produces_7) 68 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
+/Names [(_produces_25) 184 0 R (_produces_26) 190 0 R (_produces_27) 197 0 R (_produces_28) 201 0 R (_produces_29) 206 0 R (_produces_3) 40 0 R (_produces_4) 49 0 R (_produces_5) 52 0 R (_produces_6) 61 0 R (_produces_7) 68 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
 >>
 endobj
-198 0 obj
+199 0 obj
 [192 0 R /XYZ 0 556.9200000000004 null]
 endobj
-199 0 obj
+200 0 obj
 [192 0 R /XYZ 0 516.8400000000005 null]
 endobj
-200 0 obj
+201 0 obj
 [192 0 R /XYZ 0 411.7200000000005 null]
 endobj
-201 0 obj
+202 0 obj
 [192 0 R /XYZ 0 355.44000000000045 null]
 endobj
-202 0 obj
+203 0 obj
 [192 0 R /XYZ 0 315.3600000000004 null]
 endobj
-203 0 obj
+204 0 obj
 [192 0 R /XYZ 0 210.2400000000004 null]
 endobj
-204 0 obj
+205 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -22840,10 +22845,10 @@ endobj
 /Type /Annot
 >>
 endobj
-205 0 obj
+206 0 obj
 [192 0 R /XYZ 0 105.12000000000037 null]
 endobj
-206 0 obj
+207 0 obj
 << /Length 16082
 >>
 stream
@@ -24086,32 +24091,32 @@ Q
 
 endstream
 endobj
-207 0 obj
+208 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 206 0 R
+/Contents 207 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [211 0 R]
+/Annots [212 0 R]
 >>
 endobj
-208 0 obj
-[207 0 R /XYZ 0 792.0 null]
-endobj
 209 0 obj
-[207 0 R /XYZ 0 712.0799999999999 null]
+[208 0 R /XYZ 0 792.0 null]
 endobj
 210 0 obj
-[207 0 R /XYZ 0 524.04 null]
+[208 0 R /XYZ 0 712.0799999999999 null]
 endobj
 211 0 obj
+[208 0 R /XYZ 0 524.04 null]
+endobj
+212 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -24119,10 +24124,10 @@ endobj
 /Type /Annot
 >>
 endobj
-212 0 obj
-[207 0 R /XYZ 0 148.19999999999993 null]
-endobj
 213 0 obj
+[208 0 R /XYZ 0 148.19999999999993 null]
+endobj
+214 0 obj
 << /Length 20298
 >>
 stream
@@ -25699,23 +25704,23 @@ Q
 
 endstream
 endobj
-214 0 obj
+215 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 213 0 R
+/Contents 214 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [215 0 R 217 0 R]
+/Annots [216 0 R 218 0 R]
 >>
 endobj
-215 0 obj
+216 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -25723,10 +25728,10 @@ endobj
 /Type /Annot
 >>
 endobj
-216 0 obj
-[214 0 R /XYZ 0 345.11999999999995 null]
-endobj
 217 0 obj
+[215 0 R /XYZ 0 345.11999999999995 null]
+endobj
+218 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -25734,10 +25739,10 @@ endobj
 /Type /Annot
 >>
 endobj
-218 0 obj
-[214 0 R /XYZ 0 194.6399999999999 null]
-endobj
 219 0 obj
+[215 0 R /XYZ 0 194.6399999999999 null]
+endobj
+220 0 obj
 << /Length 21931
 >>
 stream
@@ -27415,26 +27420,26 @@ Q
 
 endstream
 endobj
-220 0 obj
+221 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 219 0 R
+/Contents 220 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [222 0 R 223 0 R 224 0 R 225 0 R 226 0 R]
+/Annots [223 0 R 224 0 R 225 0 R 226 0 R 227 0 R]
 >>
 endobj
-221 0 obj
-[220 0 R /XYZ 0 683.1600000000001 null]
-endobj
 222 0 obj
+[221 0 R /XYZ 0 683.1600000000001 null]
+endobj
+223 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -27442,7 +27447,7 @@ endobj
 /Type /Annot
 >>
 endobj
-223 0 obj
+224 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -27450,7 +27455,7 @@ endobj
 /Type /Annot
 >>
 endobj
-224 0 obj
+225 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -27458,7 +27463,7 @@ endobj
 /Type /Annot
 >>
 endobj
-225 0 obj
+226 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -27466,7 +27471,7 @@ endobj
 /Type /Annot
 >>
 endobj
-226 0 obj
+227 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -27474,7 +27479,7 @@ endobj
 /Type /Annot
 >>
 endobj
-227 0 obj
+228 0 obj
 << /Length 21512
 >>
 stream
@@ -29136,26 +29141,26 @@ Q
 
 endstream
 endobj
-228 0 obj
+229 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 227 0 R
+/Contents 228 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [230 0 R 231 0 R 232 0 R]
+/Annots [231 0 R 232 0 R 233 0 R]
 >>
 endobj
-229 0 obj
-[228 0 R /XYZ 0 532.9200000000003 null]
-endobj
 230 0 obj
+[229 0 R /XYZ 0 532.9200000000003 null]
+endobj
+231 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -29163,7 +29168,7 @@ endobj
 /Type /Annot
 >>
 endobj
-231 0 obj
+232 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -29171,7 +29176,7 @@ endobj
 /Type /Annot
 >>
 endobj
-232 0 obj
+233 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -29179,7 +29184,7 @@ endobj
 /Type /Annot
 >>
 endobj
-233 0 obj
+234 0 obj
 << /Length 21163
 >>
 stream
@@ -30833,23 +30838,23 @@ Q
 
 endstream
 endobj
-234 0 obj
+235 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 233 0 R
+/Contents 234 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [235 0 R 236 0 R]
+/Annots [236 0 R 237 0 R]
 >>
 endobj
-235 0 obj
+236 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -30857,7 +30862,7 @@ endobj
 /Type /Annot
 >>
 endobj
-236 0 obj
+237 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -30865,10 +30870,10 @@ endobj
 /Type /Annot
 >>
 endobj
-237 0 obj
-[234 0 R /XYZ 0 382.68000000000023 null]
-endobj
 238 0 obj
+[235 0 R /XYZ 0 382.68000000000023 null]
+endobj
+239 0 obj
 << /Length 21656
 >>
 stream
@@ -32546,23 +32551,23 @@ Q
 
 endstream
 endobj
-239 0 obj
+240 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 238 0 R
+/Contents 239 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [240 0 R 241 0 R 242 0 R 243 0 R 244 0 R]
+/Annots [241 0 R 242 0 R 243 0 R 244 0 R 245 0 R]
 >>
 endobj
-240 0 obj
+241 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -32570,7 +32575,7 @@ endobj
 /Type /Annot
 >>
 endobj
-241 0 obj
+242 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -32578,7 +32583,7 @@ endobj
 /Type /Annot
 >>
 endobj
-242 0 obj
+243 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -32586,7 +32591,7 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
+244 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -32594,7 +32599,7 @@ endobj
 /Type /Annot
 >>
 endobj
-244 0 obj
+245 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -32602,15 +32607,15 @@ endobj
 /Type /Annot
 >>
 endobj
-245 0 obj
-[239 0 R /XYZ 0 232.44000000000023 null]
-endobj
 246 0 obj
+[240 0 R /XYZ 0 232.44000000000023 null]
+endobj
+247 0 obj
 << /Limits [(_externalcomponent) (_parameters_12)]
-/Names [(_externalcomponent) 216 0 R (_externalcomponentstate) 218 0 R (_jsonarray) 221 0 R (_jsonnull) 229 0 R (_jsonobject) 237 0 R (_jsonprimitive) 245 0 R (_loop) 256 0 R (_loopelementmodel) 266 0 R (_looplog) 269 0 R (_looptemplate) 273 0 R (_looptemplateloopelementmodel) 278 0 R (_microservicepolicy) 281 0 R (_number) 289 0 R (_operationalpolicy) 290 0 R (_overview) 19 0 R (_parameters) 44 0 R (_parameters_10) 107 0 R (_parameters_11) 114 0 R (_parameters_12) 120 0 R]
+/Names [(_externalcomponent) 217 0 R (_externalcomponentstate) 219 0 R (_jsonarray) 222 0 R (_jsonnull) 230 0 R (_jsonobject) 238 0 R (_jsonprimitive) 246 0 R (_loop) 257 0 R (_loopelementmodel) 267 0 R (_looplog) 270 0 R (_looptemplate) 274 0 R (_looptemplateloopelementmodel) 279 0 R (_microservicepolicy) 282 0 R (_number) 290 0 R (_operationalpolicy) 291 0 R (_overview) 19 0 R (_parameters) 44 0 R (_parameters_10) 107 0 R (_parameters_11) 114 0 R (_parameters_12) 119 0 R]
 >>
 endobj
-247 0 obj
+248 0 obj
 << /Length 22690
 >>
 stream
@@ -34379,23 +34384,23 @@ Q
 
 endstream
 endobj
-248 0 obj
+249 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 247 0 R
+/Contents 248 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [249 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
+/Annots [250 0 R 251 0 R 252 0 R 253 0 R 254 0 R]
 >>
 endobj
-249 0 obj
+250 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -34403,7 +34408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-250 0 obj
+251 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -34411,7 +34416,7 @@ endobj
 /Type /Annot
 >>
 endobj
-251 0 obj
+252 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -34419,7 +34424,7 @@ endobj
 /Type /Annot
 >>
 endobj
-252 0 obj
+253 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -34427,7 +34432,7 @@ endobj
 /Type /Annot
 >>
 endobj
-253 0 obj
+254 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -34435,7 +34440,7 @@ endobj
 /Type /Annot
 >>
 endobj
-254 0 obj
+255 0 obj
 << /Length 23337
 >>
 stream
@@ -36192,26 +36197,26 @@ Q
 
 endstream
 endobj
-255 0 obj
+256 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 254 0 R
+/Contents 255 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R]
+/Annots [258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R]
 >>
 endobj
-256 0 obj
-[255 0 R /XYZ 0 645.6000000000001 null]
-endobj
 257 0 obj
+[256 0 R /XYZ 0 645.6000000000001 null]
+endobj
+258 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -36219,7 +36224,7 @@ endobj
 /Type /Annot
 >>
 endobj
-258 0 obj
+259 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -36227,7 +36232,7 @@ endobj
 /Type /Annot
 >>
 endobj
-259 0 obj
+260 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -36235,7 +36240,7 @@ endobj
 /Type /Annot
 >>
 endobj
-260 0 obj
+261 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -36243,7 +36248,7 @@ endobj
 /Type /Annot
 >>
 endobj
-261 0 obj
+262 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -36251,7 +36256,7 @@ endobj
 /Type /Annot
 >>
 endobj
-262 0 obj
+263 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -36259,7 +36264,7 @@ endobj
 /Type /Annot
 >>
 endobj
-263 0 obj
+264 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -36267,7 +36272,7 @@ endobj
 /Type /Annot
 >>
 endobj
-264 0 obj
+265 0 obj
 << /Length 20640
 >>
 stream
@@ -37858,26 +37863,26 @@ Q
 
 endstream
 endobj
-265 0 obj
+266 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 264 0 R
+/Contents 265 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [267 0 R 268 0 R]
+/Annots [268 0 R 269 0 R]
 >>
 endobj
-266 0 obj
-[265 0 R /XYZ 0 645.6000000000001 null]
-endobj
 267 0 obj
+[266 0 R /XYZ 0 645.6000000000001 null]
+endobj
+268 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -37885,7 +37890,7 @@ endobj
 /Type /Annot
 >>
 endobj
-268 0 obj
+269 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -37893,10 +37898,10 @@ endobj
 /Type /Annot
 >>
 endobj
-269 0 obj
-[265 0 R /XYZ 0 157.08000000000015 null]
-endobj
 270 0 obj
+[266 0 R /XYZ 0 157.08000000000015 null]
+endobj
+271 0 obj
 << /Length 21650
 >>
 stream
@@ -39572,23 +39577,23 @@ Q
 
 endstream
 endobj
-271 0 obj
+272 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 270 0 R
+/Contents 271 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [272 0 R 274 0 R 275 0 R]
+/Annots [273 0 R 275 0 R 276 0 R]
 >>
 endobj
-272 0 obj
+273 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -39596,10 +39601,10 @@ endobj
 /Type /Annot
 >>
 endobj
-273 0 obj
-[271 0 R /XYZ 0 532.9200000000001 null]
-endobj
 274 0 obj
+[272 0 R /XYZ 0 532.9200000000001 null]
+endobj
+275 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -39607,7 +39612,7 @@ endobj
 /Type /Annot
 >>
 endobj
-275 0 obj
+276 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -39615,7 +39620,7 @@ endobj
 /Type /Annot
 >>
 endobj
-276 0 obj
+277 0 obj
 << /Length 20753
 >>
 stream
@@ -41194,26 +41199,26 @@ Q
 
 endstream
 endobj
-277 0 obj
+278 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 276 0 R
+/Contents 277 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [279 0 R 280 0 R 282 0 R 283 0 R]
+/Annots [280 0 R 281 0 R 283 0 R 284 0 R]
 >>
 endobj
-278 0 obj
-[277 0 R /XYZ 0 645.6000000000001 null]
-endobj
 279 0 obj
+[278 0 R /XYZ 0 645.6000000000001 null]
+endobj
+280 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -41221,7 +41226,7 @@ endobj
 /Type /Annot
 >>
 endobj
-280 0 obj
+281 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -41229,10 +41234,10 @@ endobj
 /Type /Annot
 >>
 endobj
-281 0 obj
-[277 0 R /XYZ 0 457.56000000000023 null]
-endobj
 282 0 obj
+[278 0 R /XYZ 0 457.56000000000023 null]
+endobj
+283 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -41240,7 +41245,7 @@ endobj
 /Type /Annot
 >>
 endobj
-283 0 obj
+284 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -41248,8 +41253,8 @@ endobj
 /Type /Annot
 >>
 endobj
-284 0 obj
-<< /Length 20603
+285 0 obj
+<< /Length 20394
 >>
 stream
 q
@@ -41326,6 +41331,14 @@ f
 269.177 432.240 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -41682,7 +41695,7 @@ S
 BT
 51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<70647053756247726f7570> Tj
 ET
 
 
@@ -41725,21 +41738,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 596.6530000000001 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -41772,7 +41777,7 @@ S
 BT
 51.24 566.2330000000002 Td
 /F2.0 10.5 Tf
-<736861726564> Tj
+<706f6c6963794d6f64656c> Tj
 ET
 
 
@@ -41815,13 +41820,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 559.0930000000001 Td
 /F1.0 10.5 Tf
-<626f6f6c65616e> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -41854,7 +41867,7 @@ S
 BT
 51.24 528.673 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<736861726564> Tj
 ET
 
 
@@ -41901,7 +41914,7 @@ S
 BT
 272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<626f6f6c65616e> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -41936,7 +41949,7 @@ S
 BT
 51.24 491.1130000000001 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
@@ -41983,7 +41996,7 @@ S
 BT
 272.17692192000004 483.9730000000001 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -42018,7 +42031,7 @@ S
 BT
 51.24 453.55300000000017 Td
 /F2.0 10.5 Tf
-[<7573656442> 20.01953125 <794c6f6f7073>] TJ
+<7570646174656444617465> Tj
 ET
 
 
@@ -42061,13 +42074,95 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.4130000000002 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.680 m
+269.177 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.490 m
+48.240 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.9930000000002 Td
+/F2.0 10.5 Tf
+[<7573656442> 20.01953125 <794c6f6f7073>] TJ
+ET
+
+
+BT
+51.24 401.7130000000002 Td
+ET
+
+
+BT
+51.24 401.7130000000002 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.680 m
+563.760 394.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.490 m
+269.177 394.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.490 m
+563.760 394.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.4130000000002 Td
+272.17692192000004 408.85300000000024 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -42076,7 +42171,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 446.4130000000002 Td
+280.76592192000004 408.85300000000024 Td
 /F1.0 10.5 Tf
 <4c6f6f70> Tj
 ET
@@ -42085,7 +42180,7 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-305.86092192000007 446.4130000000002 Td
+305.86092192000007 408.85300000000024 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
@@ -42095,7 +42190,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 396.8160000000002 Td
+48.24 359.25600000000026 Td
 /F2.0 18 Tf
 <332e31362e204e756d626572> Tj
 ET
@@ -42106,7 +42201,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 368.19600000000014 Td
+48.24 330.6360000000002 Td
 /F3.0 10.5 Tf
 <54797065> Tj
 ET
@@ -42117,7 +42212,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-71.4345 368.19600000000014 Td
+71.4345 330.6360000000002 Td
 /F1.0 10.5 Tf
 <203a206f626a656374> Tj
 ET
@@ -42128,7 +42223,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 328.95600000000013 Td
+48.24 291.3960000000002 Td
 /F2.0 18 Tf
 [<332e31372e204f706572> 20.01953125 <6174696f6e616c506f6c696379>] TJ
 ET
@@ -42136,153 +42231,75 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 289.020 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 289.020 294.583 23.280 re
+48.240 251.460 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 251.460 220.937 37.560 re
+269.177 251.460 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 251.460 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
 48.240 213.900 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 213.900 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 48.240 176.340 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 269.177 176.340 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 48.240 138.780 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 138.780 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 48.240 101.220 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 269.177 101.220 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 48.240 63.660 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 63.660 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 312.300 m
-269.177 312.300 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 289.020 m
-269.177 289.020 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 312.550 m
-48.240 288.270 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 312.550 m
-269.177 288.270 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 296.55300000000005 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 312.300 m
-563.760 312.300 l
+48.240 274.740 m
+269.177 274.740 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 289.020 m
-563.760 289.020 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 312.550 m
-269.177 288.270 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 312.550 m
-563.760 288.270 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 296.55300000000005 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 289.020 m
-269.177 289.020 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
 48.240 251.460 m
 269.177 251.460 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 289.270 m
-48.240 251.210 l
+48.240 274.990 m
+48.240 250.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.270 m
-269.177 251.210 l
+269.177 274.990 m
+269.177 250.710 l
 S
 [ ] 0 d
 1 w
@@ -42290,31 +42307,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 272.7730000000001 Td
+51.24 258.9930000000001 Td
 /F2.0 10.5 Tf
-[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
-ET
-
-
-BT
-51.24 258.49300000000005 Td
-ET
-
-
-BT
-51.24 258.49300000000005 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.020 m
-563.760 289.020 l
+269.177 274.740 m
+563.760 274.740 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
 269.177 251.460 m
 563.760 251.460 l
@@ -42322,34 +42327,26 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 289.270 m
-269.177 251.210 l
+269.177 274.990 m
+269.177 250.710 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 289.270 m
-563.760 251.210 l
+563.760 274.990 m
+563.760 250.710 l
 S
 [ ] 0 d
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 265.6330000000001 Td
-/F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+272.17692192000004 258.9930000000001 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42380,19 +42377,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 235.21300000000008 Td
+51.24 235.21300000000014 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+[<636f6e6669677572> 20.01953125 <6174696f6e734a736f6e>] TJ
 ET
 
 
 BT
-51.24 220.93300000000008 Td
+51.24 220.93300000000013 Td
 ET
 
 
 BT
-51.24 220.93300000000008 Td
+51.24 220.93300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42425,13 +42422,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 228.07300000000006 Td
+272.17692192000004 228.07300000000012 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42462,19 +42467,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 197.65300000000008 Td
+51.24 197.65300000000013 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 183.37300000000008 Td
+51.24 183.37300000000013 Td
 ET
 
 
 BT
-51.24 183.37300000000008 Td
+51.24 183.37300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42509,9 +42514,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 190.51300000000006 Td
+272.17692192000004 190.51300000000012 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -42544,19 +42549,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 160.09300000000007 Td
+51.24 160.09300000000013 Td
 /F2.0 10.5 Tf
-<6a736f6e526570726573656e746174696f6e> Tj
+<6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 145.81300000000007 Td
+51.24 145.81300000000013 Td
 ET
 
 
 BT
-51.24 145.81300000000007 Td
+51.24 145.81300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42589,21 +42594,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 152.95300000000006 Td
+272.17692192000004 152.95300000000012 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -42634,19 +42631,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 122.53300000000007 Td
+51.24 122.53300000000013 Td
 /F2.0 10.5 Tf
-<6c6f6f70> Tj
+<6a736f6e526570726573656e746174696f6e> Tj
 ET
 
 
 BT
-51.24 108.25300000000007 Td
+51.24 108.25300000000013 Td
 ET
 
 
 BT
-51.24 108.25300000000007 Td
+51.24 108.25300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42687,9 +42684,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 115.39300000000007 Td
+272.17692192000004 115.39300000000013 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -42724,19 +42721,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 84.97300000000006 Td
+51.24 84.97300000000011 Td
 /F2.0 10.5 Tf
-<6c6f6f70456c656d656e744d6f64656c> Tj
+<6c6f6f70> Tj
 ET
 
 
 BT
-51.24 70.69300000000005 Td
+51.24 70.69300000000011 Td
 ET
 
 
 BT
-51.24 70.69300000000005 Td
+51.24 70.69300000000011 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -42777,9 +42774,9 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 77.83300000000006 Td
+272.17692192000004 77.83300000000011 Td
 /F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -42809,23 +42806,23 @@ Q
 
 endstream
 endobj
-285 0 obj
+286 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 284 0 R
+/Contents 285 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [286 0 R 287 0 R 288 0 R 291 0 R 292 0 R 293 0 R 294 0 R]
+/Annots [287 0 R 288 0 R 289 0 R 292 0 R 293 0 R 294 0 R]
 >>
 endobj
-286 0 obj
+287 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -42833,62 +42830,54 @@ endobj
 /Type /Annot
 >>
 endobj
-287 0 obj
+288 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
-/Rect [272.17692192000004 593.5870000000002 333.47592192 607.8670000000002]
+/Rect [272.17692192000004 556.0270000000002 333.47592192 570.3070000000001]
 /Type /Annot
 >>
 endobj
-288 0 obj
+289 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
-/Rect [280.76592192000004 443.34700000000015 305.86092192000007 457.6270000000002]
+/Rect [280.76592192000004 405.7870000000002 305.86092192000007 420.06700000000023]
 /Type /Annot
 >>
 endobj
-289 0 obj
-[285 0 R /XYZ 0 420.2400000000002 null]
-endobj
 290 0 obj
-[285 0 R /XYZ 0 352.3800000000001 null]
+[286 0 R /XYZ 0 382.68000000000023 null]
 endobj
 291 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 262.56700000000006 325.32792192000005 276.8470000000001]
-/Type /Annot
->>
+[286 0 R /XYZ 0 314.82000000000016 null]
 endobj
 292 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 149.88700000000009 325.32792192000005 164.1670000000001]
+/Rect [272.17692192000004 225.00700000000015 325.32792192000005 239.28700000000015]
 /Type /Annot
 >>
 endobj
 293 0 obj
 << /Border [0 0 0]
-/Dest (_loop)
+/Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 112.32700000000007 297.27192192000007 126.60700000000007]
+/Rect [272.17692192000004 112.32700000000013 325.32792192000005 126.60700000000013]
 /Type /Annot
 >>
 endobj
 294 0 obj
 << /Border [0 0 0]
-/Dest (_loopelementmodel)
+/Dest (_loop)
 /Subtype /Link
-/Rect [272.17692192000004 74.76700000000005 369.88992192000006 89.04700000000005]
+/Rect [272.17692192000004 74.76700000000011 297.27192192000007 89.04700000000011]
 /Type /Annot
 >>
 endobj
 295 0 obj
-<< /Length 19359
+<< /Length 21773
 >>
 stream
 q
@@ -42941,6 +42930,22 @@ f
 269.177 544.920 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 507.360 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 507.360 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 469.800 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 469.800 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -43043,7 +43048,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<6c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 
@@ -43086,13 +43091,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -43125,17 +43138,17 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-<70647047726f7570> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 664.633 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 664.633 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43170,7 +43183,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 671.7729999999999 Td
+272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -43205,19 +43218,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3529999999998 Td
+51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<70647047726f7570> Tj
 ET
 
 
 BT
-51.24 627.0729999999999 Td
+51.24 627.073 Td
 ET
 
 
 BT
-51.24 627.0729999999999 Td
+51.24 627.073 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43250,21 +43263,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 634.2129999999999 Td
+272.17692192000004 634.213 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -43297,7 +43302,7 @@ S
 BT
 51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<70647053756247726f7570> Tj
 ET
 
 
@@ -43379,7 +43384,7 @@ S
 BT
 51.24 566.233 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+<706f6c6963794d6f64656c> Tj
 ET
 
 
@@ -43422,127 +43427,44 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-48.24 509.49600000000015 Td
-/F2.0 18 Tf
-<332e31382e20506f6c6963794d6f64656c> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
 0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 469.560 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 469.560 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 432.000 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 432.000 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 394.440 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 394.440 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 319.320 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 319.320 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 281.760 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 281.760 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 244.200 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 244.200 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 206.640 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 206.640 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 169.080 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 169.080 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 131.520 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 131.520 294.583 37.560 re
-f
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 492.840 m
-269.177 492.840 l
+48.240 544.920 m
+269.177 544.920 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 493.090 m
-48.240 468.810 l
+48.240 545.170 m
+48.240 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 493.090 m
-269.177 468.810 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 1 w
@@ -43550,34 +43472,46 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 477.0930000000001 Td
+51.24 528.673 Td
 /F2.0 10.5 Tf
-<4e616d65> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
+ET
+
+
+BT
+51.24 514.393 Td
+ET
+
+
+BT
+51.24 514.393 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 492.840 m
-563.760 492.840 l
+269.177 544.920 m
+563.760 544.920 l
 S
 [ ] 0 d
-1.5 w
+0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 493.090 m
-269.177 468.810 l
+269.177 545.170 m
+269.177 507.110 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 493.090 m
-563.760 468.810 l
+563.760 545.170 m
+563.760 507.110 l
 S
 [ ] 0 d
 1 w
@@ -43585,34 +43519,34 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 477.0930000000001 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
+272.17692192000004 521.533 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.560 m
-269.177 469.560 l
+48.240 507.360 m
+269.177 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 469.800 m
+269.177 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 469.810 m
-48.240 431.750 l
+48.240 507.610 m
+48.240 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 1 w
@@ -43620,19 +43554,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000005 Td
+51.24 491.113 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
+<7570646174656444617465> Tj
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 476.83299999999997 Td
 ET
 
 
 BT
-51.24 439.033 Td
+51.24 476.83299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43640,26 +43574,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.560 m
-563.760 469.560 l
+269.177 507.360 m
+563.760 507.360 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 469.800 m
+563.760 469.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 469.810 m
-269.177 431.750 l
+269.177 507.610 m
+269.177 469.550 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 469.810 m
-563.760 431.750 l
+563.760 507.610 m
+563.760 469.550 l
 S
 [ ] 0 d
 1 w
@@ -43667,19 +43601,110 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.17300000000006 Td
+272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 434.37600000000003 Td
+/F2.0 18 Tf
+<332e31382e20506f6c6963794d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 394.440 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 394.440 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 356.880 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 356.880 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 319.320 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 319.320 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 281.760 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 281.760 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 244.200 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 244.200 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 206.640 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 206.640 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 169.080 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 169.080 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 131.520 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 131.520 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 93.960 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 93.960 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 56.400 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 56.400 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.000 m
-269.177 432.000 l
+48.240 417.720 m
+269.177 417.720 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
 48.240 394.440 m
 269.177 394.440 l
@@ -43687,14 +43712,14 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 432.250 m
-48.240 394.190 l
+48.240 417.970 m
+48.240 393.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 417.970 m
+269.177 393.690 l
 S
 [ ] 0 d
 1 w
@@ -43702,31 +43727,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 415.7530000000001 Td
+51.24 401.97299999999996 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
-ET
-
-
-BT
-51.24 401.47300000000007 Td
-ET
-
-
-BT
-51.24 401.47300000000007 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.000 m
-563.760 432.000 l
+269.177 417.720 m
+563.760 417.720 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
 269.177 394.440 m
 563.760 394.440 l
@@ -43734,14 +43747,14 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 432.250 m
-269.177 394.190 l
+269.177 417.970 m
+269.177 393.690 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 432.250 m
-563.760 394.190 l
+563.760 417.970 m
+563.760 393.690 l
 S
 [ ] 0 d
 1 w
@@ -43749,9 +43762,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 408.6130000000001 Td
-/F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+272.17692192000004 401.97299999999996 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -43784,19 +43797,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.19300000000004 Td
+51.24 378.1929999999999 Td
 /F2.0 10.5 Tf
-[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 363.913 Td
+51.24 363.9129999999999 Td
 ET
 
 
 BT
-51.24 363.913 Td
+51.24 363.9129999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43831,7 +43844,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05300000000005 Td
+272.17692192000004 371.05299999999994 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -43866,19 +43879,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 340.6330000000001 Td
+51.24 340.633 Td
 /F2.0 10.5 Tf
-[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
+<6372656174656444617465> Tj
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 326.35299999999995 Td
 ET
 
 
 BT
-51.24 326.35300000000007 Td
+51.24 326.35299999999995 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43913,9 +43926,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 333.4930000000001 Td
+272.17692192000004 333.493 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -43948,19 +43961,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 303.07300000000004 Td
+51.24 303.0729999999999 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c54797065> Tj
+[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
 ET
 
 
 BT
-51.24 288.793 Td
+51.24 288.7929999999999 Td
 ET
 
 
 BT
-51.24 288.793 Td
+51.24 288.7929999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -43995,7 +44008,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 295.93300000000005 Td
+272.17692192000004 295.93299999999994 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44030,19 +44043,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 265.5130000000001 Td
+51.24 265.513 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 251.23299999999998 Td
 ET
 
 
 BT
-51.24 251.2330000000001 Td
+51.24 251.23299999999998 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44077,7 +44090,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 258.3730000000001 Td
+272.17692192000004 258.373 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44112,19 +44125,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 227.9530000000001 Td
+51.24 227.95299999999997 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
 BT
-51.24 213.6730000000001 Td
+51.24 213.67299999999997 Td
 ET
 
 
 BT
-51.24 213.6730000000001 Td
+51.24 213.67299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44159,9 +44172,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 220.81300000000007 Td
+272.17692192000004 220.81299999999996 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -44194,19 +44207,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 190.39300000000006 Td
+51.24 190.39299999999997 Td
 /F2.0 10.5 Tf
-[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
+<706f6c69637950647047726f7570> Tj
 ET
 
 
 BT
-51.24 176.11300000000006 Td
+51.24 176.11299999999997 Td
 ET
 
 
 BT
-51.24 176.11300000000006 Td
+51.24 176.11299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44243,31 +44256,17 @@ S
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 183.25300000000004 Td
-/F1.0 10.5 Tf
-<3c20> Tj
-ET
-
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 183.25300000000004 Td
+272.17692192000004 183.25299999999996 Td
 /F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-
-BT
-378.47892192000006 183.25300000000004 Td
-/F1.0 10.5 Tf
-[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
-ET
-
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -44298,19 +44297,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 152.83300000000006 Td
+51.24 152.83299999999997 Td
 /F2.0 10.5 Tf
-<76657273696f6e> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 138.55300000000005 Td
+51.24 138.55299999999997 Td
 ET
 
 
 BT
-51.24 138.55300000000005 Td
+51.24 138.55299999999997 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44345,22 +44344,197 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 145.69300000000004 Td
+272.17692192000004 145.69299999999996 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.520 m
+269.177 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 131.770 m
+48.240 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
 
 BT
-48.24 96.09600000000003 Td
-/F2.0 18 Tf
-<332e31392e2053657276696365> Tj
+51.24 115.27299999999993 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 100.99299999999992 Td
+ET
+
+
+BT
+51.24 100.99299999999992 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.520 m
+563.760 131.520 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 131.770 m
+269.177 93.710 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 131.770 m
+563.760 93.710 l
+S
+[ ] 0 d
+1 w
 0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 108.13299999999992 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 93.960 m
+269.177 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 56.400 m
+269.177 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 94.210 m
+48.240 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 77.71299999999992 Td
+/F2.0 10.5 Tf
+[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
+ET
+
+
+BT
+51.24 63.43299999999992 Td
+ET
+
+
+BT
+51.24 63.43299999999992 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 93.960 m
+563.760 93.960 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 56.400 m
+563.760 56.400 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 94.210 m
+269.177 56.150 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 94.210 m
+563.760 56.150 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57299999999992 Td
+/F1.0 10.5 Tf
+<3c20> Tj
+ET
+
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+
+BT
+280.76592192000004 70.57299999999992 Td
+/F1.0 10.5 Tf
+<4c6f6f70456c656d656e744d6f64656c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+378.47892192000006 70.57299999999992 Td
+/F1.0 10.5 Tf
+[<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
+ET
+
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -44396,36 +44570,49 @@ endobj
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [297 0 R 299 0 R]
+/Annots [297 0 R 298 0 R 300 0 R 301 0 R]
 >>
 endobj
 297 0 obj
 << /Border [0 0 0]
-/Dest (_policymodel)
+/Dest (_loopelementmodel)
 /Subtype /Link
-/Rect [272.17692192000004 631.1469999999999 333.47592192 645.4269999999999]
+/Rect [272.17692192000004 706.267 369.88992192000006 720.547]
 /Type /Annot
 >>
 endobj
 298 0 obj
-[296 0 R /XYZ 0 532.9200000000001 null]
-endobj
-299 0 obj
 << /Border [0 0 0]
-/Dest (_loopelementmodel)
+/Dest (_policymodel)
 /Subtype /Link
-/Rect [280.76592192000004 180.18700000000007 378.47892192000006 194.46700000000004]
+/Rect [272.17692192000004 556.027 333.47592192 570.307]
 /Type /Annot
 >>
 endobj
+299 0 obj
+[296 0 R /XYZ 0 457.8 null]
+endobj
 300 0 obj
-[296 0 R /XYZ 0 119.52000000000004 null]
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 180.18699999999998 325.32792192000005 194.46699999999998]
+/Type /Annot
+>>
 endobj
 301 0 obj
-<< /Length 7264
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 67.50699999999992 378.47892192000006 81.78699999999992]
+/Type /Annot
+>>
+endobj
+302 0 obj
+<< /Length 9726
 >>
 stream
 q
@@ -44446,38 +44633,6 @@ f
 269.177 695.160 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 657.600 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 657.600 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 620.040 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 620.040 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-48.240 582.480 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
-269.177 582.480 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 544.920 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 544.920 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -44578,19 +44733,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.473 Td
+51.24 716.4730000000002 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<76657273696f6e> Tj
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 702.1930000000001 Td
 ET
 
 
 BT
-51.24 702.193 Td
+51.24 702.1930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44625,34 +44780,128 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.333 Td
+272.17692192000004 709.3330000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
 
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 659.7360000000001 Td
+/F2.0 18 Tf
+<332e31392e2053657276696365> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 619.800 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 619.800 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 582.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 582.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 544.680 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 544.680 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 507.120 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 507.120 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 469.560 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 469.560 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 432.000 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 432.000 294.583 37.560 re
+f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 643.080 m
+269.177 643.080 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 619.800 m
+269.177 619.800 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 643.330 m
+48.240 619.050 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.410 m
-48.240 657.350 l
+269.177 643.330 m
+269.177 619.050 l
 S
 [ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 627.3330000000001 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 643.080 m
+563.760 643.080 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 619.800 m
+563.760 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 643.330 m
+269.177 619.050 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 643.330 m
+563.760 619.050 l
 S
 [ ] 0 d
 1 w
@@ -44660,19 +44909,136 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 678.913 Td
+272.17692192000004 627.3330000000001 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 619.800 m
+269.177 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.240 m
+269.177 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 620.050 m
+48.240 581.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.050 m
+269.177 581.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 603.5530000000001 Td
+/F2.0 10.5 Tf
+<6e616d65> Tj
+ET
+
+
+BT
+51.24 589.2730000000001 Td
+ET
+
+
+BT
+51.24 589.2730000000001 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 619.800 m
+563.760 619.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.240 m
+563.760 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 620.050 m
+269.177 581.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 620.050 m
+563.760 581.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 596.4130000000001 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.240 m
+269.177 582.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 544.680 m
+269.177 544.680 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 582.490 m
+48.240 544.430 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 582.490 m
+269.177 544.430 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 565.9930000000002 Td
 /F2.0 10.5 Tf
 <7265736f7572636544657461696c73> Tj
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 551.7130000000001 Td
 ET
 
 
 BT
-51.24 664.6329999999999 Td
+51.24 551.7130000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44680,26 +45046,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 582.240 m
+563.760 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.410 m
-269.177 657.350 l
+269.177 582.490 m
+269.177 544.430 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 695.410 m
-563.760 657.350 l
+563.760 582.490 m
+563.760 544.430 l
 S
 [ ] 0 d
 1 w
@@ -44713,7 +45079,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 671.7729999999999 Td
+272.17692192000004 558.8530000000001 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -44723,26 +45089,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.600 m
-269.177 657.600 l
+48.240 544.680 m
+269.177 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 657.850 m
-48.240 619.790 l
+48.240 544.930 m
+48.240 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 1 w
@@ -44750,19 +45116,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 641.3530000000001 Td
+51.24 528.4330000000002 Td
 /F2.0 10.5 Tf
 <7365727669636544657461696c73> Tj
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 514.1530000000001 Td
 ET
 
 
 BT
-51.24 627.073 Td
+51.24 514.1530000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44770,26 +45136,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.600 m
-563.760 657.600 l
+269.177 544.680 m
+563.760 544.680 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 657.850 m
-269.177 619.790 l
+269.177 544.930 m
+269.177 506.870 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 657.850 m
-563.760 619.790 l
+563.760 544.930 m
+563.760 506.870 l
 S
 [ ] 0 d
 1 w
@@ -44803,7 +45169,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 634.213 Td
+272.17692192000004 521.2930000000001 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -44813,26 +45179,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.040 m
-269.177 620.040 l
+48.240 507.120 m
+269.177 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.290 m
-48.240 582.230 l
+48.240 507.370 m
+48.240 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 1 w
@@ -44840,19 +45206,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.7929999999999 Td
+51.24 490.8730000000001 Td
 /F2.0 10.5 Tf
 <7365727669636555756964> Tj
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 476.5930000000001 Td
 ET
 
 
 BT
-51.24 589.5129999999999 Td
+51.24 476.5930000000001 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44860,26 +45226,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.040 m
-563.760 620.040 l
+269.177 507.120 m
+563.760 507.120 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.290 m
-269.177 582.230 l
+269.177 507.370 m
+269.177 469.310 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.290 m
-563.760 582.230 l
+563.760 507.370 m
+563.760 469.310 l
 S
 [ ] 0 d
 1 w
@@ -44887,7 +45253,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.6529999999999 Td
+272.17692192000004 483.7330000000001 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44895,26 +45261,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.480 m
-269.177 582.480 l
+48.240 469.560 m
+269.177 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 544.920 m
-269.177 544.920 l
+48.240 432.000 m
+269.177 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 582.730 m
-48.240 544.670 l
+48.240 469.810 m
+48.240 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 1 w
@@ -44922,19 +45288,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 566.233 Td
+51.24 453.31300000000016 Td
 /F2.0 10.5 Tf
 <76657273696f6e> Tj
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 439.03300000000013 Td
 ET
 
 
 BT
-51.24 551.953 Td
+51.24 439.03300000000013 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44942,26 +45308,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.480 m
-563.760 582.480 l
+269.177 469.560 m
+563.760 469.560 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 544.920 m
-563.760 544.920 l
+269.177 432.000 m
+563.760 432.000 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 582.730 m
-269.177 544.670 l
+269.177 469.810 m
+269.177 431.750 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 582.730 m
-563.760 544.670 l
+563.760 469.810 m
+563.760 431.750 l
 S
 [ ] 0 d
 1 w
@@ -44969,7 +45335,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 559.093 Td
+272.17692192000004 446.1730000000002 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44999,39 +45365,42 @@ Q
 
 endstream
 endobj
-302 0 obj
+303 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 301 0 R
+/Contents 302 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 587 0 R
+/XObject << /Stamp1 589 0 R
 >>
 >>
-/Annots [303 0 R 304 0 R]
+/Annots [305 0 R 306 0 R]
 >>
 endobj
-303 0 obj
+304 0 obj
+[303 0 R /XYZ 0 683.1600000000001 null]
+endobj
+305 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 668.707 325.32792192000005 682.987]
+/Rect [272.17692192000004 555.7870000000001 325.32792192000005 570.0670000000001]
 /Type /Annot
 >>
 endobj
-304 0 obj
+306 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 631.147 325.32792192000005 645.427]
+/Rect [272.17692192000004 518.2270000000002 325.32792192000005 532.5070000000002]
 /Type /Annot
 >>
 endobj
-305 0 obj
+307 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -45039,7 +45408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-306 0 obj
+308 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -45047,7 +45416,7 @@ endobj
 /Type /Annot
 >>
 endobj
-307 0 obj
+309 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -45055,7 +45424,7 @@ endobj
 /Type /Annot
 >>
 endobj
-308 0 obj
+310 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -45063,7 +45432,7 @@ endobj
 /Type /Annot
 >>
 endobj
-309 0 obj
+311 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -45071,7 +45440,7 @@ endobj
 /Type /Annot
 >>
 endobj
-310 0 obj
+312 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -45079,7 +45448,7 @@ endobj
 /Type /Annot
 >>
 endobj
-311 0 obj
+313 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -45087,7 +45456,7 @@ endobj
 /Type /Annot
 >>
 endobj
-312 0 obj
+314 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -45095,23 +45464,23 @@ endobj
 /Type /Annot
 >>
 endobj
-313 0 obj
+315 0 obj
 << /Border [0 0 0]
-/Dest (_route92)
+/Dest (_route30)
 /Subtype /Link
 /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998]
 /Type /Annot
 >>
 endobj
-314 0 obj
+316 0 obj
 << /Border [0 0 0]
-/Dest (_route92)
+/Dest (_route30)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
 >>
 endobj
-315 0 obj
+317 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -45119,7 +45488,7 @@ endobj
 /Type /Annot
 >>
 endobj
-316 0 obj
+318 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -45127,7 +45496,7 @@ endobj
 /Type /Annot
 >>
 endobj
-317 0 obj
+319 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -45135,7 +45504,7 @@ endobj
 /Type /Annot
 >>
 endobj
-318 0 obj
+320 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -45143,23 +45512,23 @@ endobj
 /Type /Annot
 >>
 endobj
-319 0 obj
+321 0 obj
 << /Border [0 0 0]
-/Dest (_route93)
+/Dest (_route31)
 /Subtype /Link
 /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998]
 /Type /Annot
 >>
 endobj
-320 0 obj
+322 0 obj
 << /Border [0 0 0]
-/Dest (_route93)
+/Dest (_route31)
 /Subtype /Link
 /Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
 /Type /Annot
 >>
 endobj
-321 0 obj
+323 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -45167,7 +45536,7 @@ endobj
 /Type /Annot
 >>
 endobj
-322 0 obj
+324 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -45175,7 +45544,7 @@ endobj
 /Type /Annot
 >>
 endobj
-323 0 obj
+325 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -45183,7 +45552,7 @@ endobj
 /Type /Annot
 >>
 endobj
-324 0 obj
+326 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -45191,23 +45560,23 @@ endobj
 /Type /Annot
 >>
 endobj
-325 0 obj
+327 0 obj
 << /Border [0 0 0]
-/Dest (_route80)
+/Dest (_route18)
 /Subtype /Link
 /Rect [60.24000000000001 510.89999999999975 172.716 525.1799999999997]
 /Type /Annot
 >>
 endobj
-326 0 obj
+328 0 obj
 << /Border [0 0 0]
-/Dest (_route80)
+/Dest (_route18)
 /Subtype /Link
 /Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
 /Type /Annot
 >>
 endobj
-327 0 obj
+329 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -45215,7 +45584,7 @@ endobj
 /Type /Annot
 >>
 endobj
-328 0 obj
+330 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -45223,7 +45592,7 @@ endobj
 /Type /Annot
 >>
 endobj
-329 0 obj
+331 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -45231,7 +45600,7 @@ endobj
 /Type /Annot
 >>
 endobj
-330 0 obj
+332 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -45239,23 +45608,23 @@ endobj
 /Type /Annot
 >>
 endobj
-331 0 obj
+333 0 obj
 << /Border [0 0 0]
-/Dest (_route82)
+/Dest (_route20)
 /Subtype /Link
 /Rect [60.24000000000001 455.4599999999997 172.548 469.73999999999967]
 /Type /Annot
 >>
 endobj
-332 0 obj
+334 0 obj
 << /Border [0 0 0]
-/Dest (_route82)
+/Dest (_route20)
 /Subtype /Link
 /Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
 /Type /Annot
 >>
 endobj
-333 0 obj
+335 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -45263,7 +45632,7 @@ endobj
 /Type /Annot
 >>
 endobj
-334 0 obj
+336 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -45271,7 +45640,7 @@ endobj
 /Type /Annot
 >>
 endobj
-335 0 obj
+337 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -45279,7 +45648,7 @@ endobj
 /Type /Annot
 >>
 endobj
-336 0 obj
+338 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -45287,7 +45656,7 @@ endobj
 /Type /Annot
 >>
 endobj
-337 0 obj
+339 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -45295,7 +45664,7 @@ endobj
 /Type /Annot
 >>
 endobj
-338 0 obj
+340 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -45303,7 +45672,7 @@ endobj
 /Type /Annot
 >>
 endobj
-339 0 obj
+341 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -45311,7 +45680,7 @@ endobj
 /Type /Annot
 >>
 endobj
-340 0 obj
+342 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -45319,7 +45688,7 @@ endobj
 /Type /Annot
 >>
 endobj
-341 0 obj
+343 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_secondary_names_get)
 /Subtype /Link
@@ -45327,7 +45696,7 @@ endobj
 /Type /Annot
 >>
 endobj
-342 0 obj
+344 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_secondary_names_get)
 /Subtype /Link
@@ -45335,7 +45704,7 @@ endobj
 /Type /Annot
 >>
 endobj
-343 0 obj
+345 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -45343,7 +45712,7 @@ endobj
 /Type /Annot
 >>
 endobj
-344 0 obj
+346 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -45351,7 +45720,7 @@ endobj
 /Type /Annot
 >>
 endobj
-345 0 obj
+347 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -45359,7 +45728,7 @@ endobj
 /Type /Annot
 >>
 endobj
-346 0 obj
+348 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -45367,7 +45736,7 @@ endobj
 /Type /Annot
 >>
 endobj
-347 0 obj
+349 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_dictionaryname_get)
 /Subtype /Link
@@ -45375,7 +45744,7 @@ endobj
 /Type /Annot
 >>
 endobj
-348 0 obj
+350 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_dictionaryname_get)
 /Subtype /Link
@@ -45383,7 +45752,7 @@ endobj
 /Type /Annot
 >>
 endobj
-349 0 obj
+351 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -45391,7 +45760,7 @@ endobj
 /Type /Annot
 >>
 endobj
-350 0 obj
+352 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -45399,7 +45768,7 @@ endobj
 /Type /Annot
 >>
 endobj
-351 0 obj
+353 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -45407,7 +45776,7 @@ endobj
 /Type /Annot
 >>
 endobj
-352 0 obj
+354 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -45415,7 +45784,7 @@ endobj
 /Type /Annot
 >>
 endobj
-353 0 obj
+355 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -45423,7 +45792,7 @@ endobj
 /Type /Annot
 >>
 endobj
-354 0 obj
+356 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -45431,7 +45800,7 @@ endobj
 /Type /Annot
 >>
 endobj
-355 0 obj
+357 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_put)
 /Subtype /Link
@@ -45439,7 +45808,7 @@ endobj
 /Type /Annot
 >>
 endobj
-356 0 obj
+358 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_put)
 /Subtype /Link
@@ -45447,7 +45816,7 @@ endobj
 /Type /Annot
 >>
 endobj
-357 0 obj
+359 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -45455,7 +45824,7 @@ endobj
 /Type /Annot
 >>
 endobj
-358 0 obj
+360 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -45463,7 +45832,7 @@ endobj
 /Type /Annot
 >>
 endobj
-359 0 obj
+361 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -45471,7 +45840,7 @@ endobj
 /Type /Annot
 >>
 endobj
-360 0 obj
+362 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -45479,7 +45848,7 @@ endobj
 /Type /Annot
 >>
 endobj
-361 0 obj
+363 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -45487,7 +45856,7 @@ endobj
 /Type /Annot
 >>
 endobj
-362 0 obj
+364 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -45495,7 +45864,7 @@ endobj
 /Type /Annot
 >>
 endobj
-363 0 obj
+365 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -45503,7 +45872,7 @@ endobj
 /Type /Annot
 >>
 endobj
-364 0 obj
+366 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -45511,23 +45880,23 @@ endobj
 /Type /Annot
 >>
 endobj
-365 0 obj
+367 0 obj
 << /Border [0 0 0]
-/Dest (_route84)
+/Dest (_route22)
 /Subtype /Link
 /Rect [60.24000000000001 141.29999999999953 232.70250000000001 155.57999999999953]
 /Type /Annot
 >>
 endobj
-366 0 obj
+368 0 obj
 << /Border [0 0 0]
-/Dest (_route84)
+/Dest (_route22)
 /Subtype /Link
 /Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
 /Type /Annot
 >>
 endobj
-367 0 obj
+369 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -45535,7 +45904,7 @@ endobj
 /Type /Annot
 >>
 endobj
-368 0 obj
+370 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -45543,7 +45912,7 @@ endobj
 /Type /Annot
 >>
 endobj
-369 0 obj
+371 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -45551,7 +45920,7 @@ endobj
 /Type /Annot
 >>
 endobj
-370 0 obj
+372 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -45559,7 +45928,7 @@ endobj
 /Type /Annot
 >>
 endobj
-371 0 obj
+373 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -45567,7 +45936,7 @@ endobj
 /Type /Annot
 >>
 endobj
-372 0 obj
+374 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -45575,7 +45944,7 @@ endobj
 /Type /Annot
 >>
 endobj
-373 0 obj
+375 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_elements_shortname_delete)
 /Subtype /Link
@@ -45583,7 +45952,7 @@ endobj
 /Type /Annot
 >>
 endobj
-374 0 obj
+376 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_elements_shortname_delete)
 /Subtype /Link
@@ -45591,7 +45960,7 @@ endobj
 /Type /Annot
 >>
 endobj
-375 0 obj
+377 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -45599,7 +45968,7 @@ endobj
 /Type /Annot
 >>
 endobj
-376 0 obj
+378 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -45607,7 +45976,7 @@ endobj
 /Type /Annot
 >>
 endobj
-377 0 obj
+379 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -45615,7 +45984,7 @@ endobj
 /Type /Annot
 >>
 endobj
-378 0 obj
+380 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -45623,7 +45992,7 @@ endobj
 /Type /Annot
 >>
 endobj
-379 0 obj
+381 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -45631,7 +46000,7 @@ endobj
 /Type /Annot
 >>
 endobj
-380 0 obj
+382 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -45639,23 +46008,23 @@ endobj
 /Type /Annot
 >>
 endobj
-381 0 obj
+383 0 obj
 << /Border [0 0 0]
-/Dest (_route76)
+/Dest (_route14)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 245.15550000000002 719.04]
 /Type /Annot
 >>
 endobj
-382 0 obj
+384 0 obj
 << /Border [0 0 0]
-/Dest (_route76)
+/Dest (_route14)
 /Subtype /Link
 /Rect [557.8905 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-383 0 obj
+385 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -45663,7 +46032,7 @@ endobj
 /Type /Annot
 >>
 endobj
-384 0 obj
+386 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -45671,7 +46040,7 @@ endobj
 /Type /Annot
 >>
 endobj
-385 0 obj
+387 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -45679,7 +46048,7 @@ endobj
 /Type /Annot
 >>
 endobj
-386 0 obj
+388 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -45687,23 +46056,23 @@ endobj
 /Type /Annot
 >>
 endobj
-387 0 obj
+389 0 obj
 << /Border [0 0 0]
-/Dest (_route70)
+/Dest (_route8)
 /Subtype /Link
 /Rect [60.24000000000001 649.3199999999998 248.431294921875 663.5999999999999]
 /Type /Annot
 >>
 endobj
-388 0 obj
+390 0 obj
 << /Border [0 0 0]
-/Dest (_route70)
+/Dest (_route8)
 /Subtype /Link
 /Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
-389 0 obj
+391 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -45711,7 +46080,7 @@ endobj
 /Type /Annot
 >>
 endobj
-390 0 obj
+392 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -45719,7 +46088,7 @@ endobj
 /Type /Annot
 >>
 endobj
-391 0 obj
+393 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -45727,7 +46096,7 @@ endobj
 /Type /Annot
 >>
 endobj
-392 0 obj
+394 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -45735,7 +46104,7 @@ endobj
 /Type /Annot
 >>
 endobj
-393 0 obj
+395 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -45743,7 +46112,7 @@ endobj
 /Type /Annot
 >>
 endobj
-394 0 obj
+396 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -45751,23 +46120,23 @@ endobj
 /Type /Annot
 >>
 endobj
-395 0 obj
+397 0 obj
 << /Border [0 0 0]
-/Dest (_route64)
+/Dest (_route2)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 214.8735 589.6799999999998]
 /Type /Annot
 >>
 endobj
-396 0 obj
+398 0 obj
 << /Border [0 0 0]
-/Dest (_route64)
+/Dest (_route2)
 /Subtype /Link
 /Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-397 0 obj
+399 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -45775,7 +46144,7 @@ endobj
 /Type /Annot
 >>
 endobj
-398 0 obj
+400 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -45783,7 +46152,7 @@ endobj
 /Type /Annot
 >>
 endobj
-399 0 obj
+401 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -45791,7 +46160,7 @@ endobj
 /Type /Annot
 >>
 endobj
-400 0 obj
+402 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -45799,23 +46168,23 @@ endobj
 /Type /Annot
 >>
 endobj
-401 0 obj
+403 0 obj
 << /Border [0 0 0]
-/Dest (_route77)
+/Dest (_route15)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 259.467 534.2399999999998]
 /Type /Annot
 >>
 endobj
-402 0 obj
+404 0 obj
 << /Border [0 0 0]
-/Dest (_route77)
+/Dest (_route15)
 /Subtype /Link
 /Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-403 0 obj
+405 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -45823,7 +46192,7 @@ endobj
 /Type /Annot
 >>
 endobj
-404 0 obj
+406 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -45831,7 +46200,7 @@ endobj
 /Type /Annot
 >>
 endobj
-405 0 obj
+407 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -45839,7 +46208,7 @@ endobj
 /Type /Annot
 >>
 endobj
-406 0 obj
+408 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -45847,7 +46216,7 @@ endobj
 /Type /Annot
 >>
 endobj
-407 0 obj
+409 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -45855,7 +46224,7 @@ endobj
 /Type /Annot
 >>
 endobj
-408 0 obj
+410 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -45863,23 +46232,23 @@ endobj
 /Type /Annot
 >>
 endobj
-409 0 obj
+411 0 obj
 << /Border [0 0 0]
-/Dest (_route71)
+/Dest (_route9)
 /Subtype /Link
 /Rect [60.24000000000001 446.03999999999974 355.8885 460.3199999999997]
 /Type /Annot
 >>
 endobj
-410 0 obj
+412 0 obj
 << /Border [0 0 0]
-/Dest (_route71)
+/Dest (_route9)
 /Subtype /Link
 /Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-411 0 obj
+413 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -45887,7 +46256,7 @@ endobj
 /Type /Annot
 >>
 endobj
-412 0 obj
+414 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -45895,7 +46264,7 @@ endobj
 /Type /Annot
 >>
 endobj
-413 0 obj
+415 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -45903,7 +46272,7 @@ endobj
 /Type /Annot
 >>
 endobj
-414 0 obj
+416 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -45911,7 +46280,7 @@ endobj
 /Type /Annot
 >>
 endobj
-415 0 obj
+417 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -45919,7 +46288,7 @@ endobj
 /Type /Annot
 >>
 endobj
-416 0 obj
+418 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -45927,23 +46296,23 @@ endobj
 /Type /Annot
 >>
 endobj
-417 0 obj
+419 0 obj
 << /Border [0 0 0]
-/Dest (_route74)
+/Dest (_route12)
 /Subtype /Link
 /Rect [60.24000000000001 372.11999999999966 248.45250000000001 386.39999999999964]
 /Type /Annot
 >>
 endobj
-418 0 obj
+420 0 obj
 << /Border [0 0 0]
-/Dest (_route74)
+/Dest (_route12)
 /Subtype /Link
 /Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-419 0 obj
+421 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -45951,7 +46320,7 @@ endobj
 /Type /Annot
 >>
 endobj
-420 0 obj
+422 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -45959,7 +46328,7 @@ endobj
 /Type /Annot
 >>
 endobj
-421 0 obj
+423 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -45967,7 +46336,7 @@ endobj
 /Type /Annot
 >>
 endobj
-422 0 obj
+424 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -45975,7 +46344,7 @@ endobj
 /Type /Annot
 >>
 endobj
-423 0 obj
+425 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -45983,7 +46352,7 @@ endobj
 /Type /Annot
 >>
 endobj
-424 0 obj
+426 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -45991,23 +46360,23 @@ endobj
 /Type /Annot
 >>
 endobj
-425 0 obj
+427 0 obj
 << /Border [0 0 0]
-/Dest (_route73)
+/Dest (_route11)
 /Subtype /Link
 /Rect [60.24000000000001 298.1999999999996 235.842 312.47999999999956]
 /Type /Annot
 >>
 endobj
-426 0 obj
+428 0 obj
 << /Border [0 0 0]
-/Dest (_route73)
+/Dest (_route11)
 /Subtype /Link
 /Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
-427 0 obj
+429 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -46015,7 +46384,7 @@ endobj
 /Type /Annot
 >>
 endobj
-428 0 obj
+430 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -46023,7 +46392,7 @@ endobj
 /Type /Annot
 >>
 endobj
-429 0 obj
+431 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -46031,7 +46400,7 @@ endobj
 /Type /Annot
 >>
 endobj
-430 0 obj
+432 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -46039,7 +46408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-431 0 obj
+433 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -46047,7 +46416,7 @@ endobj
 /Type /Annot
 >>
 endobj
-432 0 obj
+434 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -46055,23 +46424,23 @@ endobj
 /Type /Annot
 >>
 endobj
-433 0 obj
+435 0 obj
 << /Border [0 0 0]
-/Dest (_route75)
+/Dest (_route13)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 249.70200000000003 238.55999999999952]
 /Type /Annot
 >>
 endobj
-434 0 obj
+436 0 obj
 << /Border [0 0 0]
-/Dest (_route75)
+/Dest (_route13)
 /Subtype /Link
 /Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-435 0 obj
+437 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -46079,7 +46448,7 @@ endobj
 /Type /Annot
 >>
 endobj
-436 0 obj
+438 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -46087,7 +46456,7 @@ endobj
 /Type /Annot
 >>
 endobj
-437 0 obj
+439 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -46095,7 +46464,7 @@ endobj
 /Type /Annot
 >>
 endobj
-438 0 obj
+440 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -46103,7 +46472,7 @@ endobj
 /Type /Annot
 >>
 endobj
-439 0 obj
+441 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -46111,7 +46480,7 @@ endobj
 /Type /Annot
 >>
 endobj
-440 0 obj
+442 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -46119,23 +46488,23 @@ endobj
 /Type /Annot
 >>
 endobj
-441 0 obj
+443 0 obj
 << /Border [0 0 0]
-/Dest (_route66)
+/Dest (_route4)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 307.641 164.63999999999956]
 /Type /Annot
 >>
 endobj
-442 0 obj
+444 0 obj
 << /Border [0 0 0]
-/Dest (_route66)
+/Dest (_route4)
 /Subtype /Link
 /Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-443 0 obj
+445 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -46143,7 +46512,7 @@ endobj
 /Type /Annot
 >>
 endobj
-444 0 obj
+446 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -46151,7 +46520,7 @@ endobj
 /Type /Annot
 >>
 endobj
-445 0 obj
+447 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -46159,7 +46528,7 @@ endobj
 /Type /Annot
 >>
 endobj
-446 0 obj
+448 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -46167,7 +46536,7 @@ endobj
 /Type /Annot
 >>
 endobj
-447 0 obj
+449 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -46175,7 +46544,7 @@ endobj
 /Type /Annot
 >>
 endobj
-448 0 obj
+450 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -46183,23 +46552,23 @@ endobj
 /Type /Annot
 >>
 endobj
-449 0 obj
+451 0 obj
 << /Border [0 0 0]
-/Dest (_route72)
+/Dest (_route10)
 /Subtype /Link
 /Rect [60.24000000000001 76.4399999999996 261.860794921875 90.7199999999996]
 /Type /Annot
 >>
 endobj
-450 0 obj
+452 0 obj
 << /Border [0 0 0]
-/Dest (_route72)
+/Dest (_route10)
 /Subtype /Link
 /Rect [557.8905 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
-451 0 obj
+453 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -46207,7 +46576,7 @@ endobj
 /Type /Annot
 >>
 endobj
-452 0 obj
+454 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -46215,7 +46584,7 @@ endobj
 /Type /Annot
 >>
 endobj
-453 0 obj
+455 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -46223,7 +46592,7 @@ endobj
 /Type /Annot
 >>
 endobj
-454 0 obj
+456 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -46231,7 +46600,7 @@ endobj
 /Type /Annot
 >>
 endobj
-455 0 obj
+457 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -46239,7 +46608,7 @@ endobj
 /Type /Annot
 >>
 endobj
-456 0 obj
+458 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -46247,23 +46616,23 @@ endobj
 /Type /Annot
 >>
 endobj
-457 0 obj
+459 0 obj
 << /Border [0 0 0]
-/Dest (_route67)
+/Dest (_route5)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 339.560794921875 719.04]
 /Type /Annot
 >>
 endobj
-458 0 obj
+460 0 obj
 << /Border [0 0 0]
-/Dest (_route67)
+/Dest (_route5)
 /Subtype /Link
 /Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-459 0 obj
+461 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -46271,7 +46640,7 @@ endobj
 /Type /Annot
 >>
 endobj
-460 0 obj
+462 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -46279,7 +46648,7 @@ endobj
 /Type /Annot
 >>
 endobj
-461 0 obj
+463 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -46287,7 +46656,7 @@ endobj
 /Type /Annot
 >>
 endobj
-462 0 obj
+464 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -46295,7 +46664,7 @@ endobj
 /Type /Annot
 >>
 endobj
-463 0 obj
+465 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -46303,7 +46672,7 @@ endobj
 /Type /Annot
 >>
 endobj
-464 0 obj
+466 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -46311,7 +46680,7 @@ endobj
 /Type /Annot
 >>
 endobj
-465 0 obj
+467 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -46319,7 +46688,7 @@ endobj
 /Type /Annot
 >>
 endobj
-466 0 obj
+468 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -46327,23 +46696,23 @@ endobj
 /Type /Annot
 >>
 endobj
-467 0 obj
+469 0 obj
 << /Border [0 0 0]
-/Dest (_route69)
+/Dest (_route7)
 /Subtype /Link
 /Rect [60.24000000000001 612.3599999999998 350.38629492187505 626.6399999999999]
 /Type /Annot
 >>
 endobj
-468 0 obj
+470 0 obj
 << /Border [0 0 0]
-/Dest (_route69)
+/Dest (_route7)
 /Subtype /Link
 /Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
-469 0 obj
+471 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -46351,7 +46720,7 @@ endobj
 /Type /Annot
 >>
 endobj
-470 0 obj
+472 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -46359,7 +46728,7 @@ endobj
 /Type /Annot
 >>
 endobj
-471 0 obj
+473 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -46367,7 +46736,7 @@ endobj
 /Type /Annot
 >>
 endobj
-472 0 obj
+474 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -46375,7 +46744,7 @@ endobj
 /Type /Annot
 >>
 endobj
-473 0 obj
+475 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -46383,7 +46752,7 @@ endobj
 /Type /Annot
 >>
 endobj
-474 0 obj
+476 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -46391,7 +46760,7 @@ endobj
 /Type /Annot
 >>
 endobj
-475 0 obj
+477 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -46399,7 +46768,7 @@ endobj
 /Type /Annot
 >>
 endobj
-476 0 obj
+478 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -46407,23 +46776,23 @@ endobj
 /Type /Annot
 >>
 endobj
-477 0 obj
+479 0 obj
 << /Border [0 0 0]
-/Dest (_route68)
+/Dest (_route6)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 352.81158984375 534.2399999999998]
 /Type /Annot
 >>
 endobj
-478 0 obj
+480 0 obj
 << /Border [0 0 0]
-/Dest (_route68)
+/Dest (_route6)
 /Subtype /Link
 /Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-479 0 obj
+481 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -46431,7 +46800,7 @@ endobj
 /Type /Annot
 >>
 endobj
-480 0 obj
+482 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -46439,7 +46808,7 @@ endobj
 /Type /Annot
 >>
 endobj
-481 0 obj
+483 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -46447,7 +46816,7 @@ endobj
 /Type /Annot
 >>
 endobj
-482 0 obj
+484 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -46455,7 +46824,7 @@ endobj
 /Type /Annot
 >>
 endobj
-483 0 obj
+485 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -46463,7 +46832,7 @@ endobj
 /Type /Annot
 >>
 endobj
-484 0 obj
+486 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -46471,7 +46840,7 @@ endobj
 /Type /Annot
 >>
 endobj
-485 0 obj
+487 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -46479,7 +46848,7 @@ endobj
 /Type /Annot
 >>
 endobj
-486 0 obj
+488 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -46487,23 +46856,23 @@ endobj
 /Type /Annot
 >>
 endobj
-487 0 obj
+489 0 obj
 << /Border [0 0 0]
-/Dest (_route65)
+/Dest (_route3)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 212.0595 441.8399999999997]
 /Type /Annot
 >>
 endobj
-488 0 obj
+490 0 obj
 << /Border [0 0 0]
-/Dest (_route65)
+/Dest (_route3)
 /Subtype /Link
 /Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-489 0 obj
+491 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -46511,7 +46880,7 @@ endobj
 /Type /Annot
 >>
 endobj
-490 0 obj
+492 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -46519,7 +46888,7 @@ endobj
 /Type /Annot
 >>
 endobj
-491 0 obj
+493 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -46527,7 +46896,7 @@ endobj
 /Type /Annot
 >>
 endobj
-492 0 obj
+494 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -46535,7 +46904,7 @@ endobj
 /Type /Annot
 >>
 endobj
-493 0 obj
+495 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -46543,7 +46912,7 @@ endobj
 /Type /Annot
 >>
 endobj
-494 0 obj
+496 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -46551,23 +46920,23 @@ endobj
 /Type /Annot
 >>
 endobj
-495 0 obj
+497 0 obj
 << /Border [0 0 0]
-/Dest (_route87)
+/Dest (_route25)
 /Subtype /Link
 /Rect [60.24000000000001 353.63999999999965 221.091755859375 367.9199999999996]
 /Type /Annot
 >>
 endobj
-496 0 obj
+498 0 obj
 << /Border [0 0 0]
-/Dest (_route87)
+/Dest (_route25)
 /Subtype /Link
 /Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
-497 0 obj
+499 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -46575,7 +46944,7 @@ endobj
 /Type /Annot
 >>
 endobj
-498 0 obj
+500 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -46583,7 +46952,7 @@ endobj
 /Type /Annot
 >>
 endobj
-499 0 obj
+501 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -46591,7 +46960,7 @@ endobj
 /Type /Annot
 >>
 endobj
-500 0 obj
+502 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -46599,7 +46968,7 @@ endobj
 /Type /Annot
 >>
 endobj
-501 0 obj
+503 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
 /Subtype /Link
@@ -46607,7 +46976,7 @@ endobj
 /Type /Annot
 >>
 endobj
-502 0 obj
+504 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
 /Subtype /Link
@@ -46615,7 +46984,7 @@ endobj
 /Type /Annot
 >>
 endobj
-503 0 obj
+505 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -46623,7 +46992,7 @@ endobj
 /Type /Annot
 >>
 endobj
-504 0 obj
+506 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -46631,7 +47000,7 @@ endobj
 /Type /Annot
 >>
 endobj
-505 0 obj
+507 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -46639,7 +47008,7 @@ endobj
 /Type /Annot
 >>
 endobj
-506 0 obj
+508 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -46647,7 +47016,7 @@ endobj
 /Type /Annot
 >>
 endobj
-507 0 obj
+509 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -46655,7 +47024,7 @@ endobj
 /Type /Annot
 >>
 endobj
-508 0 obj
+510 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -46663,7 +47032,7 @@ endobj
 /Type /Annot
 >>
 endobj
-509 0 obj
+511 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_policymodeltype_get)
 /Subtype /Link
@@ -46671,7 +47040,7 @@ endobj
 /Type /Annot
 >>
 endobj
-510 0 obj
+512 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_policymodeltype_get)
 /Subtype /Link
@@ -46679,7 +47048,7 @@ endobj
 /Type /Annot
 >>
 endobj
-511 0 obj
+513 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -46687,7 +47056,7 @@ endobj
 /Type /Annot
 >>
 endobj
-512 0 obj
+514 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -46695,7 +47064,7 @@ endobj
 /Type /Annot
 >>
 endobj
-513 0 obj
+515 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -46703,7 +47072,7 @@ endobj
 /Type /Annot
 >>
 endobj
-514 0 obj
+516 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -46711,7 +47080,7 @@ endobj
 /Type /Annot
 >>
 endobj
-515 0 obj
+517 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -46719,7 +47088,7 @@ endobj
 /Type /Annot
 >>
 endobj
-516 0 obj
+518 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -46727,23 +47096,23 @@ endobj
 /Type /Annot
 >>
 endobj
-517 0 obj
+519 0 obj
 << /Border [0 0 0]
-/Dest (_route88)
+/Dest (_route26)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 318.73125585937504 164.63999999999956]
 /Type /Annot
 >>
 endobj
-518 0 obj
+520 0 obj
 << /Border [0 0 0]
-/Dest (_route88)
+/Dest (_route26)
 /Subtype /Link
 /Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-519 0 obj
+521 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -46751,7 +47120,7 @@ endobj
 /Type /Annot
 >>
 endobj
-520 0 obj
+522 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -46759,7 +47128,7 @@ endobj
 /Type /Annot
 >>
 endobj
-521 0 obj
+523 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -46767,7 +47136,7 @@ endobj
 /Type /Annot
 >>
 endobj
-522 0 obj
+524 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -46775,7 +47144,7 @@ endobj
 /Type /Annot
 >>
 endobj
-523 0 obj
+525 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -46783,7 +47152,7 @@ endobj
 /Type /Annot
 >>
 endobj
-524 0 obj
+526 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -46791,7 +47160,7 @@ endobj
 /Type /Annot
 >>
 endobj
-525 0 obj
+527 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -46799,7 +47168,7 @@ endobj
 /Type /Annot
 >>
 endobj
-526 0 obj
+528 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -46807,23 +47176,23 @@ endobj
 /Type /Annot
 >>
 endobj
-527 0 obj
+529 0 obj
 << /Border [0 0 0]
-/Dest (_route91)
+/Dest (_route29)
 /Subtype /Link
 /Rect [60.24000000000001 57.95999999999961 175.8555 72.23999999999961]
 /Type /Annot
 >>
 endobj
-528 0 obj
+530 0 obj
 << /Border [0 0 0]
-/Dest (_route91)
+/Dest (_route29)
 /Subtype /Link
 /Rect [552.021 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
-529 0 obj
+531 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -46831,7 +47200,7 @@ endobj
 /Type /Annot
 >>
 endobj
-530 0 obj
+532 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -46839,7 +47208,7 @@ endobj
 /Type /Annot
 >>
 endobj
-531 0 obj
+533 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -46847,7 +47216,7 @@ endobj
 /Type /Annot
 >>
 endobj
-532 0 obj
+534 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -46855,7 +47224,7 @@ endobj
 /Type /Annot
 >>
 endobj
-533 0 obj
+535 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_names_get)
 /Subtype /Link
@@ -46863,7 +47232,7 @@ endobj
 /Type /Annot
 >>
 endobj
-534 0 obj
+536 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_names_get)
 /Subtype /Link
@@ -46871,7 +47240,7 @@ endobj
 /Type /Annot
 >>
 endobj
-535 0 obj
+537 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -46879,7 +47248,7 @@ endobj
 /Type /Annot
 >>
 endobj
-536 0 obj
+538 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -46887,7 +47256,7 @@ endobj
 /Type /Annot
 >>
 endobj
-537 0 obj
+539 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -46895,7 +47264,7 @@ endobj
 /Type /Annot
 >>
 endobj
-538 0 obj
+540 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -46903,7 +47272,7 @@ endobj
 /Type /Annot
 >>
 endobj
-539 0 obj
+541 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_templatename_get)
 /Subtype /Link
@@ -46911,7 +47280,7 @@ endobj
 /Type /Annot
 >>
 endobj
-540 0 obj
+542 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_templatename_get)
 /Subtype /Link
@@ -46919,7 +47288,7 @@ endobj
 /Type /Annot
 >>
 endobj
-541 0 obj
+543 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -46927,7 +47296,7 @@ endobj
 /Type /Annot
 >>
 endobj
-542 0 obj
+544 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -46935,7 +47304,7 @@ endobj
 /Type /Annot
 >>
 endobj
-543 0 obj
+545 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -46943,7 +47312,7 @@ endobj
 /Type /Annot
 >>
 endobj
-544 0 obj
+546 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -46951,7 +47320,7 @@ endobj
 /Type /Annot
 >>
 endobj
-545 0 obj
+547 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -46959,7 +47328,7 @@ endobj
 /Type /Annot
 >>
 endobj
-546 0 obj
+548 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -46967,7 +47336,7 @@ endobj
 /Type /Annot
 >>
 endobj
-547 0 obj
+549 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -46975,7 +47344,7 @@ endobj
 /Type /Annot
 >>
 endobj
-548 0 obj
+550 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -46983,7 +47352,7 @@ endobj
 /Type /Annot
 >>
 endobj
-549 0 obj
+551 0 obj
 << /Border [0 0 0]
 /Dest (_cldshealthcheck)
 /Subtype /Link
@@ -46991,7 +47360,7 @@ endobj
 /Type /Annot
 >>
 endobj
-550 0 obj
+552 0 obj
 << /Border [0 0 0]
 /Dest (_cldshealthcheck)
 /Subtype /Link
@@ -46999,7 +47368,7 @@ endobj
 /Type /Annot
 >>
 endobj
-551 0 obj
+553 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -47007,7 +47376,7 @@ endobj
 /Type /Annot
 >>
 endobj
-552 0 obj
+554 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -47015,7 +47384,7 @@ endobj
 /Type /Annot
 >>
 endobj
-553 0 obj
+555 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -47023,7 +47392,7 @@ endobj
 /Type /Annot
 >>
 endobj
-554 0 obj
+556 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -47031,7 +47400,7 @@ endobj
 /Type /Annot
 >>
 endobj
-555 0 obj
+557 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -47039,7 +47408,7 @@ endobj
 /Type /Annot
 >>
 endobj
-556 0 obj
+558 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -47047,7 +47416,7 @@ endobj
 /Type /Annot
 >>
 endobj
-557 0 obj
+559 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -47055,7 +47424,7 @@ endobj
 /Type /Annot
 >>
 endobj
-558 0 obj
+560 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -47063,7 +47432,7 @@ endobj
 /Type /Annot
 >>
 endobj
-559 0 obj
+561 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -47071,7 +47440,7 @@ endobj
 /Type /Annot
 >>
 endobj
-560 0 obj
+562 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -47079,7 +47448,7 @@ endobj
 /Type /Annot
 >>
 endobj
-561 0 obj
+563 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -47087,7 +47456,7 @@ endobj
 /Type /Annot
 >>
 endobj
-562 0 obj
+564 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -47095,7 +47464,7 @@ endobj
 /Type /Annot
 >>
 endobj
-563 0 obj
+565 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -47103,7 +47472,7 @@ endobj
 /Type /Annot
 >>
 endobj
-564 0 obj
+566 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -47111,7 +47480,7 @@ endobj
 /Type /Annot
 >>
 endobj
-565 0 obj
+567 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -47119,7 +47488,7 @@ endobj
 /Type /Annot
 >>
 endobj
-566 0 obj
+568 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -47127,7 +47496,7 @@ endobj
 /Type /Annot
 >>
 endobj
-567 0 obj
+569 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -47135,7 +47504,7 @@ endobj
 /Type /Annot
 >>
 endobj
-568 0 obj
+570 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -47143,7 +47512,7 @@ endobj
 /Type /Annot
 >>
 endobj
-569 0 obj
+571 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -47151,7 +47520,7 @@ endobj
 /Type /Annot
 >>
 endobj
-570 0 obj
+572 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -47159,7 +47528,7 @@ endobj
 /Type /Annot
 >>
 endobj
-571 0 obj
+573 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -47167,7 +47536,7 @@ endobj
 /Type /Annot
 >>
 endobj
-572 0 obj
+574 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -47175,7 +47544,7 @@ endobj
 /Type /Annot
 >>
 endobj
-573 0 obj
+575 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -47183,7 +47552,7 @@ endobj
 /Type /Annot
 >>
 endobj
-574 0 obj
+576 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -47191,7 +47560,7 @@ endobj
 /Type /Annot
 >>
 endobj
-575 0 obj
+577 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -47199,7 +47568,7 @@ endobj
 /Type /Annot
 >>
 endobj
-576 0 obj
+578 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -47207,7 +47576,7 @@ endobj
 /Type /Annot
 >>
 endobj
-577 0 obj
+579 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -47215,7 +47584,7 @@ endobj
 /Type /Annot
 >>
 endobj
-578 0 obj
+580 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -47223,7 +47592,7 @@ endobj
 /Type /Annot
 >>
 endobj
-579 0 obj
+581 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -47231,7 +47600,7 @@ endobj
 /Type /Annot
 >>
 endobj
-580 0 obj
+582 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -47239,7 +47608,7 @@ endobj
 /Type /Annot
 >>
 endobj
-581 0 obj
+583 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -47247,7 +47616,7 @@ endobj
 /Type /Annot
 >>
 endobj
-582 0 obj
+584 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -47255,7 +47624,7 @@ endobj
 /Type /Annot
 >>
 endobj
-583 0 obj
+585 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -47263,7 +47632,7 @@ endobj
 /Type /Annot
 >>
 endobj
-584 0 obj
+586 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -47271,7 +47640,7 @@ endobj
 /Type /Annot
 >>
 endobj
-585 0 obj
+587 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -47279,7 +47648,7 @@ endobj
 /Type /Annot
 >>
 endobj
-586 0 obj
+588 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -47287,7 +47656,7 @@ endobj
 /Type /Annot
 >>
 endobj
-587 0 obj
+589 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 612.0 792.0]
@@ -47315,1299 +47684,1299 @@ Q
 
 endstream
 endobj
-588 0 obj
+590 0 obj
 << /Type /Outlines
 /Count 143
-/First 589 0 R
-/Last 712 0 R
+/First 591 0 R
+/Last 714 0 R
 >>
 endobj
-589 0 obj
+591 0 obj
 << /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
-/Parent 588 0 R
+/Parent 590 0 R
 /Count 0
-/Next 590 0 R
+/Next 592 0 R
 /Dest [7 0 R /XYZ 0 792.0 null]
 >>
 endobj
-590 0 obj
+592 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 588 0 R
+/Parent 590 0 R
 /Count 0
-/Next 591 0 R
-/Prev 589 0 R
+/Next 593 0 R
+/Prev 591 0 R
 /Dest [10 0 R /XYZ 0 792.0 null]
 >>
 endobj
-591 0 obj
+593 0 obj
 << /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
-/Parent 588 0 R
+/Parent 590 0 R
 /Count 2
-/First 592 0 R
-/Last 593 0 R
-/Next 594 0 R
-/Prev 590 0 R
+/First 594 0 R
+/Last 595 0 R
+/Next 596 0 R
+/Prev 592 0 R
 /Dest [18 0 R /XYZ 0 792.0 null]
 >>
 endobj
-592 0 obj
+594 0 obj
 << /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
-/Parent 591 0 R
+/Parent 593 0 R
 /Count 0
-/Next 593 0 R
+/Next 595 0 R
 /Dest [18 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-593 0 obj
+595 0 obj
 << /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
-/Parent 591 0 R
+/Parent 593 0 R
 /Count 0
-/Prev 592 0 R
+/Prev 594 0 R
 /Dest [18 0 R /XYZ 0 644.22 null]
 >>
 endobj
-594 0 obj
+596 0 obj
 << /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
-/Parent 588 0 R
+/Parent 590 0 R
 /Count 117
-/First 595 0 R
-/Last 708 0 R
-/Next 712 0 R
-/Prev 591 0 R
+/First 597 0 R
+/Last 710 0 R
+/Next 714 0 R
+/Prev 593 0 R
 /Dest [27 0 R /XYZ 0 792.0 null]
 >>
 endobj
-595 0 obj
+597 0 obj
 << /Title <feff0032002e0031002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 596 0 R
-/Last 597 0 R
-/Next 598 0 R
+/First 598 0 R
+/Last 599 0 R
+/Next 600 0 R
 /Dest [27 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-596 0 obj
+598 0 obj
 << /Title <feff0032002e0031002e0031002e00200052006500730070006f006e007300650073>
-/Parent 595 0 R
+/Parent 597 0 R
 /Count 0
-/Next 597 0 R
+/Next 599 0 R
 /Dest [27 0 R /XYZ 0 672.0 null]
 >>
 endobj
-597 0 obj
+599 0 obj
 << /Title <feff0032002e0031002e0032002e002000500072006f00640075006300650073>
-/Parent 595 0 R
+/Parent 597 0 R
 /Count 0
-/Prev 596 0 R
+/Prev 598 0 R
 /Dest [27 0 R /XYZ 0 566.8800000000001 null]
 >>
 endobj
-598 0 obj
+600 0 obj
 << /Title <feff0032002e0032002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 599 0 R
-/Last 600 0 R
-/Next 601 0 R
-/Prev 595 0 R
+/First 601 0 R
+/Last 602 0 R
+/Next 603 0 R
+/Prev 597 0 R
 /Dest [27 0 R /XYZ 0 510.60000000000025 null]
 >>
 endobj
-599 0 obj
+601 0 obj
 << /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 598 0 R
+/Parent 600 0 R
 /Count 0
-/Next 600 0 R
+/Next 602 0 R
 /Dest [27 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-600 0 obj
+602 0 obj
 << /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
-/Parent 598 0 R
+/Parent 600 0 R
 /Count 0
-/Prev 599 0 R
+/Prev 601 0 R
 /Dest [27 0 R /XYZ 0 379.6800000000002 null]
 >>
 endobj
-601 0 obj
+603 0 obj
 << /Title <feff0032002e0033002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 602 0 R
-/Last 603 0 R
-/Next 604 0 R
-/Prev 598 0 R
+/First 604 0 R
+/Last 605 0 R
+/Next 606 0 R
+/Prev 600 0 R
 /Dest [27 0 R /XYZ 0 323.40000000000015 null]
 >>
 endobj
-602 0 obj
+604 0 obj
 << /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 601 0 R
+/Parent 603 0 R
 /Count 0
-/Next 603 0 R
+/Next 605 0 R
 /Dest [27 0 R /XYZ 0 283.3200000000001 null]
 >>
 endobj
-603 0 obj
+605 0 obj
 << /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
-/Parent 601 0 R
+/Parent 603 0 R
 /Count 0
-/Prev 602 0 R
+/Prev 604 0 R
 /Dest [27 0 R /XYZ 0 178.2000000000001 null]
 >>
 endobj
-604 0 obj
+606 0 obj
 << /Title <feff0032002e0034002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 594 0 R
-/Count 4
-/First 605 0 R
-/Last 608 0 R
-/Next 609 0 R
-/Prev 601 0 R
+/Parent 596 0 R
+/Count 4
+/First 607 0 R
+/Last 610 0 R
+/Next 611 0 R
+/Prev 603 0 R
 /Dest [27 0 R /XYZ 0 121.92000000000007 null]
 >>
 endobj
-605 0 obj
+607 0 obj
 << /Title <feff0032002e0034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 604 0 R
+/Parent 606 0 R
 /Count 0
-/Next 606 0 R
+/Next 608 0 R
 /Dest [43 0 R /XYZ 0 792.0 null]
 >>
 endobj
-606 0 obj
+608 0 obj
 << /Title <feff0032002e0034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 604 0 R
+/Parent 606 0 R
 /Count 0
-/Next 607 0 R
-/Prev 605 0 R
+/Next 609 0 R
+/Prev 607 0 R
 /Dest [43 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-607 0 obj
+609 0 obj
 << /Title <feff0032002e0034002e0033002e00200043006f006e00730075006d00650073>
-/Parent 604 0 R
+/Parent 606 0 R
 /Count 0
-/Next 608 0 R
-/Prev 606 0 R
+/Next 610 0 R
+/Prev 608 0 R
 /Dest [43 0 R /XYZ 0 548.1600000000003 null]
 >>
 endobj
-608 0 obj
+610 0 obj
 << /Title <feff0032002e0034002e0034002e002000500072006f00640075006300650073>
-/Parent 604 0 R
+/Parent 606 0 R
 /Count 0
-/Prev 607 0 R
+/Prev 609 0 R
 /Dest [43 0 R /XYZ 0 491.88000000000045 null]
 >>
 endobj
-609 0 obj
+611 0 obj
 << /Title <feff0032002e0035002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007300650063006f006e0064006100720079002f006e0061006d00650073>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 610 0 R
-/Last 611 0 R
-/Next 612 0 R
-/Prev 604 0 R
+/First 612 0 R
+/Last 613 0 R
+/Next 614 0 R
+/Prev 606 0 R
 /Dest [43 0 R /XYZ 0 435.6000000000004 null]
 >>
 endobj
-610 0 obj
+612 0 obj
 << /Title <feff0032002e0035002e0031002e00200052006500730070006f006e007300650073>
-/Parent 609 0 R
+/Parent 611 0 R
 /Count 0
-/Next 611 0 R
+/Next 613 0 R
 /Dest [43 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
-611 0 obj
+613 0 obj
 << /Title <feff0032002e0035002e0032002e002000500072006f00640075006300650073>
-/Parent 609 0 R
+/Parent 611 0 R
 /Count 0
-/Prev 610 0 R
+/Prev 612 0 R
 /Dest [43 0 R /XYZ 0 290.4000000000003 null]
 >>
 endobj
-612 0 obj
+614 0 obj
 << /Title <feff0032002e0036002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 613 0 R
-/Last 615 0 R
-/Next 616 0 R
-/Prev 609 0 R
+/First 615 0 R
+/Last 617 0 R
+/Next 618 0 R
+/Prev 611 0 R
 /Dest [43 0 R /XYZ 0 234.1200000000003 null]
 >>
 endobj
-613 0 obj
+615 0 obj
 << /Title <feff0032002e0036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 612 0 R
+/Parent 614 0 R
 /Count 0
-/Next 614 0 R
+/Next 616 0 R
 /Dest [43 0 R /XYZ 0 194.04000000000028 null]
 >>
 endobj
-614 0 obj
+616 0 obj
 << /Title <feff0032002e0036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 612 0 R
+/Parent 614 0 R
 /Count 0
-/Next 615 0 R
-/Prev 613 0 R
+/Next 617 0 R
+/Prev 615 0 R
 /Dest [58 0 R /XYZ 0 792.0 null]
 >>
 endobj
-615 0 obj
+617 0 obj
 << /Title <feff0032002e0036002e0033002e002000500072006f00640075006300650073>
-/Parent 612 0 R
+/Parent 614 0 R
 /Count 0
-/Prev 614 0 R
+/Prev 616 0 R
 /Dest [58 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-616 0 obj
+618 0 obj
 << /Title <feff0032002e0037002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 4
-/First 617 0 R
-/Last 620 0 R
-/Next 621 0 R
-/Prev 612 0 R
+/First 619 0 R
+/Last 622 0 R
+/Next 623 0 R
+/Prev 614 0 R
 /Dest [58 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-617 0 obj
+619 0 obj
 << /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 616 0 R
+/Parent 618 0 R
 /Count 0
-/Next 618 0 R
+/Next 620 0 R
 /Dest [58 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-618 0 obj
+620 0 obj
 << /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 616 0 R
+/Parent 618 0 R
 /Count 0
-/Next 619 0 R
-/Prev 617 0 R
+/Next 621 0 R
+/Prev 619 0 R
 /Dest [58 0 R /XYZ 0 414.2400000000005 null]
 >>
 endobj
-619 0 obj
+621 0 obj
 << /Title <feff0032002e0037002e0033002e00200043006f006e00730075006d00650073>
-/Parent 616 0 R
+/Parent 618 0 R
 /Count 0
-/Next 620 0 R
-/Prev 618 0 R
+/Next 622 0 R
+/Prev 620 0 R
 /Dest [58 0 R /XYZ 0 309.12000000000046 null]
 >>
 endobj
-620 0 obj
+622 0 obj
 << /Title <feff0032002e0037002e0034002e002000500072006f00640075006300650073>
-/Parent 616 0 R
+/Parent 618 0 R
 /Count 0
-/Prev 619 0 R
+/Prev 621 0 R
 /Dest [58 0 R /XYZ 0 252.84000000000043 null]
 >>
 endobj
-621 0 obj
+623 0 obj
 << /Title <feff0032002e0038002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 622 0 R
-/Last 624 0 R
-/Next 625 0 R
-/Prev 616 0 R
+/First 624 0 R
+/Last 626 0 R
+/Next 627 0 R
+/Prev 618 0 R
 /Dest [58 0 R /XYZ 0 196.5600000000004 null]
 >>
 endobj
-622 0 obj
+624 0 obj
 << /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 621 0 R
+/Parent 623 0 R
 /Count 0
-/Next 623 0 R
+/Next 625 0 R
 /Dest [58 0 R /XYZ 0 156.4800000000004 null]
 >>
 endobj
-623 0 obj
+625 0 obj
 << /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 621 0 R
+/Parent 623 0 R
 /Count 0
-/Next 624 0 R
-/Prev 622 0 R
+/Next 626 0 R
+/Prev 624 0 R
 /Dest [72 0 R /XYZ 0 792.0 null]
 >>
 endobj
-624 0 obj
+626 0 obj
 << /Title <feff0032002e0038002e0033002e002000500072006f00640075006300650073>
-/Parent 621 0 R
+/Parent 623 0 R
 /Count 0
-/Prev 623 0 R
+/Prev 625 0 R
 /Dest [72 0 R /XYZ 0 667.5600000000002 null]
 >>
 endobj
-625 0 obj
+627 0 obj
 << /Title <feff0032002e0039002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d002f0065006c0065006d0065006e00740073002f007b00730068006f00720074004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 626 0 R
-/Last 628 0 R
-/Next 629 0 R
-/Prev 621 0 R
+/First 628 0 R
+/Last 630 0 R
+/Next 631 0 R
+/Prev 623 0 R
 /Dest [72 0 R /XYZ 0 611.2800000000003 null]
 >>
 endobj
-626 0 obj
+628 0 obj
 << /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 625 0 R
+/Parent 627 0 R
 /Count 0
-/Next 627 0 R
+/Next 629 0 R
 /Dest [72 0 R /XYZ 0 543.1200000000005 null]
 >>
 endobj
-627 0 obj
+629 0 obj
 << /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 625 0 R
+/Parent 627 0 R
 /Count 0
-/Next 628 0 R
-/Prev 626 0 R
+/Next 630 0 R
+/Prev 628 0 R
 /Dest [72 0 R /XYZ 0 400.44000000000057 null]
 >>
 endobj
-628 0 obj
+630 0 obj
 << /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
-/Parent 625 0 R
+/Parent 627 0 R
 /Count 0
-/Prev 627 0 R
+/Prev 629 0 R
 /Dest [72 0 R /XYZ 0 309.6000000000006 null]
 >>
 endobj
-629 0 obj
+631 0 obj
 << /Title <feff0032002e00310030002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 630 0 R
-/Last 631 0 R
-/Next 632 0 R
-/Prev 625 0 R
+/First 632 0 R
+/Last 633 0 R
+/Next 634 0 R
+/Prev 627 0 R
 /Dest [72 0 R /XYZ 0 253.32000000000056 null]
 >>
 endobj
-630 0 obj
+632 0 obj
 << /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 629 0 R
+/Parent 631 0 R
 /Count 0
-/Next 631 0 R
+/Next 633 0 R
 /Dest [72 0 R /XYZ 0 213.24000000000055 null]
 >>
 endobj
-631 0 obj
+633 0 obj
 << /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 629 0 R
+/Parent 631 0 R
 /Count 0
-/Prev 630 0 R
+/Prev 632 0 R
 /Dest [72 0 R /XYZ 0 108.12000000000052 null]
 >>
 endobj
-632 0 obj
+634 0 obj
 << /Title <feff0032002e00310031002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 633 0 R
-/Last 635 0 R
-/Next 636 0 R
-/Prev 629 0 R
+/First 635 0 R
+/Last 637 0 R
+/Next 638 0 R
+/Prev 631 0 R
 /Dest [84 0 R /XYZ 0 697.44 null]
 >>
 endobj
-633 0 obj
+635 0 obj
 << /Title <feff0032002e00310031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 632 0 R
+/Parent 634 0 R
 /Count 0
-/Next 634 0 R
+/Next 636 0 R
 /Dest [84 0 R /XYZ 0 657.3600000000001 null]
 >>
 endobj
-634 0 obj
+636 0 obj
 << /Title <feff0032002e00310031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 632 0 R
+/Parent 634 0 R
 /Count 0
-/Next 635 0 R
-/Prev 633 0 R
+/Next 637 0 R
+/Prev 635 0 R
 /Dest [84 0 R /XYZ 0 552.2400000000002 null]
 >>
 endobj
-635 0 obj
+637 0 obj
 << /Title <feff0032002e00310031002e0033002e002000500072006f00640075006300650073>
-/Parent 632 0 R
+/Parent 634 0 R
 /Count 0
-/Prev 634 0 R
+/Prev 636 0 R
 /Dest [84 0 R /XYZ 0 447.12000000000035 null]
 >>
 endobj
-636 0 obj
+638 0 obj
 << /Title <feff0032002e00310032002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 637 0 R
-/Last 638 0 R
-/Next 639 0 R
-/Prev 632 0 R
+/First 639 0 R
+/Last 640 0 R
+/Next 641 0 R
+/Prev 634 0 R
 /Dest [84 0 R /XYZ 0 390.8400000000003 null]
 >>
 endobj
-637 0 obj
+639 0 obj
 << /Title <feff0032002e00310032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 636 0 R
+/Parent 638 0 R
 /Count 0
-/Next 638 0 R
+/Next 640 0 R
 /Dest [84 0 R /XYZ 0 350.7600000000003 null]
 >>
 endobj
-638 0 obj
+640 0 obj
 << /Title <feff0032002e00310032002e0032002e002000500072006f00640075006300650073>
-/Parent 636 0 R
+/Parent 638 0 R
 /Count 0
-/Prev 637 0 R
+/Prev 639 0 R
 /Dest [84 0 R /XYZ 0 245.6400000000002 null]
 >>
 endobj
-639 0 obj
+641 0 obj
 << /Title <feff0032002e00310033002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 640 0 R
-/Last 642 0 R
-/Next 643 0 R
-/Prev 636 0 R
+/First 642 0 R
+/Last 644 0 R
+/Next 645 0 R
+/Prev 638 0 R
 /Dest [84 0 R /XYZ 0 189.36000000000018 null]
 >>
 endobj
-640 0 obj
+642 0 obj
 << /Title <feff0032002e00310033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 639 0 R
+/Parent 641 0 R
 /Count 0
-/Next 641 0 R
+/Next 643 0 R
 /Dest [84 0 R /XYZ 0 149.28000000000017 null]
 >>
 endobj
-641 0 obj
+643 0 obj
 << /Title <feff0032002e00310033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 639 0 R
+/Parent 641 0 R
 /Count 0
-/Next 642 0 R
-/Prev 640 0 R
+/Next 644 0 R
+/Prev 642 0 R
 /Dest [97 0 R /XYZ 0 792.0 null]
 >>
 endobj
-642 0 obj
+644 0 obj
 << /Title <feff0032002e00310033002e0033002e002000500072006f00640075006300650073>
-/Parent 639 0 R
+/Parent 641 0 R
 /Count 0
-/Prev 641 0 R
+/Prev 643 0 R
 /Dest [97 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-643 0 obj
+645 0 obj
 << /Title <feff0032002e00310034002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004f00700050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 644 0 R
-/Last 646 0 R
-/Next 647 0 R
-/Prev 639 0 R
+/First 646 0 R
+/Last 648 0 R
+/Next 649 0 R
+/Prev 641 0 R
 /Dest [97 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-644 0 obj
+646 0 obj
 << /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 643 0 R
+/Parent 645 0 R
 /Count 0
-/Next 645 0 R
+/Next 647 0 R
 /Dest [97 0 R /XYZ 0 528.8400000000005 null]
 >>
 endobj
-645 0 obj
+647 0 obj
 << /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 643 0 R
+/Parent 645 0 R
 /Count 0
-/Next 646 0 R
-/Prev 644 0 R
+/Next 648 0 R
+/Prev 646 0 R
 /Dest [97 0 R /XYZ 0 423.72000000000054 null]
 >>
 endobj
-646 0 obj
+648 0 obj
 << /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
-/Parent 643 0 R
+/Parent 645 0 R
 /Count 0
-/Prev 645 0 R
+/Prev 647 0 R
 /Dest [97 0 R /XYZ 0 318.6000000000005 null]
 >>
 endobj
-647 0 obj
+649 0 obj
 << /Title <feff0032002e00310035002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 648 0 R
-/Last 650 0 R
-/Next 651 0 R
-/Prev 643 0 R
+/First 650 0 R
+/Last 652 0 R
+/Next 653 0 R
+/Prev 645 0 R
 /Dest [97 0 R /XYZ 0 262.32000000000045 null]
 >>
 endobj
-648 0 obj
+650 0 obj
 << /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 647 0 R
+/Parent 649 0 R
 /Count 0
-/Next 649 0 R
+/Next 651 0 R
 /Dest [97 0 R /XYZ 0 222.24000000000046 null]
 >>
 endobj
-649 0 obj
+651 0 obj
 << /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 647 0 R
+/Parent 649 0 R
 /Count 0
-/Next 650 0 R
-/Prev 648 0 R
+/Next 652 0 R
+/Prev 650 0 R
 /Dest [97 0 R /XYZ 0 117.12000000000043 null]
 >>
 endobj
-650 0 obj
+652 0 obj
 << /Title <feff0032002e00310035002e0033002e002000500072006f00640075006300650073>
-/Parent 647 0 R
+/Parent 649 0 R
 /Count 0
-/Prev 649 0 R
+/Prev 651 0 R
 /Dest [110 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-651 0 obj
+653 0 obj
 << /Title <feff0032002e00310036002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 652 0 R
-/Last 654 0 R
-/Next 655 0 R
-/Prev 647 0 R
+/First 654 0 R
+/Last 656 0 R
+/Next 657 0 R
+/Prev 649 0 R
 /Dest [110 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-652 0 obj
+654 0 obj
 << /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 651 0 R
+/Parent 653 0 R
 /Count 0
-/Next 653 0 R
+/Next 655 0 R
 /Dest [110 0 R /XYZ 0 586.8000000000003 null]
 >>
 endobj
-653 0 obj
+655 0 obj
 << /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 651 0 R
+/Parent 653 0 R
 /Count 0
-/Next 654 0 R
-/Prev 652 0 R
+/Next 656 0 R
+/Prev 654 0 R
 /Dest [110 0 R /XYZ 0 481.68000000000046 null]
 >>
 endobj
-654 0 obj
+656 0 obj
 << /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
-/Parent 651 0 R
+/Parent 653 0 R
 /Count 0
-/Prev 653 0 R
+/Prev 655 0 R
 /Dest [110 0 R /XYZ 0 376.5600000000004 null]
 >>
 endobj
-655 0 obj
+657 0 obj
 << /Title <feff0032002e00310037002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 656 0 R
-/Last 658 0 R
-/Next 659 0 R
-/Prev 651 0 R
+/First 658 0 R
+/Last 660 0 R
+/Next 661 0 R
+/Prev 653 0 R
 /Dest [110 0 R /XYZ 0 320.28000000000037 null]
 >>
 endobj
-656 0 obj
+658 0 obj
 << /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 655 0 R
+/Parent 657 0 R
 /Count 0
-/Next 657 0 R
+/Next 659 0 R
 /Dest [110 0 R /XYZ 0 280.20000000000033 null]
 >>
 endobj
-657 0 obj
+659 0 obj
 << /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 655 0 R
+/Parent 657 0 R
 /Count 0
-/Next 658 0 R
-/Prev 656 0 R
+/Next 660 0 R
+/Prev 658 0 R
 /Dest [110 0 R /XYZ 0 175.08000000000033 null]
 >>
 endobj
-658 0 obj
+660 0 obj
 << /Title <feff0032002e00310037002e0033002e002000500072006f00640075006300650073>
-/Parent 655 0 R
+/Parent 657 0 R
 /Count 0
-/Prev 657 0 R
-/Dest [124 0 R /XYZ 0 792.0 null]
+/Prev 659 0 R
+/Dest [123 0 R /XYZ 0 792.0 null]
 >>
 endobj
-659 0 obj
+661 0 obj
 << /Title <feff0032002e00310038002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 660 0 R
-/Last 662 0 R
-/Next 663 0 R
-/Prev 655 0 R
-/Dest [124 0 R /XYZ 0 702.1200000000001 null]
+/First 662 0 R
+/Last 664 0 R
+/Next 665 0 R
+/Prev 657 0 R
+/Dest [123 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-660 0 obj
+662 0 obj
 << /Title <feff0032002e00310038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 659 0 R
+/Parent 661 0 R
 /Count 0
-/Next 661 0 R
-/Dest [124 0 R /XYZ 0 662.0400000000002 null]
+/Next 663 0 R
+/Dest [123 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-661 0 obj
+663 0 obj
 << /Title <feff0032002e00310038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 659 0 R
+/Parent 661 0 R
 /Count 0
-/Next 662 0 R
-/Prev 660 0 R
-/Dest [124 0 R /XYZ 0 556.9200000000003 null]
+/Next 664 0 R
+/Prev 662 0 R
+/Dest [123 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-662 0 obj
+664 0 obj
 << /Title <feff0032002e00310038002e0033002e002000500072006f00640075006300650073>
-/Parent 659 0 R
+/Parent 661 0 R
 /Count 0
-/Prev 661 0 R
-/Dest [124 0 R /XYZ 0 451.8000000000004 null]
+/Prev 663 0 R
+/Dest [123 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
-663 0 obj
+665 0 obj
 << /Title <feff0032002e00310039002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 664 0 R
-/Last 666 0 R
-/Next 667 0 R
-/Prev 659 0 R
-/Dest [124 0 R /XYZ 0 395.5200000000004 null]
+/First 666 0 R
+/Last 668 0 R
+/Next 669 0 R
+/Prev 661 0 R
+/Dest [123 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
-664 0 obj
+666 0 obj
 << /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 663 0 R
+/Parent 665 0 R
 /Count 0
-/Next 665 0 R
-/Dest [124 0 R /XYZ 0 355.44000000000034 null]
+/Next 667 0 R
+/Dest [123 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
-665 0 obj
+667 0 obj
 << /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 663 0 R
+/Parent 665 0 R
 /Count 0
-/Next 666 0 R
-/Prev 664 0 R
-/Dest [124 0 R /XYZ 0 250.32000000000033 null]
+/Next 668 0 R
+/Prev 666 0 R
+/Dest [123 0 R /XYZ 0 250.32000000000033 null]
 >>
 endobj
-666 0 obj
+668 0 obj
 << /Title <feff0032002e00310039002e0033002e002000500072006f00640075006300650073>
-/Parent 663 0 R
+/Parent 665 0 R
 /Count 0
-/Prev 665 0 R
-/Dest [124 0 R /XYZ 0 145.2000000000003 null]
+/Prev 667 0 R
+/Dest [123 0 R /XYZ 0 145.2000000000003 null]
 >>
 endobj
-667 0 obj
+669 0 obj
 << /Title <feff0032002e00320030002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 4
-/First 668 0 R
-/Last 671 0 R
-/Next 672 0 R
-/Prev 663 0 R
+/First 670 0 R
+/Last 673 0 R
+/Next 674 0 R
+/Prev 665 0 R
 /Dest [137 0 R /XYZ 0 792.0 null]
 >>
 endobj
-668 0 obj
+670 0 obj
 << /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 667 0 R
+/Parent 669 0 R
 /Count 0
-/Next 669 0 R
+/Next 671 0 R
 /Dest [137 0 R /XYZ 0 718.32 null]
 >>
 endobj
-669 0 obj
+671 0 obj
 << /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 667 0 R
+/Parent 669 0 R
 /Count 0
-/Next 670 0 R
-/Prev 668 0 R
+/Next 672 0 R
+/Prev 670 0 R
 /Dest [137 0 R /XYZ 0 575.6400000000001 null]
 >>
 endobj
-670 0 obj
+672 0 obj
 << /Title <feff0032002e00320030002e0033002e00200043006f006e00730075006d00650073>
-/Parent 667 0 R
+/Parent 669 0 R
 /Count 0
-/Next 671 0 R
-/Prev 669 0 R
+/Next 673 0 R
+/Prev 671 0 R
 /Dest [137 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-671 0 obj
+673 0 obj
 << /Title <feff0032002e00320030002e0034002e002000500072006f00640075006300650073>
-/Parent 667 0 R
+/Parent 669 0 R
 /Count 0
-/Prev 670 0 R
+/Prev 672 0 R
 /Dest [137 0 R /XYZ 0 414.2400000000002 null]
 >>
 endobj
-672 0 obj
+674 0 obj
 << /Title <feff0032002e00320031002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 4
-/First 673 0 R
-/Last 676 0 R
-/Next 677 0 R
-/Prev 667 0 R
+/First 675 0 R
+/Last 678 0 R
+/Next 679 0 R
+/Prev 669 0 R
 /Dest [137 0 R /XYZ 0 357.96000000000015 null]
 >>
 endobj
-673 0 obj
+675 0 obj
 << /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 672 0 R
+/Parent 674 0 R
 /Count 0
-/Next 674 0 R
+/Next 676 0 R
 /Dest [137 0 R /XYZ 0 289.8000000000001 null]
 >>
 endobj
-674 0 obj
+676 0 obj
 << /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 672 0 R
+/Parent 674 0 R
 /Count 0
-/Next 675 0 R
-/Prev 673 0 R
+/Next 677 0 R
+/Prev 675 0 R
 /Dest [137 0 R /XYZ 0 147.1200000000001 null]
 >>
 endobj
-675 0 obj
+677 0 obj
 << /Title <feff0032002e00320031002e0033002e00200043006f006e00730075006d00650073>
-/Parent 672 0 R
+/Parent 674 0 R
 /Count 0
-/Next 676 0 R
-/Prev 674 0 R
+/Next 678 0 R
+/Prev 676 0 R
 /Dest [151 0 R /XYZ 0 792.0 null]
 >>
 endobj
-676 0 obj
+678 0 obj
 << /Title <feff0032002e00320031002e0034002e002000500072006f00640075006300650073>
-/Parent 672 0 R
+/Parent 674 0 R
 /Count 0
-/Prev 675 0 R
+/Prev 677 0 R
 /Dest [151 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-677 0 obj
+679 0 obj
 << /Title <feff0032002e00320032002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 4
-/First 678 0 R
-/Last 681 0 R
-/Next 682 0 R
-/Prev 672 0 R
+/First 680 0 R
+/Last 683 0 R
+/Next 684 0 R
+/Prev 674 0 R
 /Dest [151 0 R /XYZ 0 645.8400000000003 null]
 >>
 endobj
-678 0 obj
+680 0 obj
 << /Title <feff0032002e00320032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 677 0 R
+/Parent 679 0 R
 /Count 0
-/Next 679 0 R
+/Next 681 0 R
 /Dest [151 0 R /XYZ 0 577.6800000000004 null]
 >>
 endobj
-679 0 obj
+681 0 obj
 << /Title <feff0032002e00320032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 677 0 R
+/Parent 679 0 R
 /Count 0
-/Next 680 0 R
-/Prev 678 0 R
+/Next 682 0 R
+/Prev 680 0 R
 /Dest [151 0 R /XYZ 0 435.0000000000005 null]
 >>
 endobj
-680 0 obj
+682 0 obj
 << /Title <feff0032002e00320032002e0033002e00200043006f006e00730075006d00650073>
-/Parent 677 0 R
+/Parent 679 0 R
 /Count 0
-/Next 681 0 R
-/Prev 679 0 R
+/Next 683 0 R
+/Prev 681 0 R
 /Dest [151 0 R /XYZ 0 329.88000000000045 null]
 >>
 endobj
-681 0 obj
+683 0 obj
 << /Title <feff0032002e00320032002e0034002e002000500072006f00640075006300650073>
-/Parent 677 0 R
+/Parent 679 0 R
 /Count 0
-/Prev 680 0 R
+/Prev 682 0 R
 /Dest [151 0 R /XYZ 0 273.6000000000004 null]
 >>
 endobj
-682 0 obj
+684 0 obj
 << /Title <feff0032002e00320033002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 683 0 R
-/Last 685 0 R
-/Next 686 0 R
-/Prev 677 0 R
+/First 685 0 R
+/Last 687 0 R
+/Next 688 0 R
+/Prev 679 0 R
 /Dest [151 0 R /XYZ 0 217.32000000000042 null]
 >>
 endobj
-683 0 obj
+685 0 obj
 << /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 682 0 R
+/Parent 684 0 R
 /Count 0
-/Next 684 0 R
+/Next 686 0 R
 /Dest [151 0 R /XYZ 0 177.2400000000004 null]
 >>
 endobj
-684 0 obj
+686 0 obj
 << /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 682 0 R
+/Parent 684 0 R
 /Count 0
-/Next 685 0 R
-/Prev 683 0 R
+/Next 687 0 R
+/Prev 685 0 R
 /Dest [165 0 R /XYZ 0 792.0 null]
 >>
 endobj
-685 0 obj
+687 0 obj
 << /Title <feff0032002e00320033002e0033002e002000500072006f00640075006300650073>
-/Parent 682 0 R
+/Parent 684 0 R
 /Count 0
-/Prev 684 0 R
+/Prev 686 0 R
 /Dest [165 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-686 0 obj
+688 0 obj
 << /Title <feff0032002e00320034002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 687 0 R
-/Last 688 0 R
-/Next 689 0 R
-/Prev 682 0 R
+/First 689 0 R
+/Last 690 0 R
+/Next 691 0 R
+/Prev 684 0 R
 /Dest [165 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-687 0 obj
+689 0 obj
 << /Title <feff0032002e00320034002e0031002e00200052006500730070006f006e007300650073>
-/Parent 686 0 R
+/Parent 688 0 R
 /Count 0
-/Next 688 0 R
+/Next 690 0 R
 /Dest [165 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-688 0 obj
+690 0 obj
 << /Title <feff0032002e00320034002e0032002e002000500072006f00640075006300650073>
-/Parent 686 0 R
+/Parent 688 0 R
 /Count 0
-/Prev 687 0 R
+/Prev 689 0 R
 /Dest [165 0 R /XYZ 0 451.8000000000005 null]
 >>
 endobj
-689 0 obj
+691 0 obj
 << /Title <feff0032002e00320035002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f00790061006d006c002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 690 0 R
-/Last 692 0 R
-/Next 693 0 R
-/Prev 686 0 R
+/First 692 0 R
+/Last 694 0 R
+/Next 695 0 R
+/Prev 688 0 R
 /Dest [165 0 R /XYZ 0 395.5200000000005 null]
 >>
 endobj
-690 0 obj
+692 0 obj
 << /Title <feff0032002e00320035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 689 0 R
+/Parent 691 0 R
 /Count 0
-/Next 691 0 R
+/Next 693 0 R
 /Dest [165 0 R /XYZ 0 327.36000000000047 null]
 >>
 endobj
-691 0 obj
+693 0 obj
 << /Title <feff0032002e00320035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 689 0 R
+/Parent 691 0 R
 /Count 0
-/Next 692 0 R
-/Prev 690 0 R
+/Next 694 0 R
+/Prev 692 0 R
 /Dest [165 0 R /XYZ 0 222.2400000000004 null]
 >>
 endobj
-692 0 obj
+694 0 obj
 << /Title <feff0032002e00320035002e0033002e002000500072006f00640075006300650073>
-/Parent 689 0 R
+/Parent 691 0 R
 /Count 0
-/Prev 691 0 R
+/Prev 693 0 R
 /Dest [165 0 R /XYZ 0 117.12000000000037 null]
 >>
 endobj
-693 0 obj
+695 0 obj
 << /Title <feff0032002e00320036002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 694 0 R
-/Last 696 0 R
-/Next 697 0 R
-/Prev 689 0 R
-/Dest [178 0 R /XYZ 0 792.0 null]
+/First 696 0 R
+/Last 698 0 R
+/Next 699 0 R
+/Prev 691 0 R
+/Dest [179 0 R /XYZ 0 792.0 null]
 >>
 endobj
-694 0 obj
+696 0 obj
 << /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 693 0 R
+/Parent 695 0 R
 /Count 0
-/Next 695 0 R
-/Dest [178 0 R /XYZ 0 718.32 null]
+/Next 697 0 R
+/Dest [179 0 R /XYZ 0 718.32 null]
 >>
 endobj
-695 0 obj
+697 0 obj
 << /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 693 0 R
+/Parent 695 0 R
 /Count 0
-/Next 696 0 R
-/Prev 694 0 R
-/Dest [178 0 R /XYZ 0 613.2000000000003 null]
+/Next 698 0 R
+/Prev 696 0 R
+/Dest [179 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-696 0 obj
+698 0 obj
 << /Title <feff0032002e00320036002e0033002e002000500072006f00640075006300650073>
-/Parent 693 0 R
+/Parent 695 0 R
 /Count 0
-/Prev 695 0 R
-/Dest [178 0 R /XYZ 0 508.0800000000004 null]
+/Prev 697 0 R
+/Dest [179 0 R /XYZ 0 508.0800000000004 null]
 >>
 endobj
-697 0 obj
+699 0 obj
 << /Title <feff0032002e00320037002e00200050005500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 4
-/First 698 0 R
-/Last 701 0 R
-/Next 702 0 R
-/Prev 693 0 R
-/Dest [178 0 R /XYZ 0 451.80000000000035 null]
+/First 700 0 R
+/Last 703 0 R
+/Next 704 0 R
+/Prev 695 0 R
+/Dest [179 0 R /XYZ 0 451.80000000000035 null]
 >>
 endobj
-698 0 obj
+700 0 obj
 << /Title <feff0032002e00320037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 697 0 R
+/Parent 699 0 R
 /Count 0
-/Next 699 0 R
-/Dest [178 0 R /XYZ 0 411.7200000000003 null]
+/Next 701 0 R
+/Dest [179 0 R /XYZ 0 411.7200000000003 null]
 >>
 endobj
-699 0 obj
+701 0 obj
 << /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 697 0 R
+/Parent 699 0 R
 /Count 0
-/Next 700 0 R
-/Prev 698 0 R
-/Dest [178 0 R /XYZ 0 269.04000000000025 null]
+/Next 702 0 R
+/Prev 700 0 R
+/Dest [179 0 R /XYZ 0 269.04000000000025 null]
 >>
 endobj
-700 0 obj
+702 0 obj
 << /Title <feff0032002e00320037002e0033002e00200043006f006e00730075006d00650073>
-/Parent 697 0 R
+/Parent 699 0 R
 /Count 0
-/Next 701 0 R
-/Prev 699 0 R
-/Dest [178 0 R /XYZ 0 163.92000000000024 null]
+/Next 703 0 R
+/Prev 701 0 R
+/Dest [179 0 R /XYZ 0 163.92000000000024 null]
 >>
 endobj
-701 0 obj
+703 0 obj
 << /Title <feff0032002e00320037002e0034002e002000500072006f00640075006300650073>
-/Parent 697 0 R
+/Parent 699 0 R
 /Count 0
-/Prev 700 0 R
-/Dest [178 0 R /XYZ 0 107.64000000000021 null]
+/Prev 702 0 R
+/Dest [179 0 R /XYZ 0 107.64000000000021 null]
 >>
 endobj
-702 0 obj
+704 0 obj
 << /Title <feff0032002e00320038002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 703 0 R
-/Last 704 0 R
-/Next 705 0 R
-/Prev 697 0 R
+/First 705 0 R
+/Last 706 0 R
+/Next 707 0 R
+/Prev 699 0 R
 /Dest [192 0 R /XYZ 0 792.0 null]
 >>
 endobj
-703 0 obj
+705 0 obj
 << /Title <feff0032002e00320038002e0031002e00200052006500730070006f006e007300650073>
-/Parent 702 0 R
+/Parent 704 0 R
 /Count 0
-/Next 704 0 R
+/Next 706 0 R
 /Dest [192 0 R /XYZ 0 718.32 null]
 >>
 endobj
-704 0 obj
+706 0 obj
 << /Title <feff0032002e00320038002e0032002e002000500072006f00640075006300650073>
-/Parent 702 0 R
+/Parent 704 0 R
 /Count 0
-/Prev 703 0 R
+/Prev 705 0 R
 /Dest [192 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-705 0 obj
+707 0 obj
 << /Title <feff0032002e00320039002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f006e0061006d00650073>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 2
-/First 706 0 R
-/Last 707 0 R
-/Next 708 0 R
-/Prev 702 0 R
+/First 708 0 R
+/Last 709 0 R
+/Next 710 0 R
+/Prev 704 0 R
 /Dest [192 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-706 0 obj
+708 0 obj
 << /Title <feff0032002e00320039002e0031002e00200052006500730070006f006e007300650073>
-/Parent 705 0 R
+/Parent 707 0 R
 /Count 0
-/Next 707 0 R
+/Next 709 0 R
 /Dest [192 0 R /XYZ 0 516.8400000000005 null]
 >>
 endobj
-707 0 obj
+709 0 obj
 << /Title <feff0032002e00320039002e0032002e002000500072006f00640075006300650073>
-/Parent 705 0 R
+/Parent 707 0 R
 /Count 0
-/Prev 706 0 R
+/Prev 708 0 R
 /Dest [192 0 R /XYZ 0 411.7200000000005 null]
 >>
 endobj
-708 0 obj
+710 0 obj
 << /Title <feff0032002e00330030002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 594 0 R
+/Parent 596 0 R
 /Count 3
-/First 709 0 R
-/Last 711 0 R
-/Prev 705 0 R
+/First 711 0 R
+/Last 713 0 R
+/Prev 707 0 R
 /Dest [192 0 R /XYZ 0 355.44000000000045 null]
 >>
 endobj
-709 0 obj
+711 0 obj
 << /Title <feff0032002e00330030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 708 0 R
+/Parent 710 0 R
 /Count 0
-/Next 710 0 R
+/Next 712 0 R
 /Dest [192 0 R /XYZ 0 315.3600000000004 null]
 >>
 endobj
-710 0 obj
+712 0 obj
 << /Title <feff0032002e00330030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 708 0 R
+/Parent 710 0 R
 /Count 0
-/Next 711 0 R
-/Prev 709 0 R
+/Next 713 0 R
+/Prev 711 0 R
 /Dest [192 0 R /XYZ 0 210.2400000000004 null]
 >>
 endobj
-711 0 obj
+713 0 obj
 << /Title <feff0032002e00330030002e0033002e002000500072006f00640075006300650073>
-/Parent 708 0 R
+/Parent 710 0 R
 /Count 0
-/Prev 710 0 R
+/Prev 712 0 R
 /Dest [192 0 R /XYZ 0 105.12000000000037 null]
 >>
 endobj
-712 0 obj
+714 0 obj
 << /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
-/Parent 588 0 R
+/Parent 590 0 R
 /Count 19
-/First 713 0 R
-/Last 731 0 R
-/Prev 594 0 R
-/Dest [207 0 R /XYZ 0 792.0 null]
->>
-endobj
-713 0 obj
-<< /Title <feff0033002e0031002e00200043006c00640073004800650061006c007400680043006800650063006b>
-/Parent 712 0 R
-/Count 0
-/Next 714 0 R
-/Dest [207 0 R /XYZ 0 712.0799999999999 null]
->>
-endobj
-714 0 obj
-<< /Title <feff0033002e0032002e002000440069006300740069006f006e006100720079>
-/Parent 712 0 R
-/Count 0
-/Next 715 0 R
-/Prev 713 0 R
-/Dest [207 0 R /XYZ 0 524.04 null]
+/First 715 0 R
+/Last 733 0 R
+/Prev 596 0 R
+/Dest [208 0 R /XYZ 0 792.0 null]
 >>
 endobj
 715 0 obj
-<< /Title <feff0033002e0033002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
-/Parent 712 0 R
+<< /Title <feff0033002e0031002e00200043006c00640073004800650061006c007400680043006800650063006b>
+/Parent 714 0 R
 /Count 0
 /Next 716 0 R
-/Prev 714 0 R
-/Dest [207 0 R /XYZ 0 148.19999999999993 null]
+/Dest [208 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
 716 0 obj
-<< /Title <feff0033002e0034002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
-/Parent 712 0 R
+<< /Title <feff0033002e0032002e002000440069006300740069006f006e006100720079>
+/Parent 714 0 R
 /Count 0
 /Next 717 0 R
 /Prev 715 0 R
-/Dest [214 0 R /XYZ 0 345.11999999999995 null]
+/Dest [208 0 R /XYZ 0 524.04 null]
 >>
 endobj
 717 0 obj
-<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
-/Parent 712 0 R
+<< /Title <feff0033002e0033002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
+/Parent 714 0 R
 /Count 0
 /Next 718 0 R
 /Prev 716 0 R
-/Dest [214 0 R /XYZ 0 194.6399999999999 null]
+/Dest [208 0 R /XYZ 0 148.19999999999993 null]
 >>
 endobj
 718 0 obj
-<< /Title <feff0033002e0036002e0020004a0073006f006e00410072007200610079>
-/Parent 712 0 R
+<< /Title <feff0033002e0034002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
+/Parent 714 0 R
 /Count 0
 /Next 719 0 R
 /Prev 717 0 R
-/Dest [220 0 R /XYZ 0 683.1600000000001 null]
+/Dest [215 0 R /XYZ 0 345.11999999999995 null]
 >>
 endobj
 719 0 obj
-<< /Title <feff0033002e0037002e0020004a0073006f006e004e0075006c006c>
-/Parent 712 0 R
+<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
+/Parent 714 0 R
 /Count 0
 /Next 720 0 R
 /Prev 718 0 R
-/Dest [228 0 R /XYZ 0 532.9200000000003 null]
+/Dest [215 0 R /XYZ 0 194.6399999999999 null]
 >>
 endobj
 720 0 obj
-<< /Title <feff0033002e0038002e0020004a0073006f006e004f0062006a006500630074>
-/Parent 712 0 R
+<< /Title <feff0033002e0036002e0020004a0073006f006e00410072007200610079>
+/Parent 714 0 R
 /Count 0
 /Next 721 0 R
 /Prev 719 0 R
-/Dest [234 0 R /XYZ 0 382.68000000000023 null]
+/Dest [221 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
 721 0 obj
-<< /Title <feff0033002e0039002e0020004a0073006f006e005000720069006d00690074006900760065>
-/Parent 712 0 R
+<< /Title <feff0033002e0037002e0020004a0073006f006e004e0075006c006c>
+/Parent 714 0 R
 /Count 0
 /Next 722 0 R
 /Prev 720 0 R
-/Dest [239 0 R /XYZ 0 232.44000000000023 null]
+/Dest [229 0 R /XYZ 0 532.9200000000003 null]
 >>
 endobj
 722 0 obj
-<< /Title <feff0033002e00310030002e0020004c006f006f0070>
-/Parent 712 0 R
+<< /Title <feff0033002e0038002e0020004a0073006f006e004f0062006a006500630074>
+/Parent 714 0 R
 /Count 0
 /Next 723 0 R
 /Prev 721 0 R
-/Dest [255 0 R /XYZ 0 645.6000000000001 null]
+/Dest [235 0 R /XYZ 0 382.68000000000023 null]
 >>
 endobj
 723 0 obj
-<< /Title <feff0033002e00310031002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 712 0 R
+<< /Title <feff0033002e0039002e0020004a0073006f006e005000720069006d00690074006900760065>
+/Parent 714 0 R
 /Count 0
 /Next 724 0 R
 /Prev 722 0 R
-/Dest [265 0 R /XYZ 0 645.6000000000001 null]
+/Dest [240 0 R /XYZ 0 232.44000000000023 null]
 >>
 endobj
 724 0 obj
-<< /Title <feff0033002e00310032002e0020004c006f006f0070004c006f0067>
-/Parent 712 0 R
+<< /Title <feff0033002e00310030002e0020004c006f006f0070>
+/Parent 714 0 R
 /Count 0
 /Next 725 0 R
 /Prev 723 0 R
-/Dest [265 0 R /XYZ 0 157.08000000000015 null]
+/Dest [256 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 725 0 obj
-<< /Title <feff0033002e00310033002e0020004c006f006f007000540065006d0070006c006100740065>
-/Parent 712 0 R
+<< /Title <feff0033002e00310031002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 714 0 R
 /Count 0
 /Next 726 0 R
 /Prev 724 0 R
-/Dest [271 0 R /XYZ 0 532.9200000000001 null]
+/Dest [266 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 726 0 obj
-<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 712 0 R
+<< /Title <feff0033002e00310032002e0020004c006f006f0070004c006f0067>
+/Parent 714 0 R
 /Count 0
 /Next 727 0 R
 /Prev 725 0 R
-/Dest [277 0 R /XYZ 0 645.6000000000001 null]
+/Dest [266 0 R /XYZ 0 157.08000000000015 null]
 >>
 endobj
 727 0 obj
-<< /Title <feff0033002e00310035002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
-/Parent 712 0 R
+<< /Title <feff0033002e00310033002e0020004c006f006f007000540065006d0070006c006100740065>
+/Parent 714 0 R
 /Count 0
 /Next 728 0 R
 /Prev 726 0 R
-/Dest [277 0 R /XYZ 0 457.56000000000023 null]
+/Dest [272 0 R /XYZ 0 532.9200000000001 null]
 >>
 endobj
 728 0 obj
-<< /Title <feff0033002e00310036002e0020004e0075006d006200650072>
-/Parent 712 0 R
+<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 714 0 R
 /Count 0
 /Next 729 0 R
 /Prev 727 0 R
-/Dest [285 0 R /XYZ 0 420.2400000000002 null]
+/Dest [278 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 729 0 obj
-<< /Title <feff0033002e00310037002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
-/Parent 712 0 R
+<< /Title <feff0033002e00310035002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
+/Parent 714 0 R
 /Count 0
 /Next 730 0 R
 /Prev 728 0 R
-/Dest [285 0 R /XYZ 0 352.3800000000001 null]
+/Dest [278 0 R /XYZ 0 457.56000000000023 null]
 >>
 endobj
 730 0 obj
-<< /Title <feff0033002e00310038002e00200050006f006c006900630079004d006f00640065006c>
-/Parent 712 0 R
+<< /Title <feff0033002e00310036002e0020004e0075006d006200650072>
+/Parent 714 0 R
 /Count 0
 /Next 731 0 R
 /Prev 729 0 R
-/Dest [296 0 R /XYZ 0 532.9200000000001 null]
+/Dest [286 0 R /XYZ 0 382.68000000000023 null]
 >>
 endobj
 731 0 obj
-<< /Title <feff0033002e00310039002e00200053006500720076006900630065>
-/Parent 712 0 R
+<< /Title <feff0033002e00310037002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
+/Parent 714 0 R
 /Count 0
+/Next 732 0 R
 /Prev 730 0 R
-/Dest [296 0 R /XYZ 0 119.52000000000004 null]
+/Dest [286 0 R /XYZ 0 314.82000000000016 null]
 >>
 endobj
 732 0 obj
+<< /Title <feff0033002e00310038002e00200050006f006c006900630079004d006f00640065006c>
+/Parent 714 0 R
+/Count 0
+/Next 733 0 R
+/Prev 731 0 R
+/Dest [296 0 R /XYZ 0 457.8 null]
+>>
+endobj
+733 0 obj
+<< /Title <feff0033002e00310039002e00200053006500720076006900630065>
+/Parent 714 0 R
+/Count 0
+/Prev 732 0 R
+/Dest [303 0 R /XYZ 0 683.1600000000001 null]
+>>
+endobj
+734 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (iii)
@@ -48639,10 +49008,11 @@ endobj
 >> 29 << /P (25)
 >> 30 << /P (26)
 >> 31 << /P (27)
+>> 32 << /P (28)
 >>]
 >>
 endobj
-733 0 obj
+735 0 obj
 << /Length1 12112
 /Length 7776
 /Filter [/FlateDecode]
@@ -48675,10 +49045,10 @@ G)Dz
 ”a•dç4äf�t†#Ë�e=<¥òª¦'½ýcÞɕߪù‘좼pNƒ/(i€�À$
šVô·(ý.½°Œÿ¾>Ö½t`jxp\5=àÛàÛ¥¬›Ž³€×X©wÚ«šŸ�	rèWõΪVÙö‡°-…/M³sœ
6C,”é€C¬ÁÐT¨Ä«6Ó¿˜¡éé‰|³¹Ïß?`dUlêó�™'ÌÄof]q¾ŸÑÄ÷³\LÀcM§&–>÷'àÚÆä¼sçNÓXpZ,ë©é™þaÿ:Î;Ù?p¹õï) Í€tð¡šá¾�ñ)ÐØÌxÿÀ¤jzh@åžðöÁ%x'Cµâ�Y&DÕaà2|§‚bôØÏú$£‡!V;n�ç…ç£;¿“
”õ>œÅøpȽ,“rÐ<@1e®ÙTRV×TfdPl<_oˆTpž�šA«¡Ò§€RŽWÙ¢Y,JVz ¿"Ìwnú_is[£þ‡ˆà±aì�Ÿ’¬\!ï¢ðox½(P®°Çÿ�û/’
 endstream
 endobj
-734 0 obj
+736 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAA+NotoSerif
-/FontFile2 733 0 R
+/FontFile2 735 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -48689,7 +49059,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-735 0 obj
+737 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -48699,10 +49069,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-736 0 obj
+738 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 1000 559 1000 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-737 0 obj
+739 0 obj
 << /Length1 11308
 /Length 7514
 /Filter [/FlateDecode]
@@ -48733,10 +49103,10 @@ f
 \�ïLBCŒXÇdô0Âj§äõÁsñ«ÕïØ€²Ö‘ÝŒ#¯Xc‹À19=ìŒÆQÌ8ë*ªš;ªìŠ[¯·o…Tpž�:A«+¥Ï¥¯jG3Ä\„,+�ÍfXîÿÍü–´¢ÿ„Ȧ·‹W—-}B½E‚>“¡ùK¥ìÿ
—(\(
 endstream
 endobj
-738 0 obj
+740 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAB+NotoSerif-Bold
-/FontFile2 737 0 R
+/FontFile2 739 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -48747,7 +49117,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-739 0 obj
+741 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -48757,10 +49127,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-740 0 obj
+742 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 1000 1000 1000 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-741 0 obj
+743 0 obj
 << /Length1 5116
 /Length 3170
 /Filter [/FlateDecode]
@@ -48780,10 +49150,10 @@ a
 ÿ:´2õ]Û^Ô5 w,¥Âº*›Ó‹Œ58«mÖg·±nkÞÄ7cÙÞB4èÆa¯ÅÊD[NaéU‹<V¥Éó`ØÉ@V�΋š{KÙÀ—r¿­�ËS«¯ ðêó3³§e'ó(�×ÚÏ«-{�S}`-õy÷¢¦/²±ò‹ð79à]èp$xrë’¤ÏÊÃ'ý›"ZÞé³/izïþ›]’Wâ~ ïÝ–þ&ÌÁT
 endstream
 endobj
-742 0 obj
+744 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAC+NotoSerif-Italic
-/FontFile2 741 0 R
+/FontFile2 743 0 R
 /FontBBox [-254 -250 1238 1047]
 /Flags 70
 /StemV 0
@@ -48794,7 +49164,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-743 0 obj
+745 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -48804,10 +49174,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-744 0 obj
+746 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-745 0 obj
+747 0 obj
 << /Length1 3280
 /Length 2112
 /Filter [/FlateDecode]
@@ -48822,10 +49192,10 @@ x
 ˆ‡¶�€$W´¦ö"k8À
Vš­Ûi<êí!‹§–N..ðͶ&W+uXœ¶—¨:‹’j³†Z;Ù×cžOÎ-/²UFN¤ÓÉ6»][§)å%ÛÒâr*Ÿf©Ûf“R�ÓTó6°Óß<Qsäz‰B�–Ó^"KD/“çùŸÞ)ƒ�~™’¹T¾^õ‡i9šít-Ñ£\î‚céúìw='4‡î‚9÷F|ðÂBìßëV�bCAÿWAþö}½‚[Ï‹¸
1?¾ˆøbä¢Oe›Dm$ BD<yBT™'ÂÑ`Á"BY@Ü‹þS„ÃU´n�H²g#ü‡"–Ùª¬"Zø›b±Ù*r–@(Ü+DLVQa9YÅ‹Þ Áz#VQia¦&ÁôLøOÆßDŒ¤~`ü{Ä(˜Ä<sXô�ŠH‘áåYJ&Ƭ¢Êr±WÉ;¿:1a�`Ô–‹
’È»#Ê·èuü
»U,°ðÏ2'W	†»^T6úE†3ñL”gD«ÑdŠ3ÊqÌaa.:­Qk"Ä"CJ§ØÂÛE5„çû_t–óS“9¦WÂ<“k>Ã÷e|Q!ÃgÉ�ÀÀE/iR~L zãŒ!›RÉSûz•Édä×3T2 hŽÊ±™$5�Eà×eçŒM"FÂJh@È|f #D™A΄-VQËŽAOqëXŒÐÿG¶ÑÙ§΄™–Y(‰Ì÷YÙüSBF-òÁð!ãû´c°¼^ôvuaàŠ–Ú[š™òÑ0›Caa’¢ºŒ´ ÐE•÷†Â—¨¯»c]—�GZD>&VÇk·}•[D’R]h²²ß‘zÖóé?+wú_½î“ä
 endstream
 endobj
-746 0 obj
+748 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAD+mplus1mn-regular
-/FontFile2 745 0 R
+/FontFile2 747 0 R
 /FontBBox [0 -230 1000 860]
 /Flags 4
 /StemV 0
@@ -48836,7 +49206,7 @@ endobj
 /XHeight 0
 >>
 endobj
-747 0 obj
+749 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -48846,11 +49216,11 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-748 0 obj
+750 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 500 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
 xref
-0 749
+0 751
 0000000000 65535 f 
 0000000015 00000 n 
 0000000264 00000 n 
@@ -48873,738 +49243,740 @@ xref
 0000127807 00000 n 
 0000127850 00000 n 
 0000127899 00000 n 
-0000128005 00000 n 
-0000128178 00000 n 
-0000128233 00000 n 
-0000128408 00000 n 
-0000128452 00000 n 
-0000140633 00000 n 
-0000140894 00000 n 
-0000140937 00000 n 
-0000140992 00000 n 
-0000141035 00000 n 
-0000141207 00000 n 
-0000141262 00000 n 
-0000141437 00000 n 
-0000141493 00000 n 
-0000141548 00000 n 
-0000141603 00000 n 
-0000141659 00000 n 
-0000141714 00000 n 
-0000141872 00000 n 
-0000141927 00000 n 
-0000141983 00000 n 
-0000158343 00000 n 
-0000158617 00000 n 
-0000158660 00000 n 
-0000158814 00000 n 
-0000158869 00000 n 
-0000159025 00000 n 
-0000159080 00000 n 
-0000159136 00000 n 
-0000159191 00000 n 
-0000159246 00000 n 
-0000159301 00000 n 
-0000159611 00000 n 
-0000159920 00000 n 
-0000159975 00000 n 
-0000160031 00000 n 
-0000178188 00000 n 
-0000178469 00000 n 
-0000178512 00000 n 
-0000178668 00000 n 
-0000178723 00000 n 
-0000178778 00000 n 
-0000178833 00000 n 
-0000178987 00000 n 
-0000179042 00000 n 
-0000179198 00000 n 
-0000179254 00000 n 
-0000179310 00000 n 
-0000179365 00000 n 
-0000179420 00000 n 
-0000194743 00000 n 
-0000194993 00000 n 
-0000195036 00000 n 
-0000195091 00000 n 
-0000195146 00000 n 
-0000195201 00000 n 
-0000195257 00000 n 
-0000195312 00000 n 
-0000195368 00000 n 
-0000195424 00000 n 
-0000195480 00000 n 
-0000196149 00000 n 
-0000214016 00000 n 
-0000214283 00000 n 
-0000214327 00000 n 
-0000214382 00000 n 
-0000214695 00000 n 
-0000214750 00000 n 
-0000214912 00000 n 
-0000214968 00000 n 
-0000215023 00000 n 
-0000215078 00000 n 
-0000215133 00000 n 
-0000215189 00000 n 
-0000215245 00000 n 
-0000231409 00000 n 
-0000231684 00000 n 
-0000231727 00000 n 
-0000231888 00000 n 
-0000231944 00000 n 
-0000232000 00000 n 
-0000232056 00000 n 
-0000232113 00000 n 
-0000232275 00000 n 
-0000232331 00000 n 
-0000232388 00000 n 
-0000232445 00000 n 
-0000232502 00000 n 
-0000251626 00000 n 
-0000251912 00000 n 
-0000252064 00000 n 
-0000252121 00000 n 
-0000252178 00000 n 
-0000252235 00000 n 
-0000252293 00000 n 
-0000252715 00000 n 
-0000252878 00000 n 
-0000252935 00000 n 
-0000252993 00000 n 
-0000253051 00000 n 
-0000253109 00000 n 
-0000253272 00000 n 
-0000269554 00000 n 
-0000269824 00000 n 
-0000269869 00000 n 
-0000269926 00000 n 
-0000269983 00000 n 
-0000270040 00000 n 
-0000270097 00000 n 
-0000270397 00000 n 
-0000270454 00000 n 
-0000270512 00000 n 
-0000270570 00000 n 
-0000270734 00000 n 
-0000270791 00000 n 
-0000290488 00000 n 
-0000290782 00000 n 
-0000290827 00000 n 
-0000290873 00000 n 
-0000291028 00000 n 
-0000291085 00000 n 
-0000291248 00000 n 
-0000291305 00000 n 
-0000291362 00000 n 
-0000291420 00000 n 
-0000291477 00000 n 
-0000291642 00000 n 
-0000291699 00000 n 
-0000291876 00000 n 
-0000307386 00000 n 
-0000307664 00000 n 
-0000307709 00000 n 
-0000307766 00000 n 
-0000307823 00000 n 
-0000307880 00000 n 
-0000308038 00000 n 
-0000308095 00000 n 
-0000308258 00000 n 
-0000308316 00000 n 
-0000308779 00000 n 
-0000308836 00000 n 
-0000308894 00000 n 
-0000308951 00000 n 
-0000325425 00000 n 
-0000325703 00000 n 
-0000325748 00000 n 
-0000325910 00000 n 
-0000325967 00000 n 
-0000326024 00000 n 
-0000326081 00000 n 
-0000326242 00000 n 
-0000326299 00000 n 
-0000326356 00000 n 
-0000326414 00000 n 
-0000326471 00000 n 
-0000326529 00000 n 
-0000344640 00000 n 
-0000344918 00000 n 
-0000344963 00000 n 
-0000345009 00000 n 
-0000345066 00000 n 
-0000345225 00000 n 
-0000345282 00000 n 
-0000345340 00000 n 
-0000345397 00000 n 
-0000345455 00000 n 
-0000345857 00000 n 
-0000346018 00000 n 
-0000346076 00000 n 
-0000346134 00000 n 
-0000362705 00000 n 
-0000362983 00000 n 
-0000363028 00000 n 
-0000363074 00000 n 
-0000363244 00000 n 
-0000363301 00000 n 
-0000363653 00000 n 
-0000363710 00000 n 
-0000363767 00000 n 
-0000363824 00000 n 
-0000363882 00000 n 
-0000363939 00000 n 
-0000363996 00000 n 
-0000364167 00000 n 
-0000364225 00000 n 
-0000380362 00000 n 
-0000380619 00000 n 
-0000380664 00000 n 
-0000380721 00000 n 
-0000380767 00000 n 
-0000380944 00000 n 
-0000381002 00000 n 
-0000401355 00000 n 
-0000401620 00000 n 
-0000401784 00000 n 
-0000401842 00000 n 
-0000402025 00000 n 
-0000402082 00000 n 
-0000424068 00000 n 
-0000424357 00000 n 
-0000424414 00000 n 
-0000424582 00000 n 
-0000424749 00000 n 
-0000424919 00000 n 
-0000425091 00000 n 
-0000425251 00000 n 
-0000446818 00000 n 
-0000447091 00000 n 
-0000447148 00000 n 
-0000447317 00000 n 
-0000447486 00000 n 
-0000447655 00000 n 
-0000468873 00000 n 
-0000469138 00000 n 
-0000469289 00000 n 
-0000469428 00000 n 
-0000469486 00000 n 
-0000491197 00000 n 
-0000491486 00000 n 
-0000491654 00000 n 
-0000491801 00000 n 
-0000491950 00000 n 
-0000492101 00000 n 
-0000492240 00000 n 
-0000492298 00000 n 
-0000492848 00000 n 
-0000515593 00000 n 
-0000515882 00000 n 
-0000516050 00000 n 
-0000516197 00000 n 
-0000516346 00000 n 
-0000516497 00000 n 
-0000516636 00000 n 
-0000540028 00000 n 
-0000540333 00000 n 
-0000540390 00000 n 
-0000540560 00000 n 
-0000540731 00000 n 
-0000540899 00000 n 
-0000541072 00000 n 
-0000541251 00000 n 
-0000541413 00000 n 
-0000541591 00000 n 
-0000562286 00000 n 
-0000562551 00000 n 
-0000562608 00000 n 
-0000562777 00000 n 
-0000562966 00000 n 
-0000563024 00000 n 
-0000584729 00000 n 
-0000585002 00000 n 
-0000585165 00000 n 
-0000585222 00000 n 
-0000585409 00000 n 
-0000585571 00000 n 
-0000606379 00000 n 
-0000606660 00000 n 
-0000606717 00000 n 
-0000606892 00000 n 
-0000607064 00000 n 
-0000607122 00000 n 
-0000607292 00000 n 
-0000607461 00000 n 
-0000628119 00000 n 
-0000628424 00000 n 
-0000628599 00000 n 
-0000628763 00000 n 
-0000628927 00000 n 
-0000628984 00000 n 
-0000629041 00000 n 
-0000629211 00000 n 
-0000629381 00000 n 
-0000629546 00000 n 
-0000629721 00000 n 
-0000649135 00000 n 
-0000649400 00000 n 
-0000649564 00000 n 
-0000649621 00000 n 
-0000649798 00000 n 
-0000649856 00000 n 
-0000657174 00000 n 
-0000657439 00000 n 
-0000657588 00000 n 
-0000657737 00000 n 
-0000657881 00000 n 
-0000658026 00000 n 
-0000658191 00000 n 
-0000658347 00000 n 
-0000658505 00000 n 
-0000658652 00000 n 
-0000658814 00000 n 
-0000658956 00000 n 
-0000659121 00000 n 
-0000659265 00000 n 
-0000659422 00000 n 
-0000659568 00000 n 
-0000659724 00000 n 
-0000659869 00000 n 
-0000660024 00000 n 
-0000660168 00000 n 
-0000660327 00000 n 
-0000660475 00000 n 
-0000660633 00000 n 
-0000660780 00000 n 
-0000660935 00000 n 
-0000661080 00000 n 
-0000661240 00000 n 
-0000661389 00000 n 
-0000661547 00000 n 
-0000661694 00000 n 
-0000661849 00000 n 
-0000661994 00000 n 
-0000662163 00000 n 
-0000662311 00000 n 
-0000662472 00000 n 
-0000662622 00000 n 
-0000662778 00000 n 
-0000662924 00000 n 
-0000663082 00000 n 
-0000663229 00000 n 
-0000663420 00000 n 
-0000663590 00000 n 
-0000663750 00000 n 
-0000663899 00000 n 
-0000664059 00000 n 
-0000664208 00000 n 
-0000664399 00000 n 
-0000664569 00000 n 
-0000664740 00000 n 
-0000664890 00000 n 
-0000665049 00000 n 
-0000665197 00000 n 
-0000665357 00000 n 
-0000665506 00000 n 
-0000665677 00000 n 
-0000665838 00000 n 
-0000666008 00000 n 
-0000666157 00000 n 
-0000666316 00000 n 
-0000666464 00000 n 
-0000666621 00000 n 
-0000666768 00000 n 
-0000666928 00000 n 
-0000667077 00000 n 
-0000667244 00000 n 
-0000667390 00000 n 
-0000667562 00000 n 
-0000667713 00000 n 
-0000667874 00000 n 
-0000668024 00000 n 
-0000668183 00000 n 
-0000668331 00000 n 
-0000668523 00000 n 
-0000668704 00000 n 
-0000668874 00000 n 
-0000669023 00000 n 
-0000669170 00000 n 
-0000669306 00000 n 
-0000669453 00000 n 
-0000669589 00000 n 
-0000669743 00000 n 
-0000669876 00000 n 
-0000670035 00000 n 
-0000670173 00000 n 
-0000670332 00000 n 
-0000670481 00000 n 
-0000670644 00000 n 
-0000670788 00000 n 
-0000670958 00000 n 
-0000671107 00000 n 
-0000671266 00000 n 
-0000671415 00000 n 
-0000671584 00000 n 
-0000671732 00000 n 
-0000671887 00000 n 
-0000672031 00000 n 
-0000672190 00000 n 
-0000672339 00000 n 
-0000672508 00000 n 
-0000672656 00000 n 
-0000672810 00000 n 
-0000672954 00000 n 
-0000673124 00000 n 
-0000673273 00000 n 
-0000673433 00000 n 
-0000673583 00000 n 
-0000673753 00000 n 
-0000673902 00000 n 
-0000674058 00000 n 
-0000674203 00000 n 
-0000674373 00000 n 
-0000674522 00000 n 
-0000674681 00000 n 
-0000674830 00000 n 
-0000675000 00000 n 
-0000675149 00000 n 
-0000675316 00000 n 
-0000675462 00000 n 
-0000675634 00000 n 
-0000675785 00000 n 
-0000675944 00000 n 
-0000676093 00000 n 
-0000676262 00000 n 
-0000676410 00000 n 
-0000676565 00000 n 
-0000676710 00000 n 
-0000676882 00000 n 
-0000677033 00000 n 
-0000677193 00000 n 
-0000677343 00000 n 
-0000677512 00000 n 
-0000677660 00000 n 
-0000677827 00000 n 
-0000677973 00000 n 
-0000678146 00000 n 
-0000678298 00000 n 
-0000678459 00000 n 
-0000678610 00000 n 
-0000678781 00000 n 
-0000678931 00000 n 
-0000679087 00000 n 
-0000679233 00000 n 
-0000679406 00000 n 
-0000679558 00000 n 
-0000679719 00000 n 
-0000679870 00000 n 
-0000680040 00000 n 
-0000680189 00000 n 
-0000680350 00000 n 
-0000680492 00000 n 
-0000680663 00000 n 
-0000680813 00000 n 
-0000680960 00000 n 
-0000681097 00000 n 
-0000681255 00000 n 
-0000681392 00000 n 
-0000681544 00000 n 
-0000681676 00000 n 
-0000681836 00000 n 
-0000681974 00000 n 
-0000682133 00000 n 
-0000682281 00000 n 
-0000682439 00000 n 
-0000682585 00000 n 
-0000682754 00000 n 
-0000682901 00000 n 
-0000683066 00000 n 
-0000683209 00000 n 
-0000683380 00000 n 
-0000683529 00000 n 
-0000683688 00000 n 
-0000683836 00000 n 
-0000683994 00000 n 
-0000684140 00000 n 
-0000684309 00000 n 
-0000684456 00000 n 
-0000684618 00000 n 
-0000684761 00000 n 
-0000684932 00000 n 
-0000685081 00000 n 
-0000685241 00000 n 
-0000685390 00000 n 
-0000685549 00000 n 
-0000685696 00000 n 
-0000685866 00000 n 
-0000686014 00000 n 
-0000686169 00000 n 
-0000686312 00000 n 
-0000686483 00000 n 
-0000686632 00000 n 
-0000686792 00000 n 
-0000686941 00000 n 
-0000687112 00000 n 
-0000687261 00000 n 
-0000687425 00000 n 
-0000687569 00000 n 
-0000687728 00000 n 
-0000687876 00000 n 
-0000688045 00000 n 
-0000688192 00000 n 
-0000688394 00000 n 
-0000688576 00000 n 
-0000688748 00000 n 
-0000688898 00000 n 
-0000689058 00000 n 
-0000689207 00000 n 
-0000689376 00000 n 
-0000689523 00000 n 
-0000689723 00000 n 
-0000689901 00000 n 
-0000690074 00000 n 
-0000690225 00000 n 
-0000690386 00000 n 
-0000690536 00000 n 
-0000690707 00000 n 
-0000690856 00000 n 
-0000691023 00000 n 
-0000691168 00000 n 
-0000691341 00000 n 
-0000691492 00000 n 
-0000691653 00000 n 
-0000691803 00000 n 
-0000691962 00000 n 
-0000692109 00000 n 
-0000692276 00000 n 
-0000692421 00000 n 
-0000692576 00000 n 
-0000692719 00000 n 
-0000692866 00000 n 
-0000693002 00000 n 
-0000693160 00000 n 
-0000693296 00000 n 
-0000693454 00000 n 
-0000693601 00000 n 
-0000693749 00000 n 
-0000693886 00000 n 
-0000694055 00000 n 
-0000694202 00000 n 
-0000694389 00000 n 
-0000694554 00000 n 
-0000694725 00000 n 
-0000694874 00000 n 
-0000695033 00000 n 
-0000695181 00000 n 
-0000695350 00000 n 
-0000695497 00000 n 
-0000695666 00000 n 
-0000695813 00000 n 
-0000695986 00000 n 
-0000696137 00000 n 
-0000696295 00000 n 
-0000696441 00000 n 
-0000696606 00000 n 
-0000696759 00000 n 
-0000696923 00000 n 
-0000697076 00000 n 
-0000697257 00000 n 
-0000697416 00000 n 
-0000697584 00000 n 
-0000697730 00000 n 
-0000697897 00000 n 
-0000698042 00000 n 
-0000698210 00000 n 
-0000698356 00000 n 
-0000698516 00000 n 
-0000698665 00000 n 
-0000698828 00000 n 
-0000698969 00000 n 
-0000699134 00000 n 
-0000699288 00000 n 
-0000699454 00000 n 
-0000699598 00000 n 
-0000699768 00000 n 
-0000699916 00000 n 
-0000700100 00000 n 
-0000700264 00000 n 
-0000700441 00000 n 
-0000700596 00000 n 
-0000700761 00000 n 
-0000700904 00000 n 
-0000701080 00000 n 
-0000701234 00000 n 
-0000701403 00000 n 
-0000701550 00000 n 
-0000701717 00000 n 
-0000701862 00000 n 
-0000702147 00000 n 
-0000702226 00000 n 
-0000702390 00000 n 
-0000702581 00000 n 
-0000702809 00000 n 
-0000703026 00000 n 
-0000703196 00000 n 
-0000703414 00000 n 
-0000703660 00000 n 
-0000703833 00000 n 
+0000128013 00000 n 
+0000128186 00000 n 
+0000128241 00000 n 
+0000128416 00000 n 
+0000128460 00000 n 
+0000140641 00000 n 
+0000140902 00000 n 
+0000140945 00000 n 
+0000141000 00000 n 
+0000141043 00000 n 
+0000141215 00000 n 
+0000141270 00000 n 
+0000141445 00000 n 
+0000141501 00000 n 
+0000141556 00000 n 
+0000141611 00000 n 
+0000141667 00000 n 
+0000141722 00000 n 
+0000141880 00000 n 
+0000141935 00000 n 
+0000141991 00000 n 
+0000158351 00000 n 
+0000158625 00000 n 
+0000158668 00000 n 
+0000158822 00000 n 
+0000158877 00000 n 
+0000159033 00000 n 
+0000159088 00000 n 
+0000159144 00000 n 
+0000159199 00000 n 
+0000159254 00000 n 
+0000159309 00000 n 
+0000159619 00000 n 
+0000159949 00000 n 
+0000160004 00000 n 
+0000160060 00000 n 
+0000178217 00000 n 
+0000178498 00000 n 
+0000178541 00000 n 
+0000178697 00000 n 
+0000178752 00000 n 
+0000178807 00000 n 
+0000178862 00000 n 
+0000179016 00000 n 
+0000179071 00000 n 
+0000179227 00000 n 
+0000179283 00000 n 
+0000179339 00000 n 
+0000179394 00000 n 
+0000179449 00000 n 
+0000194772 00000 n 
+0000195022 00000 n 
+0000195065 00000 n 
+0000195120 00000 n 
+0000195175 00000 n 
+0000195230 00000 n 
+0000195286 00000 n 
+0000195341 00000 n 
+0000195397 00000 n 
+0000195453 00000 n 
+0000195509 00000 n 
+0000195789 00000 n 
+0000213656 00000 n 
+0000213923 00000 n 
+0000213967 00000 n 
+0000214022 00000 n 
+0000214335 00000 n 
+0000214390 00000 n 
+0000214552 00000 n 
+0000214608 00000 n 
+0000214663 00000 n 
+0000214718 00000 n 
+0000214773 00000 n 
+0000214829 00000 n 
+0000214885 00000 n 
+0000231049 00000 n 
+0000231324 00000 n 
+0000231367 00000 n 
+0000231528 00000 n 
+0000231584 00000 n 
+0000231640 00000 n 
+0000231696 00000 n 
+0000231753 00000 n 
+0000231915 00000 n 
+0000231971 00000 n 
+0000232028 00000 n 
+0000232085 00000 n 
+0000232142 00000 n 
+0000251266 00000 n 
+0000251552 00000 n 
+0000251704 00000 n 
+0000251761 00000 n 
+0000251818 00000 n 
+0000251875 00000 n 
+0000251933 00000 n 
+0000252096 00000 n 
+0000252153 00000 n 
+0000252211 00000 n 
+0000252269 00000 n 
+0000252327 00000 n 
+0000252490 00000 n 
+0000268772 00000 n 
+0000269042 00000 n 
+0000269087 00000 n 
+0000269144 00000 n 
+0000269201 00000 n 
+0000269258 00000 n 
+0000269593 00000 n 
+0000269650 00000 n 
+0000269950 00000 n 
+0000270007 00000 n 
+0000270065 00000 n 
+0000270123 00000 n 
+0000270287 00000 n 
+0000270344 00000 n 
+0000290041 00000 n 
+0000290335 00000 n 
+0000290380 00000 n 
+0000290426 00000 n 
+0000290581 00000 n 
+0000290638 00000 n 
+0000290801 00000 n 
+0000290858 00000 n 
+0000290915 00000 n 
+0000290973 00000 n 
+0000291030 00000 n 
+0000291195 00000 n 
+0000291252 00000 n 
+0000291429 00000 n 
+0000306939 00000 n 
+0000307217 00000 n 
+0000307262 00000 n 
+0000307319 00000 n 
+0000307376 00000 n 
+0000307433 00000 n 
+0000307591 00000 n 
+0000307648 00000 n 
+0000307811 00000 n 
+0000307869 00000 n 
+0000308332 00000 n 
+0000308389 00000 n 
+0000308447 00000 n 
+0000308504 00000 n 
+0000324978 00000 n 
+0000325256 00000 n 
+0000325301 00000 n 
+0000325463 00000 n 
+0000325520 00000 n 
+0000325577 00000 n 
+0000326170 00000 n 
+0000326227 00000 n 
+0000326388 00000 n 
+0000326445 00000 n 
+0000326502 00000 n 
+0000326560 00000 n 
+0000326617 00000 n 
+0000326675 00000 n 
+0000344786 00000 n 
+0000345064 00000 n 
+0000345109 00000 n 
+0000345155 00000 n 
+0000345212 00000 n 
+0000345371 00000 n 
+0000345428 00000 n 
+0000345486 00000 n 
+0000345543 00000 n 
+0000345601 00000 n 
+0000345762 00000 n 
+0000345820 00000 n 
+0000345878 00000 n 
+0000362449 00000 n 
+0000362727 00000 n 
+0000362772 00000 n 
+0000362818 00000 n 
+0000363137 00000 n 
+0000363307 00000 n 
+0000363364 00000 n 
+0000363716 00000 n 
+0000363773 00000 n 
+0000363830 00000 n 
+0000363887 00000 n 
+0000363945 00000 n 
+0000364002 00000 n 
+0000364059 00000 n 
+0000364230 00000 n 
+0000364288 00000 n 
+0000380425 00000 n 
+0000380682 00000 n 
+0000380727 00000 n 
+0000380784 00000 n 
+0000380830 00000 n 
+0000381007 00000 n 
+0000381065 00000 n 
+0000401418 00000 n 
+0000401683 00000 n 
+0000401847 00000 n 
+0000401905 00000 n 
+0000402088 00000 n 
+0000402145 00000 n 
+0000424131 00000 n 
+0000424420 00000 n 
+0000424477 00000 n 
+0000424645 00000 n 
+0000424812 00000 n 
+0000424982 00000 n 
+0000425154 00000 n 
+0000425314 00000 n 
+0000446881 00000 n 
+0000447154 00000 n 
+0000447211 00000 n 
+0000447380 00000 n 
+0000447549 00000 n 
+0000447718 00000 n 
+0000468936 00000 n 
+0000469201 00000 n 
+0000469352 00000 n 
+0000469491 00000 n 
+0000469549 00000 n 
+0000491260 00000 n 
+0000491549 00000 n 
+0000491717 00000 n 
+0000491864 00000 n 
+0000492013 00000 n 
+0000492164 00000 n 
+0000492303 00000 n 
+0000492361 00000 n 
+0000492911 00000 n 
+0000515656 00000 n 
+0000515945 00000 n 
+0000516113 00000 n 
+0000516260 00000 n 
+0000516409 00000 n 
+0000516560 00000 n 
+0000516699 00000 n 
+0000540091 00000 n 
+0000540396 00000 n 
+0000540453 00000 n 
+0000540623 00000 n 
+0000540794 00000 n 
+0000540962 00000 n 
+0000541135 00000 n 
+0000541314 00000 n 
+0000541476 00000 n 
+0000541654 00000 n 
+0000562349 00000 n 
+0000562614 00000 n 
+0000562671 00000 n 
+0000562840 00000 n 
+0000563029 00000 n 
+0000563087 00000 n 
+0000584792 00000 n 
+0000585065 00000 n 
+0000585228 00000 n 
+0000585285 00000 n 
+0000585472 00000 n 
+0000585634 00000 n 
+0000606442 00000 n 
+0000606723 00000 n 
+0000606780 00000 n 
+0000606955 00000 n 
+0000607127 00000 n 
+0000607185 00000 n 
+0000607355 00000 n 
+0000607524 00000 n 
+0000627973 00000 n 
+0000628270 00000 n 
+0000628445 00000 n 
+0000628609 00000 n 
+0000628773 00000 n 
+0000628831 00000 n 
+0000628889 00000 n 
+0000629060 00000 n 
+0000629231 00000 n 
+0000629394 00000 n 
+0000651222 00000 n 
+0000651503 00000 n 
+0000651658 00000 n 
+0000651802 00000 n 
+0000651847 00000 n 
+0000652018 00000 n 
+0000652193 00000 n 
+0000661973 00000 n 
+0000662238 00000 n 
+0000662295 00000 n 
+0000662464 00000 n 
+0000662633 00000 n 
+0000662777 00000 n 
+0000662922 00000 n 
+0000663087 00000 n 
+0000663243 00000 n 
+0000663401 00000 n 
+0000663548 00000 n 
+0000663710 00000 n 
+0000663852 00000 n 
+0000664017 00000 n 
+0000664161 00000 n 
+0000664318 00000 n 
+0000664464 00000 n 
+0000664620 00000 n 
+0000664765 00000 n 
+0000664920 00000 n 
+0000665064 00000 n 
+0000665223 00000 n 
+0000665371 00000 n 
+0000665529 00000 n 
+0000665676 00000 n 
+0000665831 00000 n 
+0000665976 00000 n 
+0000666136 00000 n 
+0000666285 00000 n 
+0000666443 00000 n 
+0000666590 00000 n 
+0000666745 00000 n 
+0000666890 00000 n 
+0000667059 00000 n 
+0000667207 00000 n 
+0000667368 00000 n 
+0000667518 00000 n 
+0000667674 00000 n 
+0000667820 00000 n 
+0000667978 00000 n 
+0000668125 00000 n 
+0000668316 00000 n 
+0000668486 00000 n 
+0000668646 00000 n 
+0000668795 00000 n 
+0000668955 00000 n 
+0000669104 00000 n 
+0000669295 00000 n 
+0000669465 00000 n 
+0000669636 00000 n 
+0000669786 00000 n 
+0000669945 00000 n 
+0000670093 00000 n 
+0000670253 00000 n 
+0000670402 00000 n 
+0000670573 00000 n 
+0000670734 00000 n 
+0000670904 00000 n 
+0000671053 00000 n 
+0000671212 00000 n 
+0000671360 00000 n 
+0000671517 00000 n 
+0000671664 00000 n 
+0000671824 00000 n 
+0000671973 00000 n 
+0000672140 00000 n 
+0000672286 00000 n 
+0000672458 00000 n 
+0000672609 00000 n 
+0000672770 00000 n 
+0000672920 00000 n 
+0000673079 00000 n 
+0000673227 00000 n 
+0000673419 00000 n 
+0000673600 00000 n 
+0000673770 00000 n 
+0000673919 00000 n 
+0000674066 00000 n 
+0000674202 00000 n 
+0000674349 00000 n 
+0000674485 00000 n 
+0000674639 00000 n 
+0000674772 00000 n 
+0000674931 00000 n 
+0000675069 00000 n 
+0000675228 00000 n 
+0000675377 00000 n 
+0000675539 00000 n 
+0000675682 00000 n 
+0000675852 00000 n 
+0000676001 00000 n 
+0000676160 00000 n 
+0000676309 00000 n 
+0000676478 00000 n 
+0000676626 00000 n 
+0000676780 00000 n 
+0000676923 00000 n 
+0000677082 00000 n 
+0000677231 00000 n 
+0000677400 00000 n 
+0000677548 00000 n 
+0000677702 00000 n 
+0000677846 00000 n 
+0000678016 00000 n 
+0000678165 00000 n 
+0000678325 00000 n 
+0000678475 00000 n 
+0000678645 00000 n 
+0000678794 00000 n 
+0000678949 00000 n 
+0000679093 00000 n 
+0000679263 00000 n 
+0000679412 00000 n 
+0000679571 00000 n 
+0000679720 00000 n 
+0000679890 00000 n 
+0000680039 00000 n 
+0000680206 00000 n 
+0000680352 00000 n 
+0000680524 00000 n 
+0000680675 00000 n 
+0000680834 00000 n 
+0000680983 00000 n 
+0000681152 00000 n 
+0000681300 00000 n 
+0000681455 00000 n 
+0000681600 00000 n 
+0000681772 00000 n 
+0000681923 00000 n 
+0000682083 00000 n 
+0000682233 00000 n 
+0000682402 00000 n 
+0000682550 00000 n 
+0000682717 00000 n 
+0000682863 00000 n 
+0000683036 00000 n 
+0000683188 00000 n 
+0000683349 00000 n 
+0000683500 00000 n 
+0000683671 00000 n 
+0000683821 00000 n 
+0000683976 00000 n 
+0000684121 00000 n 
+0000684294 00000 n 
+0000684446 00000 n 
+0000684607 00000 n 
+0000684758 00000 n 
+0000684928 00000 n 
+0000685077 00000 n 
+0000685238 00000 n 
+0000685380 00000 n 
+0000685551 00000 n 
+0000685701 00000 n 
+0000685848 00000 n 
+0000685985 00000 n 
+0000686143 00000 n 
+0000686280 00000 n 
+0000686431 00000 n 
+0000686562 00000 n 
+0000686722 00000 n 
+0000686860 00000 n 
+0000687019 00000 n 
+0000687167 00000 n 
+0000687325 00000 n 
+0000687471 00000 n 
+0000687640 00000 n 
+0000687787 00000 n 
+0000687951 00000 n 
+0000688093 00000 n 
+0000688264 00000 n 
+0000688413 00000 n 
+0000688572 00000 n 
+0000688720 00000 n 
+0000688878 00000 n 
+0000689024 00000 n 
+0000689193 00000 n 
+0000689340 00000 n 
+0000689501 00000 n 
+0000689643 00000 n 
+0000689814 00000 n 
+0000689963 00000 n 
+0000690123 00000 n 
+0000690272 00000 n 
+0000690431 00000 n 
+0000690578 00000 n 
+0000690748 00000 n 
+0000690896 00000 n 
+0000691050 00000 n 
+0000691192 00000 n 
+0000691363 00000 n 
+0000691512 00000 n 
+0000691672 00000 n 
+0000691821 00000 n 
+0000691992 00000 n 
+0000692141 00000 n 
+0000692305 00000 n 
+0000692449 00000 n 
+0000692608 00000 n 
+0000692756 00000 n 
+0000692925 00000 n 
+0000693072 00000 n 
+0000693274 00000 n 
+0000693456 00000 n 
+0000693628 00000 n 
+0000693778 00000 n 
+0000693938 00000 n 
+0000694087 00000 n 
+0000694256 00000 n 
+0000694403 00000 n 
+0000694603 00000 n 
+0000694781 00000 n 
+0000694954 00000 n 
+0000695105 00000 n 
+0000695266 00000 n 
+0000695416 00000 n 
+0000695587 00000 n 
+0000695736 00000 n 
+0000695903 00000 n 
+0000696048 00000 n 
+0000696221 00000 n 
+0000696372 00000 n 
+0000696533 00000 n 
+0000696683 00000 n 
+0000696842 00000 n 
+0000696989 00000 n 
+0000697156 00000 n 
+0000697301 00000 n 
+0000697456 00000 n 
+0000697599 00000 n 
+0000697746 00000 n 
+0000697882 00000 n 
+0000698040 00000 n 
+0000698176 00000 n 
+0000698334 00000 n 
+0000698481 00000 n 
+0000698629 00000 n 
+0000698766 00000 n 
+0000698935 00000 n 
+0000699082 00000 n 
+0000699269 00000 n 
+0000699434 00000 n 
+0000699605 00000 n 
+0000699754 00000 n 
+0000699913 00000 n 
+0000700061 00000 n 
+0000700230 00000 n 
+0000700377 00000 n 
+0000700546 00000 n 
+0000700693 00000 n 
+0000700866 00000 n 
+0000701017 00000 n 
+0000701175 00000 n 
+0000701321 00000 n 
+0000701486 00000 n 
+0000701639 00000 n 
+0000701803 00000 n 
+0000701956 00000 n 
+0000702137 00000 n 
+0000702296 00000 n 
+0000702464 00000 n 
+0000702610 00000 n 
+0000702777 00000 n 
+0000702922 00000 n 
+0000703090 00000 n 
+0000703236 00000 n 
+0000703396 00000 n 
+0000703545 00000 n 
+0000703708 00000 n 
+0000703849 00000 n 
 0000704014 00000 n 
-0000704279 00000 n 
-0000704464 00000 n 
-0000704645 00000 n 
-0000704902 00000 n 
-0000705087 00000 n 
-0000705268 00000 n 
-0000705525 00000 n 
-0000705702 00000 n 
-0000705901 00000 n 
-0000706096 00000 n 
-0000706278 00000 n 
-0000706598 00000 n 
-0000706783 00000 n 
-0000706964 00000 n 
-0000707288 00000 n 
-0000707478 00000 n 
-0000707665 00000 n 
-0000707846 00000 n 
-0000708130 00000 n 
-0000708319 00000 n 
-0000708518 00000 n 
-0000708714 00000 n 
-0000708896 00000 n 
-0000709192 00000 n 
-0000709381 00000 n 
-0000709568 00000 n 
-0000709749 00000 n 
-0000710129 00000 n 
-0000710318 00000 n 
-0000710518 00000 n 
-0000710699 00000 n 
-0000711008 00000 n 
-0000711202 00000 n 
-0000711392 00000 n 
-0000711689 00000 n 
-0000711882 00000 n 
-0000712085 00000 n 
-0000712271 00000 n 
-0000712555 00000 n 
-0000712744 00000 n 
-0000712929 00000 n 
-0000713250 00000 n 
-0000713444 00000 n 
-0000713635 00000 n 
-0000713820 00000 n 
-0000714204 00000 n 
-0000714397 00000 n 
-0000714601 00000 n 
-0000714786 00000 n 
-0000715099 00000 n 
-0000715293 00000 n 
-0000715497 00000 n 
-0000715683 00000 n 
-0000715984 00000 n 
-0000716178 00000 n 
-0000716383 00000 n 
+0000704168 00000 n 
+0000704334 00000 n 
+0000704478 00000 n 
+0000704648 00000 n 
+0000704796 00000 n 
+0000704980 00000 n 
+0000705144 00000 n 
+0000705321 00000 n 
+0000705476 00000 n 
+0000705641 00000 n 
+0000705784 00000 n 
+0000705960 00000 n 
+0000706114 00000 n 
+0000706283 00000 n 
+0000706430 00000 n 
+0000706597 00000 n 
+0000706742 00000 n 
+0000707027 00000 n 
+0000707106 00000 n 
+0000707270 00000 n 
+0000707461 00000 n 
+0000707689 00000 n 
+0000707906 00000 n 
+0000708076 00000 n 
+0000708294 00000 n 
+0000708540 00000 n 
+0000708713 00000 n 
+0000708894 00000 n 
+0000709159 00000 n 
+0000709344 00000 n 
+0000709525 00000 n 
+0000709782 00000 n 
+0000709967 00000 n 
+0000710148 00000 n 
+0000710405 00000 n 
+0000710582 00000 n 
+0000710781 00000 n 
+0000710976 00000 n 
+0000711158 00000 n 
+0000711478 00000 n 
+0000711663 00000 n 
+0000711844 00000 n 
+0000712168 00000 n 
+0000712358 00000 n 
+0000712545 00000 n 
+0000712726 00000 n 
+0000713010 00000 n 
+0000713199 00000 n 
+0000713398 00000 n 
+0000713594 00000 n 
+0000713776 00000 n 
+0000714072 00000 n 
+0000714261 00000 n 
+0000714448 00000 n 
+0000714629 00000 n 
+0000715009 00000 n 
+0000715198 00000 n 
+0000715398 00000 n 
+0000715579 00000 n 
+0000715888 00000 n 
+0000716082 00000 n 
+0000716272 00000 n 
 0000716569 00000 n 
-0000716879 00000 n 
-0000717074 00000 n 
-0000717279 00000 n 
-0000717453 00000 n 
-0000717806 00000 n 
-0000718000 00000 n 
-0000718204 00000 n 
-0000718390 00000 n 
-0000718707 00000 n 
-0000718902 00000 n 
-0000719107 00000 n 
-0000719293 00000 n 
-0000719658 00000 n 
-0000719841 00000 n 
-0000720045 00000 n 
-0000720245 00000 n 
-0000720431 00000 n 
-0000720817 00000 n 
-0000721011 00000 n 
-0000721215 00000 n 
-0000721403 00000 n 
-0000721589 00000 n 
-0000721978 00000 n 
-0000722172 00000 n 
-0000722376 00000 n 
-0000722577 00000 n 
-0000722763 00000 n 
-0000723045 00000 n 
-0000723239 00000 n 
-0000723431 00000 n 
-0000723617 00000 n 
-0000723906 00000 n 
-0000724096 00000 n 
-0000724282 00000 n 
-0000724663 00000 n 
-0000724858 00000 n 
-0000725062 00000 n 
-0000725249 00000 n 
-0000725598 00000 n 
-0000725781 00000 n 
-0000725985 00000 n 
-0000726171 00000 n 
-0000726533 00000 n 
-0000726727 00000 n 
-0000726932 00000 n 
-0000727133 00000 n 
-0000727320 00000 n 
-0000727565 00000 n 
-0000727744 00000 n 
-0000727930 00000 n 
-0000728211 00000 n 
-0000728401 00000 n 
-0000728587 00000 n 
-0000728891 00000 n 
-0000729085 00000 n 
-0000729289 00000 n 
-0000729476 00000 n 
-0000729704 00000 n 
-0000729906 00000 n 
-0000730091 00000 n 
-0000730316 00000 n 
-0000730541 00000 n 
-0000730785 00000 n 
-0000730977 00000 n 
-0000731165 00000 n 
-0000731362 00000 n 
-0000731571 00000 n 
-0000731747 00000 n 
-0000731971 00000 n 
-0000732160 00000 n 
-0000732368 00000 n 
-0000732640 00000 n 
-0000732873 00000 n 
-0000733057 00000 n 
-0000733285 00000 n 
-0000733489 00000 n 
-0000733664 00000 n 
-0000734202 00000 n 
-0000742070 00000 n 
-0000742286 00000 n 
-0000743649 00000 n 
-0000744718 00000 n 
-0000752324 00000 n 
-0000752545 00000 n 
-0000753908 00000 n 
-0000754987 00000 n 
-0000758248 00000 n 
-0000758474 00000 n 
-0000759837 00000 n 
-0000760953 00000 n 
-0000763156 00000 n 
-0000763370 00000 n 
-0000764733 00000 n 
+0000716762 00000 n 
+0000716965 00000 n 
+0000717151 00000 n 
+0000717435 00000 n 
+0000717624 00000 n 
+0000717809 00000 n 
+0000718130 00000 n 
+0000718324 00000 n 
+0000718515 00000 n 
+0000718700 00000 n 
+0000719084 00000 n 
+0000719277 00000 n 
+0000719481 00000 n 
+0000719666 00000 n 
+0000719979 00000 n 
+0000720173 00000 n 
+0000720377 00000 n 
+0000720563 00000 n 
+0000720864 00000 n 
+0000721058 00000 n 
+0000721263 00000 n 
+0000721449 00000 n 
+0000721759 00000 n 
+0000721954 00000 n 
+0000722159 00000 n 
+0000722333 00000 n 
+0000722686 00000 n 
+0000722880 00000 n 
+0000723084 00000 n 
+0000723270 00000 n 
+0000723587 00000 n 
+0000723782 00000 n 
+0000723987 00000 n 
+0000724173 00000 n 
+0000724538 00000 n 
+0000724721 00000 n 
+0000724925 00000 n 
+0000725125 00000 n 
+0000725311 00000 n 
+0000725697 00000 n 
+0000725891 00000 n 
+0000726095 00000 n 
+0000726283 00000 n 
+0000726469 00000 n 
+0000726858 00000 n 
+0000727052 00000 n 
+0000727256 00000 n 
+0000727457 00000 n 
+0000727643 00000 n 
+0000727925 00000 n 
+0000728119 00000 n 
+0000728311 00000 n 
+0000728497 00000 n 
+0000728786 00000 n 
+0000728976 00000 n 
+0000729162 00000 n 
+0000729543 00000 n 
+0000729738 00000 n 
+0000729942 00000 n 
+0000730129 00000 n 
+0000730478 00000 n 
+0000730661 00000 n 
+0000730865 00000 n 
+0000731051 00000 n 
+0000731413 00000 n 
+0000731607 00000 n 
+0000731812 00000 n 
+0000732013 00000 n 
+0000732200 00000 n 
+0000732445 00000 n 
+0000732624 00000 n 
+0000732810 00000 n 
+0000733091 00000 n 
+0000733281 00000 n 
+0000733467 00000 n 
+0000733771 00000 n 
+0000733965 00000 n 
+0000734169 00000 n 
+0000734356 00000 n 
+0000734584 00000 n 
+0000734786 00000 n 
+0000734971 00000 n 
+0000735196 00000 n 
+0000735421 00000 n 
+0000735665 00000 n 
+0000735857 00000 n 
+0000736045 00000 n 
+0000736242 00000 n 
+0000736451 00000 n 
+0000736627 00000 n 
+0000736851 00000 n 
+0000737040 00000 n 
+0000737248 00000 n 
+0000737520 00000 n 
+0000737753 00000 n 
+0000737938 00000 n 
+0000738167 00000 n 
+0000738359 00000 n 
+0000738533 00000 n 
+0000739088 00000 n 
+0000746956 00000 n 
+0000747172 00000 n 
+0000748535 00000 n 
+0000749604 00000 n 
+0000757210 00000 n 
+0000757431 00000 n 
+0000758794 00000 n 
+0000759873 00000 n 
+0000763134 00000 n 
+0000763360 00000 n 
+0000764723 00000 n 
+0000765839 00000 n 
+0000768042 00000 n 
+0000768256 00000 n 
+0000769619 00000 n 
 trailer
-<< /Size 749
+<< /Size 751
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-765858
+770744
 %%EOF
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index dd79eff9e..41ca89a70 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-26 04:12:57.965164','Not found','2020-02-26 04:12:58.942851',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-27 15:08:46.764261','Not found','2020-02-27 15:08:48.172681',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca','Not found','2020-02-26 04:12:58.533953','Not found','2020-02-26 04:12:58.533953','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-88bbf402-1252-419f-a115-7bad5c78f150',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-c77ad93c-11f4-42b3-8ee4-587086fe3f7d\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-56bb4fd3-6354-4d81-813f-9d495ed81773\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca_3','Not found','2020-02-26 04:12:58.264588','Not found','2020-02-26 04:12:58.264588','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-f5efa9dc-a7ad-4c64-a765-bc91d9a55211',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-981b9707-f880-4e4f-ae5f-79a76dbdaab2\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-54008f91-e57b-4990-8c1e-71be596f0298\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName2_tca_2','Not found','2020-02-26 04:12:57.917717','Not found','2020-02-26 04:12:57.917717','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-73b380f7-c715-47c8-bf42-90aef749701c',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4636db5f-4f0b-4d2e-9fef-69387f5961c3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-af706c28-e283-4e73-a283-ba92b28fb028\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"482\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca','Not found','2020-02-27 15:08:47.793512','Not found','2020-02-27 15:08:47.793512','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-49bf6c16-46a7-4962-a667-8be63b66f549',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-1a5feff5-6b1c-4099-9abe-991ed90d0385\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3ce74d04-7349-4318-ac9e-7e002fe56ec0\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-ae12f7f4-adf7-40d7-86d5-8e5d28171a89\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca_3','Not found','2020-02-27 15:08:47.303168','Not found','2020-02-27 15:08:47.303168','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-41007420-32ac-4d57-8541-12faa3554315',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-5b934835-48c1-42f0-aad0-36908cbea8d3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-b0f3df35-6549-4de0-95d3-f274ed3e16f3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-d73cb3bb-6f38-4edd-89a9-004c3fb11c01\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName2_tca_2','Not found','2020-02-27 15:08:46.692894','Not found','2020-02-27 15:08:46.692894','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-e3a75307-db43-4d5a-869d-75ff38d86dda',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-d29c82c3-4632-4f4a-8817-19b82649e34c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a05e8625-c40d-4d24-b50c-2c65734399ea\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-412a95e2-554a-4f62-9887-21105c8d0bb8\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ur2KW_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,15 +152,15 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','Not found','2020-02-26 04:13:02.073313','Not found','2020-02-26 04:13:02.073313','Guard','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-02-26 04:13:02.320782','Not found','2020-02-26 04:13:02.320782','Blacklist','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-02-26 04:13:02.008960','Not found','2020-02-26 04:13:02.008960','FrequencyLimiter','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','Not found','2020-02-26 04:13:01.997505','Not found','2020-02-26 04:13:01.997505','MinMax','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','Not found','2020-02-26 04:13:02.471738','Not found','2020-02-26 04:13:02.471738','Operational','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','Not found','2020-02-26 04:13:02.380152','Not found','2020-02-26 04:13:02.380152','Apex','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','Not found','2020-02-26 04:13:02.001488','Not found','2020-02-26 04:13:02.001488','Drools','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','Not found','2020-02-26 04:13:02.553548','Not found','2020-02-26 04:13:02.553548','Monitoring','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-02-26 04:12:57.983305','Not found','2020-02-26 04:12:57.983305','app','{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','Not found','2020-02-27 15:09:20.557489','Not found','2020-02-27 15:09:21.051644','Guard','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-02-27 15:09:20.518533','Not found','2020-02-27 15:09:20.518533','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-02-27 15:09:20.386878','Not found','2020-02-27 15:09:20.386878','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','Not found','2020-02-27 15:09:20.483188','Not found','2020-02-27 15:09:20.483188','MinMax','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','Not found','2020-02-27 15:09:20.358225','Not found','2020-02-27 15:09:21.072743','Operational','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"apex\",\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','Not found','2020-02-27 15:09:20.354431','Not found','2020-02-27 15:09:20.354431','Apex','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','Not found','2020-02-27 15:09:20.354507','Not found','2020-02-27 15:09:20.354507','Drools','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','Not found','2020-02-27 15:09:20.514460','Not found','2020-02-27 15:09:20.514460','Monitoring','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-02-27 15:08:46.796072','Not found','2020-02-27 15:09:21.107687','app','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -182,4 +182,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-26 12:14:24
+-- Dump completed on 2020-02-27 23:10:22
diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
index 5ec59dbaf..509d4e41c 100755
--- a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java
@@ -83,13 +83,12 @@ public class Painter {
 
         for (MicroServicePolicy ms : microServices) {
             ib.arrow().rectangle(ms.getName(),
-                    RectTypes.MICROSERVICE, ms.getPolicyModel().getPolicyAcronym()).arrow();
+                    RectTypes.MICROSERVICE, ms.getPolicyModel().getPolicyAcronym());
         }
         for (OperationalPolicy policy : policies) {
-            ib.arrow().rectangle(policy.getName(), RectTypes.POLICY, policy.getPolicyModel().getPolicyAcronym())
-                    .arrow();
+            ib.arrow().rectangle(policy.getName(), RectTypes.POLICY, policy.getPolicyModel().getPolicyAcronym());
         }
-        ib.circle("stop-circle", THICK_LINE);
+        ib.arrow().circle("stop-circle", THICK_LINE);
     }
 
     private void adjustGraphics2DProperties() {
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index 2ad47a3c1..7ee088c44 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -39,11 +39,10 @@ public class LoopController {
 
     private final LoopService loopService;
     private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {
-    }
-            .getType();
+    }.getType();
+
     private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {
-    }
-            .getType();
+    }.getType();
 
     @Autowired
     public LoopController(LoopService loopService) {
@@ -103,13 +102,13 @@ public class LoopController {
     /**
      * This method add an operational policy to a loop instance.
      *
-     * @param loopName The loop name
-     * @param policyType The policy model type
+     * @param loopName      The loop name
+     * @param policyType    The policy model type
      * @param policyVersion The policy model  version
      * @return The loop modified
      */
     public Loop addOperationalPolicy(String loopName, String policyType, String policyVersion) {
-        return loopService.addOperationalPolicy(loopName,policyType,policyVersion);
+        return loopService.addOperationalPolicy(loopName, policyType, policyVersion);
     }
 
     /**
diff --git a/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java
index 725bfe88b..ff7777f7f 100644
--- a/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/LegacyOperationalPolicy.java
@@ -173,7 +173,7 @@ public class LegacyOperationalPolicy {
      * @param loop               The parent loop object
      */
     public static void preloadConfiguration(JsonObject configurationsJson, Loop loop) {
-        if (configurationsJson.entrySet().isEmpty()) {
+        if (configurationsJson != null && configurationsJson.entrySet().isEmpty()) {
             JsonObject controlLoopName = new JsonObject();
             controlLoopName.addProperty("controlLoopName",
                     loop != null ? loop.getName() : "Empty (NO loop loaded yet)");
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 52b877208..1c7840579 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -32,7 +32,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.Expose;
-
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -40,7 +39,6 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -50,7 +48,6 @@ import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
@@ -94,12 +91,13 @@ public class OperationalPolicy extends Policy implements Serializable {
 
     /**
      * The constructor.
-     *  @param name               The name of the operational policy
+     *
+     * @param name               The name of the operational policy
      * @param loop               The loop that uses this operational policy
      * @param configurationsJson The operational policy property in the format of
- *                           json
+     *                           json
      * @param policyModel        The policy model associated if any, can be null
-     * @param loopElementModel The loop element from which this instance is supposed to be created
+     * @param loopElementModel   The loop element from which this instance is supposed to be created
      */
     public OperationalPolicy(String name, Loop loop, JsonObject configurationsJson, PolicyModel policyModel,
                              LoopElementModel loopElementModel) {
@@ -108,7 +106,9 @@ public class OperationalPolicy extends Policy implements Serializable {
         this.setPolicyModel(policyModel);
         this.setConfigurationsJson(configurationsJson);
         this.setLoopElementModel(loopElementModel);
-        LegacyOperationalPolicy.preloadConfiguration(configurationsJson, loop);
+        if (policyModel != null && policyModel.getPolicyModelType().contains("legacy")) {
+            LegacyOperationalPolicy.preloadConfiguration(configurationsJson, loop);
+        }
         try {
             this.setJsonRepresentation(
                     OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 74322f36b..23844cb23 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,25 +444,25 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route92">2.1. GET /v1/healthcheck</a>
+<li><a href="#_route30">2.1. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route93">2.2. GET /v1/user/getUser</a>
+<li><a href="#_route31">2.2. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route80">2.3. GET /v2/dictionary</a>
+<li><a href="#_route18">2.3. GET /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route82">2.4. PUT /v2/dictionary</a>
+<li><a href="#_route20">2.4. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters">2.4.1. Parameters</a></li>
 <li><a href="#_responses_4">2.4.2. Responses</a></li>
@@ -491,7 +491,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_7">2.7.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route84">2.8. DELETE /v2/dictionary/{name}</a>
+<li><a href="#_route22">2.8. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_4">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
@@ -505,75 +505,75 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route76">2.10. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route14">2.10. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_6">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
 </ul>
 </li>
-<li><a href="#_route70">2.11. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route8">2.11. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_7">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
 <li><a href="#_produces_10">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route64">2.12. GET /v2/loop/getAllNames</a>
+<li><a href="#_route2">2.12. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_12">2.12.1. Responses</a></li>
 <li><a href="#_produces_11">2.12.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route77">2.13. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route15">2.13. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_8">2.13.1. Parameters</a></li>
 <li><a href="#_responses_13">2.13.2. Responses</a></li>
 <li><a href="#_produces_12">2.13.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route71">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
+<li><a href="#_route9">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route74">2.15. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route12">2.15. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_10">2.15.1. Parameters</a></li>
 <li><a href="#_responses_15">2.15.2. Responses</a></li>
 <li><a href="#_produces_14">2.15.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route73">2.16. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route11">2.16. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_11">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route75">2.17. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route13">2.17. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_12">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
 <li><a href="#_produces_16">2.17.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route66">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route4">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_13">2.18.1. Parameters</a></li>
 <li><a href="#_responses_18">2.18.2. Responses</a></li>
 <li><a href="#_produces_17">2.18.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route72">2.19. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route10">2.19. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_14">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
 <li><a href="#_produces_18">2.19.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route67">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route5">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_15">2.20.1. Parameters</a></li>
 <li><a href="#_responses_20">2.20.2. Responses</a></li>
@@ -581,7 +581,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_19">2.20.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route69">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route7">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_16">2.21.1. Parameters</a></li>
 <li><a href="#_responses_21">2.21.2. Responses</a></li>
@@ -589,7 +589,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_20">2.21.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route68">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route6">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_17">2.22.1. Parameters</a></li>
 <li><a href="#_responses_22">2.22.2. Responses</a></li>
@@ -597,14 +597,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_21">2.22.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route65">2.23. GET /v2/loop/{loopName}</a>
+<li><a href="#_route3">2.23. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_18">2.23.1. Parameters</a></li>
 <li><a href="#_responses_23">2.23.2. Responses</a></li>
 <li><a href="#_produces_22">2.23.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route87">2.24. GET /v2/policyToscaModels</a>
+<li><a href="#_route25">2.24. GET /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_24">2.24.1. Responses</a></li>
 <li><a href="#_produces_23">2.24.2. Produces</a></li>
@@ -624,7 +624,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_25">2.26.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route88">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
+<li><a href="#_route26">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_21">2.27.1. Parameters</a></li>
 <li><a href="#_responses_27">2.27.2. Responses</a></li>
@@ -632,7 +632,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_26">2.27.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route91">2.28. GET /v2/templates</a>
+<li><a href="#_route29">2.28. GET /v2/templates</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_28">2.28.1. Responses</a></li>
 <li><a href="#_produces_27">2.28.2. Produces</a></li>
@@ -692,7 +692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:33631<br>
+<p><em>Host</em> : localhost:37295<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -703,7 +703,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route92"><a class="anchor" href="#_route92"></a><a class="link" href="#_route92">2.1. GET /v1/healthcheck</a></h3>
+<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.1. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -740,7 +740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route93"><a class="anchor" href="#_route93"></a><a class="link" href="#_route93">2.2. GET /v1/user/getUser</a></h3>
+<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.2. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -774,7 +774,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route80"><a class="anchor" href="#_route80"></a><a class="link" href="#_route80">2.3. GET /v2/dictionary</a></h3>
+<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.3. GET /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -811,7 +811,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route82"><a class="anchor" href="#_route82"></a><a class="link" href="#_route82">2.4. PUT /v2/dictionary</a></h3>
+<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.4. PUT /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.4.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1060,7 +1060,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route84"><a class="anchor" href="#_route84"></a><a class="link" href="#_route84">2.8. DELETE /v2/dictionary/{name}</a></h3>
+<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.8. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1184,7 +1184,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route76"><a class="anchor" href="#_route76"></a><a class="link" href="#_route76">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1233,7 +1233,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route70"><a class="anchor" href="#_route70"></a><a class="link" href="#_route70">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1295,7 +1295,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route64"><a class="anchor" href="#_route64"></a><a class="link" href="#_route64">2.12. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.12. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
 <h4 id="_responses_12"><a class="anchor" href="#_responses_12"></a><a class="link" href="#_responses_12">2.12.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1332,7 +1332,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route77"><a class="anchor" href="#_route77"></a><a class="link" href="#_route77">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.13.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1394,7 +1394,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route71"><a class="anchor" href="#_route71"></a><a class="link" href="#_route71">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
+<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1456,7 +1456,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route74"><a class="anchor" href="#_route74"></a><a class="link" href="#_route74">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.15.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1518,7 +1518,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route73"><a class="anchor" href="#_route73"></a><a class="link" href="#_route73">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1580,7 +1580,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route75"><a class="anchor" href="#_route75"></a><a class="link" href="#_route75">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1642,7 +1642,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route66"><a class="anchor" href="#_route66"></a><a class="link" href="#_route66">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.18.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1704,7 +1704,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route72"><a class="anchor" href="#_route72"></a><a class="link" href="#_route72">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1766,7 +1766,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route67"><a class="anchor" href="#_route67"></a><a class="link" href="#_route67">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.20.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1844,7 +1844,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route69"><a class="anchor" href="#_route69"></a><a class="link" href="#_route69">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.21.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1922,7 +1922,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route68"><a class="anchor" href="#_route68"></a><a class="link" href="#_route68">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.22.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2000,7 +2000,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route65"><a class="anchor" href="#_route65"></a><a class="link" href="#_route65">2.23. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.23. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.23.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2062,7 +2062,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route87"><a class="anchor" href="#_route87"></a><a class="link" href="#_route87">2.24. GET /v2/policyToscaModels</a></h3>
+<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.24. GET /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_responses_24"><a class="anchor" href="#_responses_24"></a><a class="link" href="#_responses_24">2.24.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2223,7 +2223,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route88"><a class="anchor" href="#_route88"></a><a class="link" href="#_route88">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
+<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.27.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2301,7 +2301,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route91"><a class="anchor" href="#_route91"></a><a class="link" href="#_route91">2.28. GET /v2/templates</a></h3>
+<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.28. GET /v2/templates</a></h3>
 <div class="sect3">
 <h4 id="_responses_28"><a class="anchor" href="#_responses_28"></a><a class="link" href="#_responses_28">2.28.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -3544,6 +3544,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpSubGroup</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModel</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
@@ -3632,6 +3637,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpSubGroup</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyModel</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_policymodel">PolicyModel</a></p></td>
@@ -3689,6 +3699,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>policyPdpGroup</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>updatedBy</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 3bcfc06bb..fe3f6bdaf 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -569,29 +569,21 @@
 			</route>
 		</get>
 
-		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}"
-			 outType="org.onap.clamp.loop.Loop" produces="application/json">
+		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders pattern="*" excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
 				<doTry>
-					<log loggingLevel="INFO"
-						 message="ADD OperationalPolicy request for loop: ${header.loopName}" />
 					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'ADD OperationalPolicy request')" />
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
 					<to
-							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','write')" />
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request','INFO',${exchangeProperty[loopObject]})" />
-					<doTry>
-						<to
-								uri="bean:org.onap.clamp.loop.LoopController?method=addOperationalPolicy(${loopName},${policyType},${policyVersion})" />
-
-						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
-					</doTry>
+							uri="bean:org.onap.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+					<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
 						<exception>java.lang.Exception</exception>
 						<handled>
@@ -602,13 +594,8 @@
 						<log loggingLevel="ERROR"
 							 message="ADD OperationalPolicy request failed for loop: ${header.loopName}" />
 						<to
-								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
 					</doCatch>
-					<doFinally>
-						<setBody>
-							<simple>${exchangeProperty[loopObject]}</simple>
-						</setBody>
-					</doFinally>
 				</doTry>
 			</route>
 		</put>
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index 48febfc07..a4b6e2920 100644
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/src/main/resources/clds/camel/routes/loop-flows.xml
@@ -38,7 +38,7 @@
 				<simple>${body.getName()}</simple>
 			</setProperty>
 			<setProperty propertyName="policyType">
-				<simple>${body.getModelType()}</simple>
+				<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
 			</setProperty>
 			<setProperty propertyName="policyVersion">
 				<simple>1.0.0</simple>
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
index ce37fe1d6..afc5f952a 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/src/main/resources/clds/camel/routes/policy-flows.xml
@@ -213,9 +213,9 @@
 								</simple>
 						</setHeader>
 						<log loggingLevel="INFO"
-								message="Endpoint to create microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies"></log>
+								message="Endpoint to create microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getPolicyModel().getPolicyModelType()}/versions/1.0.0/policies"></log>
 						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getPolicyModel().getPolicyModelType()}/versions/1.0.0/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 						<doFinally>
 								<to uri="direct:reset-raise-http-exception-flag"/>
 								<to
@@ -259,9 +259,9 @@
 								</simple>
 						</setHeader>
 						<log loggingLevel="INFO"
-								message="Endpoint to delete microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies/${exchangeProperty[microServicePolicy].getName()}/versions/1.0.0"></log>
+								message="Endpoint to delete microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getPolicyModel().getPolicyModelType()}/versions/1.0.0/policies/${exchangeProperty[microServicePolicy].getName()}/versions/1.0.0"></log>
 						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies/${exchangeProperty[microServicePolicy].getName()}/versions/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getPolicyModel().getPolicyModelType()}/versions/1.0.0/policies/${exchangeProperty[microServicePolicy].getName()}/versions/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
 						<doFinally>
 								<to uri="direct:reset-raise-http-exception-flag"/>
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 2f13cfe32..92380ab6c 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -107,6 +107,7 @@ export default class MenuBar extends React.Component {
 							<NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Undeploy from Policy Engine (STOP)</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>ReDeploy to Policy Engine (RESTART)</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete loop instance (DELETE)</NavDropdown.Item>
+							<NavDropdown.Divider />
 							<NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy to DCAE (DEPLOY)</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy to DCAE (UNDEPLOY)</NavDropdown.Item>
 					</StyledNavDropdown>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 63d3f6543..dfc6a5682 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -680,6 +680,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
     >
       Delete loop instance (DELETE)
     </DropdownItem>
+    <DropdownDivider
+      role="separator"
+    />
     <DropdownItem
       as={
         Object {
-- 
cgit 1.2.3-korg


From 635445a5f262464c88287e5b5ceace4abf9cc4bc Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 2 Mar 2020 11:37:20 +0100
Subject: Update UI to define Pdp Group

Update teh UI, adding the possibilities to define Pdp Group and Pdp
Subgroup info.

Issue-ID: CLAMP-654
Change-Id: I3660c491d3a4c730a7414f9c6de9e3859f3c3601
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../clamp/clds/util/drawing/ClampGraphBuilder.java |   2 +-
 src/main/java/org/onap/clamp/loop/Loop.java        |   2 +-
 .../java/org/onap/clamp/loop/LoopController.java   |   4 +-
 src/main/java/org/onap/clamp/loop/LoopService.java |   2 +-
 .../loop/components/external/PolicyComponent.java  |   7 +-
 .../org/onap/clamp/loop/template/PolicyModel.java  |   1 +
 src/main/java/org/onap/clamp/policy/Policy.java    |  18 ++--
 .../policy/microservice/MicroServicePolicy.java    |  13 ++-
 .../microservice/MicroServicePolicyService.java    |   4 +-
 .../policy/operational/OperationalPolicy.java      |  18 ++--
 .../operational/OperationalPolicyService.java      |  10 +-
 .../clds/util/drawing/ClampGraphBuilderTest.java   |   2 +-
 .../clds/util/drawing/SvgLoopGeneratorTest.java    |   2 +-
 .../org/onap/clamp/loop/DcaeComponentTest.java     |   2 +-
 .../org/onap/clamp/loop/DeployFlowTestItCase.java  |   2 +-
 .../onap/clamp/loop/LoopControllerTestItCase.java  |   2 +-
 .../onap/clamp/loop/LoopRepositoriesItCase.java    |   4 +-
 .../org/onap/clamp/loop/LoopServiceTestItCase.java |  26 ++---
 .../java/org/onap/clamp/loop/LoopToJsonTest.java   |   4 +-
 .../org/onap/clamp/loop/PolicyComponentTest.java   |  13 +--
 .../microservice/OperationalPolicyPayloadTest.java |   6 +-
 ui-react/src/api/LoopCache.js                      |  87 ++++++++++++++--
 ui-react/src/api/LoopCache.test.js                 |  11 +-
 .../src/components/dialogs/Policy/PolicyModal.js   | 111 +++++++++++++++++----
 24 files changed, 248 insertions(+), 105 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java b/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
index 8e3b06a46..846b3ab2d 100755
--- a/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
+++ b/src/main/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilder.java
@@ -91,7 +91,7 @@ public class ClampGraphBuilder {
                     loopElementModel.getPolicyModels().first(), false, loopElementModel));
         } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(loopElementModel.getLoopElementType())) {
             policies.add(new OperationalPolicy(loopElementModel.getName(), null, null,
-                    loopElementModel.getPolicyModels().first(), loopElementModel));
+                    loopElementModel.getPolicyModels().first(), loopElementModel, null, null));
         }
         return this;
     }
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index b3fe58f9c..122b4c77f 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -173,7 +173,7 @@ public class Loop extends AuditEntity implements Serializable {
             } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
                     .equals(element.getLoopElementModel().getLoopElementType())) {
                 this.addOperationalPolicy(new OperationalPolicy(name, null, new JsonObject(),
-                        element.getLoopElementModel().getPolicyModels().first(), element.getLoopElementModel()));
+                        element.getLoopElementModel().getPolicyModels().first(), element.getLoopElementModel(), null, null));
             }
         });
     }
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index 7ee088c44..59b97e1a2 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -69,7 +69,7 @@ public class LoopController {
      * @return The updated loop
      */
     public Loop updateOperationalPolicies(String loopName, JsonArray operationalPoliciesJson) {
-        List<OperationalPolicy> operationalPolicies = JsonUtils.GSON.fromJson(operationalPoliciesJson,
+        List<OperationalPolicy> operationalPolicies = JsonUtils.GSON_JPA_MODEL.fromJson(operationalPoliciesJson,
                 OPERATIONAL_POLICY_TYPE);
         return loopService.updateAndSaveOperationalPolicies(loopName, operationalPolicies);
     }
@@ -83,7 +83,7 @@ public class LoopController {
      * @return The updated loop
      */
     public Loop updateMicroservicePolicies(String loopName, JsonArray microServicePoliciesJson) {
-        List<MicroServicePolicy> microservicePolicies = JsonUtils.GSON.fromJson(microServicePoliciesJson,
+        List<MicroServicePolicy> microservicePolicies = JsonUtils.GSON_JPA_MODEL.fromJson(microServicePoliciesJson,
                 MICROSERVICE_POLICY_TYPE);
         return loopService.updateAndSaveMicroservicePolicies(loopName, microservicePolicies);
     }
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index 0be3132b0..98a2fbddc 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -119,7 +119,7 @@ public class LoopService {
         loop.addOperationalPolicy(
                 new OperationalPolicy(Policy.generatePolicyName("OPERATIONAL", loop.getModelService().getName(),
                         loop.getModelService().getVersion(), RandomStringUtils.randomAlphanumeric(3),
-                        RandomStringUtils.randomAlphanumeric(4)), loop, null, policyModel, null));
+                        RandomStringUtils.randomAlphanumeric(4)), loop, null, policyModel, null, null, null));
         return loopsRepository.save(loop);
     }
 
diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
index d47bc9644..4cabe7f1f 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
@@ -35,7 +35,6 @@ import java.util.List;
 import javax.persistence.Transient;
 
 import org.apache.camel.Exchange;
-import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
@@ -85,18 +84,18 @@ public class PolicyComponent extends ExternalComponent {
         jsonObject.add("groups", jsonArray);
 
         for (OperationalPolicy opPolicy : loop.getOperationalPolicies()) {
-            jsonArray.add(createPdpDeploymentPayload(opPolicy.getPdpGroup(), opPolicy.getPdpSubGroup(),
+            jsonArray.add(createPdpDeploymentPayload(opPolicy.getPdpGroup(), opPolicy.getPdpSubgroup(),
                     opPolicy.getPolicyModel().getPolicyModelType(), opPolicy.getPolicyModel().getVersion()));
         }
 
         for (MicroServicePolicy msPolicy : loop.getMicroServicePolicies()) {
-            jsonArray.add(createPdpDeploymentPayload(msPolicy.getPdpGroup(), msPolicy.getPdpSubGroup(),
+            jsonArray.add(createPdpDeploymentPayload(msPolicy.getPdpGroup(), msPolicy.getPdpSubgroup(),
                     msPolicy.getPolicyModel().getPolicyModelType(), msPolicy.getPolicyModel().getVersion()));
         }
 
         String payload = new GsonBuilder().setPrettyPrinting().create().toJson(jsonObject);
         logger.info("PdpGroup policy payload: " + payload);
-        return new GsonBuilder().setPrettyPrinting().create().toJson(jsonObject);
+        return payload;
     }
 
     private static JsonObject createPdpDeploymentPayload(String pdpGroup, String pdpSubGroup,
diff --git a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
index 66b05f65f..3f45d0551 100644
--- a/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/PolicyModel.java
@@ -84,6 +84,7 @@ public class PolicyModel extends AuditEntity implements Serializable, Comparable
     @ManyToMany(mappedBy = "policyModels", fetch = FetchType.EAGER)
     private Set<LoopElementModel> usedByElementModels = new HashSet<>();
 
+    @Expose
     @Type(type = "json")
     @Column(columnDefinition = "json", name = "policy_pdp_group")
     private JsonObject policyPdpGroup;
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
index cce9e567f..47dee1ae9 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -70,7 +70,7 @@ public abstract class Policy extends AuditEntity {
 
     @Expose
     @Column(name = "pdp_sub_group")
-    private String pdpSubGroup;
+    private String pdpSubgroup;
 
     public abstract String createPolicyPayload() throws UnsupportedEncodingException;
 
@@ -159,21 +159,21 @@ public abstract class Policy extends AuditEntity {
     }
 
     /**
-     * pdpSubGroup getter.
+     * pdpSubgroup getter.
      * 
-     * @return the pdpSubGroup
+     * @return the pdpSubgroup
      */
-    public String getPdpSubGroup() {
-        return pdpSubGroup;
+    public String getPdpSubgroup() {
+        return pdpSubgroup;
     }
 
     /**
-     * pdpSubGroup setter.
+     * pdpSubgroup setter.
      * 
-     * @param pdpSubGroup the pdpSubGroup to set
+     * @param pdpSubgroup the pdpSubgroup to set
      */
-    public void setPdpSubGroup(String pdpSubGroup) {
-        this.pdpSubGroup = pdpSubGroup;
+    public void setPdpSubgroup(String pdpSubgroup) {
+        this.pdpSubgroup = pdpSubgroup;
     }
 
     /**
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index 75efca769..7fd752c31 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -121,7 +121,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
     public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared, LoopElementModel loopElementModel) {
         this(name,policyModel,shared,JsonUtils.GSON_JPA_MODEL
                 .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
-                        policyModel.getPolicyModelType()), JsonObject.class),loopElementModel);
+                        policyModel.getPolicyModelType()), JsonObject.class),loopElementModel, null, null);
     }
 
     private JsonObject createJsonFromPolicyTosca() {
@@ -138,15 +138,19 @@ public class MicroServicePolicy extends Policy implements Serializable {
      * @param shared             The flag indicate whether the MicroService is
  *                           shared
      * @param jsonRepresentation The UI representation in json format
-     * @param loopElementModel The loop element model from which this instance should be created
+     * @param loopElementModel   The loop element model from which this instance should be created
+     * @param pdpGroup           The Pdp Group info
+     * @param pdpSubgroup        The Pdp Subgrouop info
      */
     public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared,
-                              JsonObject jsonRepresentation, LoopElementModel loopElementModel) {
+                              JsonObject jsonRepresentation, LoopElementModel loopElementModel, String pdpGroup, String pdpSubgroup) {
         this.name = name;
         this.policyModel = policyModel;
         this.shared = shared;
         this.setJsonRepresentation(jsonRepresentation);
         this.setLoopElementModel(loopElementModel);
+        this.setPdpGroup(pdpGroup);
+        this.setPdpSubgroup(pdpSubgroup);
     }
 
     @Override
@@ -284,8 +288,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
             }
         } else if (!name.equals(other.name)) {
             return false;
-        }
-        return true;
+        }        return true;
     }
 
     private String getMicroServicePropertyNameFromTosca(JsonObject object) {
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
index 2af8ec720..3ad97c598 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
@@ -63,7 +63,7 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
         return repository.save(
                 repository.findById(policy.getName()).map(p -> updateMicroservicePolicyProperties(p, policy, loop))
                         .orElse(new MicroServicePolicy(policy.getName(), policy.getPolicyModel(),
-                                policy.getShared(), policy.getJsonRepresentation(),null)));
+                                policy.getShared(), policy.getJsonRepresentation(),null, policy.getPdpGroup(), policy.getPdpSubgroup())));
     }
 
     private MicroServicePolicy updateMicroservicePolicyProperties(MicroServicePolicy oldPolicy,
@@ -72,6 +72,8 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
         if (!oldPolicy.getUsedByLoops().contains(loop)) {
             oldPolicy.getUsedByLoops().add(loop);
         }
+        oldPolicy.setPdpGroup(newPolicy.getPdpGroup());
+        oldPolicy.setPdpSubgroup(newPolicy.getPdpSubgroup());
         return oldPolicy;
     }
 
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 1c7840579..aab30bfb6 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -98,20 +98,24 @@ public class OperationalPolicy extends Policy implements Serializable {
      *                           json
      * @param policyModel        The policy model associated if any, can be null
      * @param loopElementModel   The loop element from which this instance is supposed to be created
+     * @param pdpGroup           The Pdp Group info
+     * @param pdpSubgroup        The Pdp Subgroup info
      */
     public OperationalPolicy(String name, Loop loop, JsonObject configurationsJson, PolicyModel policyModel,
-                             LoopElementModel loopElementModel) {
+                             LoopElementModel loopElementModel, String pdpGroup, String pdpSubgroup) {
         this.name = name;
         this.loop = loop;
         this.setPolicyModel(policyModel);
         this.setConfigurationsJson(configurationsJson);
+        this.setPdpGroup(pdpGroup);
+        this.setPdpSubgroup(pdpSubgroup);
         this.setLoopElementModel(loopElementModel);
         if (policyModel != null && policyModel.getPolicyModelType().contains("legacy")) {
             LegacyOperationalPolicy.preloadConfiguration(configurationsJson, loop);
         }
         try {
             this.setJsonRepresentation(
-                    OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+                OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
         } catch (JsonSyntaxException | IOException | NullPointerException e) {
             logger.error("Unable to generate the operational policy Schema ... ", e);
             this.setJsonRepresentation(new JsonObject());
@@ -252,11 +256,13 @@ public class OperationalPolicy extends Policy implements Serializable {
     public Map<String, String> createGuardPolicyPayloads() {
         Map<String, String> result = new HashMap<>();
 
-        JsonElement guardsList = this.getConfigurationsJson().get("guard_policies");
-        if (guardsList != null) {
-            for (JsonElement guardElem : guardsList.getAsJsonArray()) {
-                result.put(guardElem.getAsJsonObject().get("policy-id").getAsString(),
+        if (this.getConfigurationsJson() != null) {
+            JsonElement guardsList = this.getConfigurationsJson().get("guard_policies");
+            if (guardsList != null) {
+                for (JsonElement guardElem : guardsList.getAsJsonArray()) {
+                    result.put(guardElem.getAsJsonObject().get("policy-id").getAsString(),
                         new GsonBuilder().create().toJson(guardElem));
+                }
             }
         }
         logger.info("Guard policy payload: " + result);
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
index cc636babb..357a96d21 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
@@ -49,10 +49,10 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
                 .map(policy ->
                         operationalPolicyRepository
                                 .findById(policy.getName())
-                                .map(p -> setConfigurationJson(p, policy.getConfigurationsJson()))
+                                .map(p -> setConfigurationJson(p, policy))
                                 .orElse(new OperationalPolicy(policy.getName(), loop,
                                         policy.getConfigurationsJson(),
-                                        policy.getPolicyModel(), null)))
+                                        policy.getPolicyModel(), null, policy.getPdpGroup(), policy.getPdpSubgroup())))
                 .collect(Collectors.toSet());
     }
 
@@ -61,8 +61,10 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
         return operationalPolicyRepository.existsById(policyName);
     }
 
-    private OperationalPolicy setConfigurationJson(OperationalPolicy policy, JsonObject configurationsJson) {
-        policy.setConfigurationsJson(configurationsJson);
+    private OperationalPolicy setConfigurationJson(OperationalPolicy policy, OperationalPolicy newPolicy) {
+        policy.setConfigurationsJson(newPolicy.getConfigurationsJson());
+        policy.setPdpGroup(newPolicy.getPdpGroup());
+        policy.setPdpSubgroup(newPolicy.getPdpSubgroup());
         return policy;
     }
 }
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
index 2ccecf3e8..184a391d7 100644
--- a/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/drawing/ClampGraphBuilderTest.java
@@ -70,7 +70,7 @@ public class ClampGraphBuilderTest {
                 null);
 
         OperationalPolicy opPolicy = new OperationalPolicy("OperationalPolicy", new Loop(), new JsonObject(),
-                new PolicyModel("org.onap.opolicy", null, "1.0.0", "opolicy1"), null);
+                new PolicyModel("org.onap.opolicy", null, "1.0.0", "opolicy1"), null, null, null);
         final Set<OperationalPolicy> opPolicies = Set.of(opPolicy);
         final Set<MicroServicePolicy> microServices = Set.of(ms1, ms2);
 
diff --git a/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java b/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
index 7b83a4c35..a320131c4 100644
--- a/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
+++ b/src/test/java/org/onap/clamp/clds/util/drawing/SvgLoopGeneratorTest.java
@@ -44,7 +44,7 @@ public class SvgLoopGeneratorTest {
                 new MicroServicePolicy("ms2", new PolicyModel("org.onap.ms2", "", "1.0.0", "short.ms2"),
                         false, null);
         OperationalPolicy opPolicy = new OperationalPolicy("OperationalPolicy", new Loop(), new JsonObject(),
-                new PolicyModel("org.onap.opolicy", null, "1.0.0", "short.OperationalPolicy"), null);
+                new PolicyModel("org.onap.opolicy", null, "1.0.0", "short.OperationalPolicy"), null, null, null);
         Loop loop = new Loop();
         loop.addMicroServicePolicy(ms1);
         loop.addMicroServicePolicy(ms2);
diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
index 50e2e8d39..fc7e1c90a 100644
--- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
@@ -54,7 +54,7 @@ public class DcaeComponentTest {
 
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", new PolicyModel("policy1",
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0","1.0.0"), true,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null);
+                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null, null, null);
         microServicePolicy.setConfigurationsJson(new Gson().fromJson("{\"param1\":\"value1\"}", JsonObject.class));
 
         loopTest.addMicroServicePolicy(microServicePolicy);
diff --git a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
index 3c2ce17ed..f1d299226 100644
--- a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
@@ -297,7 +297,7 @@ public class DeployFlowTestItCase {
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy microService = new MicroServicePolicy(name, policyModel,
                 shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), null);
+                gson.fromJson(jsonRepresentation, JsonObject.class), null, null, null);
 
         microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
         return microService;
diff --git a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
index 714cbd592..f017dd899 100644
--- a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
@@ -135,7 +135,7 @@ public class LoopControllerTestItCase {
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0","1.0.0");
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy policy = new MicroServicePolicy("policyName", policyModel, false,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
         loopController.updateMicroservicePolicy(EXAMPLE_LOOP_NAME, policy);
         assertThat(microServicePolicyService.isExisting("policyName")).isTrue();
     }
diff --git a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
index acde66d9a..47b4b65c3 100644
--- a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
@@ -90,7 +90,7 @@ public class LoopRepositoriesItCase {
     }
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name, PolicyModel policyModel) {
-        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel, null);
+        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel, null, null, null);
     }
 
     private LoopElementModel getLoopElementModel(String yaml, String name, String policyType, String createdBy,
@@ -130,7 +130,7 @@ public class LoopRepositoriesItCase {
     private MicroServicePolicy getMicroServicePolicy(String name, String jsonRepresentation, String jsonProperties,
                                                      boolean shared, PolicyModel policyModel) {
         MicroServicePolicy microService = new MicroServicePolicy(name, policyModel, shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), null);
+                gson.fromJson(jsonRepresentation, JsonObject.class), null, null, null);
         microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
         return microService;
     }
diff --git a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
index 849ca5cfe..5449ada1a 100644
--- a/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopServiceTestItCase.java
@@ -101,7 +101,7 @@ public class LoopServiceTestItCase {
         // given
         saveTestLoopToDb();
         OperationalPolicy operationalPolicy = new OperationalPolicy("policyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
 
         // when
         Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
@@ -129,7 +129,7 @@ public class LoopServiceTestItCase {
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "policyModel1");
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("policyName", policyModel,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
 
         // when
         Loop actualLoop = loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME,
@@ -159,11 +159,11 @@ public class LoopServiceTestItCase {
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "secondPolicyName");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
         MicroServicePolicy firstMicroServicePolicy = new MicroServicePolicy("firstPolicyName", policyModel1, false,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
 
         loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstMicroServicePolicy));
         MicroServicePolicy secondMicroServicePolicy = new MicroServicePolicy("secondPolicyName", policyModel2, false,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
 
         // when
         firstMicroServicePolicy
@@ -203,11 +203,11 @@ public class LoopServiceTestItCase {
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "secondPolicyName");
         policyModelsService.saveOrUpdatePolicyModel(policyModel2);
         MicroServicePolicy firstMicroServicePolicy = new MicroServicePolicy("firstPolicyName", policyModel1,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
         loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstMicroServicePolicy));
 
         MicroServicePolicy secondMicroServicePolicy = new MicroServicePolicy("secondPolicyName", policyModel2,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
 
         // when
         Loop actualLoop = loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME,
@@ -232,11 +232,11 @@ public class LoopServiceTestItCase {
         JsonObject newJsonConfiguration = JsonUtils.GSON.fromJson("{}", JsonObject.class);
 
         OperationalPolicy firstOperationalPolicy = new OperationalPolicy("firstPolicyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
         loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstOperationalPolicy));
 
         OperationalPolicy secondOperationalPolicy = new OperationalPolicy("secondPolicyName", null,
-                newJsonConfiguration, null, null);
+                newJsonConfiguration, null, null, null, null);
 
         // when
         firstOperationalPolicy.setConfigurationsJson(newJsonConfiguration);
@@ -263,11 +263,11 @@ public class LoopServiceTestItCase {
         saveTestLoopToDb();
 
         OperationalPolicy firstOperationalPolicy = new OperationalPolicy("firstPolicyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
         loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstOperationalPolicy));
 
         OperationalPolicy secondOperationalPolicy = new OperationalPolicy("policyName", null,
-                JsonUtils.GSON.fromJson("{}", JsonObject.class), null, null);
+                JsonUtils.GSON.fromJson("{}", JsonObject.class), null, null, "pdpGroup1", "pdpSubgroup1");
 
         // when
         Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
@@ -319,7 +319,7 @@ public class LoopServiceTestItCase {
         loop = loopService.saveOrUpdateLoop(loop);
         // Add op policy
         OperationalPolicy operationalPolicy = new OperationalPolicy("opPolicy", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null);
+                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
         loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(operationalPolicy));
 
         PolicyModel policyModel = new PolicyModel("org.policies.microPolicy",
@@ -327,7 +327,7 @@ public class LoopServiceTestItCase {
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         // Add Micro service policy
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("microPolicy", policyModel,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
         loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(microServicePolicy));
 
         // Verify it's there
@@ -371,7 +371,7 @@ public class LoopServiceTestItCase {
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "policyName");
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("policyName", policyModel,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null);
+                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
         loopService.updateMicroservicePolicy(EXAMPLE_LOOP_NAME, microServicePolicy);
         assertThat(microServicePolicyService.isExisting("policyName")).isTrue();
     }
diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
index 6c6fb0c87..de2ef145a 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
@@ -52,7 +52,7 @@ public class LoopToJsonTest {
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name) {
         return new OperationalPolicy(name, null, gson.fromJson(configJson, JsonObject.class),
-                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"), null);
+                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"), null, null, null);
     }
 
     private Loop getLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
@@ -70,7 +70,7 @@ public class LoopToJsonTest {
                                                      String policyTosca, String jsonProperties, boolean shared) {
         MicroServicePolicy microService = new MicroServicePolicy(name, new PolicyModel(modelType, policyTosca, "1.0.0"),
                 shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), null);
+                gson.fromJson(jsonRepresentation, JsonObject.class), null, null, null);
         microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
         return microService;
     }
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
index 52e10d2db..370c319b3 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
@@ -26,7 +26,9 @@ package org.onap.clamp.loop;
 import static org.assertj.core.api.Assertions.assertThat;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+
 import java.io.IOException;
+import java.util.HashSet;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.junit.Test;
@@ -258,18 +260,12 @@ public class PolicyComponentTest {
         PolicyModel policyModel1 = new PolicyModel("onap.policies.monitoring.test", null, "1.0.0");
 
         MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", policyModel1, true,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null);
-        microServicePolicy.setPdpGroup("pdpGroup1");
-        microServicePolicy.setPdpSubGroup("pdpSubgroup1");
-
+                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null, "pdpGroup1", "pdpSubgroup1");
         loopTest.addMicroServicePolicy(microServicePolicy);
 
         PolicyModel policyModel2 = new PolicyModel("onap.policies.controlloop.Operational", null, "1.0.0");
         OperationalPolicy opPolicy = new OperationalPolicy("opPolicy", loopTest,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), policyModel2, null);
-        opPolicy.setPdpGroup("pdpGroup2");
-        opPolicy.setPdpSubGroup("pdpSubgroup2");
-
+                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), policyModel2, null, "pdpGroup2", "pdpSubgroup2");
         loopTest.addOperationalPolicy(opPolicy);
 
         LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", "svg", 1, null);
@@ -278,6 +274,7 @@ public class PolicyComponentTest {
 
         String payload = PolicyComponent.createPoliciesPayloadPdpGroup(loopTest);
         String expectedRes = ResourceFileUtil.getResourceAsString("tosca/pdp-group-policy-payload.json");
+
         assertThat(payload).isEqualTo(expectedRes);
     }
 }
diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
index bdc7e80de..5686bc161 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
@@ -41,7 +41,7 @@ public class OperationalPolicyPayloadTest {
     public void testOperationalPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null, null, null);
 
         assertThat(policy.createPolicyPayloadYaml())
                 .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.yaml"));
@@ -63,7 +63,7 @@ public class OperationalPolicyPayloadTest {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-no-guard-properties.json"),
                 JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null, null, null);
         Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
         assertThat(guardsMap).isEmpty();
         assertThat(guardsMap.entrySet()).isEmpty();
@@ -73,7 +73,7 @@ public class OperationalPolicyPayloadTest {
     public void testGuardPolicyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null, null, null);
 
         Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
 
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 03cec9fa6..c8ecca2ff 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -36,12 +36,34 @@ export default class LoopCache {
 			}
 	}
 
+	updateMicroServicePdpGroup(name, pdpGroup, pdpSubgroup) {
+			for (var policy in this.loopJsonCache["microServicePolicies"]) {
+				if (this.loopJsonCache["microServicePolicies"][policy]["name"] === name) {
+					this.loopJsonCache["microServicePolicies"][policy]["pdpGroup"] = pdpGroup;
+					this.loopJsonCache["microServicePolicies"][policy]["pdpSubgroup"] = pdpSubgroup;
+				}
+			}
+	}
+
 	updateGlobalProperties(newGlobalProperties) {
 		this.loopJsonCache["globalPropertiesJson"] = newGlobalProperties;
 	}
 
-	updateOperationalPolicyProperties(newOpProperties) {
-		this.loopJsonCache["operationalPolicies"] = newOpProperties;
+	updateOperationalPolicyProperties(name, newOpProperties) {
+		for (var policy in this.loopJsonCache["operationalPolicies"]) {
+				if (this.loopJsonCache["operationalPolicies"][policy]["name"] === name) {
+					this.loopJsonCache["operationalPolicies"][policy]["configurationsJson"] = newOpProperties;
+				}
+			}
+	}
+
+	updateOperationalPolicyPdpGroup(name, pdpGroup, pdpSubgroup) {
+		for (var policy in this.loopJsonCache["operationalPolicies"]) {
+			if (this.loopJsonCache["operationalPolicies"][policy]["name"] === name) {
+				this.loopJsonCache["operationalPolicies"][policy]["pdpGroup"] = pdpGroup;
+				this.loopJsonCache["operationalPolicies"][policy]["pdpSubgroup"] = pdpSubgroup;
+			}
+		}
 	}
 
 	getLoopName() {
@@ -51,7 +73,7 @@ export default class LoopCache {
 	getOperationalPolicyConfigurationJson() {
 		return this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"];
 	}
-	
+
 	getOperationalPolicyJsonSchema() {
 		return this.loopJsonCache["operationalPolicies"]["0"]["jsonRepresentation"];
 	}
@@ -97,13 +119,60 @@ export default class LoopCache {
 	}
 
 	getOperationalPolicyJsonRepresentationForName(name) {
-    	var opConfig = this.getOperationalPolicyForName(name);
-    	if (opConfig !== null) {
-    		return opConfig["jsonRepresentation"];
-    	}
-    	return null;
-    }
+		var opConfig = this.getOperationalPolicyForName(name);
+		if (opConfig !== null) {
+			return opConfig["jsonRepresentation"];
+		}
+		return null;
+	}
+
+	getOperationalPolicySupportedPdpgroup(name) {
+		var opConfig=this.getOperationalPolicyForName(name);
+		if (opConfig !== null) {
+			return opConfig["policyModel"]["policyPdpGroup"]["supportedPdpGroups"];
+		}
+		return null;
+	}
+
+	getOperationalPolicyPdpGroup(name) {
+		var opConfig=this.getOperationalPolicyForName(name);
+		if (opConfig !== null) {
+			return opConfig["pdpGroup"];
+		}
+		return null;
+	}
+
+	getOperationalPolicyPdpSubgroup(name) {
+		var opConfig=this.getOperationalPolicyForName(name);
+		if (opConfig !== null) {
+			return opConfig["pdpSubgroup"];
+		}
+		return null;
+	}
 
+	getMicroServiceSupportedPdpgroup(name) {
+		var microService=this.getMicroServiceForName(name);
+		if (microService !== null) {
+			return microService["policyModel"]["policyPdpGroup"]["supportedPdpGroups"];
+		}
+		return null;
+	}
+
+	getMicroServicePdpGroup(name) {
+		var microService=this.getMicroServiceForName(name);
+		if (microService !== null) {
+			return microService["pdpGroup"];
+		}
+		return null;
+	}
+
+	getMicroServicePdpSubgroup(name) {
+		var microService=this.getMicroServiceForName(name);
+		if (microService !== null) {
+			return microService["pdpSubgroup"];
+		}
+		return null;
+	}
 
 	getMicroServiceForName(name) {
 		var msProperties=this.getMicroServicePolicies();
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index 97c09fa36..fc7568148 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -206,18 +206,15 @@ describe('Verify LoopCache functions', () => {
     });
 
     it('updateOperationalPolicyProperties', () => {
-      const newOpPolicy = [{
-        "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca_new",
-        "configurationsJson": {
+      const newOpPolicy = {
           "guard_policies": {},
           "operational_policy": {
             "controlLoop": {},
             "policies": []
           }
-        }
-      }];
-      loopCache.updateOperationalPolicyProperties(newOpPolicy);
-      expect(loopCache.getOperationalPolicies()).toStrictEqual(newOpPolicy);
+        };
+      loopCache.updateOperationalPolicyProperties("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",newOpPolicy);
+      expect(loopCache.getOperationalPolicyPropertiesForName("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newOpPolicy);
     });
 
     it('updateMicroServiceProperties', () => {
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 51a6464c3..caae70ef0 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -23,6 +23,10 @@
 
 import React from 'react'
 import Button from 'react-bootstrap/Button';
+import Form from 'react-bootstrap/Form';
+import Col from 'react-bootstrap/Col';
+import Row from 'react-bootstrap/Row';
+import Select from 'react-select';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
 import LoopService from '../../../api/LoopService';
@@ -40,7 +44,12 @@ export default class PolicyModal extends React.Component {
 		jsonEditor: null,
 		policyName: this.props.match.params.policyName,
 		// This is to indicate whether it's an operational or config policy (in terms of loop instance)
-		policyInstanceType: this.props.match.params.policyInstanceType
+		policyInstanceType: this.props.match.params.policyInstanceType,
+		pdpGroup: null,
+		pdpGroupList: [],
+		pdpSubgroupList: [],
+		chosenPdpGroup: '',
+		chosenPdpSubgroup: ''
 	};
 
 	constructor(props, context) {
@@ -48,6 +57,8 @@ export default class PolicyModal extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
 		this.renderJsonEditor = this.renderJsonEditor.bind(this);
+		this.handlePdpGroupChange = this.handlePdpGroupChange.bind(this);
+		this.handlePdpSubgroupChange = this.handlePdpSubgroupChange.bind(this);
 	}
 
 	handleSave() {
@@ -63,18 +74,20 @@ export default class PolicyModal extends React.Component {
 			console.info("NO validation errors found in policy data");
 			if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
                 this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
+                this.state.loopCache.updateMicroServicePdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
                 LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
                     this.setState({ show: false });
                     this.props.history.push('/');
                     this.props.loadLoopFunction(this.state.loopCache.getLoopName());
                 });
 			} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
-			    this.state.loopCache.updateOperationalPolicyProperties(editorData);
-            	LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicyForName(this.state.policyName)).then(resp => {
-            		this.setState({ show: false });
-            		this.props.history.push('/');
-            		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-            	});
+				this.state.loopCache.updateOperationalPolicyProperties(this.state.policyName, editorData[0]);
+				this.state.loopCache.updateOperationalPolicyPdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
+				LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()).then(resp => {
+					this.setState({ show: false });
+				this.props.history.push('/');
+					this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+				});
 			}
 		}
 	}
@@ -91,14 +104,22 @@ export default class PolicyModal extends React.Component {
 	renderJsonEditor() {
 		console.debug("Rendering PolicyModal ", this.state.policyName);
 		var toscaModel = {};
-	    var editorData = {};
-	    if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
-            toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
-            editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
-        } else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
-            toscaModel = this.state.loopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
-            editorData = this.state.loopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
-        }
+		var editorData = {};
+		var pdpGroupValues = {};
+		var chosenPdpGroupValue, chosenPdpSubgroupValue;
+		if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
+			toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
+			editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
+			pdpGroupValues = this.state.loopCache.getMicroServiceSupportedPdpgroup(this.state.policyName);
+			chosenPdpGroupValue = this.state.loopCache.getMicroServicePdpGroup(this.state.policyName);
+			chosenPdpSubgroupValue = this.state.loopCache.getMicroServicePdpSubgroup(this.state.policyName);
+		} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
+			toscaModel = this.state.loopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
+			editorData = this.state.loopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
+			pdpGroupValues = this.state.loopCache.getOperationalPolicySupportedPdpgroup(this.state.policyName);
+			chosenPdpGroupValue = this.state.loopCache.getOperationalPolicyPdpGroup(this.state.policyName);
+			chosenPdpSubgroupValue = this.state.loopCache.getOperationalPolicyPdpSubgroup(this.state.policyName);
+		}
 
 		if (toscaModel == null) {
 			return;
@@ -114,10 +135,48 @@ export default class PolicyModal extends React.Component {
 		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
 		JSONEditor.defaults.options.show_errors = 'always';
 
-		this.setState({
-			jsonEditor: new JSONEditor(document.getElementById("editor"),
-				{ schema: toscaModel.schema, startval: editorData })
-		})
+		var pdpGroupListValues = pdpGroupValues.map(entry => {
+				return { label: Object.keys(entry)[0], value: Object.keys(entry)[0] };
+		});
+
+		if (typeof(chosenPdpGroupValue) === "undefined") {
+			this.setState({
+				jsonEditor: new JSONEditor(document.getElementById("editor"),
+					{ schema: toscaModel.schema, startval: editorData }),
+				pdpGroup: pdpGroupValues,
+				pdpGroupList: pdpGroupListValues,
+				chosenPdpGroup: chosenPdpGroupValue,
+				chosenPdpSubgroup: chosenPdpSubgroupValue
+			})
+		} else {
+			var selectedPdpGroup =	pdpGroupValues.filter(entry => (Object.keys(entry)[0] === chosenPdpGroupValue));
+			const pdpSubgroupValues = selectedPdpGroup[0][chosenPdpGroupValue].map((pdpSubgroup) => { return { label: pdpSubgroup, value: pdpSubgroup } });
+			this.setState({
+				jsonEditor: new JSONEditor(document.getElementById("editor"),
+					{ schema: toscaModel.schema, startval: editorData }),
+				pdpGroup: pdpGroupValues,
+				pdpGroupList: pdpGroupListValues,
+				pdpSubgroupList: pdpSubgroupValues,
+				chosenPdpGroup: chosenPdpGroupValue,
+				chosenPdpSubgroup: chosenPdpSubgroupValue
+			})
+		}
+	}
+
+	handlePdpGroupChange(e) {
+		var selectedPdpGroup =	this.state.pdpGroup.filter(entry => (Object.keys(entry)[0] === e.value));
+		const pdpSubgroupValues = selectedPdpGroup[0][e.value].map((pdpSubgroup) => { return { label: pdpSubgroup, value: pdpSubgroup } });
+		if (this.state.chosenPdpGroup !== e.value) {
+			this.setState({ 
+				chosenPdpGroup: e.value,
+				chosenPdpSubgroup: '',
+				pdpSubgroupList: pdpSubgroupValues
+			});
+		}
+	}
+
+	handlePdpSubgroupChange(e) {
+		this.setState({ chosenPdpSubgroup: e.value });
 	}
 
 	render() {
@@ -128,15 +187,23 @@ export default class PolicyModal extends React.Component {
 				</Modal.Header>
 				<Modal.Body>
 					<div id="editor" />
-
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Form.Label column sm="2">Pdp Group Info</Form.Label>
+						<Col sm="3">
+							<Select value={{ label: this.state.chosenPdpGroup, value: this.state.chosenPdpGroup }} onChange={this.handlePdpGroupChange} options={this.state.pdpGroupList} />
+						</Col>
+						<Col sm="3">
+							<Select value={{ label: this.state.chosenPdpSubgroup, value: this.state.chosenPdpSubgroup }} onChange={this.handlePdpSubgroupChange} options={this.state.pdpSubgroupList} />
+						</Col>
+					</Form.Group>
 				</Modal.Body>
 				<Modal.Footer>
 					<Button variant="secondary" onClick={this.handleClose}>
 						Close
-				</Button>
+					</Button>
 					<Button variant="primary" onClick={this.handleSave}>
 						Save Changes
-	            </Button>
+					</Button>
 				</Modal.Footer>
 			</ModalStyled>
 
-- 
cgit 1.2.3-korg


From 897a3e004a858ef68d989dad15dde91a69e151a5 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 28 Feb 2020 06:03:51 -0800
Subject: Change json representation in op policy

Change the json generation for an operational policy instance and update all emulator response for all policy types

Issue-ID: CLAMP-653

Change-Id: I68525be3d5bfbf5dd7a4bcf6d59853df07fd4dd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 docs/swagger/swagger.json                          |  397 +-
 docs/swagger/swagger.pdf                           | 4970 ++++++++++----------
 extra/sql/bulkload/create-tables.sql               |   12 +-
 extra/sql/dump/test-data.sql                       |   32 +-
 .../onap/clamp/clds/config/ClampProperties.java    |   36 -
 .../clamp/clds/config/LegacyOperationalPolicy.java |   48 +
 src/main/java/org/onap/clamp/loop/Loop.java        |   14 +-
 .../java/org/onap/clamp/loop/LoopController.java   |    6 +-
 src/main/java/org/onap/clamp/policy/Policy.java    |  100 +-
 .../policy/microservice/MicroServicePolicy.java    |   81 +-
 .../policy/operational/OperationalPolicy.java      |   81 +-
 src/main/resources/META-INF/resources/swagger.html |   95 +-
 src/main/resources/application-noaaf.properties    |   41 +-
 src/main/resources/application.properties          |   35 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |   55 +-
 .../resources/clds/camel/routes/policy-flows.xml   |   96 +
 .../it/config/CldsReferencePropertiesItCase.java   |   48 +-
 .../org/onap/clamp/loop/CsarInstallerItCase.java   |   12 +-
 .../onap/clamp/loop/LoopRepositoriesItCase.java    |   13 +-
 .../java/org/onap/clamp/loop/LoopToJsonTest.java   |    4 +-
 .../org/onap/clamp/loop/PolicyComponentTest.java   |   76 +-
 .../onap/clamp/loop/PolicyModelServiceItCase.java  |    4 +-
 .../PolicyEngineControllerTestItCase.java          |    9 +-
 .../microservice/OperationalPolicyPayloadTest.java |    6 +-
 src/test/resources/application.properties          |   34 -
 .../.file                                          |   29 +-
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  158 -
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |    1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  158 -
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |    1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  192 +-
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  202 +-
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  196 +-
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  158 -
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |    1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  158 -
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |    1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  311 +-
 .../tosca/operational-policy-payload.json          |    2 +-
 .../tosca/operational-policy-payload.yaml          |    4 +-
 .../loop_viewer/svg/LoopComponentConverter.js      |    6 +-
 41 files changed, 3495 insertions(+), 4388 deletions(-)
 create mode 100644 src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 64b43ab8c..d9a0b8279 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,13 +4,13 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:37295",
+  "host" : "localhost:39099",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route18",
+        "operationId" : "route49",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,11 +20,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route18"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route49"
       },
       "put" : {
-        "operationId" : "route20",
+        "operationId" : "route51",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -43,8 +43,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route51"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
@@ -64,7 +64,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       }
     },
@@ -93,11 +93,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       },
       "delete" : {
-        "operationId" : "route22",
+        "operationId" : "route53",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -108,8 +108,8 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route53"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
@@ -129,7 +129,7 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       }
     },
@@ -147,13 +147,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route3",
+        "operationId" : "route34",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -169,13 +169,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route3"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route34"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route14",
+        "operationId" : "route45",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -185,13 +185,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route14"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route45"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route8",
+        "operationId" : "route39",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -207,13 +207,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route8"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route39"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route2",
+        "operationId" : "route33",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -226,13 +226,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route2"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route33"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route15",
+        "operationId" : "route46",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -248,13 +248,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route15"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route46"
       }
     },
     "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : {
       "put" : {
-        "operationId" : "route9",
+        "operationId" : "route40",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -270,13 +270,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route9"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route40"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route12",
+        "operationId" : "route43",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -292,13 +292,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route12"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route43"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route11",
+        "operationId" : "route42",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -314,13 +314,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route11"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route42"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route13",
+        "operationId" : "route44",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -336,13 +336,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route13"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route44"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route4",
+        "operationId" : "route35",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -358,13 +358,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route4"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route35"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route10",
+        "operationId" : "route41",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -380,13 +380,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route10"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route41"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route5",
+        "operationId" : "route36",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -410,13 +410,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route5"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route36"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route7",
+        "operationId" : "route38",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -440,13 +440,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route7"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route38"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route6",
+        "operationId" : "route37",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -470,13 +470,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route6"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route37"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route25",
+        "operationId" : "route56",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -486,8 +486,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route56"
       }
     },
     "/v2/policyToscaModels/{policyModelType}" : {
@@ -507,11 +507,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       },
       "put" : {
-        "operationId" : "route26",
+        "operationId" : "route57",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -535,8 +535,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route57"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}" : {
@@ -556,13 +556,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route29",
+        "operationId" : "route60",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -572,8 +572,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route60"
       }
     },
     "/v2/templates/{templateName}" : {
@@ -593,7 +593,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       }
     },
@@ -611,13 +611,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
+        "x-camelContextId" : "camel-2",
         "x-routeId" : null
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route30",
+        "operationId" : "route61",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -627,19 +627,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route61"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route31",
+        "operationId" : "route62",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route31"
+        "x-camelContextId" : "camel-2",
+        "x-routeId" : "route62"
       }
     }
   },
@@ -803,34 +803,31 @@
     "JsonPrimitive" : {
       "type" : "object",
       "properties" : {
-        "asBoolean" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "number" : {
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "boolean" : {
           "type" : "boolean"
         },
-        "asString" : {
-          "type" : "string"
+        "asBoolean" : {
+          "type" : "boolean"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -848,22 +845,28 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "boolean" : {
+        "number" : {
           "type" : "boolean"
         },
+        "asString" : {
+          "type" : "string"
+        },
         "string" : {
           "type" : "boolean"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
@@ -874,9 +877,6 @@
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
         }
       }
     },
@@ -912,6 +912,9 @@
         "pdpSubGroup" : {
           "type" : "string"
         },
+        "policyModel" : {
+          "$ref" : "#/definitions/PolicyModel"
+        },
         "name" : {
           "type" : "string"
         },
@@ -939,9 +942,6 @@
         },
         "dcaeBlueprintId" : {
           "type" : "string"
-        },
-        "policyModel" : {
-          "$ref" : "#/definitions/PolicyModel"
         }
       },
       "x-className" : {
@@ -952,55 +952,31 @@
     "JsonObject" : {
       "type" : "object",
       "properties" : {
-        "asBoolean" : {
-          "type" : "boolean"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "jsonNull" : {
+        "asBoolean" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1017,6 +993,30 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "asString" : {
+          "type" : "string"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         }
       },
       "x-className" : {
@@ -1136,69 +1136,48 @@
         "pdpSubGroup" : {
           "type" : "string"
         },
+        "policyModel" : {
+          "$ref" : "#/definitions/PolicyModel"
+        },
         "name" : {
           "type" : "string"
         },
         "loop" : {
           "$ref" : "#/definitions/Loop"
         },
-        "policyModel" : {
-          "$ref" : "#/definitions/PolicyModel"
+        "legacy" : {
+          "type" : "boolean"
         }
       }
     },
     "JsonNull" : {
       "type" : "object",
       "properties" : {
-        "asBoolean" : {
-          "type" : "boolean"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
-        "jsonObject" : {
-          "type" : "boolean"
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
         },
-        "jsonPrimitive" : {
-          "type" : "boolean"
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
         },
-        "jsonNull" : {
+        "asBoolean" : {
           "type" : "boolean"
         },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
-        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1215,36 +1194,57 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
+        },
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "asString" : {
+          "type" : "string"
+        },
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
         }
       }
     },
     "JsonArray" : {
       "type" : "object",
       "properties" : {
-        "asBoolean" : {
-          "type" : "boolean"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
         },
         "asDouble" : {
           "type" : "number",
           "format" : "double"
         },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asLong" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asBoolean" : {
+          "type" : "boolean"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
         },
         "asByte" : {
           "type" : "string",
@@ -1263,16 +1263,22 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
+        "asString" : {
+          "type" : "string"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "jsonObject" : {
+          "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonObject" : {
+        "jsonArray" : {
           "type" : "boolean"
         },
         "jsonPrimitive" : {
@@ -1283,9 +1289,6 @@
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
-        },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
         }
       },
       "x-className" : {
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index 394b7c625..d992107ee 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,16 +4,16 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200227150954-08'00')
-/ModDate (D:20200227150954-08'00')
+/CreationDate (D:20200302132601-08'00')
+/ModDate (D:20200302132601-08'00')
 >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 3 0 R
 /Names 20 0 R
-/Outlines 590 0 R
-/PageLabels 734 0 R
+/Outlines 589 0 R
+/PageLabels 733 0 R
 /PageMode /UseOutlines
 /OpenAction [7 0 R /FitH 793.0]
 /ViewerPreferences << /DisplayDocTitle true
@@ -23,7 +23,7 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 33
-/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 58 0 R 72 0 R 84 0 R 97 0 R 110 0 R 123 0 R 137 0 R 151 0 R 165 0 R 179 0 R 192 0 R 208 0 R 215 0 R 221 0 R 229 0 R 235 0 R 240 0 R 249 0 R 256 0 R 266 0 R 272 0 R 278 0 R 286 0 R 296 0 R 303 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 27 0 R 43 0 R 58 0 R 72 0 R 84 0 R 97 0 R 110 0 R 124 0 R 137 0 R 151 0 R 165 0 R 178 0 R 192 0 R 207 0 R 214 0 R 220 0 R 228 0 R 234 0 R 239 0 R 248 0 R 255 0 R 265 0 R 271 0 R 277 0 R 285 0 R 294 0 R 301 0 R]
 >>
 endobj
 4 0 obj
@@ -80,11 +80,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAA+NotoSerif
 /Subtype /TrueType
-/FontDescriptor 736 0 R
+/FontDescriptor 735 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 738 0 R
-/ToUnicode 737 0 R
+/Widths 737 0 R
+/ToUnicode 736 0 R
 >>
 endobj
 9 0 obj
@@ -1559,7 +1559,7 @@ endobj
 /F1.0 8 0 R
 >>
 >>
-/Annots [307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R 378 0 R]
+/Annots [306 0 R 307 0 R 308 0 R 309 0 R 310 0 R 311 0 R 312 0 R 313 0 R 314 0 R 315 0 R 316 0 R 317 0 R 318 0 R 319 0 R 320 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 326 0 R 327 0 R 328 0 R 329 0 R 330 0 R 331 0 R 332 0 R 333 0 R 334 0 R 335 0 R 336 0 R 337 0 R 338 0 R 339 0 R 340 0 R 341 0 R 342 0 R 343 0 R 344 0 R 345 0 R 346 0 R 347 0 R 348 0 R 349 0 R 350 0 R 351 0 R 352 0 R 353 0 R 354 0 R 355 0 R 356 0 R 357 0 R 358 0 R 359 0 R 360 0 R 361 0 R 362 0 R 363 0 R 364 0 R 365 0 R 366 0 R 367 0 R 368 0 R 369 0 R 370 0 R 371 0 R 372 0 R 373 0 R 374 0 R 375 0 R 376 0 R 377 0 R]
 >>
 endobj
 11 0 obj
@@ -3102,7 +3102,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R 454 0 R]
+/Annots [378 0 R 379 0 R 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R 385 0 R 386 0 R 387 0 R 388 0 R 389 0 R 390 0 R 391 0 R 392 0 R 393 0 R 394 0 R 395 0 R 396 0 R 397 0 R 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R 407 0 R 408 0 R 409 0 R 410 0 R 411 0 R 412 0 R 413 0 R 414 0 R 415 0 R 416 0 R 417 0 R 418 0 R 419 0 R 420 0 R 421 0 R 422 0 R 423 0 R 424 0 R 425 0 R 426 0 R 427 0 R 428 0 R 429 0 R 430 0 R 431 0 R 432 0 R 433 0 R 434 0 R 435 0 R 436 0 R 437 0 R 438 0 R 439 0 R 440 0 R 441 0 R 442 0 R 443 0 R 444 0 R 445 0 R 446 0 R 447 0 R 448 0 R 449 0 R 450 0 R 451 0 R 452 0 R 453 0 R]
 >>
 endobj
 13 0 obj
@@ -4645,7 +4645,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R 530 0 R]
+/Annots [454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R 522 0 R 523 0 R 524 0 R 525 0 R 526 0 R 527 0 R 528 0 R 529 0 R]
 >>
 endobj
 15 0 obj
@@ -5828,7 +5828,7 @@ endobj
 /Font << /F1.0 8 0 R
 >>
 >>
-/Annots [531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R 588 0 R]
+/Annots [530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R 563 0 R 564 0 R 565 0 R 566 0 R 567 0 R 568 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R 584 0 R 585 0 R 586 0 R 587 0 R]
 >>
 endobj
 17 0 obj
@@ -5910,7 +5910,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3337323935> Tj
+<203a206c6f63616c686f73743a3339303939> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -6011,7 +6011,7 @@ endobj
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 >>
@@ -6025,18 +6025,18 @@ endobj
 >>
 endobj
 21 0 obj
-<< /Kids [53 0 R 247 0 R 160 0 R 87 0 R 130 0 R 198 0 R 54 0 R 128 0 R 195 0 R 82 0 R 170 0 R]
+<< /Kids [53 0 R 246 0 R 160 0 R 87 0 R 130 0 R 197 0 R 54 0 R 187 0 R 116 0 R 82 0 R]
 >>
 endobj
 22 0 obj
 << /Type /Font
 /BaseFont /AAAAAB+NotoSerif-Bold
 /Subtype /TrueType
-/FontDescriptor 740 0 R
+/FontDescriptor 739 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 742 0 R
-/ToUnicode 741 0 R
+/Widths 741 0 R
+/ToUnicode 740 0 R
 >>
 endobj
 23 0 obj
@@ -6046,11 +6046,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAC+NotoSerif-Italic
 /Subtype /TrueType
-/FontDescriptor 744 0 R
+/FontDescriptor 743 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 746 0 R
-/ToUnicode 745 0 R
+/Widths 745 0 R
+/ToUnicode 744 0 R
 >>
 endobj
 25 0 obj
@@ -6950,7 +6950,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [31 0 R 39 0 R]
@@ -6980,11 +6980,11 @@ endobj
 << /Type /Font
 /BaseFont /AAAAAD+mplus1mn-regular
 /Subtype /TrueType
-/FontDescriptor 748 0 R
+/FontDescriptor 747 0 R
 /FirstChar 32
 /LastChar 255
-/Widths 750 0 R
-/ToUnicode 749 0 R
+/Widths 749 0 R
+/ToUnicode 748 0 R
 >>
 endobj
 34 0 obj
@@ -8225,7 +8225,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [45 0 R 47 0 R]
@@ -8270,12 +8270,12 @@ endobj
 endobj
 53 0 obj
 << /Limits [(_cldshealthcheck) (_dictionaryelement)]
-/Names [(_cldshealthcheck) 210 0 R (_consumes) 48 0 R (_consumes_2) 67 0 R (_consumes_3) 143 0 R (_consumes_4) 152 0 R (_consumes_5) 159 0 R (_consumes_6) 189 0 R (_definitions) 209 0 R (_dictionary) 211 0 R (_dictionaryelement) 213 0 R]
+/Names [(_cldshealthcheck) 209 0 R (_consumes) 48 0 R (_consumes_2) 67 0 R (_consumes_3) 143 0 R (_consumes_4) 152 0 R (_consumes_5) 159 0 R (_consumes_6) 189 0 R (_definitions) 208 0 R (_dictionary) 210 0 R (_dictionaryelement) 212 0 R]
 >>
 endobj
 54 0 obj
-<< /Limits [(_responses_10) (_responses_2)]
-/Names [(_responses_10) 81 0 R (_responses_11) 88 0 R (_responses_12) 92 0 R (_responses_13) 98 0 R (_responses_14) 103 0 R (_responses_15) 108 0 R (_responses_16) 115 0 R (_responses_17) 120 0 R (_responses_18) 127 0 R (_responses_19) 133 0 R (_responses_2) 35 0 R]
+<< /Limits [(_responses_10) (_responses_19)]
+/Names [(_responses_10) 81 0 R (_responses_11) 88 0 R (_responses_12) 92 0 R (_responses_13) 98 0 R (_responses_14) 103 0 R (_responses_15) 108 0 R (_responses_16) 115 0 R (_responses_17) 121 0 R (_responses_18) 128 0 R (_responses_19) 133 0 R]
 >>
 endobj
 55 0 obj
@@ -9630,7 +9630,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [60 0 R 64 0 R 66 0 R]
@@ -10824,7 +10824,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 >>
@@ -10857,8 +10857,8 @@ endobj
 [72 0 R /XYZ 0 108.12000000000052 null]
 endobj
 82 0 obj
-<< /Limits [(_route15) (_route4)]
-/Names [(_route15) 94 0 R (_route18) 37 0 R (_route2) 91 0 R (_route20) 41 0 R (_route22) 69 0 R (_route25) 169 0 R (_route26) 185 0 R (_route29) 193 0 R (_route3) 162 0 R (_route30) 29 0 R (_route31) 34 0 R (_route4) 125 0 R]
+<< /Limits [(_route46) (_version_information)]
+/Names [(_route46) 94 0 R (_route49) 37 0 R (_route51) 41 0 R (_route53) 69 0 R (_route56) 169 0 R (_route57) 184 0 R (_route60) 193 0 R (_route61) 29 0 R (_route62) 34 0 R (_service) 303 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R]
 >>
 endobj
 83 0 obj
@@ -12192,7 +12192,7 @@ endobj
 /F3.0 24 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [89 0 R]
@@ -12206,7 +12206,7 @@ endobj
 endobj
 87 0 obj
 << /Limits [(_parameters_8) (_produces_15)]
-/Names [(_parameters_8) 95 0 R (_parameters_9) 102 0 R (_paths) 28 0 R (_policymodel) 299 0 R (_produces) 32 0 R (_produces_10) 90 0 R (_produces_11) 93 0 R (_produces_12) 100 0 R (_produces_13) 105 0 R (_produces_14) 112 0 R (_produces_15) 117 0 R]
+/Names [(_parameters_8) 95 0 R (_parameters_9) 102 0 R (_paths) 28 0 R (_policymodel) 298 0 R (_produces) 32 0 R (_produces_10) 90 0 R (_produces_11) 93 0 R (_produces_12) 100 0 R (_produces_13) 105 0 R (_produces_14) 112 0 R (_produces_15) 118 0 R]
 >>
 endobj
 88 0 obj
@@ -13432,7 +13432,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [99 0 R 104 0 R]
@@ -14902,10 +14902,10 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [111 0 R 116 0 R 121 0 R]
+/Annots [111 0 R 117 0 R 122 0 R]
 >>
 endobj
 111 0 obj
@@ -14929,6 +14929,11 @@ endobj
 [110 0 R /XYZ 0 481.68000000000046 null]
 endobj
 116 0 obj
+<< /Limits [(_responses_5) (_route45)]
+/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route33) 91 0 R (_route34) 162 0 R (_route35) 126 0 R (_route36) 138 0 R (_route37) 154 0 R (_route38) 145 0 R (_route39) 85 0 R (_route40) 101 0 R (_route41) 131 0 R (_route42) 113 0 R (_route43) 106 0 R (_route44) 119 0 R (_route45) 79 0 R]
+>>
+endobj
+117 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -14936,19 +14941,19 @@ endobj
 /Type /Annot
 >>
 endobj
-117 0 obj
+118 0 obj
 [110 0 R /XYZ 0 376.5600000000004 null]
 endobj
-118 0 obj
+119 0 obj
 [110 0 R /XYZ 0 320.28000000000037 null]
 endobj
-119 0 obj
+120 0 obj
 [110 0 R /XYZ 0 280.20000000000033 null]
 endobj
-120 0 obj
+121 0 obj
 [110 0 R /XYZ 0 175.08000000000033 null]
 endobj
-121 0 obj
+122 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -14956,7 +14961,7 @@ endobj
 /Type /Annot
 >>
 endobj
-122 0 obj
+123 0 obj
 << /Length 16227
 >>
 stream
@@ -16146,56 +16151,51 @@ Q
 
 endstream
 endobj
-123 0 obj
+124 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 122 0 R
+/Contents 123 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [134 0 R]
 >>
 endobj
-124 0 obj
-[123 0 R /XYZ 0 792.0 null]
-endobj
 125 0 obj
-[123 0 R /XYZ 0 702.1200000000001 null]
+[124 0 R /XYZ 0 792.0 null]
 endobj
 126 0 obj
-[123 0 R /XYZ 0 662.0400000000002 null]
+[124 0 R /XYZ 0 702.1200000000001 null]
 endobj
 127 0 obj
-[123 0 R /XYZ 0 556.9200000000003 null]
+[124 0 R /XYZ 0 662.0400000000002 null]
 endobj
 128 0 obj
-<< /Limits [(_responses_20) (_responses_3)]
-/Names [(_responses_20) 141 0 R (_responses_21) 148 0 R (_responses_22) 157 0 R (_responses_23) 166 0 R (_responses_24) 171 0 R (_responses_25) 176 0 R (_responses_26) 182 0 R (_responses_27) 187 0 R (_responses_28) 194 0 R (_responses_29) 200 0 R (_responses_3) 38 0 R]
->>
+[124 0 R /XYZ 0 556.9200000000003 null]
 endobj
 129 0 obj
-[123 0 R /XYZ 0 451.8000000000004 null]
+[124 0 R /XYZ 0 451.8000000000004 null]
 endobj
 130 0 obj
 << /Limits [(_produces_16) (_produces_24)]
-/Names [(_produces_16) 124 0 R (_produces_17) 129 0 R (_produces_18) 135 0 R (_produces_19) 144 0 R (_produces_2) 36 0 R (_produces_20) 153 0 R (_produces_21) 161 0 R (_produces_22) 168 0 R (_produces_23) 173 0 R (_produces_24) 177 0 R]
+/Names [(_produces_16) 125 0 R (_produces_17) 129 0 R (_produces_18) 135 0 R (_produces_19) 144 0 R (_produces_2) 36 0 R (_produces_20) 153 0 R (_produces_21) 161 0 R (_produces_22) 168 0 R (_produces_23) 172 0 R (_produces_24) 176 0 R]
 >>
 endobj
 131 0 obj
-[123 0 R /XYZ 0 395.5200000000004 null]
+[124 0 R /XYZ 0 395.5200000000004 null]
 endobj
 132 0 obj
-[123 0 R /XYZ 0 355.44000000000034 null]
+[124 0 R /XYZ 0 355.44000000000034 null]
 endobj
 133 0 obj
-[123 0 R /XYZ 0 250.32000000000033 null]
+[124 0 R /XYZ 0 250.32000000000033 null]
 endobj
 134 0 obj
 << /Border [0 0 0]
@@ -16206,7 +16206,7 @@ endobj
 >>
 endobj
 135 0 obj
-[123 0 R /XYZ 0 145.2000000000003 null]
+[124 0 R /XYZ 0 145.2000000000003 null]
 endobj
 136 0 obj
 << /Length 19642
@@ -17665,7 +17665,7 @@ endobj
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [140 0 R 142 0 R 147 0 R 149 0 R]
@@ -18861,7 +18861,7 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
 /Annots [156 0 R 158 0 R]
@@ -18903,7 +18903,7 @@ endobj
 endobj
 160 0 obj
 << /Limits [(_parameters_13) (_parameters_7)]
-/Names [(_parameters_13) 126 0 R (_parameters_14) 132 0 R (_parameters_15) 139 0 R (_parameters_16) 146 0 R (_parameters_17) 155 0 R (_parameters_18) 163 0 R (_parameters_19) 175 0 R (_parameters_2) 56 0 R (_parameters_20) 181 0 R (_parameters_21) 186 0 R (_parameters_22) 203 0 R (_parameters_3) 63 0 R (_parameters_4) 70 0 R (_parameters_5) 76 0 R (_parameters_6) 80 0 R (_parameters_7) 86 0 R]
+/Names [(_parameters_13) 127 0 R (_parameters_14) 132 0 R (_parameters_15) 139 0 R (_parameters_16) 146 0 R (_parameters_17) 155 0 R (_parameters_18) 163 0 R (_parameters_19) 174 0 R (_parameters_2) 56 0 R (_parameters_20) 180 0 R (_parameters_21) 185 0 R (_parameters_22) 202 0 R (_parameters_3) 63 0 R (_parameters_4) 70 0 R (_parameters_5) 76 0 R (_parameters_6) 80 0 R (_parameters_7) 86 0 R]
 >>
 endobj
 161 0 obj
@@ -20130,10 +20130,10 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [167 0 R 172 0 R]
+/Annots [167 0 R 171 0 R]
 >>
 endobj
 166 0 obj
@@ -20154,14 +20154,9 @@ endobj
 [165 0 R /XYZ 0 597.0000000000003 null]
 endobj
 170 0 obj
-<< /Limits [(_route5) (_version_information)]
-/Names [(_route5) 138 0 R (_route6) 154 0 R (_route7) 145 0 R (_route8) 85 0 R (_route9) 101 0 R (_service) 304 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 180 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 174 0 R (_v2_templates_names_get) 199 0 R (_v2_templates_templatename_get) 202 0 R (_version_information) 23 0 R]
->>
-endobj
-171 0 obj
 [165 0 R /XYZ 0 556.9200000000004 null]
 endobj
-172 0 obj
+171 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -20169,22 +20164,22 @@ endobj
 /Type /Annot
 >>
 endobj
-173 0 obj
+172 0 obj
 [165 0 R /XYZ 0 451.8000000000005 null]
 endobj
-174 0 obj
+173 0 obj
 [165 0 R /XYZ 0 395.5200000000005 null]
 endobj
-175 0 obj
+174 0 obj
 [165 0 R /XYZ 0 327.36000000000047 null]
 endobj
-176 0 obj
+175 0 obj
 [165 0 R /XYZ 0 222.2400000000004 null]
 endobj
-177 0 obj
+176 0 obj
 [165 0 R /XYZ 0 117.12000000000037 null]
 endobj
-178 0 obj
+177 0 obj
 << /Length 18056
 >>
 stream
@@ -21511,33 +21506,33 @@ Q
 
 endstream
 endobj
-179 0 obj
+178 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 178 0 R
+/Contents 177 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 /F4.0 33 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [183 0 R 188 0 R]
+/Annots [182 0 R 188 0 R]
 >>
 endobj
+179 0 obj
+[178 0 R /XYZ 0 792.0 null]
+endobj
 180 0 obj
-[179 0 R /XYZ 0 792.0 null]
+[178 0 R /XYZ 0 718.32 null]
 endobj
 181 0 obj
-[179 0 R /XYZ 0 718.32 null]
+[178 0 R /XYZ 0 613.2000000000003 null]
 endobj
 182 0 obj
-[179 0 R /XYZ 0 613.2000000000003 null]
-endobj
-183 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -21545,17 +21540,22 @@ endobj
 /Type /Annot
 >>
 endobj
+183 0 obj
+[178 0 R /XYZ 0 508.0800000000004 null]
+endobj
 184 0 obj
-[179 0 R /XYZ 0 508.0800000000004 null]
+[178 0 R /XYZ 0 451.80000000000035 null]
 endobj
 185 0 obj
-[179 0 R /XYZ 0 451.80000000000035 null]
+[178 0 R /XYZ 0 411.7200000000003 null]
 endobj
 186 0 obj
-[179 0 R /XYZ 0 411.7200000000003 null]
+[178 0 R /XYZ 0 269.04000000000025 null]
 endobj
 187 0 obj
-[179 0 R /XYZ 0 269.04000000000025 null]
+<< /Limits [(_responses_2) (_responses_4)]
+/Names [(_responses_2) 35 0 R (_responses_20) 141 0 R (_responses_21) 148 0 R (_responses_22) 157 0 R (_responses_23) 166 0 R (_responses_24) 170 0 R (_responses_25) 175 0 R (_responses_26) 181 0 R (_responses_27) 186 0 R (_responses_28) 194 0 R (_responses_29) 199 0 R (_responses_3) 38 0 R (_responses_30) 203 0 R (_responses_4) 46 0 R]
+>>
 endobj
 188 0 obj
 << /Border [0 0 0]
@@ -21566,10 +21566,10 @@ endobj
 >>
 endobj
 189 0 obj
-[179 0 R /XYZ 0 163.92000000000024 null]
+[178 0 R /XYZ 0 163.92000000000024 null]
 endobj
 190 0 obj
-[179 0 R /XYZ 0 107.64000000000021 null]
+[178 0 R /XYZ 0 107.64000000000021 null]
 endobj
 191 0 obj
 << /Length 16516
@@ -22786,10 +22786,10 @@ endobj
 /F4.0 33 0 R
 /F3.0 24 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [196 0 R 205 0 R]
+/Annots [195 0 R 204 0 R]
 >>
 endobj
 193 0 obj
@@ -22799,11 +22799,6 @@ endobj
 [192 0 R /XYZ 0 718.32 null]
 endobj
 195 0 obj
-<< /Limits [(_responses_30) (_route14)]
-/Names [(_responses_30) 204 0 R (_responses_4) 46 0 R (_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route10) 131 0 R (_route11) 113 0 R (_route12) 106 0 R (_route13) 118 0 R (_route14) 79 0 R]
->>
-endobj
-196 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -22811,33 +22806,33 @@ endobj
 /Type /Annot
 >>
 endobj
-197 0 obj
+196 0 obj
 [192 0 R /XYZ 0 613.2000000000003 null]
 endobj
-198 0 obj
+197 0 obj
 << /Limits [(_produces_25) (_responses)]
-/Names [(_produces_25) 184 0 R (_produces_26) 190 0 R (_produces_27) 197 0 R (_produces_28) 201 0 R (_produces_29) 206 0 R (_produces_3) 40 0 R (_produces_4) 49 0 R (_produces_5) 52 0 R (_produces_6) 61 0 R (_produces_7) 68 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
+/Names [(_produces_25) 183 0 R (_produces_26) 190 0 R (_produces_27) 196 0 R (_produces_28) 200 0 R (_produces_29) 205 0 R (_produces_3) 40 0 R (_produces_4) 49 0 R (_produces_5) 52 0 R (_produces_6) 61 0 R (_produces_7) 68 0 R (_produces_8) 74 0 R (_produces_9) 78 0 R (_responses) 30 0 R]
 >>
 endobj
-199 0 obj
+198 0 obj
 [192 0 R /XYZ 0 556.9200000000004 null]
 endobj
-200 0 obj
+199 0 obj
 [192 0 R /XYZ 0 516.8400000000005 null]
 endobj
-201 0 obj
+200 0 obj
 [192 0 R /XYZ 0 411.7200000000005 null]
 endobj
-202 0 obj
+201 0 obj
 [192 0 R /XYZ 0 355.44000000000045 null]
 endobj
-203 0 obj
+202 0 obj
 [192 0 R /XYZ 0 315.3600000000004 null]
 endobj
-204 0 obj
+203 0 obj
 [192 0 R /XYZ 0 210.2400000000004 null]
 endobj
-205 0 obj
+204 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -22845,10 +22840,10 @@ endobj
 /Type /Annot
 >>
 endobj
-206 0 obj
+205 0 obj
 [192 0 R /XYZ 0 105.12000000000037 null]
 endobj
-207 0 obj
+206 0 obj
 << /Length 16082
 >>
 stream
@@ -24091,32 +24086,32 @@ Q
 
 endstream
 endobj
-208 0 obj
+207 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 207 0 R
+/Contents 206 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [212 0 R]
+/Annots [211 0 R]
 >>
 endobj
+208 0 obj
+[207 0 R /XYZ 0 792.0 null]
+endobj
 209 0 obj
-[208 0 R /XYZ 0 792.0 null]
+[207 0 R /XYZ 0 712.0799999999999 null]
 endobj
 210 0 obj
-[208 0 R /XYZ 0 712.0799999999999 null]
+[207 0 R /XYZ 0 524.04 null]
 endobj
 211 0 obj
-[208 0 R /XYZ 0 524.04 null]
-endobj
-212 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -24124,10 +24119,10 @@ endobj
 /Type /Annot
 >>
 endobj
-213 0 obj
-[208 0 R /XYZ 0 148.19999999999993 null]
+212 0 obj
+[207 0 R /XYZ 0 148.19999999999993 null]
 endobj
-214 0 obj
+213 0 obj
 << /Length 20298
 >>
 stream
@@ -25704,23 +25699,23 @@ Q
 
 endstream
 endobj
-215 0 obj
+214 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 214 0 R
+/Contents 213 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [216 0 R 218 0 R]
+/Annots [215 0 R 217 0 R]
 >>
 endobj
-216 0 obj
+215 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -25728,10 +25723,10 @@ endobj
 /Type /Annot
 >>
 endobj
-217 0 obj
-[215 0 R /XYZ 0 345.11999999999995 null]
+216 0 obj
+[214 0 R /XYZ 0 345.11999999999995 null]
 endobj
-218 0 obj
+217 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -25739,10 +25734,10 @@ endobj
 /Type /Annot
 >>
 endobj
-219 0 obj
-[215 0 R /XYZ 0 194.6399999999999 null]
+218 0 obj
+[214 0 R /XYZ 0 194.6399999999999 null]
 endobj
-220 0 obj
+219 0 obj
 << /Length 21931
 >>
 stream
@@ -27420,26 +27415,26 @@ Q
 
 endstream
 endobj
-221 0 obj
+220 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 220 0 R
+/Contents 219 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [223 0 R 224 0 R 225 0 R 226 0 R 227 0 R]
+/Annots [222 0 R 223 0 R 224 0 R 225 0 R 226 0 R]
 >>
 endobj
-222 0 obj
-[221 0 R /XYZ 0 683.1600000000001 null]
+221 0 obj
+[220 0 R /XYZ 0 683.1600000000001 null]
 endobj
-223 0 obj
+222 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -27447,7 +27442,7 @@ endobj
 /Type /Annot
 >>
 endobj
-224 0 obj
+223 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -27455,7 +27450,7 @@ endobj
 /Type /Annot
 >>
 endobj
-225 0 obj
+224 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -27463,7 +27458,7 @@ endobj
 /Type /Annot
 >>
 endobj
-226 0 obj
+225 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -27471,7 +27466,7 @@ endobj
 /Type /Annot
 >>
 endobj
-227 0 obj
+226 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -27479,7 +27474,7 @@ endobj
 /Type /Annot
 >>
 endobj
-228 0 obj
+227 0 obj
 << /Length 21512
 >>
 stream
@@ -29141,26 +29136,26 @@ Q
 
 endstream
 endobj
-229 0 obj
+228 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 228 0 R
+/Contents 227 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [231 0 R 232 0 R 233 0 R]
+/Annots [230 0 R 231 0 R 232 0 R]
 >>
 endobj
-230 0 obj
-[229 0 R /XYZ 0 532.9200000000003 null]
+229 0 obj
+[228 0 R /XYZ 0 532.9200000000003 null]
 endobj
-231 0 obj
+230 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -29168,7 +29163,7 @@ endobj
 /Type /Annot
 >>
 endobj
-232 0 obj
+231 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -29176,7 +29171,7 @@ endobj
 /Type /Annot
 >>
 endobj
-233 0 obj
+232 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -29184,7 +29179,7 @@ endobj
 /Type /Annot
 >>
 endobj
-234 0 obj
+233 0 obj
 << /Length 21163
 >>
 stream
@@ -30838,23 +30833,23 @@ Q
 
 endstream
 endobj
-235 0 obj
+234 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 234 0 R
+/Contents 233 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [236 0 R 237 0 R]
+/Annots [235 0 R 236 0 R]
 >>
 endobj
-236 0 obj
+235 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -30862,7 +30857,7 @@ endobj
 /Type /Annot
 >>
 endobj
-237 0 obj
+236 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -30870,10 +30865,10 @@ endobj
 /Type /Annot
 >>
 endobj
-238 0 obj
-[235 0 R /XYZ 0 382.68000000000023 null]
+237 0 obj
+[234 0 R /XYZ 0 382.68000000000023 null]
 endobj
-239 0 obj
+238 0 obj
 << /Length 21656
 >>
 stream
@@ -32551,23 +32546,23 @@ Q
 
 endstream
 endobj
-240 0 obj
+239 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 239 0 R
+/Contents 238 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [241 0 R 242 0 R 243 0 R 244 0 R 245 0 R]
+/Annots [240 0 R 241 0 R 242 0 R 243 0 R 244 0 R]
 >>
 endobj
-241 0 obj
+240 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -32575,7 +32570,7 @@ endobj
 /Type /Annot
 >>
 endobj
-242 0 obj
+241 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -32583,7 +32578,7 @@ endobj
 /Type /Annot
 >>
 endobj
-243 0 obj
+242 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -32591,7 +32586,7 @@ endobj
 /Type /Annot
 >>
 endobj
-244 0 obj
+243 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -32599,7 +32594,7 @@ endobj
 /Type /Annot
 >>
 endobj
-245 0 obj
+244 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -32607,15 +32602,15 @@ endobj
 /Type /Annot
 >>
 endobj
-246 0 obj
-[240 0 R /XYZ 0 232.44000000000023 null]
+245 0 obj
+[239 0 R /XYZ 0 232.44000000000023 null]
 endobj
-247 0 obj
+246 0 obj
 << /Limits [(_externalcomponent) (_parameters_12)]
-/Names [(_externalcomponent) 217 0 R (_externalcomponentstate) 219 0 R (_jsonarray) 222 0 R (_jsonnull) 230 0 R (_jsonobject) 238 0 R (_jsonprimitive) 246 0 R (_loop) 257 0 R (_loopelementmodel) 267 0 R (_looplog) 270 0 R (_looptemplate) 274 0 R (_looptemplateloopelementmodel) 279 0 R (_microservicepolicy) 282 0 R (_number) 290 0 R (_operationalpolicy) 291 0 R (_overview) 19 0 R (_parameters) 44 0 R (_parameters_10) 107 0 R (_parameters_11) 114 0 R (_parameters_12) 119 0 R]
+/Names [(_externalcomponent) 216 0 R (_externalcomponentstate) 218 0 R (_jsonarray) 221 0 R (_jsonnull) 229 0 R (_jsonobject) 237 0 R (_jsonprimitive) 245 0 R (_loop) 256 0 R (_loopelementmodel) 266 0 R (_looplog) 269 0 R (_looptemplate) 273 0 R (_looptemplateloopelementmodel) 278 0 R (_microservicepolicy) 281 0 R (_number) 289 0 R (_operationalpolicy) 290 0 R (_overview) 19 0 R (_parameters) 44 0 R (_parameters_10) 107 0 R (_parameters_11) 114 0 R (_parameters_12) 120 0 R]
 >>
 endobj
-248 0 obj
+247 0 obj
 << /Length 22690
 >>
 stream
@@ -34384,23 +34379,23 @@ Q
 
 endstream
 endobj
-249 0 obj
+248 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 248 0 R
+/Contents 247 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [250 0 R 251 0 R 252 0 R 253 0 R 254 0 R]
+/Annots [249 0 R 250 0 R 251 0 R 252 0 R 253 0 R]
 >>
 endobj
-250 0 obj
+249 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -34408,7 +34403,7 @@ endobj
 /Type /Annot
 >>
 endobj
-251 0 obj
+250 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -34416,7 +34411,7 @@ endobj
 /Type /Annot
 >>
 endobj
-252 0 obj
+251 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -34424,7 +34419,7 @@ endobj
 /Type /Annot
 >>
 endobj
-253 0 obj
+252 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -34432,7 +34427,7 @@ endobj
 /Type /Annot
 >>
 endobj
-254 0 obj
+253 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -34440,7 +34435,7 @@ endobj
 /Type /Annot
 >>
 endobj
-255 0 obj
+254 0 obj
 << /Length 23337
 >>
 stream
@@ -36197,26 +36192,26 @@ Q
 
 endstream
 endobj
-256 0 obj
+255 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 255 0 R
+/Contents 254 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R 264 0 R]
+/Annots [257 0 R 258 0 R 259 0 R 260 0 R 261 0 R 262 0 R 263 0 R]
 >>
 endobj
-257 0 obj
-[256 0 R /XYZ 0 645.6000000000001 null]
+256 0 obj
+[255 0 R /XYZ 0 645.6000000000001 null]
 endobj
-258 0 obj
+257 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -36224,7 +36219,7 @@ endobj
 /Type /Annot
 >>
 endobj
-259 0 obj
+258 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -36232,7 +36227,7 @@ endobj
 /Type /Annot
 >>
 endobj
-260 0 obj
+259 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -36240,7 +36235,7 @@ endobj
 /Type /Annot
 >>
 endobj
-261 0 obj
+260 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -36248,7 +36243,7 @@ endobj
 /Type /Annot
 >>
 endobj
-262 0 obj
+261 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -36256,7 +36251,7 @@ endobj
 /Type /Annot
 >>
 endobj
-263 0 obj
+262 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -36264,7 +36259,7 @@ endobj
 /Type /Annot
 >>
 endobj
-264 0 obj
+263 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -36272,7 +36267,7 @@ endobj
 /Type /Annot
 >>
 endobj
-265 0 obj
+264 0 obj
 << /Length 20640
 >>
 stream
@@ -37863,26 +37858,26 @@ Q
 
 endstream
 endobj
-266 0 obj
+265 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 265 0 R
+/Contents 264 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [268 0 R 269 0 R]
+/Annots [267 0 R 268 0 R]
 >>
 endobj
-267 0 obj
-[266 0 R /XYZ 0 645.6000000000001 null]
+266 0 obj
+[265 0 R /XYZ 0 645.6000000000001 null]
 endobj
-268 0 obj
+267 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -37890,7 +37885,7 @@ endobj
 /Type /Annot
 >>
 endobj
-269 0 obj
+268 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -37898,10 +37893,10 @@ endobj
 /Type /Annot
 >>
 endobj
-270 0 obj
-[266 0 R /XYZ 0 157.08000000000015 null]
+269 0 obj
+[265 0 R /XYZ 0 157.08000000000015 null]
 endobj
-271 0 obj
+270 0 obj
 << /Length 21650
 >>
 stream
@@ -39577,23 +39572,23 @@ Q
 
 endstream
 endobj
-272 0 obj
+271 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 271 0 R
+/Contents 270 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [273 0 R 275 0 R 276 0 R]
+/Annots [272 0 R 274 0 R 275 0 R]
 >>
 endobj
-273 0 obj
+272 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -39601,10 +39596,10 @@ endobj
 /Type /Annot
 >>
 endobj
-274 0 obj
-[272 0 R /XYZ 0 532.9200000000001 null]
+273 0 obj
+[271 0 R /XYZ 0 532.9200000000001 null]
 endobj
-275 0 obj
+274 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -39612,7 +39607,7 @@ endobj
 /Type /Annot
 >>
 endobj
-276 0 obj
+275 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -39620,7 +39615,7 @@ endobj
 /Type /Annot
 >>
 endobj
-277 0 obj
+276 0 obj
 << /Length 20753
 >>
 stream
@@ -41199,26 +41194,26 @@ Q
 
 endstream
 endobj
-278 0 obj
+277 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 277 0 R
+/Contents 276 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [280 0 R 281 0 R 283 0 R 284 0 R]
+/Annots [279 0 R 280 0 R 282 0 R 283 0 R]
 >>
 endobj
-279 0 obj
-[278 0 R /XYZ 0 645.6000000000001 null]
+278 0 obj
+[277 0 R /XYZ 0 645.6000000000001 null]
 endobj
-280 0 obj
+279 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -41226,7 +41221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-281 0 obj
+280 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -41234,10 +41229,10 @@ endobj
 /Type /Annot
 >>
 endobj
-282 0 obj
-[278 0 R /XYZ 0 457.56000000000023 null]
+281 0 obj
+[277 0 R /XYZ 0 457.56000000000023 null]
 endobj
-283 0 obj
+282 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -41245,7 +41240,7 @@ endobj
 /Type /Annot
 >>
 endobj
-284 0 obj
+283 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -41253,8 +41248,8 @@ endobj
 /Type /Annot
 >>
 endobj
-285 0 obj
-<< /Length 20394
+284 0 obj
+<< /Length 20228
 >>
 stream
 q
@@ -42723,7 +42718,7 @@ S
 BT
 51.24 84.97300000000011 Td
 /F2.0 10.5 Tf
-<6c6f6f70> Tj
+<6c6567616379> Tj
 ET
 
 
@@ -42766,21 +42761,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 77.83300000000011 Td
 /F1.0 10.5 Tf
-<4c6f6f70> Tj
+<626f6f6c65616e> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 q
 0.000 0.000 0.000 scn
@@ -42806,23 +42793,23 @@ Q
 
 endstream
 endobj
-286 0 obj
+285 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 285 0 R
+/Contents 284 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [287 0 R 288 0 R 289 0 R 292 0 R 293 0 R 294 0 R]
+/Annots [286 0 R 287 0 R 288 0 R 291 0 R 292 0 R]
 >>
 endobj
-287 0 obj
+286 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -42830,7 +42817,7 @@ endobj
 /Type /Annot
 >>
 endobj
-288 0 obj
+287 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -42838,7 +42825,7 @@ endobj
 /Type /Annot
 >>
 endobj
-289 0 obj
+288 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -42846,13 +42833,13 @@ endobj
 /Type /Annot
 >>
 endobj
+289 0 obj
+[285 0 R /XYZ 0 382.68000000000023 null]
+endobj
 290 0 obj
-[286 0 R /XYZ 0 382.68000000000023 null]
+[285 0 R /XYZ 0 314.82000000000016 null]
 endobj
 291 0 obj
-[286 0 R /XYZ 0 314.82000000000016 null]
-endobj
-292 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -42860,7 +42847,7 @@ endobj
 /Type /Annot
 >>
 endobj
-293 0 obj
+292 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -42868,16 +42855,8 @@ endobj
 /Type /Annot
 >>
 endobj
-294 0 obj
-<< /Border [0 0 0]
-/Dest (_loop)
-/Subtype /Link
-/Rect [272.17692192000004 74.76700000000011 297.27192192000007 89.04700000000011]
-/Type /Annot
->>
-endobj
-295 0 obj
-<< /Length 21773
+293 0 obj
+<< /Length 21473
 >>
 stream
 q
@@ -42946,6 +42925,14 @@ f
 269.177 469.800 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 432.240 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 432.240 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
 0.5 w
 /DeviceRGB CS
 0.867 0.867 0.867 SCN
@@ -43048,7 +43035,7 @@ S
 BT
 51.24 716.473 Td
 /F2.0 10.5 Tf
-<6c6f6f70456c656d656e744d6f64656c> Tj
+<6c6f6f70> Tj
 ET
 
 
@@ -43101,7 +43088,7 @@ S
 BT
 272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
-<4c6f6f70456c656d656e744d6f64656c> Tj
+<4c6f6f70> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -43138,7 +43125,7 @@ S
 BT
 51.24 678.913 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
+<6c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
 
@@ -43181,13 +43168,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 671.773 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4c6f6f70456c656d656e744d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -43220,7 +43215,7 @@ S
 BT
 51.24 641.3530000000001 Td
 /F2.0 10.5 Tf
-<70647047726f7570> Tj
+<6e616d65> Tj
 ET
 
 
@@ -43302,7 +43297,7 @@ S
 BT
 51.24 603.7929999999999 Td
 /F2.0 10.5 Tf
-<70647053756247726f7570> Tj
+<70647047726f7570> Tj
 ET
 
 
@@ -43384,7 +43379,7 @@ S
 BT
 51.24 566.233 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c> Tj
+<70647053756247726f7570> Tj
 ET
 
 
@@ -43427,21 +43422,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 559.093 Td
 /F1.0 10.5 Tf
-<506f6c6963794d6f64656c> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -43474,7 +43461,7 @@ S
 BT
 51.24 528.673 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<706f6c6963794d6f64656c> Tj
 ET
 
 
@@ -43517,13 +43504,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 521.533 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<506f6c6963794d6f64656c> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -43556,7 +43551,7 @@ S
 BT
 51.24 491.113 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
@@ -43603,6 +43598,88 @@ S
 BT
 272.17692192000004 483.973 Td
 /F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 469.800 m
+269.177 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.240 m
+269.177 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 470.050 m
+48.240 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 453.553 Td
+/F2.0 10.5 Tf
+<7570646174656444617465> Tj
+ET
+
+
+BT
+51.24 439.273 Td
+ET
+
+
+BT
+51.24 439.273 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 469.800 m
+563.760 469.800 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.240 m
+563.760 432.240 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 470.050 m
+269.177 431.990 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 470.050 m
+563.760 431.990 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 446.413 Td
+/F1.0 10.5 Tf
 <696e74656765722028696e74363429> Tj
 ET
 
@@ -43611,7 +43688,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 434.37600000000003 Td
+48.24 396.81600000000003 Td
 /F2.0 18 Tf
 <332e31382e20506f6c6963794d6f64656c> Tj
 ET
@@ -43619,177 +43696,99 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 394.440 220.937 23.280 re
+48.240 356.880 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 394.440 294.583 23.280 re
+269.177 356.880 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 356.880 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 356.880 294.583 37.560 re
-f
-0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
 48.240 319.320 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 319.320 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 48.240 281.760 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 269.177 281.760 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 48.240 244.200 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 244.200 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 48.240 206.640 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 269.177 206.640 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 48.240 169.080 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 169.080 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 48.240 131.520 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 269.177 131.520 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 48.240 93.960 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-0.976 0.976 0.976 scn
+1.000 1.000 1.000 scn
 269.177 93.960 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 48.240 56.400 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
+0.976 0.976 0.976 scn
 269.177 56.400 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 417.720 m
-269.177 417.720 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 417.970 m
-48.240 393.690 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 417.970 m
-269.177 393.690 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 401.97299999999996 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 417.720 m
-563.760 417.720 l
+48.240 380.160 m
+269.177 380.160 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 417.970 m
-269.177 393.690 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 417.970 m
-563.760 393.690 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 401.97299999999996 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 394.440 m
-269.177 394.440 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
 48.240 356.880 m
 269.177 356.880 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 394.690 m
-48.240 356.630 l
+48.240 380.410 m
+48.240 356.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 380.410 m
+269.177 356.130 l
 S
 [ ] 0 d
 1 w
@@ -43797,31 +43796,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 378.1929999999999 Td
+51.24 364.41299999999995 Td
 /F2.0 10.5 Tf
-[<6372656174656442> 20.01953125 <79>] TJ
-ET
-
-
-BT
-51.24 363.9129999999999 Td
-ET
-
-
-BT
-51.24 363.9129999999999 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.440 m
-563.760 394.440 l
+269.177 380.160 m
+563.760 380.160 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
 269.177 356.880 m
 563.760 356.880 l
@@ -43829,14 +43816,14 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 394.690 m
-269.177 356.630 l
+269.177 380.410 m
+269.177 356.130 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 394.690 m
-563.760 356.630 l
+563.760 380.410 m
+563.760 356.130 l
 S
 [ ] 0 d
 1 w
@@ -43844,9 +43831,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 371.05299999999994 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 364.41299999999995 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -43881,7 +43868,7 @@ S
 BT
 51.24 340.633 Td
 /F2.0 10.5 Tf
-<6372656174656444617465> Tj
+[<6372656174656442> 20.01953125 <79>] TJ
 ET
 
 
@@ -43928,7 +43915,7 @@ S
 BT
 272.17692192000004 333.493 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -43963,7 +43950,7 @@ S
 BT
 51.24 303.0729999999999 Td
 /F2.0 10.5 Tf
-[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
+<6372656174656444617465> Tj
 ET
 
 
@@ -44010,7 +43997,7 @@ S
 BT
 272.17692192000004 295.93299999999994 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<696e74656765722028696e74363429> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -44045,7 +44032,7 @@ S
 BT
 51.24 265.513 Td
 /F2.0 10.5 Tf
-[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
+[<706f6c69637941> 20.01953125 <63726f6e> 20.01953125 <796d>] TJ
 ET
 
 
@@ -44127,7 +44114,7 @@ S
 BT
 51.24 227.95299999999997 Td
 /F2.0 10.5 Tf
-<706f6c6963794d6f64656c54797065> Tj
+[<706f6c6963794d6f64656c54> 29.78515625 <6f736361>] TJ
 ET
 
 
@@ -44209,7 +44196,7 @@ S
 BT
 51.24 190.39299999999997 Td
 /F2.0 10.5 Tf
-<706f6c69637950647047726f7570> Tj
+<706f6c6963794d6f64656c54797065> Tj
 ET
 
 
@@ -44252,21 +44239,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 183.25299999999996 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -44299,7 +44278,7 @@ S
 BT
 51.24 152.83299999999997 Td
 /F2.0 10.5 Tf
-[<7570646174656442> 20.01953125 <79>] TJ
+<706f6c69637950647047726f7570> Tj
 ET
 
 
@@ -44342,13 +44321,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
 272.17692192000004 145.69299999999996 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -44379,19 +44366,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 115.27299999999993 Td
+51.24 115.27299999999995 Td
 /F2.0 10.5 Tf
-<7570646174656444617465> Tj
+[<7570646174656442> 20.01953125 <79>] TJ
 ET
 
 
 BT
-51.24 100.99299999999992 Td
+51.24 100.99299999999995 Td
 ET
 
 
 BT
-51.24 100.99299999999992 Td
+51.24 100.99299999999995 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44426,9 +44413,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 108.13299999999992 Td
+272.17692192000004 108.13299999999995 Td
 /F1.0 10.5 Tf
-<696e74656765722028696e74363429> Tj
+<737472696e67> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -44463,7 +44450,7 @@ S
 BT
 51.24 77.71299999999992 Td
 /F2.0 10.5 Tf
-[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
+<7570646174656444617465> Tj
 ET
 
 
@@ -44506,13 +44493,271 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 70.57299999999992 Td
+/F1.0 10.5 Tf
+<696e74656765722028696e74363429> Tj
+ET
+
+0.000 0.000 0.000 scn
+q
+0.000 0.000 0.000 scn
+0.000 0.000 0.000 SCN
+1 w
+0 J
+0 j
+[ ] 0 d
+/Stamp1 Do
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+552.698 14.388 Td
+/F1.0 9 Tf
+<3237> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+Q
+Q
+
+endstream
+endobj
+294 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 612.0 792.0]
+/Contents 293 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font << /F2.0 22 0 R
+/F3.0 24 0 R
+/F1.0 8 0 R
+>>
+/XObject << /Stamp1 588 0 R
+>>
+>>
+/Annots [295 0 R 296 0 R 297 0 R 299 0 R]
+>>
+endobj
+295 0 obj
+<< /Border [0 0 0]
+/Dest (_loop)
+/Subtype /Link
+/Rect [272.17692192000004 706.267 297.27192192000007 720.547]
+/Type /Annot
+>>
+endobj
+296 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [272.17692192000004 668.7070000000001 369.88992192000006 682.9870000000001]
+/Type /Annot
+>>
+endobj
+297 0 obj
+<< /Border [0 0 0]
+/Dest (_policymodel)
+/Subtype /Link
+/Rect [272.17692192000004 518.4670000000001 333.47592192 532.7470000000001]
+/Type /Annot
+>>
+endobj
+298 0 obj
+[294 0 R /XYZ 0 420.24 null]
+endobj
+299 0 obj
+<< /Border [0 0 0]
+/Dest (_jsonobject)
+/Subtype /Link
+/Rect [272.17692192000004 142.62699999999998 325.32792192000005 156.90699999999998]
+/Type /Annot
+>>
+endobj
+300 0 obj
+<< /Length 11146
+>>
+stream
+q
+/DeviceRGB cs
+1.000 1.000 1.000 scn
+48.240 732.720 220.937 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 732.720 294.583 23.280 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+48.240 695.160 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+1.000 1.000 1.000 scn
+269.177 695.160 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+48.240 657.600 220.937 37.560 re
+f
+0.000 0.000 0.000 scn
+0.976 0.976 0.976 scn
+269.177 657.600 294.583 37.560 re
+f
+0.000 0.000 0.000 scn
+0.5 w
+/DeviceRGB CS
+0.867 0.867 0.867 SCN
+48.240 756.000 m
+269.177 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 756.250 m
+48.240 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 740.2529999999999 Td
+/F2.0 10.5 Tf
+<4e616d65> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.000 m
+563.760 756.000 l
+S
+[ ] 0 d
+1.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 756.250 m
+269.177 731.970 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 756.250 m
+563.760 731.970 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 740.2529999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.720 m
+269.177 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 695.160 m
+269.177 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 732.970 m
+48.240 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 716.473 Td
+/F2.0 10.5 Tf
+[<7573656442> 20.01953125 <79456c656d656e744d6f64656c73>] TJ
+ET
+
+
+BT
+51.24 702.193 Td
+ET
+
+
+BT
+51.24 702.193 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.720 m
+563.760 732.720 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 695.160 m
+563.760 695.160 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 732.970 m
+269.177 694.910 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 732.970 m
+563.760 694.910 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 70.57299999999992 Td
+272.17692192000004 709.333 Td
 /F1.0 10.5 Tf
 <3c20> Tj
 ET
@@ -44521,7 +44766,7 @@ ET
 0.259 0.545 0.792 SCN
 
 BT
-280.76592192000004 70.57299999999992 Td
+280.76592192000004 709.333 Td
 /F1.0 10.5 Tf
 <4c6f6f70456c656d656e744d6f64656c> Tj
 ET
@@ -44530,202 +44775,34 @@ ET
 0.200 0.200 0.200 scn
 
 BT
-378.47892192000006 70.57299999999992 Td
+378.47892192000006 709.333 Td
 /F1.0 10.5 Tf
 [<203e20617272> 20.01953125 <61> 20.01953125 <79>] TJ
 ET
 
-0.000 0.000 0.000 scn
-q
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 SCN
-1 w
-0 J
-0 j
-[ ] 0 d
-/Stamp1 Do
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-BT
-552.698 14.388 Td
-/F1.0 9 Tf
-<3237> Tj
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-Q
-Q
-
-endstream
-endobj
-296 0 obj
-<< /Type /Page
-/Parent 3 0 R
-/MediaBox [0 0 612.0 792.0]
-/Contents 295 0 R
-/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F2.0 22 0 R
-/F3.0 24 0 R
-/F1.0 8 0 R
->>
-/XObject << /Stamp1 589 0 R
->>
->>
-/Annots [297 0 R 298 0 R 300 0 R 301 0 R]
->>
-endobj
-297 0 obj
-<< /Border [0 0 0]
-/Dest (_loopelementmodel)
-/Subtype /Link
-/Rect [272.17692192000004 706.267 369.88992192000006 720.547]
-/Type /Annot
->>
-endobj
-298 0 obj
-<< /Border [0 0 0]
-/Dest (_policymodel)
-/Subtype /Link
-/Rect [272.17692192000004 556.027 333.47592192 570.307]
-/Type /Annot
->>
-endobj
-299 0 obj
-[296 0 R /XYZ 0 457.8 null]
-endobj
-300 0 obj
-<< /Border [0 0 0]
-/Dest (_jsonobject)
-/Subtype /Link
-/Rect [272.17692192000004 180.18699999999998 325.32792192000005 194.46699999999998]
-/Type /Annot
->>
-endobj
-301 0 obj
-<< /Border [0 0 0]
-/Dest (_loopelementmodel)
-/Subtype /Link
-/Rect [280.76592192000004 67.50699999999992 378.47892192000006 81.78699999999992]
-/Type /Annot
->>
-endobj
-302 0 obj
-<< /Length 9726
->>
-stream
-q
-/DeviceRGB cs
-1.000 1.000 1.000 scn
-48.240 732.720 220.937 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 732.720 294.583 23.280 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-48.240 695.160 220.937 37.560 re
-f
-0.000 0.000 0.000 scn
-1.000 1.000 1.000 scn
-269.177 695.160 294.583 37.560 re
-f
 0.000 0.000 0.000 scn
 0.5 w
-/DeviceRGB CS
 0.867 0.867 0.867 SCN
-48.240 756.000 m
-269.177 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 756.250 m
-48.240 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 740.2529999999999 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.000 m
-563.760 756.000 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 756.250 m
-269.177 731.970 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 756.250 m
-563.760 731.970 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 740.2529999999999 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 732.720 m
-269.177 732.720 l
+48.240 695.160 m
+269.177 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 695.160 m
-269.177 695.160 l
+48.240 657.600 m
+269.177 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 732.970 m
-48.240 694.910 l
+48.240 695.410 m
+48.240 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 1 w
@@ -44733,19 +44810,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 716.4730000000002 Td
+51.24 678.913 Td
 /F2.0 10.5 Tf
 <76657273696f6e> Tj
 ET
 
 
 BT
-51.24 702.1930000000001 Td
+51.24 664.6329999999999 Td
 ET
 
 
 BT
-51.24 702.1930000000001 Td
+51.24 664.6329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -44753,26 +44830,26 @@ ET
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.720 m
-563.760 732.720 l
+269.177 695.160 m
+563.760 695.160 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 695.160 m
-563.760 695.160 l
+269.177 657.600 m
+563.760 657.600 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 732.970 m
-269.177 694.910 l
+269.177 695.410 m
+269.177 657.350 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 732.970 m
-563.760 694.910 l
+563.760 695.410 m
+563.760 657.350 l
 S
 [ ] 0 d
 1 w
@@ -44780,7 +44857,7 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 709.3330000000001 Td
+272.17692192000004 671.7729999999999 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -44790,7 +44867,7 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-48.24 659.7360000000001 Td
+48.24 622.1759999999999 Td
 /F2.0 18 Tf
 <332e31392e2053657276696365> Tj
 ET
@@ -44798,145 +44875,75 @@ ET
 0.000 0.000 0.000 SCN
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 619.800 220.937 23.280 re
+48.240 582.240 220.937 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 619.800 294.583 23.280 re
+269.177 582.240 294.583 23.280 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 582.240 220.937 37.560 re
+48.240 544.680 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 582.240 294.583 37.560 re
+269.177 544.680 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 544.680 220.937 37.560 re
+48.240 507.120 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 544.680 294.583 37.560 re
+269.177 507.120 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 507.120 220.937 37.560 re
+48.240 469.560 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 507.120 294.583 37.560 re
+269.177 469.560 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-48.240 469.560 220.937 37.560 re
+48.240 432.000 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 0.976 0.976 0.976 scn
-269.177 469.560 294.583 37.560 re
+269.177 432.000 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-48.240 432.000 220.937 37.560 re
+48.240 394.440 220.937 37.560 re
 f
 0.000 0.000 0.000 scn
 1.000 1.000 1.000 scn
-269.177 432.000 294.583 37.560 re
+269.177 394.440 294.583 37.560 re
 f
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 643.080 m
-269.177 643.080 l
-S
-[ ] 0 d
-1.5 w
-0.867 0.867 0.867 SCN
-48.240 619.800 m
-269.177 619.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 643.330 m
-48.240 619.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.330 m
-269.177 619.050 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-51.24 627.3330000000001 Td
-/F2.0 10.5 Tf
-<4e616d65> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.080 m
-563.760 643.080 l
+48.240 605.520 m
+269.177 605.520 l
 S
 [ ] 0 d
 1.5 w
 0.867 0.867 0.867 SCN
-269.177 619.800 m
-563.760 619.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-269.177 643.330 m
-269.177 619.050 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
-563.760 643.330 m
-563.760 619.050 l
-S
-[ ] 0 d
-1 w
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-
-BT
-272.17692192000004 627.3330000000001 Td
-/F2.0 10.5 Tf
-<536368656d61> Tj
-ET
-
-0.000 0.000 0.000 scn
-0.5 w
-0.867 0.867 0.867 SCN
-48.240 619.800 m
-269.177 619.800 l
-S
-[ ] 0 d
-0.5 w
-0.867 0.867 0.867 SCN
 48.240 582.240 m
 269.177 582.240 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-48.240 620.050 m
-48.240 581.990 l
+48.240 605.770 m
+48.240 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.050 m
-269.177 581.990 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 1 w
@@ -44944,31 +44951,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 603.5530000000001 Td
+51.24 589.7729999999999 Td
 /F2.0 10.5 Tf
-<6e616d65> Tj
-ET
-
-
-BT
-51.24 589.2730000000001 Td
-ET
-
-
-BT
-51.24 589.2730000000001 Td
-/F3.0 10.5 Tf
-<6f7074696f6e616c> Tj
+<4e616d65> Tj
 ET
 
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 619.800 m
-563.760 619.800 l
+269.177 605.520 m
+563.760 605.520 l
 S
 [ ] 0 d
-0.5 w
+1.5 w
 0.867 0.867 0.867 SCN
 269.177 582.240 m
 563.760 582.240 l
@@ -44976,14 +44971,14 @@ S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-269.177 620.050 m
-269.177 581.990 l
+269.177 605.770 m
+269.177 581.490 l
 S
 [ ] 0 d
 0.5 w
 0.867 0.867 0.867 SCN
-563.760 620.050 m
-563.760 581.990 l
+563.760 605.770 m
+563.760 581.490 l
 S
 [ ] 0 d
 1 w
@@ -44991,9 +44986,9 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 596.4130000000001 Td
-/F1.0 10.5 Tf
-<737472696e67> Tj
+272.17692192000004 589.7729999999999 Td
+/F2.0 10.5 Tf
+<536368656d61> Tj
 ET
 
 0.000 0.000 0.000 scn
@@ -45026,19 +45021,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 565.9930000000002 Td
+51.24 565.9929999999999 Td
 /F2.0 10.5 Tf
-<7265736f7572636544657461696c73> Tj
+<6e616d65> Tj
 ET
 
 
 BT
-51.24 551.7130000000001 Td
+51.24 551.713 Td
 ET
 
 
 BT
-51.24 551.7130000000001 Td
+51.24 551.713 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45071,21 +45066,13 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 558.8530000000001 Td
+272.17692192000004 558.853 Td
 /F1.0 10.5 Tf
-<4a736f6e4f626a656374> Tj
+<737472696e67> Tj
 ET
 
-0.000 0.000 0.000 SCN
-0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -45116,19 +45103,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 528.4330000000002 Td
+51.24 528.433 Td
 /F2.0 10.5 Tf
-<7365727669636544657461696c73> Tj
+<7265736f7572636544657461696c73> Tj
 ET
 
 
 BT
-51.24 514.1530000000001 Td
+51.24 514.1529999999999 Td
 ET
 
 
 BT
-51.24 514.1530000000001 Td
+51.24 514.1529999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45169,7 +45156,7 @@ S
 0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 521.2930000000001 Td
+272.17692192000004 521.2929999999999 Td
 /F1.0 10.5 Tf
 <4a736f6e4f626a656374> Tj
 ET
@@ -45206,19 +45193,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 490.8730000000001 Td
+51.24 490.873 Td
 /F2.0 10.5 Tf
-<7365727669636555756964> Tj
+<7365727669636544657461696c73> Tj
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 476.59299999999996 Td
 ET
 
 
 BT
-51.24 476.5930000000001 Td
+51.24 476.59299999999996 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45251,13 +45238,21 @@ S
 1 w
 0.000 0.000 0.000 SCN
 0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+0.259 0.545 0.792 scn
+0.259 0.545 0.792 SCN
 
 BT
-272.17692192000004 483.7330000000001 Td
+272.17692192000004 483.733 Td
 /F1.0 10.5 Tf
-<737472696e67> Tj
+<4a736f6e4f626a656374> Tj
 ET
 
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
 0.000 0.000 0.000 scn
 0.5 w
 0.867 0.867 0.867 SCN
@@ -45288,19 +45283,19 @@ S
 0.200 0.200 0.200 scn
 
 BT
-51.24 453.31300000000016 Td
+51.24 453.31299999999993 Td
 /F2.0 10.5 Tf
-<76657273696f6e> Tj
+<7365727669636555756964> Tj
 ET
 
 
 BT
-51.24 439.03300000000013 Td
+51.24 439.0329999999999 Td
 ET
 
 
 BT
-51.24 439.03300000000013 Td
+51.24 439.0329999999999 Td
 /F3.0 10.5 Tf
 <6f7074696f6e616c> Tj
 ET
@@ -45335,7 +45330,89 @@ S
 0.200 0.200 0.200 scn
 
 BT
-272.17692192000004 446.1730000000002 Td
+272.17692192000004 446.17299999999994 Td
+/F1.0 10.5 Tf
+<737472696e67> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.000 m
+269.177 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 394.440 m
+269.177 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+48.240 432.250 m
+48.240 394.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.250 m
+269.177 394.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+51.24 415.753 Td
+/F2.0 10.5 Tf
+<76657273696f6e> Tj
+ET
+
+
+BT
+51.24 401.47299999999996 Td
+ET
+
+
+BT
+51.24 401.47299999999996 Td
+/F3.0 10.5 Tf
+<6f7074696f6e616c> Tj
+ET
+
+0.000 0.000 0.000 scn
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.000 m
+563.760 432.000 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 394.440 m
+563.760 394.440 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+269.177 432.250 m
+269.177 394.190 l
+S
+[ ] 0 d
+0.5 w
+0.867 0.867 0.867 SCN
+563.760 432.250 m
+563.760 394.190 l
+S
+[ ] 0 d
+1 w
+0.000 0.000 0.000 SCN
+0.200 0.200 0.200 scn
+
+BT
+272.17692192000004 408.613 Td
 /F1.0 10.5 Tf
 <737472696e67> Tj
 ET
@@ -45365,42 +45442,50 @@ Q
 
 endstream
 endobj
-303 0 obj
+301 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 612.0 792.0]
-/Contents 302 0 R
+/Contents 300 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 /Font << /F2.0 22 0 R
 /F3.0 24 0 R
 /F1.0 8 0 R
 >>
-/XObject << /Stamp1 589 0 R
+/XObject << /Stamp1 588 0 R
 >>
 >>
-/Annots [305 0 R 306 0 R]
+/Annots [302 0 R 304 0 R 305 0 R]
 >>
 endobj
-304 0 obj
-[303 0 R /XYZ 0 683.1600000000001 null]
+302 0 obj
+<< /Border [0 0 0]
+/Dest (_loopelementmodel)
+/Subtype /Link
+/Rect [280.76592192000004 706.267 378.47892192000006 720.547]
+/Type /Annot
+>>
 endobj
-305 0 obj
+303 0 obj
+[301 0 R /XYZ 0 645.5999999999999 null]
+endobj
+304 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 555.7870000000001 325.32792192000005 570.0670000000001]
+/Rect [272.17692192000004 518.227 325.32792192000005 532.507]
 /Type /Annot
 >>
 endobj
-306 0 obj
+305 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
-/Rect [272.17692192000004 518.2270000000002 325.32792192000005 532.5070000000002]
+/Rect [272.17692192000004 480.667 325.32792192000005 494.947]
 /Type /Annot
 >>
 endobj
-307 0 obj
+306 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -45408,7 +45493,7 @@ endobj
 /Type /Annot
 >>
 endobj
-308 0 obj
+307 0 obj
 << /Border [0 0 0]
 /Dest (_overview)
 /Subtype /Link
@@ -45416,7 +45501,7 @@ endobj
 /Type /Annot
 >>
 endobj
-309 0 obj
+308 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -45424,7 +45509,7 @@ endobj
 /Type /Annot
 >>
 endobj
-310 0 obj
+309 0 obj
 << /Border [0 0 0]
 /Dest (_version_information)
 /Subtype /Link
@@ -45432,7 +45517,7 @@ endobj
 /Type /Annot
 >>
 endobj
-311 0 obj
+310 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -45440,7 +45525,7 @@ endobj
 /Type /Annot
 >>
 endobj
-312 0 obj
+311 0 obj
 << /Border [0 0 0]
 /Dest (_uri_scheme)
 /Subtype /Link
@@ -45448,7 +45533,7 @@ endobj
 /Type /Annot
 >>
 endobj
-313 0 obj
+312 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -45456,7 +45541,7 @@ endobj
 /Type /Annot
 >>
 endobj
-314 0 obj
+313 0 obj
 << /Border [0 0 0]
 /Dest (_paths)
 /Subtype /Link
@@ -45464,23 +45549,23 @@ endobj
 /Type /Annot
 >>
 endobj
-315 0 obj
+314 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route61)
 /Subtype /Link
 /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998]
 /Type /Annot
 >>
 endobj
-316 0 obj
+315 0 obj
 << /Border [0 0 0]
-/Dest (_route30)
+/Dest (_route61)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
 >>
 endobj
-317 0 obj
+316 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -45488,7 +45573,7 @@ endobj
 /Type /Annot
 >>
 endobj
-318 0 obj
+317 0 obj
 << /Border [0 0 0]
 /Dest (_responses)
 /Subtype /Link
@@ -45496,7 +45581,7 @@ endobj
 /Type /Annot
 >>
 endobj
-319 0 obj
+318 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -45504,7 +45589,7 @@ endobj
 /Type /Annot
 >>
 endobj
-320 0 obj
+319 0 obj
 << /Border [0 0 0]
 /Dest (_produces)
 /Subtype /Link
@@ -45512,23 +45597,23 @@ endobj
 /Type /Annot
 >>
 endobj
-321 0 obj
+320 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route62)
 /Subtype /Link
 /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998]
 /Type /Annot
 >>
 endobj
-322 0 obj
+321 0 obj
 << /Border [0 0 0]
-/Dest (_route31)
+/Dest (_route62)
 /Subtype /Link
 /Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
 /Type /Annot
 >>
 endobj
-323 0 obj
+322 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -45536,7 +45621,7 @@ endobj
 /Type /Annot
 >>
 endobj
-324 0 obj
+323 0 obj
 << /Border [0 0 0]
 /Dest (_responses_2)
 /Subtype /Link
@@ -45544,7 +45629,7 @@ endobj
 /Type /Annot
 >>
 endobj
-325 0 obj
+324 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -45552,7 +45637,7 @@ endobj
 /Type /Annot
 >>
 endobj
-326 0 obj
+325 0 obj
 << /Border [0 0 0]
 /Dest (_produces_2)
 /Subtype /Link
@@ -45560,23 +45645,23 @@ endobj
 /Type /Annot
 >>
 endobj
-327 0 obj
+326 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_route49)
 /Subtype /Link
 /Rect [60.24000000000001 510.89999999999975 172.716 525.1799999999997]
 /Type /Annot
 >>
 endobj
-328 0 obj
+327 0 obj
 << /Border [0 0 0]
-/Dest (_route18)
+/Dest (_route49)
 /Subtype /Link
 /Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
 /Type /Annot
 >>
 endobj
-329 0 obj
+328 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -45584,7 +45669,7 @@ endobj
 /Type /Annot
 >>
 endobj
-330 0 obj
+329 0 obj
 << /Border [0 0 0]
 /Dest (_responses_3)
 /Subtype /Link
@@ -45592,7 +45677,7 @@ endobj
 /Type /Annot
 >>
 endobj
-331 0 obj
+330 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -45600,7 +45685,7 @@ endobj
 /Type /Annot
 >>
 endobj
-332 0 obj
+331 0 obj
 << /Border [0 0 0]
 /Dest (_produces_3)
 /Subtype /Link
@@ -45608,23 +45693,23 @@ endobj
 /Type /Annot
 >>
 endobj
-333 0 obj
+332 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_route51)
 /Subtype /Link
 /Rect [60.24000000000001 455.4599999999997 172.548 469.73999999999967]
 /Type /Annot
 >>
 endobj
-334 0 obj
+333 0 obj
 << /Border [0 0 0]
-/Dest (_route20)
+/Dest (_route51)
 /Subtype /Link
 /Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
 /Type /Annot
 >>
 endobj
-335 0 obj
+334 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -45632,7 +45717,7 @@ endobj
 /Type /Annot
 >>
 endobj
-336 0 obj
+335 0 obj
 << /Border [0 0 0]
 /Dest (_parameters)
 /Subtype /Link
@@ -45640,7 +45725,7 @@ endobj
 /Type /Annot
 >>
 endobj
-337 0 obj
+336 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -45648,7 +45733,7 @@ endobj
 /Type /Annot
 >>
 endobj
-338 0 obj
+337 0 obj
 << /Border [0 0 0]
 /Dest (_responses_4)
 /Subtype /Link
@@ -45656,7 +45741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-339 0 obj
+338 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -45664,7 +45749,7 @@ endobj
 /Type /Annot
 >>
 endobj
-340 0 obj
+339 0 obj
 << /Border [0 0 0]
 /Dest (_consumes)
 /Subtype /Link
@@ -45672,7 +45757,7 @@ endobj
 /Type /Annot
 >>
 endobj
-341 0 obj
+340 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -45680,7 +45765,7 @@ endobj
 /Type /Annot
 >>
 endobj
-342 0 obj
+341 0 obj
 << /Border [0 0 0]
 /Dest (_produces_4)
 /Subtype /Link
@@ -45688,7 +45773,7 @@ endobj
 /Type /Annot
 >>
 endobj
-343 0 obj
+342 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_secondary_names_get)
 /Subtype /Link
@@ -45696,7 +45781,7 @@ endobj
 /Type /Annot
 >>
 endobj
-344 0 obj
+343 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_secondary_names_get)
 /Subtype /Link
@@ -45704,7 +45789,7 @@ endobj
 /Type /Annot
 >>
 endobj
-345 0 obj
+344 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -45712,7 +45797,7 @@ endobj
 /Type /Annot
 >>
 endobj
-346 0 obj
+345 0 obj
 << /Border [0 0 0]
 /Dest (_responses_5)
 /Subtype /Link
@@ -45720,7 +45805,7 @@ endobj
 /Type /Annot
 >>
 endobj
-347 0 obj
+346 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -45728,7 +45813,7 @@ endobj
 /Type /Annot
 >>
 endobj
-348 0 obj
+347 0 obj
 << /Border [0 0 0]
 /Dest (_produces_5)
 /Subtype /Link
@@ -45736,7 +45821,7 @@ endobj
 /Type /Annot
 >>
 endobj
-349 0 obj
+348 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_dictionaryname_get)
 /Subtype /Link
@@ -45744,7 +45829,7 @@ endobj
 /Type /Annot
 >>
 endobj
-350 0 obj
+349 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_dictionaryname_get)
 /Subtype /Link
@@ -45752,7 +45837,7 @@ endobj
 /Type /Annot
 >>
 endobj
-351 0 obj
+350 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -45760,7 +45845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-352 0 obj
+351 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_2)
 /Subtype /Link
@@ -45768,7 +45853,7 @@ endobj
 /Type /Annot
 >>
 endobj
-353 0 obj
+352 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -45776,7 +45861,7 @@ endobj
 /Type /Annot
 >>
 endobj
-354 0 obj
+353 0 obj
 << /Border [0 0 0]
 /Dest (_responses_6)
 /Subtype /Link
@@ -45784,7 +45869,7 @@ endobj
 /Type /Annot
 >>
 endobj
-355 0 obj
+354 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -45792,7 +45877,7 @@ endobj
 /Type /Annot
 >>
 endobj
-356 0 obj
+355 0 obj
 << /Border [0 0 0]
 /Dest (_produces_6)
 /Subtype /Link
@@ -45800,7 +45885,7 @@ endobj
 /Type /Annot
 >>
 endobj
-357 0 obj
+356 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_put)
 /Subtype /Link
@@ -45808,7 +45893,7 @@ endobj
 /Type /Annot
 >>
 endobj
-358 0 obj
+357 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_put)
 /Subtype /Link
@@ -45816,7 +45901,7 @@ endobj
 /Type /Annot
 >>
 endobj
-359 0 obj
+358 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -45824,7 +45909,7 @@ endobj
 /Type /Annot
 >>
 endobj
-360 0 obj
+359 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_3)
 /Subtype /Link
@@ -45832,7 +45917,7 @@ endobj
 /Type /Annot
 >>
 endobj
-361 0 obj
+360 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -45840,7 +45925,7 @@ endobj
 /Type /Annot
 >>
 endobj
-362 0 obj
+361 0 obj
 << /Border [0 0 0]
 /Dest (_responses_7)
 /Subtype /Link
@@ -45848,7 +45933,7 @@ endobj
 /Type /Annot
 >>
 endobj
-363 0 obj
+362 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -45856,7 +45941,7 @@ endobj
 /Type /Annot
 >>
 endobj
-364 0 obj
+363 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_2)
 /Subtype /Link
@@ -45864,7 +45949,7 @@ endobj
 /Type /Annot
 >>
 endobj
-365 0 obj
+364 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -45872,7 +45957,7 @@ endobj
 /Type /Annot
 >>
 endobj
-366 0 obj
+365 0 obj
 << /Border [0 0 0]
 /Dest (_produces_7)
 /Subtype /Link
@@ -45880,23 +45965,23 @@ endobj
 /Type /Annot
 >>
 endobj
-367 0 obj
+366 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_route53)
 /Subtype /Link
 /Rect [60.24000000000001 141.29999999999953 232.70250000000001 155.57999999999953]
 /Type /Annot
 >>
 endobj
-368 0 obj
+367 0 obj
 << /Border [0 0 0]
-/Dest (_route22)
+/Dest (_route53)
 /Subtype /Link
 /Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
 /Type /Annot
 >>
 endobj
-369 0 obj
+368 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -45904,7 +45989,7 @@ endobj
 /Type /Annot
 >>
 endobj
-370 0 obj
+369 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_4)
 /Subtype /Link
@@ -45912,7 +45997,7 @@ endobj
 /Type /Annot
 >>
 endobj
-371 0 obj
+370 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -45920,7 +46005,7 @@ endobj
 /Type /Annot
 >>
 endobj
-372 0 obj
+371 0 obj
 << /Border [0 0 0]
 /Dest (_responses_8)
 /Subtype /Link
@@ -45928,7 +46013,7 @@ endobj
 /Type /Annot
 >>
 endobj
-373 0 obj
+372 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -45936,7 +46021,7 @@ endobj
 /Type /Annot
 >>
 endobj
-374 0 obj
+373 0 obj
 << /Border [0 0 0]
 /Dest (_produces_8)
 /Subtype /Link
@@ -45944,7 +46029,7 @@ endobj
 /Type /Annot
 >>
 endobj
-375 0 obj
+374 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_elements_shortname_delete)
 /Subtype /Link
@@ -45952,7 +46037,7 @@ endobj
 /Type /Annot
 >>
 endobj
-376 0 obj
+375 0 obj
 << /Border [0 0 0]
 /Dest (_v2_dictionary_name_elements_shortname_delete)
 /Subtype /Link
@@ -45960,7 +46045,7 @@ endobj
 /Type /Annot
 >>
 endobj
-377 0 obj
+376 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -45968,7 +46053,7 @@ endobj
 /Type /Annot
 >>
 endobj
-378 0 obj
+377 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_5)
 /Subtype /Link
@@ -45976,7 +46061,7 @@ endobj
 /Type /Annot
 >>
 endobj
-379 0 obj
+378 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -45984,7 +46069,7 @@ endobj
 /Type /Annot
 >>
 endobj
-380 0 obj
+379 0 obj
 << /Border [0 0 0]
 /Dest (_responses_9)
 /Subtype /Link
@@ -45992,7 +46077,7 @@ endobj
 /Type /Annot
 >>
 endobj
-381 0 obj
+380 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -46000,7 +46085,7 @@ endobj
 /Type /Annot
 >>
 endobj
-382 0 obj
+381 0 obj
 << /Border [0 0 0]
 /Dest (_produces_9)
 /Subtype /Link
@@ -46008,23 +46093,23 @@ endobj
 /Type /Annot
 >>
 endobj
-383 0 obj
+382 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route45)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 245.15550000000002 719.04]
 /Type /Annot
 >>
 endobj
-384 0 obj
+383 0 obj
 << /Border [0 0 0]
-/Dest (_route14)
+/Dest (_route45)
 /Subtype /Link
 /Rect [557.8905 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-385 0 obj
+384 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -46032,7 +46117,7 @@ endobj
 /Type /Annot
 >>
 endobj
-386 0 obj
+385 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_6)
 /Subtype /Link
@@ -46040,7 +46125,7 @@ endobj
 /Type /Annot
 >>
 endobj
-387 0 obj
+386 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -46048,7 +46133,7 @@ endobj
 /Type /Annot
 >>
 endobj
-388 0 obj
+387 0 obj
 << /Border [0 0 0]
 /Dest (_responses_10)
 /Subtype /Link
@@ -46056,23 +46141,23 @@ endobj
 /Type /Annot
 >>
 endobj
-389 0 obj
+388 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route39)
 /Subtype /Link
 /Rect [60.24000000000001 649.3199999999998 248.431294921875 663.5999999999999]
 /Type /Annot
 >>
 endobj
-390 0 obj
+389 0 obj
 << /Border [0 0 0]
-/Dest (_route8)
+/Dest (_route39)
 /Subtype /Link
 /Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
 >>
 endobj
-391 0 obj
+390 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -46080,7 +46165,7 @@ endobj
 /Type /Annot
 >>
 endobj
-392 0 obj
+391 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_7)
 /Subtype /Link
@@ -46088,7 +46173,7 @@ endobj
 /Type /Annot
 >>
 endobj
-393 0 obj
+392 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -46096,7 +46181,7 @@ endobj
 /Type /Annot
 >>
 endobj
-394 0 obj
+393 0 obj
 << /Border [0 0 0]
 /Dest (_responses_11)
 /Subtype /Link
@@ -46104,7 +46189,7 @@ endobj
 /Type /Annot
 >>
 endobj
-395 0 obj
+394 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -46112,7 +46197,7 @@ endobj
 /Type /Annot
 >>
 endobj
-396 0 obj
+395 0 obj
 << /Border [0 0 0]
 /Dest (_produces_10)
 /Subtype /Link
@@ -46120,23 +46205,23 @@ endobj
 /Type /Annot
 >>
 endobj
-397 0 obj
+396 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route33)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 214.8735 589.6799999999998]
 /Type /Annot
 >>
 endobj
-398 0 obj
+397 0 obj
 << /Border [0 0 0]
-/Dest (_route2)
+/Dest (_route33)
 /Subtype /Link
 /Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
 >>
 endobj
-399 0 obj
+398 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -46144,7 +46229,7 @@ endobj
 /Type /Annot
 >>
 endobj
-400 0 obj
+399 0 obj
 << /Border [0 0 0]
 /Dest (_responses_12)
 /Subtype /Link
@@ -46152,7 +46237,7 @@ endobj
 /Type /Annot
 >>
 endobj
-401 0 obj
+400 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -46160,7 +46245,7 @@ endobj
 /Type /Annot
 >>
 endobj
-402 0 obj
+401 0 obj
 << /Border [0 0 0]
 /Dest (_produces_11)
 /Subtype /Link
@@ -46168,23 +46253,23 @@ endobj
 /Type /Annot
 >>
 endobj
-403 0 obj
+402 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_route46)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 259.467 534.2399999999998]
 /Type /Annot
 >>
 endobj
-404 0 obj
+403 0 obj
 << /Border [0 0 0]
-/Dest (_route15)
+/Dest (_route46)
 /Subtype /Link
 /Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-405 0 obj
+404 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -46192,7 +46277,7 @@ endobj
 /Type /Annot
 >>
 endobj
-406 0 obj
+405 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_8)
 /Subtype /Link
@@ -46200,7 +46285,7 @@ endobj
 /Type /Annot
 >>
 endobj
-407 0 obj
+406 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -46208,7 +46293,7 @@ endobj
 /Type /Annot
 >>
 endobj
-408 0 obj
+407 0 obj
 << /Border [0 0 0]
 /Dest (_responses_13)
 /Subtype /Link
@@ -46216,7 +46301,7 @@ endobj
 /Type /Annot
 >>
 endobj
-409 0 obj
+408 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -46224,7 +46309,7 @@ endobj
 /Type /Annot
 >>
 endobj
-410 0 obj
+409 0 obj
 << /Border [0 0 0]
 /Dest (_produces_12)
 /Subtype /Link
@@ -46232,23 +46317,23 @@ endobj
 /Type /Annot
 >>
 endobj
-411 0 obj
+410 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_route40)
 /Subtype /Link
 /Rect [60.24000000000001 446.03999999999974 355.8885 460.3199999999997]
 /Type /Annot
 >>
 endobj
-412 0 obj
+411 0 obj
 << /Border [0 0 0]
-/Dest (_route9)
+/Dest (_route40)
 /Subtype /Link
 /Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
 >>
 endobj
-413 0 obj
+412 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -46256,7 +46341,7 @@ endobj
 /Type /Annot
 >>
 endobj
-414 0 obj
+413 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_9)
 /Subtype /Link
@@ -46264,7 +46349,7 @@ endobj
 /Type /Annot
 >>
 endobj
-415 0 obj
+414 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -46272,7 +46357,7 @@ endobj
 /Type /Annot
 >>
 endobj
-416 0 obj
+415 0 obj
 << /Border [0 0 0]
 /Dest (_responses_14)
 /Subtype /Link
@@ -46280,7 +46365,7 @@ endobj
 /Type /Annot
 >>
 endobj
-417 0 obj
+416 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -46288,7 +46373,7 @@ endobj
 /Type /Annot
 >>
 endobj
-418 0 obj
+417 0 obj
 << /Border [0 0 0]
 /Dest (_produces_13)
 /Subtype /Link
@@ -46296,23 +46381,23 @@ endobj
 /Type /Annot
 >>
 endobj
-419 0 obj
+418 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_route43)
 /Subtype /Link
 /Rect [60.24000000000001 372.11999999999966 248.45250000000001 386.39999999999964]
 /Type /Annot
 >>
 endobj
-420 0 obj
+419 0 obj
 << /Border [0 0 0]
-/Dest (_route12)
+/Dest (_route43)
 /Subtype /Link
 /Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
 >>
 endobj
-421 0 obj
+420 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -46320,7 +46405,7 @@ endobj
 /Type /Annot
 >>
 endobj
-422 0 obj
+421 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_10)
 /Subtype /Link
@@ -46328,7 +46413,7 @@ endobj
 /Type /Annot
 >>
 endobj
-423 0 obj
+422 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -46336,7 +46421,7 @@ endobj
 /Type /Annot
 >>
 endobj
-424 0 obj
+423 0 obj
 << /Border [0 0 0]
 /Dest (_responses_15)
 /Subtype /Link
@@ -46344,7 +46429,7 @@ endobj
 /Type /Annot
 >>
 endobj
-425 0 obj
+424 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -46352,7 +46437,7 @@ endobj
 /Type /Annot
 >>
 endobj
-426 0 obj
+425 0 obj
 << /Border [0 0 0]
 /Dest (_produces_14)
 /Subtype /Link
@@ -46360,23 +46445,23 @@ endobj
 /Type /Annot
 >>
 endobj
-427 0 obj
+426 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_route42)
 /Subtype /Link
 /Rect [60.24000000000001 298.1999999999996 235.842 312.47999999999956]
 /Type /Annot
 >>
 endobj
-428 0 obj
+427 0 obj
 << /Border [0 0 0]
-/Dest (_route11)
+/Dest (_route42)
 /Subtype /Link
 /Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
 >>
 endobj
-429 0 obj
+428 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -46384,7 +46469,7 @@ endobj
 /Type /Annot
 >>
 endobj
-430 0 obj
+429 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_11)
 /Subtype /Link
@@ -46392,7 +46477,7 @@ endobj
 /Type /Annot
 >>
 endobj
-431 0 obj
+430 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -46400,7 +46485,7 @@ endobj
 /Type /Annot
 >>
 endobj
-432 0 obj
+431 0 obj
 << /Border [0 0 0]
 /Dest (_responses_16)
 /Subtype /Link
@@ -46408,7 +46493,7 @@ endobj
 /Type /Annot
 >>
 endobj
-433 0 obj
+432 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -46416,7 +46501,7 @@ endobj
 /Type /Annot
 >>
 endobj
-434 0 obj
+433 0 obj
 << /Border [0 0 0]
 /Dest (_produces_15)
 /Subtype /Link
@@ -46424,23 +46509,23 @@ endobj
 /Type /Annot
 >>
 endobj
-435 0 obj
+434 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_route44)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 249.70200000000003 238.55999999999952]
 /Type /Annot
 >>
 endobj
-436 0 obj
+435 0 obj
 << /Border [0 0 0]
-/Dest (_route13)
+/Dest (_route44)
 /Subtype /Link
 /Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
 >>
 endobj
-437 0 obj
+436 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -46448,7 +46533,7 @@ endobj
 /Type /Annot
 >>
 endobj
-438 0 obj
+437 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_12)
 /Subtype /Link
@@ -46456,7 +46541,7 @@ endobj
 /Type /Annot
 >>
 endobj
-439 0 obj
+438 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -46464,7 +46549,7 @@ endobj
 /Type /Annot
 >>
 endobj
-440 0 obj
+439 0 obj
 << /Border [0 0 0]
 /Dest (_responses_17)
 /Subtype /Link
@@ -46472,7 +46557,7 @@ endobj
 /Type /Annot
 >>
 endobj
-441 0 obj
+440 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -46480,7 +46565,7 @@ endobj
 /Type /Annot
 >>
 endobj
-442 0 obj
+441 0 obj
 << /Border [0 0 0]
 /Dest (_produces_16)
 /Subtype /Link
@@ -46488,23 +46573,23 @@ endobj
 /Type /Annot
 >>
 endobj
-443 0 obj
+442 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_route35)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 307.641 164.63999999999956]
 /Type /Annot
 >>
 endobj
-444 0 obj
+443 0 obj
 << /Border [0 0 0]
-/Dest (_route4)
+/Dest (_route35)
 /Subtype /Link
 /Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-445 0 obj
+444 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -46512,7 +46597,7 @@ endobj
 /Type /Annot
 >>
 endobj
-446 0 obj
+445 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_13)
 /Subtype /Link
@@ -46520,7 +46605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-447 0 obj
+446 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -46528,7 +46613,7 @@ endobj
 /Type /Annot
 >>
 endobj
-448 0 obj
+447 0 obj
 << /Border [0 0 0]
 /Dest (_responses_18)
 /Subtype /Link
@@ -46536,7 +46621,7 @@ endobj
 /Type /Annot
 >>
 endobj
-449 0 obj
+448 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -46544,7 +46629,7 @@ endobj
 /Type /Annot
 >>
 endobj
-450 0 obj
+449 0 obj
 << /Border [0 0 0]
 /Dest (_produces_17)
 /Subtype /Link
@@ -46552,23 +46637,23 @@ endobj
 /Type /Annot
 >>
 endobj
-451 0 obj
+450 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_route41)
 /Subtype /Link
 /Rect [60.24000000000001 76.4399999999996 261.860794921875 90.7199999999996]
 /Type /Annot
 >>
 endobj
-452 0 obj
+451 0 obj
 << /Border [0 0 0]
-/Dest (_route10)
+/Dest (_route41)
 /Subtype /Link
 /Rect [557.8905 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
 >>
 endobj
-453 0 obj
+452 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -46576,7 +46661,7 @@ endobj
 /Type /Annot
 >>
 endobj
-454 0 obj
+453 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_14)
 /Subtype /Link
@@ -46584,7 +46669,7 @@ endobj
 /Type /Annot
 >>
 endobj
-455 0 obj
+454 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -46592,7 +46677,7 @@ endobj
 /Type /Annot
 >>
 endobj
-456 0 obj
+455 0 obj
 << /Border [0 0 0]
 /Dest (_responses_19)
 /Subtype /Link
@@ -46600,7 +46685,7 @@ endobj
 /Type /Annot
 >>
 endobj
-457 0 obj
+456 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -46608,7 +46693,7 @@ endobj
 /Type /Annot
 >>
 endobj
-458 0 obj
+457 0 obj
 << /Border [0 0 0]
 /Dest (_produces_18)
 /Subtype /Link
@@ -46616,23 +46701,23 @@ endobj
 /Type /Annot
 >>
 endobj
-459 0 obj
+458 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_route36)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 339.560794921875 719.04]
 /Type /Annot
 >>
 endobj
-460 0 obj
+459 0 obj
 << /Border [0 0 0]
-/Dest (_route5)
+/Dest (_route36)
 /Subtype /Link
 /Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
 >>
 endobj
-461 0 obj
+460 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -46640,7 +46725,7 @@ endobj
 /Type /Annot
 >>
 endobj
-462 0 obj
+461 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_15)
 /Subtype /Link
@@ -46648,7 +46733,7 @@ endobj
 /Type /Annot
 >>
 endobj
-463 0 obj
+462 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -46656,7 +46741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-464 0 obj
+463 0 obj
 << /Border [0 0 0]
 /Dest (_responses_20)
 /Subtype /Link
@@ -46664,7 +46749,7 @@ endobj
 /Type /Annot
 >>
 endobj
-465 0 obj
+464 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -46672,7 +46757,7 @@ endobj
 /Type /Annot
 >>
 endobj
-466 0 obj
+465 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_3)
 /Subtype /Link
@@ -46680,7 +46765,7 @@ endobj
 /Type /Annot
 >>
 endobj
-467 0 obj
+466 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -46688,7 +46773,7 @@ endobj
 /Type /Annot
 >>
 endobj
-468 0 obj
+467 0 obj
 << /Border [0 0 0]
 /Dest (_produces_19)
 /Subtype /Link
@@ -46696,23 +46781,23 @@ endobj
 /Type /Annot
 >>
 endobj
-469 0 obj
+468 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_route38)
 /Subtype /Link
 /Rect [60.24000000000001 612.3599999999998 350.38629492187505 626.6399999999999]
 /Type /Annot
 >>
 endobj
-470 0 obj
+469 0 obj
 << /Border [0 0 0]
-/Dest (_route7)
+/Dest (_route38)
 /Subtype /Link
 /Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
 >>
 endobj
-471 0 obj
+470 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -46720,7 +46805,7 @@ endobj
 /Type /Annot
 >>
 endobj
-472 0 obj
+471 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_16)
 /Subtype /Link
@@ -46728,7 +46813,7 @@ endobj
 /Type /Annot
 >>
 endobj
-473 0 obj
+472 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -46736,7 +46821,7 @@ endobj
 /Type /Annot
 >>
 endobj
-474 0 obj
+473 0 obj
 << /Border [0 0 0]
 /Dest (_responses_21)
 /Subtype /Link
@@ -46744,7 +46829,7 @@ endobj
 /Type /Annot
 >>
 endobj
-475 0 obj
+474 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -46752,7 +46837,7 @@ endobj
 /Type /Annot
 >>
 endobj
-476 0 obj
+475 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_4)
 /Subtype /Link
@@ -46760,7 +46845,7 @@ endobj
 /Type /Annot
 >>
 endobj
-477 0 obj
+476 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -46768,7 +46853,7 @@ endobj
 /Type /Annot
 >>
 endobj
-478 0 obj
+477 0 obj
 << /Border [0 0 0]
 /Dest (_produces_20)
 /Subtype /Link
@@ -46776,23 +46861,23 @@ endobj
 /Type /Annot
 >>
 endobj
-479 0 obj
+478 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_route37)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 352.81158984375 534.2399999999998]
 /Type /Annot
 >>
 endobj
-480 0 obj
+479 0 obj
 << /Border [0 0 0]
-/Dest (_route6)
+/Dest (_route37)
 /Subtype /Link
 /Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
 >>
 endobj
-481 0 obj
+480 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -46800,7 +46885,7 @@ endobj
 /Type /Annot
 >>
 endobj
-482 0 obj
+481 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_17)
 /Subtype /Link
@@ -46808,7 +46893,7 @@ endobj
 /Type /Annot
 >>
 endobj
-483 0 obj
+482 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -46816,7 +46901,7 @@ endobj
 /Type /Annot
 >>
 endobj
-484 0 obj
+483 0 obj
 << /Border [0 0 0]
 /Dest (_responses_22)
 /Subtype /Link
@@ -46824,7 +46909,7 @@ endobj
 /Type /Annot
 >>
 endobj
-485 0 obj
+484 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -46832,7 +46917,7 @@ endobj
 /Type /Annot
 >>
 endobj
-486 0 obj
+485 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_5)
 /Subtype /Link
@@ -46840,7 +46925,7 @@ endobj
 /Type /Annot
 >>
 endobj
-487 0 obj
+486 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -46848,7 +46933,7 @@ endobj
 /Type /Annot
 >>
 endobj
-488 0 obj
+487 0 obj
 << /Border [0 0 0]
 /Dest (_produces_21)
 /Subtype /Link
@@ -46856,23 +46941,23 @@ endobj
 /Type /Annot
 >>
 endobj
-489 0 obj
+488 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_route34)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 212.0595 441.8399999999997]
 /Type /Annot
 >>
 endobj
-490 0 obj
+489 0 obj
 << /Border [0 0 0]
-/Dest (_route3)
+/Dest (_route34)
 /Subtype /Link
 /Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
 >>
 endobj
-491 0 obj
+490 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -46880,7 +46965,7 @@ endobj
 /Type /Annot
 >>
 endobj
-492 0 obj
+491 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_18)
 /Subtype /Link
@@ -46888,7 +46973,7 @@ endobj
 /Type /Annot
 >>
 endobj
-493 0 obj
+492 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -46896,7 +46981,7 @@ endobj
 /Type /Annot
 >>
 endobj
-494 0 obj
+493 0 obj
 << /Border [0 0 0]
 /Dest (_responses_23)
 /Subtype /Link
@@ -46904,7 +46989,7 @@ endobj
 /Type /Annot
 >>
 endobj
-495 0 obj
+494 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -46912,7 +46997,7 @@ endobj
 /Type /Annot
 >>
 endobj
-496 0 obj
+495 0 obj
 << /Border [0 0 0]
 /Dest (_produces_22)
 /Subtype /Link
@@ -46920,23 +47005,23 @@ endobj
 /Type /Annot
 >>
 endobj
-497 0 obj
+496 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route56)
 /Subtype /Link
 /Rect [60.24000000000001 353.63999999999965 221.091755859375 367.9199999999996]
 /Type /Annot
 >>
 endobj
-498 0 obj
+497 0 obj
 << /Border [0 0 0]
-/Dest (_route25)
+/Dest (_route56)
 /Subtype /Link
 /Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
 >>
 endobj
-499 0 obj
+498 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -46944,7 +47029,7 @@ endobj
 /Type /Annot
 >>
 endobj
-500 0 obj
+499 0 obj
 << /Border [0 0 0]
 /Dest (_responses_24)
 /Subtype /Link
@@ -46952,7 +47037,7 @@ endobj
 /Type /Annot
 >>
 endobj
-501 0 obj
+500 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -46960,7 +47045,7 @@ endobj
 /Type /Annot
 >>
 endobj
-502 0 obj
+501 0 obj
 << /Border [0 0 0]
 /Dest (_produces_23)
 /Subtype /Link
@@ -46968,7 +47053,7 @@ endobj
 /Type /Annot
 >>
 endobj
-503 0 obj
+502 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
 /Subtype /Link
@@ -46976,7 +47061,7 @@ endobj
 /Type /Annot
 >>
 endobj
-504 0 obj
+503 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_yaml_policymodeltype_get)
 /Subtype /Link
@@ -46984,7 +47069,7 @@ endobj
 /Type /Annot
 >>
 endobj
-505 0 obj
+504 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -46992,7 +47077,7 @@ endobj
 /Type /Annot
 >>
 endobj
-506 0 obj
+505 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_19)
 /Subtype /Link
@@ -47000,7 +47085,7 @@ endobj
 /Type /Annot
 >>
 endobj
-507 0 obj
+506 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -47008,7 +47093,7 @@ endobj
 /Type /Annot
 >>
 endobj
-508 0 obj
+507 0 obj
 << /Border [0 0 0]
 /Dest (_responses_25)
 /Subtype /Link
@@ -47016,7 +47101,7 @@ endobj
 /Type /Annot
 >>
 endobj
-509 0 obj
+508 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -47024,7 +47109,7 @@ endobj
 /Type /Annot
 >>
 endobj
-510 0 obj
+509 0 obj
 << /Border [0 0 0]
 /Dest (_produces_24)
 /Subtype /Link
@@ -47032,7 +47117,7 @@ endobj
 /Type /Annot
 >>
 endobj
-511 0 obj
+510 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_policymodeltype_get)
 /Subtype /Link
@@ -47040,7 +47125,7 @@ endobj
 /Type /Annot
 >>
 endobj
-512 0 obj
+511 0 obj
 << /Border [0 0 0]
 /Dest (_v2_policytoscamodels_policymodeltype_get)
 /Subtype /Link
@@ -47048,7 +47133,7 @@ endobj
 /Type /Annot
 >>
 endobj
-513 0 obj
+512 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -47056,7 +47141,7 @@ endobj
 /Type /Annot
 >>
 endobj
-514 0 obj
+513 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_20)
 /Subtype /Link
@@ -47064,7 +47149,7 @@ endobj
 /Type /Annot
 >>
 endobj
-515 0 obj
+514 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -47072,7 +47157,7 @@ endobj
 /Type /Annot
 >>
 endobj
-516 0 obj
+515 0 obj
 << /Border [0 0 0]
 /Dest (_responses_26)
 /Subtype /Link
@@ -47080,7 +47165,7 @@ endobj
 /Type /Annot
 >>
 endobj
-517 0 obj
+516 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -47088,7 +47173,7 @@ endobj
 /Type /Annot
 >>
 endobj
-518 0 obj
+517 0 obj
 << /Border [0 0 0]
 /Dest (_produces_25)
 /Subtype /Link
@@ -47096,23 +47181,23 @@ endobj
 /Type /Annot
 >>
 endobj
-519 0 obj
+518 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route57)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 318.73125585937504 164.63999999999956]
 /Type /Annot
 >>
 endobj
-520 0 obj
+519 0 obj
 << /Border [0 0 0]
-/Dest (_route26)
+/Dest (_route57)
 /Subtype /Link
 /Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
 >>
 endobj
-521 0 obj
+520 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -47120,7 +47205,7 @@ endobj
 /Type /Annot
 >>
 endobj
-522 0 obj
+521 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_21)
 /Subtype /Link
@@ -47128,7 +47213,7 @@ endobj
 /Type /Annot
 >>
 endobj
-523 0 obj
+522 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -47136,7 +47221,7 @@ endobj
 /Type /Annot
 >>
 endobj
-524 0 obj
+523 0 obj
 << /Border [0 0 0]
 /Dest (_responses_27)
 /Subtype /Link
@@ -47144,7 +47229,7 @@ endobj
 /Type /Annot
 >>
 endobj
-525 0 obj
+524 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -47152,7 +47237,7 @@ endobj
 /Type /Annot
 >>
 endobj
-526 0 obj
+525 0 obj
 << /Border [0 0 0]
 /Dest (_consumes_6)
 /Subtype /Link
@@ -47160,7 +47245,7 @@ endobj
 /Type /Annot
 >>
 endobj
-527 0 obj
+526 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -47168,7 +47253,7 @@ endobj
 /Type /Annot
 >>
 endobj
-528 0 obj
+527 0 obj
 << /Border [0 0 0]
 /Dest (_produces_26)
 /Subtype /Link
@@ -47176,23 +47261,23 @@ endobj
 /Type /Annot
 >>
 endobj
-529 0 obj
+528 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_route60)
 /Subtype /Link
 /Rect [60.24000000000001 57.95999999999961 175.8555 72.23999999999961]
 /Type /Annot
 >>
 endobj
-530 0 obj
+529 0 obj
 << /Border [0 0 0]
-/Dest (_route29)
+/Dest (_route60)
 /Subtype /Link
 /Rect [552.021 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
 >>
 endobj
-531 0 obj
+530 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -47200,7 +47285,7 @@ endobj
 /Type /Annot
 >>
 endobj
-532 0 obj
+531 0 obj
 << /Border [0 0 0]
 /Dest (_responses_28)
 /Subtype /Link
@@ -47208,7 +47293,7 @@ endobj
 /Type /Annot
 >>
 endobj
-533 0 obj
+532 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -47216,7 +47301,7 @@ endobj
 /Type /Annot
 >>
 endobj
-534 0 obj
+533 0 obj
 << /Border [0 0 0]
 /Dest (_produces_27)
 /Subtype /Link
@@ -47224,7 +47309,7 @@ endobj
 /Type /Annot
 >>
 endobj
-535 0 obj
+534 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_names_get)
 /Subtype /Link
@@ -47232,7 +47317,7 @@ endobj
 /Type /Annot
 >>
 endobj
-536 0 obj
+535 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_names_get)
 /Subtype /Link
@@ -47240,7 +47325,7 @@ endobj
 /Type /Annot
 >>
 endobj
-537 0 obj
+536 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -47248,7 +47333,7 @@ endobj
 /Type /Annot
 >>
 endobj
-538 0 obj
+537 0 obj
 << /Border [0 0 0]
 /Dest (_responses_29)
 /Subtype /Link
@@ -47256,7 +47341,7 @@ endobj
 /Type /Annot
 >>
 endobj
-539 0 obj
+538 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -47264,7 +47349,7 @@ endobj
 /Type /Annot
 >>
 endobj
-540 0 obj
+539 0 obj
 << /Border [0 0 0]
 /Dest (_produces_28)
 /Subtype /Link
@@ -47272,7 +47357,7 @@ endobj
 /Type /Annot
 >>
 endobj
-541 0 obj
+540 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_templatename_get)
 /Subtype /Link
@@ -47280,7 +47365,7 @@ endobj
 /Type /Annot
 >>
 endobj
-542 0 obj
+541 0 obj
 << /Border [0 0 0]
 /Dest (_v2_templates_templatename_get)
 /Subtype /Link
@@ -47288,7 +47373,7 @@ endobj
 /Type /Annot
 >>
 endobj
-543 0 obj
+542 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -47296,7 +47381,7 @@ endobj
 /Type /Annot
 >>
 endobj
-544 0 obj
+543 0 obj
 << /Border [0 0 0]
 /Dest (_parameters_22)
 /Subtype /Link
@@ -47304,7 +47389,7 @@ endobj
 /Type /Annot
 >>
 endobj
-545 0 obj
+544 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -47312,7 +47397,7 @@ endobj
 /Type /Annot
 >>
 endobj
-546 0 obj
+545 0 obj
 << /Border [0 0 0]
 /Dest (_responses_30)
 /Subtype /Link
@@ -47320,7 +47405,7 @@ endobj
 /Type /Annot
 >>
 endobj
-547 0 obj
+546 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -47328,7 +47413,7 @@ endobj
 /Type /Annot
 >>
 endobj
-548 0 obj
+547 0 obj
 << /Border [0 0 0]
 /Dest (_produces_29)
 /Subtype /Link
@@ -47336,7 +47421,7 @@ endobj
 /Type /Annot
 >>
 endobj
-549 0 obj
+548 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -47344,7 +47429,7 @@ endobj
 /Type /Annot
 >>
 endobj
-550 0 obj
+549 0 obj
 << /Border [0 0 0]
 /Dest (_definitions)
 /Subtype /Link
@@ -47352,7 +47437,7 @@ endobj
 /Type /Annot
 >>
 endobj
-551 0 obj
+550 0 obj
 << /Border [0 0 0]
 /Dest (_cldshealthcheck)
 /Subtype /Link
@@ -47360,7 +47445,7 @@ endobj
 /Type /Annot
 >>
 endobj
-552 0 obj
+551 0 obj
 << /Border [0 0 0]
 /Dest (_cldshealthcheck)
 /Subtype /Link
@@ -47368,7 +47453,7 @@ endobj
 /Type /Annot
 >>
 endobj
-553 0 obj
+552 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -47376,7 +47461,7 @@ endobj
 /Type /Annot
 >>
 endobj
-554 0 obj
+553 0 obj
 << /Border [0 0 0]
 /Dest (_dictionary)
 /Subtype /Link
@@ -47384,7 +47469,7 @@ endobj
 /Type /Annot
 >>
 endobj
-555 0 obj
+554 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -47392,7 +47477,7 @@ endobj
 /Type /Annot
 >>
 endobj
-556 0 obj
+555 0 obj
 << /Border [0 0 0]
 /Dest (_dictionaryelement)
 /Subtype /Link
@@ -47400,7 +47485,7 @@ endobj
 /Type /Annot
 >>
 endobj
-557 0 obj
+556 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -47408,7 +47493,7 @@ endobj
 /Type /Annot
 >>
 endobj
-558 0 obj
+557 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponent)
 /Subtype /Link
@@ -47416,7 +47501,7 @@ endobj
 /Type /Annot
 >>
 endobj
-559 0 obj
+558 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -47424,7 +47509,7 @@ endobj
 /Type /Annot
 >>
 endobj
-560 0 obj
+559 0 obj
 << /Border [0 0 0]
 /Dest (_externalcomponentstate)
 /Subtype /Link
@@ -47432,7 +47517,7 @@ endobj
 /Type /Annot
 >>
 endobj
-561 0 obj
+560 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -47440,7 +47525,7 @@ endobj
 /Type /Annot
 >>
 endobj
-562 0 obj
+561 0 obj
 << /Border [0 0 0]
 /Dest (_jsonarray)
 /Subtype /Link
@@ -47448,7 +47533,7 @@ endobj
 /Type /Annot
 >>
 endobj
-563 0 obj
+562 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -47456,7 +47541,7 @@ endobj
 /Type /Annot
 >>
 endobj
-564 0 obj
+563 0 obj
 << /Border [0 0 0]
 /Dest (_jsonnull)
 /Subtype /Link
@@ -47464,7 +47549,7 @@ endobj
 /Type /Annot
 >>
 endobj
-565 0 obj
+564 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -47472,7 +47557,7 @@ endobj
 /Type /Annot
 >>
 endobj
-566 0 obj
+565 0 obj
 << /Border [0 0 0]
 /Dest (_jsonobject)
 /Subtype /Link
@@ -47480,7 +47565,7 @@ endobj
 /Type /Annot
 >>
 endobj
-567 0 obj
+566 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -47488,7 +47573,7 @@ endobj
 /Type /Annot
 >>
 endobj
-568 0 obj
+567 0 obj
 << /Border [0 0 0]
 /Dest (_jsonprimitive)
 /Subtype /Link
@@ -47496,7 +47581,7 @@ endobj
 /Type /Annot
 >>
 endobj
-569 0 obj
+568 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -47504,7 +47589,7 @@ endobj
 /Type /Annot
 >>
 endobj
-570 0 obj
+569 0 obj
 << /Border [0 0 0]
 /Dest (_loop)
 /Subtype /Link
@@ -47512,7 +47597,7 @@ endobj
 /Type /Annot
 >>
 endobj
-571 0 obj
+570 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -47520,7 +47605,7 @@ endobj
 /Type /Annot
 >>
 endobj
-572 0 obj
+571 0 obj
 << /Border [0 0 0]
 /Dest (_loopelementmodel)
 /Subtype /Link
@@ -47528,7 +47613,7 @@ endobj
 /Type /Annot
 >>
 endobj
-573 0 obj
+572 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -47536,7 +47621,7 @@ endobj
 /Type /Annot
 >>
 endobj
-574 0 obj
+573 0 obj
 << /Border [0 0 0]
 /Dest (_looplog)
 /Subtype /Link
@@ -47544,7 +47629,7 @@ endobj
 /Type /Annot
 >>
 endobj
-575 0 obj
+574 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -47552,7 +47637,7 @@ endobj
 /Type /Annot
 >>
 endobj
-576 0 obj
+575 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplate)
 /Subtype /Link
@@ -47560,7 +47645,7 @@ endobj
 /Type /Annot
 >>
 endobj
-577 0 obj
+576 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -47568,7 +47653,7 @@ endobj
 /Type /Annot
 >>
 endobj
-578 0 obj
+577 0 obj
 << /Border [0 0 0]
 /Dest (_looptemplateloopelementmodel)
 /Subtype /Link
@@ -47576,7 +47661,7 @@ endobj
 /Type /Annot
 >>
 endobj
-579 0 obj
+578 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -47584,7 +47669,7 @@ endobj
 /Type /Annot
 >>
 endobj
-580 0 obj
+579 0 obj
 << /Border [0 0 0]
 /Dest (_microservicepolicy)
 /Subtype /Link
@@ -47592,7 +47677,7 @@ endobj
 /Type /Annot
 >>
 endobj
-581 0 obj
+580 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -47600,7 +47685,7 @@ endobj
 /Type /Annot
 >>
 endobj
-582 0 obj
+581 0 obj
 << /Border [0 0 0]
 /Dest (_number)
 /Subtype /Link
@@ -47608,7 +47693,7 @@ endobj
 /Type /Annot
 >>
 endobj
-583 0 obj
+582 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -47616,7 +47701,7 @@ endobj
 /Type /Annot
 >>
 endobj
-584 0 obj
+583 0 obj
 << /Border [0 0 0]
 /Dest (_operationalpolicy)
 /Subtype /Link
@@ -47624,7 +47709,7 @@ endobj
 /Type /Annot
 >>
 endobj
-585 0 obj
+584 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -47632,7 +47717,7 @@ endobj
 /Type /Annot
 >>
 endobj
-586 0 obj
+585 0 obj
 << /Border [0 0 0]
 /Dest (_policymodel)
 /Subtype /Link
@@ -47640,7 +47725,7 @@ endobj
 /Type /Annot
 >>
 endobj
-587 0 obj
+586 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -47648,7 +47733,7 @@ endobj
 /Type /Annot
 >>
 endobj
-588 0 obj
+587 0 obj
 << /Border [0 0 0]
 /Dest (_service)
 /Subtype /Link
@@ -47656,7 +47741,7 @@ endobj
 /Type /Annot
 >>
 endobj
-589 0 obj
+588 0 obj
 << /Type /XObject
 /Subtype /Form
 /BBox [0 0 612.0 792.0]
@@ -47684,1299 +47769,1299 @@ Q
 
 endstream
 endobj
-590 0 obj
+589 0 obj
 << /Type /Outlines
 /Count 143
-/First 591 0 R
-/Last 714 0 R
+/First 590 0 R
+/Last 713 0 R
 >>
 endobj
-591 0 obj
+590 0 obj
 << /Title <feff0043006c0061006d0070002000520065007300740020004100500049>
-/Parent 590 0 R
+/Parent 589 0 R
 /Count 0
-/Next 592 0 R
+/Next 591 0 R
 /Dest [7 0 R /XYZ 0 792.0 null]
 >>
 endobj
-592 0 obj
+591 0 obj
 << /Title <feff005400610062006c00650020006f006600200043006f006e00740065006e00740073>
-/Parent 590 0 R
+/Parent 589 0 R
 /Count 0
-/Next 593 0 R
-/Prev 591 0 R
+/Next 592 0 R
+/Prev 590 0 R
 /Dest [10 0 R /XYZ 0 792.0 null]
 >>
 endobj
-593 0 obj
+592 0 obj
 << /Title <feff004300680061007000740065007200200031002e0020004f0076006500720076006900650077>
-/Parent 590 0 R
+/Parent 589 0 R
 /Count 2
-/First 594 0 R
-/Last 595 0 R
-/Next 596 0 R
-/Prev 592 0 R
+/First 593 0 R
+/Last 594 0 R
+/Next 595 0 R
+/Prev 591 0 R
 /Dest [18 0 R /XYZ 0 792.0 null]
 >>
 endobj
-594 0 obj
+593 0 obj
 << /Title <feff0031002e0031002e002000560065007200730069006f006e00200069006e0066006f0072006d006100740069006f006e>
-/Parent 593 0 R
+/Parent 592 0 R
 /Count 0
-/Next 595 0 R
+/Next 594 0 R
 /Dest [18 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-595 0 obj
+594 0 obj
 << /Title <feff0031002e0032002e002000550052004900200073006300680065006d0065>
-/Parent 593 0 R
+/Parent 592 0 R
 /Count 0
-/Prev 594 0 R
+/Prev 593 0 R
 /Dest [18 0 R /XYZ 0 644.22 null]
 >>
 endobj
-596 0 obj
+595 0 obj
 << /Title <feff004300680061007000740065007200200032002e002000500061007400680073>
-/Parent 590 0 R
+/Parent 589 0 R
 /Count 117
-/First 597 0 R
-/Last 710 0 R
-/Next 714 0 R
-/Prev 593 0 R
+/First 596 0 R
+/Last 709 0 R
+/Next 713 0 R
+/Prev 592 0 R
 /Dest [27 0 R /XYZ 0 792.0 null]
 >>
 endobj
-597 0 obj
+596 0 obj
 << /Title <feff0032002e0031002e00200047004500540020002f00760031002f006800650061006c007400680063006800650063006b>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 598 0 R
-/Last 599 0 R
-/Next 600 0 R
+/First 597 0 R
+/Last 598 0 R
+/Next 599 0 R
 /Dest [27 0 R /XYZ 0 712.0799999999999 null]
 >>
 endobj
-598 0 obj
+597 0 obj
 << /Title <feff0032002e0031002e0031002e00200052006500730070006f006e007300650073>
-/Parent 597 0 R
+/Parent 596 0 R
 /Count 0
-/Next 599 0 R
+/Next 598 0 R
 /Dest [27 0 R /XYZ 0 672.0 null]
 >>
 endobj
-599 0 obj
+598 0 obj
 << /Title <feff0032002e0031002e0032002e002000500072006f00640075006300650073>
-/Parent 597 0 R
+/Parent 596 0 R
 /Count 0
-/Prev 598 0 R
+/Prev 597 0 R
 /Dest [27 0 R /XYZ 0 566.8800000000001 null]
 >>
 endobj
-600 0 obj
+599 0 obj
 << /Title <feff0032002e0032002e00200047004500540020002f00760031002f0075007300650072002f0067006500740055007300650072>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 601 0 R
-/Last 602 0 R
-/Next 603 0 R
-/Prev 597 0 R
+/First 600 0 R
+/Last 601 0 R
+/Next 602 0 R
+/Prev 596 0 R
 /Dest [27 0 R /XYZ 0 510.60000000000025 null]
 >>
 endobj
-601 0 obj
+600 0 obj
 << /Title <feff0032002e0032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 600 0 R
+/Parent 599 0 R
 /Count 0
-/Next 602 0 R
+/Next 601 0 R
 /Dest [27 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-602 0 obj
+601 0 obj
 << /Title <feff0032002e0032002e0032002e002000500072006f00640075006300650073>
-/Parent 600 0 R
+/Parent 599 0 R
 /Count 0
-/Prev 601 0 R
+/Prev 600 0 R
 /Dest [27 0 R /XYZ 0 379.6800000000002 null]
 >>
 endobj
-603 0 obj
+602 0 obj
 << /Title <feff0032002e0033002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 604 0 R
-/Last 605 0 R
-/Next 606 0 R
-/Prev 600 0 R
+/First 603 0 R
+/Last 604 0 R
+/Next 605 0 R
+/Prev 599 0 R
 /Dest [27 0 R /XYZ 0 323.40000000000015 null]
 >>
 endobj
-604 0 obj
+603 0 obj
 << /Title <feff0032002e0033002e0031002e00200052006500730070006f006e007300650073>
-/Parent 603 0 R
+/Parent 602 0 R
 /Count 0
-/Next 605 0 R
+/Next 604 0 R
 /Dest [27 0 R /XYZ 0 283.3200000000001 null]
 >>
 endobj
-605 0 obj
+604 0 obj
 << /Title <feff0032002e0033002e0032002e002000500072006f00640075006300650073>
-/Parent 603 0 R
+/Parent 602 0 R
 /Count 0
-/Prev 604 0 R
+/Prev 603 0 R
 /Dest [27 0 R /XYZ 0 178.2000000000001 null]
 >>
 endobj
-606 0 obj
+605 0 obj
 << /Title <feff0032002e0034002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 4
-/First 607 0 R
-/Last 610 0 R
-/Next 611 0 R
-/Prev 603 0 R
+/First 606 0 R
+/Last 609 0 R
+/Next 610 0 R
+/Prev 602 0 R
 /Dest [27 0 R /XYZ 0 121.92000000000007 null]
 >>
 endobj
-607 0 obj
+606 0 obj
 << /Title <feff0032002e0034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 606 0 R
+/Parent 605 0 R
 /Count 0
-/Next 608 0 R
+/Next 607 0 R
 /Dest [43 0 R /XYZ 0 792.0 null]
 >>
 endobj
-608 0 obj
+607 0 obj
 << /Title <feff0032002e0034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 606 0 R
+/Parent 605 0 R
 /Count 0
-/Next 609 0 R
-/Prev 607 0 R
+/Next 608 0 R
+/Prev 606 0 R
 /Dest [43 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-609 0 obj
+608 0 obj
 << /Title <feff0032002e0034002e0033002e00200043006f006e00730075006d00650073>
-/Parent 606 0 R
+/Parent 605 0 R
 /Count 0
-/Next 610 0 R
-/Prev 608 0 R
+/Next 609 0 R
+/Prev 607 0 R
 /Dest [43 0 R /XYZ 0 548.1600000000003 null]
 >>
 endobj
-610 0 obj
+609 0 obj
 << /Title <feff0032002e0034002e0034002e002000500072006f00640075006300650073>
-/Parent 606 0 R
+/Parent 605 0 R
 /Count 0
-/Prev 609 0 R
+/Prev 608 0 R
 /Dest [43 0 R /XYZ 0 491.88000000000045 null]
 >>
 endobj
-611 0 obj
+610 0 obj
 << /Title <feff0032002e0035002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007300650063006f006e0064006100720079002f006e0061006d00650073>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 612 0 R
-/Last 613 0 R
-/Next 614 0 R
-/Prev 606 0 R
+/First 611 0 R
+/Last 612 0 R
+/Next 613 0 R
+/Prev 605 0 R
 /Dest [43 0 R /XYZ 0 435.6000000000004 null]
 >>
 endobj
-612 0 obj
+611 0 obj
 << /Title <feff0032002e0035002e0031002e00200052006500730070006f006e007300650073>
-/Parent 611 0 R
+/Parent 610 0 R
 /Count 0
-/Next 613 0 R
+/Next 612 0 R
 /Dest [43 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
-613 0 obj
+612 0 obj
 << /Title <feff0032002e0035002e0032002e002000500072006f00640075006300650073>
-/Parent 611 0 R
+/Parent 610 0 R
 /Count 0
-/Prev 612 0 R
+/Prev 611 0 R
 /Dest [43 0 R /XYZ 0 290.4000000000003 null]
 >>
 endobj
-614 0 obj
+613 0 obj
 << /Title <feff0032002e0036002e00200047004500540020002f00760032002f00640069006300740069006f006e006100720079002f007b00640069006300740069006f006e006100720079004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 615 0 R
-/Last 617 0 R
-/Next 618 0 R
-/Prev 611 0 R
+/First 614 0 R
+/Last 616 0 R
+/Next 617 0 R
+/Prev 610 0 R
 /Dest [43 0 R /XYZ 0 234.1200000000003 null]
 >>
 endobj
-615 0 obj
+614 0 obj
 << /Title <feff0032002e0036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 614 0 R
+/Parent 613 0 R
 /Count 0
-/Next 616 0 R
+/Next 615 0 R
 /Dest [43 0 R /XYZ 0 194.04000000000028 null]
 >>
 endobj
-616 0 obj
+615 0 obj
 << /Title <feff0032002e0036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 614 0 R
+/Parent 613 0 R
 /Count 0
-/Next 617 0 R
-/Prev 615 0 R
+/Next 616 0 R
+/Prev 614 0 R
 /Dest [58 0 R /XYZ 0 792.0 null]
 >>
 endobj
-617 0 obj
+616 0 obj
 << /Title <feff0032002e0036002e0033002e002000500072006f00640075006300650073>
-/Parent 614 0 R
+/Parent 613 0 R
 /Count 0
-/Prev 616 0 R
+/Prev 615 0 R
 /Dest [58 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-618 0 obj
+617 0 obj
 << /Title <feff0032002e0037002e00200050005500540020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 4
-/First 619 0 R
-/Last 622 0 R
-/Next 623 0 R
-/Prev 614 0 R
+/First 618 0 R
+/Last 621 0 R
+/Next 622 0 R
+/Prev 613 0 R
 /Dest [58 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-619 0 obj
+618 0 obj
 << /Title <feff0032002e0037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 618 0 R
+/Parent 617 0 R
 /Count 0
-/Next 620 0 R
+/Next 619 0 R
 /Dest [58 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-620 0 obj
+619 0 obj
 << /Title <feff0032002e0037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 618 0 R
+/Parent 617 0 R
 /Count 0
-/Next 621 0 R
-/Prev 619 0 R
+/Next 620 0 R
+/Prev 618 0 R
 /Dest [58 0 R /XYZ 0 414.2400000000005 null]
 >>
 endobj
-621 0 obj
+620 0 obj
 << /Title <feff0032002e0037002e0033002e00200043006f006e00730075006d00650073>
-/Parent 618 0 R
+/Parent 617 0 R
 /Count 0
-/Next 622 0 R
-/Prev 620 0 R
+/Next 621 0 R
+/Prev 619 0 R
 /Dest [58 0 R /XYZ 0 309.12000000000046 null]
 >>
 endobj
-622 0 obj
+621 0 obj
 << /Title <feff0032002e0037002e0034002e002000500072006f00640075006300650073>
-/Parent 618 0 R
+/Parent 617 0 R
 /Count 0
-/Prev 621 0 R
+/Prev 620 0 R
 /Dest [58 0 R /XYZ 0 252.84000000000043 null]
 >>
 endobj
-623 0 obj
+622 0 obj
 << /Title <feff0032002e0038002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 624 0 R
-/Last 626 0 R
-/Next 627 0 R
-/Prev 618 0 R
+/First 623 0 R
+/Last 625 0 R
+/Next 626 0 R
+/Prev 617 0 R
 /Dest [58 0 R /XYZ 0 196.5600000000004 null]
 >>
 endobj
-624 0 obj
+623 0 obj
 << /Title <feff0032002e0038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 623 0 R
+/Parent 622 0 R
 /Count 0
-/Next 625 0 R
+/Next 624 0 R
 /Dest [58 0 R /XYZ 0 156.4800000000004 null]
 >>
 endobj
-625 0 obj
+624 0 obj
 << /Title <feff0032002e0038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 623 0 R
+/Parent 622 0 R
 /Count 0
-/Next 626 0 R
-/Prev 624 0 R
+/Next 625 0 R
+/Prev 623 0 R
 /Dest [72 0 R /XYZ 0 792.0 null]
 >>
 endobj
-626 0 obj
+625 0 obj
 << /Title <feff0032002e0038002e0033002e002000500072006f00640075006300650073>
-/Parent 623 0 R
+/Parent 622 0 R
 /Count 0
-/Prev 625 0 R
+/Prev 624 0 R
 /Dest [72 0 R /XYZ 0 667.5600000000002 null]
 >>
 endobj
-627 0 obj
+626 0 obj
 << /Title <feff0032002e0039002e002000440045004c0045005400450020002f00760032002f00640069006300740069006f006e006100720079002f007b006e0061006d0065007d002f0065006c0065006d0065006e00740073002f007b00730068006f00720074004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 628 0 R
-/Last 630 0 R
-/Next 631 0 R
-/Prev 623 0 R
+/First 627 0 R
+/Last 629 0 R
+/Next 630 0 R
+/Prev 622 0 R
 /Dest [72 0 R /XYZ 0 611.2800000000003 null]
 >>
 endobj
-628 0 obj
+627 0 obj
 << /Title <feff0032002e0039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 627 0 R
+/Parent 626 0 R
 /Count 0
-/Next 629 0 R
+/Next 628 0 R
 /Dest [72 0 R /XYZ 0 543.1200000000005 null]
 >>
 endobj
-629 0 obj
+628 0 obj
 << /Title <feff0032002e0039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 627 0 R
+/Parent 626 0 R
 /Count 0
-/Next 630 0 R
-/Prev 628 0 R
+/Next 629 0 R
+/Prev 627 0 R
 /Dest [72 0 R /XYZ 0 400.44000000000057 null]
 >>
 endobj
-630 0 obj
+629 0 obj
 << /Title <feff0032002e0039002e0033002e002000500072006f00640075006300650073>
-/Parent 627 0 R
+/Parent 626 0 R
 /Count 0
-/Prev 629 0 R
+/Prev 628 0 R
 /Dest [72 0 R /XYZ 0 309.6000000000006 null]
 >>
 endobj
-631 0 obj
+630 0 obj
 << /Title <feff0032002e00310030002e00200050005500540020002f00760032002f006c006f006f0070002f00640065006c006500740065002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 632 0 R
-/Last 633 0 R
-/Next 634 0 R
-/Prev 627 0 R
+/First 631 0 R
+/Last 632 0 R
+/Next 633 0 R
+/Prev 626 0 R
 /Dest [72 0 R /XYZ 0 253.32000000000056 null]
 >>
 endobj
-632 0 obj
+631 0 obj
 << /Title <feff0032002e00310030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 631 0 R
+/Parent 630 0 R
 /Count 0
-/Next 633 0 R
+/Next 632 0 R
 /Dest [72 0 R /XYZ 0 213.24000000000055 null]
 >>
 endobj
-633 0 obj
+632 0 obj
 << /Title <feff0032002e00310030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 631 0 R
+/Parent 630 0 R
 /Count 0
-/Prev 632 0 R
+/Prev 631 0 R
 /Dest [72 0 R /XYZ 0 108.12000000000052 null]
 >>
 endobj
-634 0 obj
+633 0 obj
 << /Title <feff0032002e00310031002e00200050005500540020002f00760032002f006c006f006f0070002f006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 635 0 R
-/Last 637 0 R
-/Next 638 0 R
-/Prev 631 0 R
+/First 634 0 R
+/Last 636 0 R
+/Next 637 0 R
+/Prev 630 0 R
 /Dest [84 0 R /XYZ 0 697.44 null]
 >>
 endobj
-635 0 obj
+634 0 obj
 << /Title <feff0032002e00310031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 634 0 R
+/Parent 633 0 R
 /Count 0
-/Next 636 0 R
+/Next 635 0 R
 /Dest [84 0 R /XYZ 0 657.3600000000001 null]
 >>
 endobj
-636 0 obj
+635 0 obj
 << /Title <feff0032002e00310031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 634 0 R
+/Parent 633 0 R
 /Count 0
-/Next 637 0 R
-/Prev 635 0 R
+/Next 636 0 R
+/Prev 634 0 R
 /Dest [84 0 R /XYZ 0 552.2400000000002 null]
 >>
 endobj
-637 0 obj
+636 0 obj
 << /Title <feff0032002e00310031002e0033002e002000500072006f00640075006300650073>
-/Parent 634 0 R
+/Parent 633 0 R
 /Count 0
-/Prev 636 0 R
+/Prev 635 0 R
 /Dest [84 0 R /XYZ 0 447.12000000000035 null]
 >>
 endobj
-638 0 obj
+637 0 obj
 << /Title <feff0032002e00310032002e00200047004500540020002f00760032002f006c006f006f0070002f0067006500740041006c006c004e0061006d00650073>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 639 0 R
-/Last 640 0 R
-/Next 641 0 R
-/Prev 634 0 R
+/First 638 0 R
+/Last 639 0 R
+/Next 640 0 R
+/Prev 633 0 R
 /Dest [84 0 R /XYZ 0 390.8400000000003 null]
 >>
 endobj
-639 0 obj
+638 0 obj
 << /Title <feff0032002e00310032002e0031002e00200052006500730070006f006e007300650073>
-/Parent 638 0 R
+/Parent 637 0 R
 /Count 0
-/Next 640 0 R
+/Next 639 0 R
 /Dest [84 0 R /XYZ 0 350.7600000000003 null]
 >>
 endobj
-640 0 obj
+639 0 obj
 << /Title <feff0032002e00310032002e0032002e002000500072006f00640075006300650073>
-/Parent 638 0 R
+/Parent 637 0 R
 /Count 0
-/Prev 639 0 R
+/Prev 638 0 R
 /Dest [84 0 R /XYZ 0 245.6400000000002 null]
 >>
 endobj
-641 0 obj
+640 0 obj
 << /Title <feff0032002e00310033002e00200047004500540020002f00760032002f006c006f006f0070002f006700650074007300740061007400750073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 642 0 R
-/Last 644 0 R
-/Next 645 0 R
-/Prev 638 0 R
+/First 641 0 R
+/Last 643 0 R
+/Next 644 0 R
+/Prev 637 0 R
 /Dest [84 0 R /XYZ 0 189.36000000000018 null]
 >>
 endobj
-642 0 obj
+641 0 obj
 << /Title <feff0032002e00310033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 641 0 R
+/Parent 640 0 R
 /Count 0
-/Next 643 0 R
+/Next 642 0 R
 /Dest [84 0 R /XYZ 0 149.28000000000017 null]
 >>
 endobj
-643 0 obj
+642 0 obj
 << /Title <feff0032002e00310033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 641 0 R
+/Parent 640 0 R
 /Count 0
-/Next 644 0 R
-/Prev 642 0 R
+/Next 643 0 R
+/Prev 641 0 R
 /Dest [97 0 R /XYZ 0 792.0 null]
 >>
 endobj
-644 0 obj
+643 0 obj
 << /Title <feff0032002e00310033002e0033002e002000500072006f00640075006300650073>
-/Parent 641 0 R
+/Parent 640 0 R
 /Count 0
-/Prev 643 0 R
+/Prev 642 0 R
 /Dest [97 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-645 0 obj
+644 0 obj
 << /Title <feff0032002e00310034002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500660072006500730068004f00700050006f006c006900630079004a0073006f006e0053006300680065006d0061002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 646 0 R
-/Last 648 0 R
-/Next 649 0 R
-/Prev 641 0 R
+/First 645 0 R
+/Last 647 0 R
+/Next 648 0 R
+/Prev 640 0 R
 /Dest [97 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-646 0 obj
+645 0 obj
 << /Title <feff0032002e00310034002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 645 0 R
+/Parent 644 0 R
 /Count 0
-/Next 647 0 R
+/Next 646 0 R
 /Dest [97 0 R /XYZ 0 528.8400000000005 null]
 >>
 endobj
-647 0 obj
+646 0 obj
 << /Title <feff0032002e00310034002e0032002e00200052006500730070006f006e007300650073>
-/Parent 645 0 R
+/Parent 644 0 R
 /Count 0
-/Next 648 0 R
-/Prev 646 0 R
+/Next 647 0 R
+/Prev 645 0 R
 /Dest [97 0 R /XYZ 0 423.72000000000054 null]
 >>
 endobj
-648 0 obj
+647 0 obj
 << /Title <feff0032002e00310034002e0033002e002000500072006f00640075006300650073>
-/Parent 645 0 R
+/Parent 644 0 R
 /Count 0
-/Prev 647 0 R
+/Prev 646 0 R
 /Dest [97 0 R /XYZ 0 318.6000000000005 null]
 >>
 endobj
-649 0 obj
+648 0 obj
 << /Title <feff0032002e00310035002e00200050005500540020002f00760032002f006c006f006f0070002f0072006500730074006100720074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 650 0 R
-/Last 652 0 R
-/Next 653 0 R
-/Prev 645 0 R
+/First 649 0 R
+/Last 651 0 R
+/Next 652 0 R
+/Prev 644 0 R
 /Dest [97 0 R /XYZ 0 262.32000000000045 null]
 >>
 endobj
-650 0 obj
+649 0 obj
 << /Title <feff0032002e00310035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 649 0 R
+/Parent 648 0 R
 /Count 0
-/Next 651 0 R
+/Next 650 0 R
 /Dest [97 0 R /XYZ 0 222.24000000000046 null]
 >>
 endobj
-651 0 obj
+650 0 obj
 << /Title <feff0032002e00310035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 649 0 R
+/Parent 648 0 R
 /Count 0
-/Next 652 0 R
-/Prev 650 0 R
+/Next 651 0 R
+/Prev 649 0 R
 /Dest [97 0 R /XYZ 0 117.12000000000043 null]
 >>
 endobj
-652 0 obj
+651 0 obj
 << /Title <feff0032002e00310035002e0033002e002000500072006f00640075006300650073>
-/Parent 649 0 R
+/Parent 648 0 R
 /Count 0
-/Prev 651 0 R
+/Prev 650 0 R
 /Dest [110 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
-653 0 obj
+652 0 obj
 << /Title <feff0032002e00310036002e00200050005500540020002f00760032002f006c006f006f0070002f00730074006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 654 0 R
-/Last 656 0 R
-/Next 657 0 R
-/Prev 649 0 R
+/First 653 0 R
+/Last 655 0 R
+/Next 656 0 R
+/Prev 648 0 R
 /Dest [110 0 R /XYZ 0 626.8800000000002 null]
 >>
 endobj
-654 0 obj
+653 0 obj
 << /Title <feff0032002e00310036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 653 0 R
+/Parent 652 0 R
 /Count 0
-/Next 655 0 R
+/Next 654 0 R
 /Dest [110 0 R /XYZ 0 586.8000000000003 null]
 >>
 endobj
-655 0 obj
+654 0 obj
 << /Title <feff0032002e00310036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 653 0 R
+/Parent 652 0 R
 /Count 0
-/Next 656 0 R
-/Prev 654 0 R
+/Next 655 0 R
+/Prev 653 0 R
 /Dest [110 0 R /XYZ 0 481.68000000000046 null]
 >>
 endobj
-656 0 obj
+655 0 obj
 << /Title <feff0032002e00310036002e0033002e002000500072006f00640075006300650073>
-/Parent 653 0 R
+/Parent 652 0 R
 /Count 0
-/Prev 655 0 R
+/Prev 654 0 R
 /Dest [110 0 R /XYZ 0 376.5600000000004 null]
 >>
 endobj
-657 0 obj
+656 0 obj
 << /Title <feff0032002e00310037002e00200050005500540020002f00760032002f006c006f006f0070002f007300750062006d00690074002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 658 0 R
-/Last 660 0 R
-/Next 661 0 R
-/Prev 653 0 R
+/First 657 0 R
+/Last 659 0 R
+/Next 660 0 R
+/Prev 652 0 R
 /Dest [110 0 R /XYZ 0 320.28000000000037 null]
 >>
 endobj
-658 0 obj
+657 0 obj
 << /Title <feff0032002e00310037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 657 0 R
+/Parent 656 0 R
 /Count 0
-/Next 659 0 R
+/Next 658 0 R
 /Dest [110 0 R /XYZ 0 280.20000000000033 null]
 >>
 endobj
-659 0 obj
+658 0 obj
 << /Title <feff0032002e00310037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 657 0 R
+/Parent 656 0 R
 /Count 0
-/Next 660 0 R
-/Prev 658 0 R
+/Next 659 0 R
+/Prev 657 0 R
 /Dest [110 0 R /XYZ 0 175.08000000000033 null]
 >>
 endobj
-660 0 obj
+659 0 obj
 << /Title <feff0032002e00310037002e0033002e002000500072006f00640075006300650073>
-/Parent 657 0 R
+/Parent 656 0 R
 /Count 0
-/Prev 659 0 R
-/Dest [123 0 R /XYZ 0 792.0 null]
+/Prev 658 0 R
+/Dest [124 0 R /XYZ 0 792.0 null]
 >>
 endobj
-661 0 obj
+660 0 obj
 << /Title <feff0032002e00310038002e00200047004500540020002f00760032002f006c006f006f0070002f0073007600670052006500700072006500730065006e0074006100740069006f006e002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 662 0 R
-/Last 664 0 R
-/Next 665 0 R
-/Prev 657 0 R
-/Dest [123 0 R /XYZ 0 702.1200000000001 null]
+/First 661 0 R
+/Last 663 0 R
+/Next 664 0 R
+/Prev 656 0 R
+/Dest [124 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-662 0 obj
+661 0 obj
 << /Title <feff0032002e00310038002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 661 0 R
+/Parent 660 0 R
 /Count 0
-/Next 663 0 R
-/Dest [123 0 R /XYZ 0 662.0400000000002 null]
+/Next 662 0 R
+/Dest [124 0 R /XYZ 0 662.0400000000002 null]
 >>
 endobj
-663 0 obj
+662 0 obj
 << /Title <feff0032002e00310038002e0032002e00200052006500730070006f006e007300650073>
-/Parent 661 0 R
+/Parent 660 0 R
 /Count 0
-/Next 664 0 R
-/Prev 662 0 R
-/Dest [123 0 R /XYZ 0 556.9200000000003 null]
+/Next 663 0 R
+/Prev 661 0 R
+/Dest [124 0 R /XYZ 0 556.9200000000003 null]
 >>
 endobj
-664 0 obj
+663 0 obj
 << /Title <feff0032002e00310038002e0033002e002000500072006f00640075006300650073>
-/Parent 661 0 R
+/Parent 660 0 R
 /Count 0
-/Prev 663 0 R
-/Dest [123 0 R /XYZ 0 451.8000000000004 null]
+/Prev 662 0 R
+/Dest [124 0 R /XYZ 0 451.8000000000004 null]
 >>
 endobj
-665 0 obj
+664 0 obj
 << /Title <feff0032002e00310039002e00200050005500540020002f00760032002f006c006f006f0070002f0075006e006400650070006c006f0079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 666 0 R
-/Last 668 0 R
-/Next 669 0 R
-/Prev 661 0 R
-/Dest [123 0 R /XYZ 0 395.5200000000004 null]
+/First 665 0 R
+/Last 667 0 R
+/Next 668 0 R
+/Prev 660 0 R
+/Dest [124 0 R /XYZ 0 395.5200000000004 null]
 >>
 endobj
-666 0 obj
+665 0 obj
 << /Title <feff0032002e00310039002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 665 0 R
+/Parent 664 0 R
 /Count 0
-/Next 667 0 R
-/Dest [123 0 R /XYZ 0 355.44000000000034 null]
+/Next 666 0 R
+/Dest [124 0 R /XYZ 0 355.44000000000034 null]
 >>
 endobj
-667 0 obj
+666 0 obj
 << /Title <feff0032002e00310039002e0032002e00200052006500730070006f006e007300650073>
-/Parent 665 0 R
+/Parent 664 0 R
 /Count 0
-/Next 668 0 R
-/Prev 666 0 R
-/Dest [123 0 R /XYZ 0 250.32000000000033 null]
+/Next 667 0 R
+/Prev 665 0 R
+/Dest [124 0 R /XYZ 0 250.32000000000033 null]
 >>
 endobj
-668 0 obj
+667 0 obj
 << /Title <feff0032002e00310039002e0033002e002000500072006f00640075006300650073>
-/Parent 665 0 R
+/Parent 664 0 R
 /Count 0
-/Prev 667 0 R
-/Dest [123 0 R /XYZ 0 145.2000000000003 null]
+/Prev 666 0 R
+/Dest [124 0 R /XYZ 0 145.2000000000003 null]
 >>
 endobj
-669 0 obj
+668 0 obj
 << /Title <feff0032002e00320030002e00200050004f005300540020002f00760032002f006c006f006f0070002f0075007000640061007400650047006c006f00620061006c00500072006f0070006500720074006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 4
-/First 670 0 R
-/Last 673 0 R
-/Next 674 0 R
-/Prev 665 0 R
+/First 669 0 R
+/Last 672 0 R
+/Next 673 0 R
+/Prev 664 0 R
 /Dest [137 0 R /XYZ 0 792.0 null]
 >>
 endobj
-670 0 obj
+669 0 obj
 << /Title <feff0032002e00320030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 669 0 R
+/Parent 668 0 R
 /Count 0
-/Next 671 0 R
+/Next 670 0 R
 /Dest [137 0 R /XYZ 0 718.32 null]
 >>
 endobj
-671 0 obj
+670 0 obj
 << /Title <feff0032002e00320030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 669 0 R
+/Parent 668 0 R
 /Count 0
-/Next 672 0 R
-/Prev 670 0 R
+/Next 671 0 R
+/Prev 669 0 R
 /Dest [137 0 R /XYZ 0 575.6400000000001 null]
 >>
 endobj
-672 0 obj
+671 0 obj
 << /Title <feff0032002e00320030002e0033002e00200043006f006e00730075006d00650073>
-/Parent 669 0 R
+/Parent 668 0 R
 /Count 0
-/Next 673 0 R
-/Prev 671 0 R
+/Next 672 0 R
+/Prev 670 0 R
 /Dest [137 0 R /XYZ 0 470.5200000000002 null]
 >>
 endobj
-673 0 obj
+672 0 obj
 << /Title <feff0032002e00320030002e0034002e002000500072006f00640075006300650073>
-/Parent 669 0 R
+/Parent 668 0 R
 /Count 0
-/Prev 672 0 R
+/Prev 671 0 R
 /Dest [137 0 R /XYZ 0 414.2400000000002 null]
 >>
 endobj
-674 0 obj
+673 0 obj
 << /Title <feff0032002e00320031002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004d006900630072006f00730065007200760069006300650050006f006c006900630079002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 4
-/First 675 0 R
-/Last 678 0 R
-/Next 679 0 R
-/Prev 669 0 R
+/First 674 0 R
+/Last 677 0 R
+/Next 678 0 R
+/Prev 668 0 R
 /Dest [137 0 R /XYZ 0 357.96000000000015 null]
 >>
 endobj
-675 0 obj
+674 0 obj
 << /Title <feff0032002e00320031002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 674 0 R
+/Parent 673 0 R
 /Count 0
-/Next 676 0 R
+/Next 675 0 R
 /Dest [137 0 R /XYZ 0 289.8000000000001 null]
 >>
 endobj
-676 0 obj
+675 0 obj
 << /Title <feff0032002e00320031002e0032002e00200052006500730070006f006e007300650073>
-/Parent 674 0 R
+/Parent 673 0 R
 /Count 0
-/Next 677 0 R
-/Prev 675 0 R
+/Next 676 0 R
+/Prev 674 0 R
 /Dest [137 0 R /XYZ 0 147.1200000000001 null]
 >>
 endobj
-677 0 obj
+676 0 obj
 << /Title <feff0032002e00320031002e0033002e00200043006f006e00730075006d00650073>
-/Parent 674 0 R
+/Parent 673 0 R
 /Count 0
-/Next 678 0 R
-/Prev 676 0 R
+/Next 677 0 R
+/Prev 675 0 R
 /Dest [151 0 R /XYZ 0 792.0 null]
 >>
 endobj
-678 0 obj
+677 0 obj
 << /Title <feff0032002e00320031002e0034002e002000500072006f00640075006300650073>
-/Parent 674 0 R
+/Parent 673 0 R
 /Count 0
-/Prev 677 0 R
+/Prev 676 0 R
 /Dest [151 0 R /XYZ 0 702.1200000000001 null]
 >>
 endobj
-679 0 obj
+678 0 obj
 << /Title <feff0032002e00320032002e00200050004f005300540020002f00760032002f006c006f006f0070002f007500700064006100740065004f007000650072006100740069006f006e0061006c0050006f006c00690063006900650073002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 4
-/First 680 0 R
-/Last 683 0 R
-/Next 684 0 R
-/Prev 674 0 R
+/First 679 0 R
+/Last 682 0 R
+/Next 683 0 R
+/Prev 673 0 R
 /Dest [151 0 R /XYZ 0 645.8400000000003 null]
 >>
 endobj
-680 0 obj
+679 0 obj
 << /Title <feff0032002e00320032002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 679 0 R
+/Parent 678 0 R
 /Count 0
-/Next 681 0 R
+/Next 680 0 R
 /Dest [151 0 R /XYZ 0 577.6800000000004 null]
 >>
 endobj
-681 0 obj
+680 0 obj
 << /Title <feff0032002e00320032002e0032002e00200052006500730070006f006e007300650073>
-/Parent 679 0 R
+/Parent 678 0 R
 /Count 0
-/Next 682 0 R
-/Prev 680 0 R
+/Next 681 0 R
+/Prev 679 0 R
 /Dest [151 0 R /XYZ 0 435.0000000000005 null]
 >>
 endobj
-682 0 obj
+681 0 obj
 << /Title <feff0032002e00320032002e0033002e00200043006f006e00730075006d00650073>
-/Parent 679 0 R
+/Parent 678 0 R
 /Count 0
-/Next 683 0 R
-/Prev 681 0 R
+/Next 682 0 R
+/Prev 680 0 R
 /Dest [151 0 R /XYZ 0 329.88000000000045 null]
 >>
 endobj
-683 0 obj
+682 0 obj
 << /Title <feff0032002e00320032002e0034002e002000500072006f00640075006300650073>
-/Parent 679 0 R
+/Parent 678 0 R
 /Count 0
-/Prev 682 0 R
+/Prev 681 0 R
 /Dest [151 0 R /XYZ 0 273.6000000000004 null]
 >>
 endobj
-684 0 obj
+683 0 obj
 << /Title <feff0032002e00320033002e00200047004500540020002f00760032002f006c006f006f0070002f007b006c006f006f0070004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 685 0 R
-/Last 687 0 R
-/Next 688 0 R
-/Prev 679 0 R
+/First 684 0 R
+/Last 686 0 R
+/Next 687 0 R
+/Prev 678 0 R
 /Dest [151 0 R /XYZ 0 217.32000000000042 null]
 >>
 endobj
-685 0 obj
+684 0 obj
 << /Title <feff0032002e00320033002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 684 0 R
+/Parent 683 0 R
 /Count 0
-/Next 686 0 R
+/Next 685 0 R
 /Dest [151 0 R /XYZ 0 177.2400000000004 null]
 >>
 endobj
-686 0 obj
+685 0 obj
 << /Title <feff0032002e00320033002e0032002e00200052006500730070006f006e007300650073>
-/Parent 684 0 R
+/Parent 683 0 R
 /Count 0
-/Next 687 0 R
-/Prev 685 0 R
+/Next 686 0 R
+/Prev 684 0 R
 /Dest [165 0 R /XYZ 0 792.0 null]
 >>
 endobj
-687 0 obj
+686 0 obj
 << /Title <feff0032002e00320033002e0033002e002000500072006f00640075006300650073>
-/Parent 684 0 R
+/Parent 683 0 R
 /Count 0
-/Prev 686 0 R
+/Prev 685 0 R
 /Dest [165 0 R /XYZ 0 653.2800000000002 null]
 >>
 endobj
-688 0 obj
+687 0 obj
 << /Title <feff0032002e00320034002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 689 0 R
-/Last 690 0 R
-/Next 691 0 R
-/Prev 684 0 R
+/First 688 0 R
+/Last 689 0 R
+/Next 690 0 R
+/Prev 683 0 R
 /Dest [165 0 R /XYZ 0 597.0000000000003 null]
 >>
 endobj
-689 0 obj
+688 0 obj
 << /Title <feff0032002e00320034002e0031002e00200052006500730070006f006e007300650073>
-/Parent 688 0 R
+/Parent 687 0 R
 /Count 0
-/Next 690 0 R
+/Next 689 0 R
 /Dest [165 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-690 0 obj
+689 0 obj
 << /Title <feff0032002e00320034002e0032002e002000500072006f00640075006300650073>
-/Parent 688 0 R
+/Parent 687 0 R
 /Count 0
-/Prev 689 0 R
+/Prev 688 0 R
 /Dest [165 0 R /XYZ 0 451.8000000000005 null]
 >>
 endobj
-691 0 obj
+690 0 obj
 << /Title <feff0032002e00320035002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f00790061006d006c002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 692 0 R
-/Last 694 0 R
-/Next 695 0 R
-/Prev 688 0 R
+/First 691 0 R
+/Last 693 0 R
+/Next 694 0 R
+/Prev 687 0 R
 /Dest [165 0 R /XYZ 0 395.5200000000005 null]
 >>
 endobj
-692 0 obj
+691 0 obj
 << /Title <feff0032002e00320035002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 691 0 R
+/Parent 690 0 R
 /Count 0
-/Next 693 0 R
+/Next 692 0 R
 /Dest [165 0 R /XYZ 0 327.36000000000047 null]
 >>
 endobj
-693 0 obj
+692 0 obj
 << /Title <feff0032002e00320035002e0032002e00200052006500730070006f006e007300650073>
-/Parent 691 0 R
+/Parent 690 0 R
 /Count 0
-/Next 694 0 R
-/Prev 692 0 R
+/Next 693 0 R
+/Prev 691 0 R
 /Dest [165 0 R /XYZ 0 222.2400000000004 null]
 >>
 endobj
-694 0 obj
+693 0 obj
 << /Title <feff0032002e00320035002e0033002e002000500072006f00640075006300650073>
-/Parent 691 0 R
+/Parent 690 0 R
 /Count 0
-/Prev 693 0 R
+/Prev 692 0 R
 /Dest [165 0 R /XYZ 0 117.12000000000037 null]
 >>
 endobj
-695 0 obj
+694 0 obj
 << /Title <feff0032002e00320036002e00200047004500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 696 0 R
-/Last 698 0 R
-/Next 699 0 R
-/Prev 691 0 R
-/Dest [179 0 R /XYZ 0 792.0 null]
+/First 695 0 R
+/Last 697 0 R
+/Next 698 0 R
+/Prev 690 0 R
+/Dest [178 0 R /XYZ 0 792.0 null]
 >>
 endobj
-696 0 obj
+695 0 obj
 << /Title <feff0032002e00320036002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 695 0 R
+/Parent 694 0 R
 /Count 0
-/Next 697 0 R
-/Dest [179 0 R /XYZ 0 718.32 null]
+/Next 696 0 R
+/Dest [178 0 R /XYZ 0 718.32 null]
 >>
 endobj
-697 0 obj
+696 0 obj
 << /Title <feff0032002e00320036002e0032002e00200052006500730070006f006e007300650073>
-/Parent 695 0 R
+/Parent 694 0 R
 /Count 0
-/Next 698 0 R
-/Prev 696 0 R
-/Dest [179 0 R /XYZ 0 613.2000000000003 null]
+/Next 697 0 R
+/Prev 695 0 R
+/Dest [178 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-698 0 obj
+697 0 obj
 << /Title <feff0032002e00320036002e0033002e002000500072006f00640075006300650073>
-/Parent 695 0 R
+/Parent 694 0 R
 /Count 0
-/Prev 697 0 R
-/Dest [179 0 R /XYZ 0 508.0800000000004 null]
+/Prev 696 0 R
+/Dest [178 0 R /XYZ 0 508.0800000000004 null]
 >>
 endobj
-699 0 obj
+698 0 obj
 << /Title <feff0032002e00320037002e00200050005500540020002f00760032002f0070006f006c0069006300790054006f007300630061004d006f00640065006c0073002f007b0070006f006c006900630079004d006f00640065006c0054007900700065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 4
-/First 700 0 R
-/Last 703 0 R
-/Next 704 0 R
-/Prev 695 0 R
-/Dest [179 0 R /XYZ 0 451.80000000000035 null]
+/First 699 0 R
+/Last 702 0 R
+/Next 703 0 R
+/Prev 694 0 R
+/Dest [178 0 R /XYZ 0 451.80000000000035 null]
 >>
 endobj
-700 0 obj
+699 0 obj
 << /Title <feff0032002e00320037002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 699 0 R
+/Parent 698 0 R
+/Count 0
+/Next 700 0 R
+/Dest [178 0 R /XYZ 0 411.7200000000003 null]
+>>
+endobj
+700 0 obj
+<< /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
+/Parent 698 0 R
 /Count 0
 /Next 701 0 R
-/Dest [179 0 R /XYZ 0 411.7200000000003 null]
+/Prev 699 0 R
+/Dest [178 0 R /XYZ 0 269.04000000000025 null]
 >>
 endobj
 701 0 obj
-<< /Title <feff0032002e00320037002e0032002e00200052006500730070006f006e007300650073>
-/Parent 699 0 R
+<< /Title <feff0032002e00320037002e0033002e00200043006f006e00730075006d00650073>
+/Parent 698 0 R
 /Count 0
 /Next 702 0 R
 /Prev 700 0 R
-/Dest [179 0 R /XYZ 0 269.04000000000025 null]
+/Dest [178 0 R /XYZ 0 163.92000000000024 null]
 >>
 endobj
 702 0 obj
-<< /Title <feff0032002e00320037002e0033002e00200043006f006e00730075006d00650073>
-/Parent 699 0 R
+<< /Title <feff0032002e00320037002e0034002e002000500072006f00640075006300650073>
+/Parent 698 0 R
 /Count 0
-/Next 703 0 R
 /Prev 701 0 R
-/Dest [179 0 R /XYZ 0 163.92000000000024 null]
+/Dest [178 0 R /XYZ 0 107.64000000000021 null]
 >>
 endobj
 703 0 obj
-<< /Title <feff0032002e00320037002e0034002e002000500072006f00640075006300650073>
-/Parent 699 0 R
-/Count 0
-/Prev 702 0 R
-/Dest [179 0 R /XYZ 0 107.64000000000021 null]
->>
-endobj
-704 0 obj
 << /Title <feff0032002e00320038002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 705 0 R
-/Last 706 0 R
-/Next 707 0 R
-/Prev 699 0 R
+/First 704 0 R
+/Last 705 0 R
+/Next 706 0 R
+/Prev 698 0 R
 /Dest [192 0 R /XYZ 0 792.0 null]
 >>
 endobj
-705 0 obj
+704 0 obj
 << /Title <feff0032002e00320038002e0031002e00200052006500730070006f006e007300650073>
-/Parent 704 0 R
+/Parent 703 0 R
 /Count 0
-/Next 706 0 R
+/Next 705 0 R
 /Dest [192 0 R /XYZ 0 718.32 null]
 >>
 endobj
-706 0 obj
+705 0 obj
 << /Title <feff0032002e00320038002e0032002e002000500072006f00640075006300650073>
-/Parent 704 0 R
+/Parent 703 0 R
 /Count 0
-/Prev 705 0 R
+/Prev 704 0 R
 /Dest [192 0 R /XYZ 0 613.2000000000003 null]
 >>
 endobj
-707 0 obj
+706 0 obj
 << /Title <feff0032002e00320039002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f006e0061006d00650073>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 2
-/First 708 0 R
-/Last 709 0 R
-/Next 710 0 R
-/Prev 704 0 R
+/First 707 0 R
+/Last 708 0 R
+/Next 709 0 R
+/Prev 703 0 R
 /Dest [192 0 R /XYZ 0 556.9200000000004 null]
 >>
 endobj
-708 0 obj
+707 0 obj
 << /Title <feff0032002e00320039002e0031002e00200052006500730070006f006e007300650073>
-/Parent 707 0 R
+/Parent 706 0 R
 /Count 0
-/Next 709 0 R
+/Next 708 0 R
 /Dest [192 0 R /XYZ 0 516.8400000000005 null]
 >>
 endobj
-709 0 obj
+708 0 obj
 << /Title <feff0032002e00320039002e0032002e002000500072006f00640075006300650073>
-/Parent 707 0 R
+/Parent 706 0 R
 /Count 0
-/Prev 708 0 R
+/Prev 707 0 R
 /Dest [192 0 R /XYZ 0 411.7200000000005 null]
 >>
 endobj
-710 0 obj
+709 0 obj
 << /Title <feff0032002e00330030002e00200047004500540020002f00760032002f00740065006d0070006c0061007400650073002f007b00740065006d0070006c006100740065004e0061006d0065007d>
-/Parent 596 0 R
+/Parent 595 0 R
 /Count 3
-/First 711 0 R
-/Last 713 0 R
-/Prev 707 0 R
+/First 710 0 R
+/Last 712 0 R
+/Prev 706 0 R
 /Dest [192 0 R /XYZ 0 355.44000000000045 null]
 >>
 endobj
-711 0 obj
+710 0 obj
 << /Title <feff0032002e00330030002e0031002e00200050006100720061006d00650074006500720073>
-/Parent 710 0 R
+/Parent 709 0 R
 /Count 0
-/Next 712 0 R
+/Next 711 0 R
 /Dest [192 0 R /XYZ 0 315.3600000000004 null]
 >>
 endobj
-712 0 obj
+711 0 obj
 << /Title <feff0032002e00330030002e0032002e00200052006500730070006f006e007300650073>
-/Parent 710 0 R
+/Parent 709 0 R
 /Count 0
-/Next 713 0 R
-/Prev 711 0 R
+/Next 712 0 R
+/Prev 710 0 R
 /Dest [192 0 R /XYZ 0 210.2400000000004 null]
 >>
 endobj
-713 0 obj
+712 0 obj
 << /Title <feff0032002e00330030002e0033002e002000500072006f00640075006300650073>
-/Parent 710 0 R
+/Parent 709 0 R
 /Count 0
-/Prev 712 0 R
+/Prev 711 0 R
 /Dest [192 0 R /XYZ 0 105.12000000000037 null]
 >>
 endobj
-714 0 obj
+713 0 obj
 << /Title <feff004300680061007000740065007200200033002e00200044006500660069006e006900740069006f006e0073>
-/Parent 590 0 R
+/Parent 589 0 R
 /Count 19
-/First 715 0 R
-/Last 733 0 R
-/Prev 596 0 R
-/Dest [208 0 R /XYZ 0 792.0 null]
+/First 714 0 R
+/Last 732 0 R
+/Prev 595 0 R
+/Dest [207 0 R /XYZ 0 792.0 null]
 >>
 endobj
-715 0 obj
+714 0 obj
 << /Title <feff0033002e0031002e00200043006c00640073004800650061006c007400680043006800650063006b>
-/Parent 714 0 R
+/Parent 713 0 R
+/Count 0
+/Next 715 0 R
+/Dest [207 0 R /XYZ 0 712.0799999999999 null]
+>>
+endobj
+715 0 obj
+<< /Title <feff0033002e0032002e002000440069006300740069006f006e006100720079>
+/Parent 713 0 R
 /Count 0
 /Next 716 0 R
-/Dest [208 0 R /XYZ 0 712.0799999999999 null]
+/Prev 714 0 R
+/Dest [207 0 R /XYZ 0 524.04 null]
 >>
 endobj
 716 0 obj
-<< /Title <feff0033002e0032002e002000440069006300740069006f006e006100720079>
-/Parent 714 0 R
+<< /Title <feff0033002e0033002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
+/Parent 713 0 R
 /Count 0
 /Next 717 0 R
 /Prev 715 0 R
-/Dest [208 0 R /XYZ 0 524.04 null]
+/Dest [207 0 R /XYZ 0 148.19999999999993 null]
 >>
 endobj
 717 0 obj
-<< /Title <feff0033002e0033002e002000440069006300740069006f006e0061007200790045006c0065006d0065006e0074>
-/Parent 714 0 R
+<< /Title <feff0033002e0034002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
+/Parent 713 0 R
 /Count 0
 /Next 718 0 R
 /Prev 716 0 R
-/Dest [208 0 R /XYZ 0 148.19999999999993 null]
+/Dest [214 0 R /XYZ 0 345.11999999999995 null]
 >>
 endobj
 718 0 obj
-<< /Title <feff0033002e0034002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e0074>
-/Parent 714 0 R
+<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
+/Parent 713 0 R
 /Count 0
 /Next 719 0 R
 /Prev 717 0 R
-/Dest [215 0 R /XYZ 0 345.11999999999995 null]
+/Dest [214 0 R /XYZ 0 194.6399999999999 null]
 >>
 endobj
 719 0 obj
-<< /Title <feff0033002e0035002e002000450078007400650072006e0061006c0043006f006d0070006f006e0065006e007400530074006100740065>
-/Parent 714 0 R
+<< /Title <feff0033002e0036002e0020004a0073006f006e00410072007200610079>
+/Parent 713 0 R
 /Count 0
 /Next 720 0 R
 /Prev 718 0 R
-/Dest [215 0 R /XYZ 0 194.6399999999999 null]
+/Dest [220 0 R /XYZ 0 683.1600000000001 null]
 >>
 endobj
 720 0 obj
-<< /Title <feff0033002e0036002e0020004a0073006f006e00410072007200610079>
-/Parent 714 0 R
+<< /Title <feff0033002e0037002e0020004a0073006f006e004e0075006c006c>
+/Parent 713 0 R
 /Count 0
 /Next 721 0 R
 /Prev 719 0 R
-/Dest [221 0 R /XYZ 0 683.1600000000001 null]
+/Dest [228 0 R /XYZ 0 532.9200000000003 null]
 >>
 endobj
 721 0 obj
-<< /Title <feff0033002e0037002e0020004a0073006f006e004e0075006c006c>
-/Parent 714 0 R
+<< /Title <feff0033002e0038002e0020004a0073006f006e004f0062006a006500630074>
+/Parent 713 0 R
 /Count 0
 /Next 722 0 R
 /Prev 720 0 R
-/Dest [229 0 R /XYZ 0 532.9200000000003 null]
+/Dest [234 0 R /XYZ 0 382.68000000000023 null]
 >>
 endobj
 722 0 obj
-<< /Title <feff0033002e0038002e0020004a0073006f006e004f0062006a006500630074>
-/Parent 714 0 R
+<< /Title <feff0033002e0039002e0020004a0073006f006e005000720069006d00690074006900760065>
+/Parent 713 0 R
 /Count 0
 /Next 723 0 R
 /Prev 721 0 R
-/Dest [235 0 R /XYZ 0 382.68000000000023 null]
+/Dest [239 0 R /XYZ 0 232.44000000000023 null]
 >>
 endobj
 723 0 obj
-<< /Title <feff0033002e0039002e0020004a0073006f006e005000720069006d00690074006900760065>
-/Parent 714 0 R
+<< /Title <feff0033002e00310030002e0020004c006f006f0070>
+/Parent 713 0 R
 /Count 0
 /Next 724 0 R
 /Prev 722 0 R
-/Dest [240 0 R /XYZ 0 232.44000000000023 null]
+/Dest [255 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 724 0 obj
-<< /Title <feff0033002e00310030002e0020004c006f006f0070>
-/Parent 714 0 R
+<< /Title <feff0033002e00310031002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 713 0 R
 /Count 0
 /Next 725 0 R
 /Prev 723 0 R
-/Dest [256 0 R /XYZ 0 645.6000000000001 null]
+/Dest [265 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 725 0 obj
-<< /Title <feff0033002e00310031002e0020004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 714 0 R
+<< /Title <feff0033002e00310032002e0020004c006f006f0070004c006f0067>
+/Parent 713 0 R
 /Count 0
 /Next 726 0 R
 /Prev 724 0 R
-/Dest [266 0 R /XYZ 0 645.6000000000001 null]
+/Dest [265 0 R /XYZ 0 157.08000000000015 null]
 >>
 endobj
 726 0 obj
-<< /Title <feff0033002e00310032002e0020004c006f006f0070004c006f0067>
-/Parent 714 0 R
+<< /Title <feff0033002e00310033002e0020004c006f006f007000540065006d0070006c006100740065>
+/Parent 713 0 R
 /Count 0
 /Next 727 0 R
 /Prev 725 0 R
-/Dest [266 0 R /XYZ 0 157.08000000000015 null]
+/Dest [271 0 R /XYZ 0 532.9200000000001 null]
 >>
 endobj
 727 0 obj
-<< /Title <feff0033002e00310033002e0020004c006f006f007000540065006d0070006c006100740065>
-/Parent 714 0 R
+<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
+/Parent 713 0 R
 /Count 0
 /Next 728 0 R
 /Prev 726 0 R
-/Dest [272 0 R /XYZ 0 532.9200000000001 null]
+/Dest [277 0 R /XYZ 0 645.6000000000001 null]
 >>
 endobj
 728 0 obj
-<< /Title <feff0033002e00310034002e0020004c006f006f007000540065006d0070006c006100740065004c006f006f00700045006c0065006d0065006e0074004d006f00640065006c>
-/Parent 714 0 R
+<< /Title <feff0033002e00310035002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
+/Parent 713 0 R
 /Count 0
 /Next 729 0 R
 /Prev 727 0 R
-/Dest [278 0 R /XYZ 0 645.6000000000001 null]
+/Dest [277 0 R /XYZ 0 457.56000000000023 null]
 >>
 endobj
 729 0 obj
-<< /Title <feff0033002e00310035002e0020004d006900630072006f00530065007200760069006300650050006f006c006900630079>
-/Parent 714 0 R
+<< /Title <feff0033002e00310036002e0020004e0075006d006200650072>
+/Parent 713 0 R
 /Count 0
 /Next 730 0 R
 /Prev 728 0 R
-/Dest [278 0 R /XYZ 0 457.56000000000023 null]
+/Dest [285 0 R /XYZ 0 382.68000000000023 null]
 >>
 endobj
 730 0 obj
-<< /Title <feff0033002e00310036002e0020004e0075006d006200650072>
-/Parent 714 0 R
+<< /Title <feff0033002e00310037002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
+/Parent 713 0 R
 /Count 0
 /Next 731 0 R
 /Prev 729 0 R
-/Dest [286 0 R /XYZ 0 382.68000000000023 null]
+/Dest [285 0 R /XYZ 0 314.82000000000016 null]
 >>
 endobj
 731 0 obj
-<< /Title <feff0033002e00310037002e0020004f007000650072006100740069006f006e0061006c0050006f006c006900630079>
-/Parent 714 0 R
+<< /Title <feff0033002e00310038002e00200050006f006c006900630079004d006f00640065006c>
+/Parent 713 0 R
 /Count 0
 /Next 732 0 R
 /Prev 730 0 R
-/Dest [286 0 R /XYZ 0 314.82000000000016 null]
+/Dest [294 0 R /XYZ 0 420.24 null]
 >>
 endobj
 732 0 obj
-<< /Title <feff0033002e00310038002e00200050006f006c006900630079004d006f00640065006c>
-/Parent 714 0 R
+<< /Title <feff0033002e00310039002e00200053006500720076006900630065>
+/Parent 713 0 R
 /Count 0
-/Next 733 0 R
 /Prev 731 0 R
-/Dest [296 0 R /XYZ 0 457.8 null]
+/Dest [301 0 R /XYZ 0 645.5999999999999 null]
 >>
 endobj
 733 0 obj
-<< /Title <feff0033002e00310039002e00200053006500720076006900630065>
-/Parent 714 0 R
-/Count 0
-/Prev 732 0 R
-/Dest [303 0 R /XYZ 0 683.1600000000001 null]
->>
-endobj
-734 0 obj
 << /Nums [0 << /P (i)
 >> 1 << /P (ii)
 >> 2 << /P (iii)
@@ -49012,7 +49097,7 @@ endobj
 >>]
 >>
 endobj
-735 0 obj
+734 0 obj
 << /Length1 12112
 /Length 7776
 /Filter [/FlateDecode]
@@ -49045,10 +49130,10 @@ G)Dz
 ”a•dç4äf�t†#Ë�e=<¥òª¦'½ýcÞɕߪù‘좼pNƒ/(i€�À$
šVô·(ý.½°Œÿ¾>Ö½t`jxp\5=àÛàÛ¥¬›Ž³€×X©wÚ«šŸ�	rèWõΪVÙö‡°-…/M³sœ
6C,”é€C¬ÁÐT¨Ä«6Ó¿˜¡éé‰|³¹Ïß?`dUlêó�™'ÌÄof]q¾ŸÑÄ÷³\LÀcM§&–>÷'àÚÆä¼sçNÓXpZ,ë©é™þaÿ:Î;Ù?p¹õï) Í€tð¡šá¾�ñ)ÐØÌxÿÀ¤jzh@åžðöÁ%x'Cµâ�Y&DÕaà2|§‚bôØÏú$£‡!V;n�ç…ç£;¿“
”õ>œÅøpȽ,“rÐ<@1e®ÙTRV×TfdPl<_oˆTpž�šA«¡Ò§€RŽWÙ¢Y,JVz ¿"Ìwnú_is[£þ‡ˆà±aì�Ÿ’¬\!ï¢ðox½(P®°Çÿ�û/’
 endstream
 endobj
-736 0 obj
+735 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAA+NotoSerif
-/FontFile2 735 0 R
+/FontFile2 734 0 R
 /FontBBox [-212 -250 1246 1047]
 /Flags 6
 /StemV 0
@@ -49059,7 +49144,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-737 0 obj
+736 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -49069,10 +49154,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-738 0 obj
+737 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 346 346 1000 1000 250 310 250 288 559 559 559 559 559 559 559 559 559 559 286 1000 559 1000 559 1000 1000 705 653 613 727 623 589 713 792 367 356 1000 623 937 763 742 604 1000 655 543 612 716 674 1046 1000 625 1000 1000 1000 1000 1000 458 1000 562 613 492 613 535 369 538 634 319 299 584 310 944 645 577 613 1000 471 451 352 634 579 861 578 564 1000 428 1000 428 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 361 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-739 0 obj
+738 0 obj
 << /Length1 11308
 /Length 7514
 /Filter [/FlateDecode]
@@ -49103,10 +49188,10 @@ f
 \�ïLBCŒXÇdô0Âj§äõÁsñ«ÕïØ€²Ö‘ÝŒ#¯Xc‹À19=ìŒÆQÌ8ë*ªš;ªìŠ[¯·o…Tpž�:A«+¥Ï¥¯jG3Ä\„,+�ÍfXîÿÍü–´¢ÿ„Ȧ·‹W—-}B½E‚>“¡ùK¥ìÿ
—(\(
 endstream
 endobj
-740 0 obj
+739 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAB+NotoSerif-Bold
-/FontFile2 739 0 R
+/FontFile2 738 0 R
 /FontBBox [-212 -250 1306 1058]
 /Flags 6
 /StemV 0
@@ -49117,7 +49202,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-741 0 obj
+740 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -49127,10 +49212,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-742 0 obj
+741 0 obj
 [259 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 293 288 559 559 559 559 559 559 559 559 559 559 1000 1000 1000 1000 1000 1000 1000 752 671 667 767 652 621 769 818 400 368 1000 653 952 788 787 638 1000 707 585 652 747 698 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 599 648 526 648 570 407 560 666 352 345 636 352 985 666 612 645 647 522 487 404 666 605 855 645 579 1000 441 1000 441 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-743 0 obj
+742 0 obj
 << /Length1 5116
 /Length 3170
 /Filter [/FlateDecode]
@@ -49150,10 +49235,10 @@ a
 ÿ:´2õ]Û^Ô5 w,¥Âº*›Ó‹Œ58«mÖg·±nkÞÄ7cÙÞB4èÆa¯ÅÊD[NaéU‹<V¥Éó`ØÉ@V�΋š{KÙÀ—r¿­�ËS«¯ ðêó3³§e'ó(�×ÚÏ«-{�S}`-õy÷¢¦/²±ò‹ð79à]èp$xrë’¤ÏÊÃ'ý›"ZÞé³/izïþ›]’Wâ~ ïÝ–þ&ÌÁT
 endstream
 endobj
-744 0 obj
+743 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAC+NotoSerif-Italic
-/FontFile2 743 0 R
+/FontFile2 742 0 R
 /FontBBox [-254 -250 1238 1047]
 /Flags 70
 /StemV 0
@@ -49164,7 +49249,7 @@ endobj
 /XHeight 1098
 >>
 endobj
-745 0 obj
+744 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -49174,10 +49259,10 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-746 0 obj
+745 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 653 1000 1000 1000 1000 1000 792 1000 1000 1000 1000 1000 1000 1000 620 1000 1000 543 612 1000 674 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 579 1000 486 579 493 1000 1000 599 304 1000 1000 304 895 599 574 577 560 467 463 368 599 1000 1000 1000 527 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
-747 0 obj
+746 0 obj
 << /Length1 3280
 /Length 2112
 /Filter [/FlateDecode]
@@ -49192,10 +49277,10 @@ x
 ˆ‡¶�€$W´¦ö"k8À
Vš­Ûi<êí!‹§–N..ðͶ&W+uXœ¶—¨:‹’j³†Z;Ù×cžOÎ-/²UFN¤ÓÉ6»][§)å%ÛÒâr*Ÿf©Ûf“R�ÓTó6°Óß<Qsäz‰B�–Ó^"KD/“çùŸÞ)ƒ�~™’¹T¾^õ‡i9šít-Ñ£\î‚céúìw='4‡î‚9÷F|ðÂBìßëV�bCAÿWAþö}½‚[Ï‹¸
1?¾ˆøbä¢Oe›Dm$ BD<yBT™'ÂÑ`Á"BY@Ü‹þS„ÃU´n�H²g#ü‡"–Ùª¬"Zø›b±Ù*r–@(Ü+DLVQa9YÅ‹Þ Áz#VQia¦&ÁôLøOÆßDŒ¤~`ü{Ä(˜Ä<sXô�ŠH‘áåYJ&Ƭ¢Êr±WÉ;¿:1a�`Ô–‹
’È»#Ê·èuü
»U,°ðÏ2'W	†»^T6úE†3ñL”gD«ÑdŠ3ÊqÌaa.:­Qk"Ä"CJ§ØÂÛE5„çû_t–óS“9¦WÂ<“k>Ã÷e|Q!ÃgÉ�ÀÀE/iR~L zãŒ!›RÉSûz•Édä×3T2 hŽÊ±™$5�Eà×eçŒM"FÂJh@È|f #D™A΄-VQËŽAOqëXŒÐÿG¶ÑÙ§΄™–Y(‰Ì÷YÙüSBF-òÁð!ãû´c°¼^ôvuaàŠ–Ú[š™òÑ0›Caa’¢ºŒ´ ÐE•÷†Â—¨¯»c]—�GZD>&VÇk·}•[D’R]h²²ß‘zÖóé?+wú_½î“ä
 endstream
 endobj
-748 0 obj
+747 0 obj
 << /Type /FontDescriptor
 /FontName /AAAAAD+mplus1mn-regular
-/FontFile2 747 0 R
+/FontFile2 746 0 R
 /FontBBox [0 -230 1000 860]
 /Flags 4
 /StemV 0
@@ -49206,7 +49291,7 @@ endobj
 /XHeight 0
 >>
 endobj
-749 0 obj
+748 0 obj
 << /Length 1286
 /Filter [/FlateDecode]
 >>
@@ -49216,11 +49301,11 @@ x
 ¿âíJ¼âíJ¼â특âíâ¬x»¯x»¯x‡�+Þ!Êw¹âB®x‡b®x‡�+Þ�
ïrÅ;àà2äÍkçÎœñJ¼Y³e¼Y†Œ7+|œÆ
x‹oSŠŒ7+[Æ›ețךyÞ¢oVûòæµ–-ã­Œ‹·é€"¯åþR¦W�*–Ó4Xq”êC™^Jú[(£à®^ƒ1»¢y]•¡Èk¹}¼YM-x¥úëÈVæz�·ÌþÊ[YEãV¼Y³ÕÙ_}
/7×*¯Y%«ê¯eã­Ó«q+ýÝ:÷Ý.â¿7™Jã‹ÈÛE¡/‰3Y(Y™*AˆW	RõÝVJSƒª‚¶á:(u@c¡ðD±]a*Õíf)¤9J­ñæ)¥o,#Ú\ØZ>M�U¡Û\ØjPSã
{HSãçMª•ôj»ˆ·’{fk”Œ°yGá‰m[z*EïsaëÝ>Š&îÓ«Óúôj%u¼Üî;¥2^��ÆWÃ[Õßήòvú[¾Ïþ2î쯲uú[•¢³Pš:ÙçÂVÌ¡§Õ…>¼M†ÁBi2.Ħ‰ÇÜèÔ‡!¯áñdÈk¹`†¼–=oÌ‘qWÞ•wdJF(”L164ÞU Ñ)™x0Eú~
êñZ?¾=¶×/·ÛöÄίÕõ�~:÷o?$®—«ÎÒÿ¿
ç†óO
 endstream
 endobj
-750 0 obj
+749 0 obj
 [1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 500 1000 500 1000 500 1000 1000 1000 500 500 1000 500 500 500 500 500 1000 1000 500 500 1000 1000 1000 500 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000]
 endobj
 xref
-0 751
+0 750
 0000000000 65535 f 
 0000000015 00000 n 
 0000000264 00000 n 
@@ -49243,740 +49328,739 @@ xref
 0000127807 00000 n 
 0000127850 00000 n 
 0000127899 00000 n 
-0000128013 00000 n 
-0000128186 00000 n 
-0000128241 00000 n 
-0000128416 00000 n 
-0000128460 00000 n 
-0000140641 00000 n 
-0000140902 00000 n 
-0000140945 00000 n 
-0000141000 00000 n 
-0000141043 00000 n 
-0000141215 00000 n 
-0000141270 00000 n 
-0000141445 00000 n 
-0000141501 00000 n 
-0000141556 00000 n 
-0000141611 00000 n 
-0000141667 00000 n 
-0000141722 00000 n 
-0000141880 00000 n 
-0000141935 00000 n 
-0000141991 00000 n 
-0000158351 00000 n 
-0000158625 00000 n 
-0000158668 00000 n 
-0000158822 00000 n 
-0000158877 00000 n 
-0000159033 00000 n 
-0000159088 00000 n 
-0000159144 00000 n 
-0000159199 00000 n 
-0000159254 00000 n 
-0000159309 00000 n 
-0000159619 00000 n 
-0000159949 00000 n 
-0000160004 00000 n 
-0000160060 00000 n 
-0000178217 00000 n 
-0000178498 00000 n 
-0000178541 00000 n 
-0000178697 00000 n 
-0000178752 00000 n 
-0000178807 00000 n 
-0000178862 00000 n 
-0000179016 00000 n 
-0000179071 00000 n 
-0000179227 00000 n 
-0000179283 00000 n 
-0000179339 00000 n 
-0000179394 00000 n 
-0000179449 00000 n 
-0000194772 00000 n 
-0000195022 00000 n 
-0000195065 00000 n 
-0000195120 00000 n 
-0000195175 00000 n 
-0000195230 00000 n 
-0000195286 00000 n 
-0000195341 00000 n 
-0000195397 00000 n 
-0000195453 00000 n 
-0000195509 00000 n 
-0000195789 00000 n 
-0000213656 00000 n 
-0000213923 00000 n 
-0000213967 00000 n 
-0000214022 00000 n 
-0000214335 00000 n 
-0000214390 00000 n 
-0000214552 00000 n 
-0000214608 00000 n 
-0000214663 00000 n 
-0000214718 00000 n 
-0000214773 00000 n 
-0000214829 00000 n 
-0000214885 00000 n 
-0000231049 00000 n 
-0000231324 00000 n 
-0000231367 00000 n 
-0000231528 00000 n 
-0000231584 00000 n 
-0000231640 00000 n 
-0000231696 00000 n 
-0000231753 00000 n 
-0000231915 00000 n 
-0000231971 00000 n 
-0000232028 00000 n 
-0000232085 00000 n 
-0000232142 00000 n 
-0000251266 00000 n 
-0000251552 00000 n 
-0000251704 00000 n 
-0000251761 00000 n 
-0000251818 00000 n 
-0000251875 00000 n 
-0000251933 00000 n 
-0000252096 00000 n 
-0000252153 00000 n 
-0000252211 00000 n 
-0000252269 00000 n 
-0000252327 00000 n 
-0000252490 00000 n 
-0000268772 00000 n 
-0000269042 00000 n 
-0000269087 00000 n 
-0000269144 00000 n 
-0000269201 00000 n 
-0000269258 00000 n 
-0000269593 00000 n 
-0000269650 00000 n 
-0000269950 00000 n 
-0000270007 00000 n 
-0000270065 00000 n 
-0000270123 00000 n 
-0000270287 00000 n 
-0000270344 00000 n 
-0000290041 00000 n 
-0000290335 00000 n 
-0000290380 00000 n 
-0000290426 00000 n 
-0000290581 00000 n 
-0000290638 00000 n 
-0000290801 00000 n 
-0000290858 00000 n 
-0000290915 00000 n 
-0000290973 00000 n 
-0000291030 00000 n 
-0000291195 00000 n 
-0000291252 00000 n 
-0000291429 00000 n 
-0000306939 00000 n 
-0000307217 00000 n 
-0000307262 00000 n 
-0000307319 00000 n 
-0000307376 00000 n 
-0000307433 00000 n 
-0000307591 00000 n 
-0000307648 00000 n 
-0000307811 00000 n 
-0000307869 00000 n 
-0000308332 00000 n 
-0000308389 00000 n 
-0000308447 00000 n 
-0000308504 00000 n 
-0000324978 00000 n 
-0000325256 00000 n 
-0000325301 00000 n 
-0000325463 00000 n 
-0000325520 00000 n 
-0000325577 00000 n 
-0000326170 00000 n 
-0000326227 00000 n 
-0000326388 00000 n 
-0000326445 00000 n 
-0000326502 00000 n 
-0000326560 00000 n 
-0000326617 00000 n 
-0000326675 00000 n 
-0000344786 00000 n 
-0000345064 00000 n 
-0000345109 00000 n 
-0000345155 00000 n 
-0000345212 00000 n 
-0000345371 00000 n 
-0000345428 00000 n 
-0000345486 00000 n 
-0000345543 00000 n 
-0000345601 00000 n 
-0000345762 00000 n 
-0000345820 00000 n 
-0000345878 00000 n 
-0000362449 00000 n 
-0000362727 00000 n 
-0000362772 00000 n 
-0000362818 00000 n 
-0000363137 00000 n 
-0000363307 00000 n 
-0000363364 00000 n 
-0000363716 00000 n 
-0000363773 00000 n 
-0000363830 00000 n 
-0000363887 00000 n 
-0000363945 00000 n 
-0000364002 00000 n 
-0000364059 00000 n 
-0000364230 00000 n 
-0000364288 00000 n 
-0000380425 00000 n 
-0000380682 00000 n 
-0000380727 00000 n 
-0000380784 00000 n 
-0000380830 00000 n 
-0000381007 00000 n 
-0000381065 00000 n 
-0000401418 00000 n 
-0000401683 00000 n 
-0000401847 00000 n 
-0000401905 00000 n 
-0000402088 00000 n 
-0000402145 00000 n 
-0000424131 00000 n 
-0000424420 00000 n 
-0000424477 00000 n 
-0000424645 00000 n 
-0000424812 00000 n 
-0000424982 00000 n 
-0000425154 00000 n 
-0000425314 00000 n 
-0000446881 00000 n 
-0000447154 00000 n 
-0000447211 00000 n 
-0000447380 00000 n 
-0000447549 00000 n 
-0000447718 00000 n 
-0000468936 00000 n 
-0000469201 00000 n 
-0000469352 00000 n 
-0000469491 00000 n 
-0000469549 00000 n 
-0000491260 00000 n 
-0000491549 00000 n 
-0000491717 00000 n 
-0000491864 00000 n 
-0000492013 00000 n 
-0000492164 00000 n 
-0000492303 00000 n 
-0000492361 00000 n 
-0000492911 00000 n 
-0000515656 00000 n 
-0000515945 00000 n 
-0000516113 00000 n 
-0000516260 00000 n 
-0000516409 00000 n 
-0000516560 00000 n 
-0000516699 00000 n 
-0000540091 00000 n 
-0000540396 00000 n 
-0000540453 00000 n 
-0000540623 00000 n 
-0000540794 00000 n 
-0000540962 00000 n 
-0000541135 00000 n 
-0000541314 00000 n 
-0000541476 00000 n 
-0000541654 00000 n 
-0000562349 00000 n 
-0000562614 00000 n 
-0000562671 00000 n 
-0000562840 00000 n 
-0000563029 00000 n 
-0000563087 00000 n 
-0000584792 00000 n 
-0000585065 00000 n 
-0000585228 00000 n 
-0000585285 00000 n 
-0000585472 00000 n 
-0000585634 00000 n 
-0000606442 00000 n 
-0000606723 00000 n 
-0000606780 00000 n 
-0000606955 00000 n 
-0000607127 00000 n 
-0000607185 00000 n 
-0000607355 00000 n 
-0000607524 00000 n 
-0000627973 00000 n 
-0000628270 00000 n 
-0000628445 00000 n 
-0000628609 00000 n 
-0000628773 00000 n 
-0000628831 00000 n 
-0000628889 00000 n 
-0000629060 00000 n 
-0000629231 00000 n 
-0000629394 00000 n 
-0000651222 00000 n 
-0000651503 00000 n 
-0000651658 00000 n 
-0000651802 00000 n 
-0000651847 00000 n 
-0000652018 00000 n 
-0000652193 00000 n 
-0000661973 00000 n 
-0000662238 00000 n 
-0000662295 00000 n 
-0000662464 00000 n 
-0000662633 00000 n 
-0000662777 00000 n 
-0000662922 00000 n 
-0000663087 00000 n 
-0000663243 00000 n 
-0000663401 00000 n 
-0000663548 00000 n 
-0000663710 00000 n 
-0000663852 00000 n 
-0000664017 00000 n 
-0000664161 00000 n 
-0000664318 00000 n 
-0000664464 00000 n 
-0000664620 00000 n 
-0000664765 00000 n 
-0000664920 00000 n 
-0000665064 00000 n 
-0000665223 00000 n 
-0000665371 00000 n 
-0000665529 00000 n 
-0000665676 00000 n 
-0000665831 00000 n 
-0000665976 00000 n 
-0000666136 00000 n 
-0000666285 00000 n 
-0000666443 00000 n 
-0000666590 00000 n 
-0000666745 00000 n 
-0000666890 00000 n 
-0000667059 00000 n 
-0000667207 00000 n 
-0000667368 00000 n 
-0000667518 00000 n 
-0000667674 00000 n 
-0000667820 00000 n 
-0000667978 00000 n 
-0000668125 00000 n 
-0000668316 00000 n 
-0000668486 00000 n 
-0000668646 00000 n 
-0000668795 00000 n 
-0000668955 00000 n 
-0000669104 00000 n 
-0000669295 00000 n 
-0000669465 00000 n 
-0000669636 00000 n 
-0000669786 00000 n 
-0000669945 00000 n 
-0000670093 00000 n 
-0000670253 00000 n 
-0000670402 00000 n 
-0000670573 00000 n 
-0000670734 00000 n 
-0000670904 00000 n 
-0000671053 00000 n 
-0000671212 00000 n 
-0000671360 00000 n 
-0000671517 00000 n 
-0000671664 00000 n 
-0000671824 00000 n 
-0000671973 00000 n 
-0000672140 00000 n 
-0000672286 00000 n 
-0000672458 00000 n 
-0000672609 00000 n 
-0000672770 00000 n 
-0000672920 00000 n 
-0000673079 00000 n 
-0000673227 00000 n 
-0000673419 00000 n 
-0000673600 00000 n 
-0000673770 00000 n 
-0000673919 00000 n 
-0000674066 00000 n 
-0000674202 00000 n 
-0000674349 00000 n 
-0000674485 00000 n 
-0000674639 00000 n 
+0000128005 00000 n 
+0000128178 00000 n 
+0000128233 00000 n 
+0000128408 00000 n 
+0000128452 00000 n 
+0000140633 00000 n 
+0000140894 00000 n 
+0000140937 00000 n 
+0000140992 00000 n 
+0000141035 00000 n 
+0000141207 00000 n 
+0000141262 00000 n 
+0000141437 00000 n 
+0000141493 00000 n 
+0000141548 00000 n 
+0000141603 00000 n 
+0000141659 00000 n 
+0000141714 00000 n 
+0000141872 00000 n 
+0000141927 00000 n 
+0000141983 00000 n 
+0000158343 00000 n 
+0000158617 00000 n 
+0000158660 00000 n 
+0000158814 00000 n 
+0000158869 00000 n 
+0000159025 00000 n 
+0000159080 00000 n 
+0000159136 00000 n 
+0000159191 00000 n 
+0000159246 00000 n 
+0000159301 00000 n 
+0000159611 00000 n 
+0000159920 00000 n 
+0000159975 00000 n 
+0000160031 00000 n 
+0000178188 00000 n 
+0000178469 00000 n 
+0000178512 00000 n 
+0000178668 00000 n 
+0000178723 00000 n 
+0000178778 00000 n 
+0000178833 00000 n 
+0000178987 00000 n 
+0000179042 00000 n 
+0000179198 00000 n 
+0000179254 00000 n 
+0000179310 00000 n 
+0000179365 00000 n 
+0000179420 00000 n 
+0000194743 00000 n 
+0000194993 00000 n 
+0000195036 00000 n 
+0000195091 00000 n 
+0000195146 00000 n 
+0000195201 00000 n 
+0000195257 00000 n 
+0000195312 00000 n 
+0000195368 00000 n 
+0000195424 00000 n 
+0000195480 00000 n 
+0000196149 00000 n 
+0000214016 00000 n 
+0000214283 00000 n 
+0000214327 00000 n 
+0000214382 00000 n 
+0000214695 00000 n 
+0000214750 00000 n 
+0000214912 00000 n 
+0000214968 00000 n 
+0000215023 00000 n 
+0000215078 00000 n 
+0000215133 00000 n 
+0000215189 00000 n 
+0000215245 00000 n 
+0000231409 00000 n 
+0000231684 00000 n 
+0000231727 00000 n 
+0000231888 00000 n 
+0000231944 00000 n 
+0000232000 00000 n 
+0000232056 00000 n 
+0000232113 00000 n 
+0000232275 00000 n 
+0000232331 00000 n 
+0000232388 00000 n 
+0000232445 00000 n 
+0000232502 00000 n 
+0000251626 00000 n 
+0000251912 00000 n 
+0000252064 00000 n 
+0000252121 00000 n 
+0000252178 00000 n 
+0000252235 00000 n 
+0000252293 00000 n 
+0000252715 00000 n 
+0000252878 00000 n 
+0000252935 00000 n 
+0000252993 00000 n 
+0000253051 00000 n 
+0000253109 00000 n 
+0000253272 00000 n 
+0000269554 00000 n 
+0000269824 00000 n 
+0000269869 00000 n 
+0000269926 00000 n 
+0000269983 00000 n 
+0000270040 00000 n 
+0000270097 00000 n 
+0000270397 00000 n 
+0000270454 00000 n 
+0000270512 00000 n 
+0000270570 00000 n 
+0000270734 00000 n 
+0000270791 00000 n 
+0000290488 00000 n 
+0000290782 00000 n 
+0000290827 00000 n 
+0000290873 00000 n 
+0000291028 00000 n 
+0000291085 00000 n 
+0000291248 00000 n 
+0000291305 00000 n 
+0000291362 00000 n 
+0000291420 00000 n 
+0000291477 00000 n 
+0000291642 00000 n 
+0000291699 00000 n 
+0000291876 00000 n 
+0000307386 00000 n 
+0000307664 00000 n 
+0000307709 00000 n 
+0000307766 00000 n 
+0000307823 00000 n 
+0000307880 00000 n 
+0000308038 00000 n 
+0000308095 00000 n 
+0000308258 00000 n 
+0000308316 00000 n 
+0000308779 00000 n 
+0000308836 00000 n 
+0000308894 00000 n 
+0000308951 00000 n 
+0000325425 00000 n 
+0000325703 00000 n 
+0000325748 00000 n 
+0000325910 00000 n 
+0000325967 00000 n 
+0000326024 00000 n 
+0000326081 00000 n 
+0000326242 00000 n 
+0000326299 00000 n 
+0000326356 00000 n 
+0000326414 00000 n 
+0000326471 00000 n 
+0000326529 00000 n 
+0000344640 00000 n 
+0000344918 00000 n 
+0000344963 00000 n 
+0000345009 00000 n 
+0000345066 00000 n 
+0000345225 00000 n 
+0000345282 00000 n 
+0000345340 00000 n 
+0000345397 00000 n 
+0000345455 00000 n 
+0000345857 00000 n 
+0000346018 00000 n 
+0000346076 00000 n 
+0000346134 00000 n 
+0000362705 00000 n 
+0000362983 00000 n 
+0000363028 00000 n 
+0000363074 00000 n 
+0000363244 00000 n 
+0000363301 00000 n 
+0000363653 00000 n 
+0000363710 00000 n 
+0000363767 00000 n 
+0000363824 00000 n 
+0000363882 00000 n 
+0000363939 00000 n 
+0000363996 00000 n 
+0000364167 00000 n 
+0000364225 00000 n 
+0000380362 00000 n 
+0000380619 00000 n 
+0000380664 00000 n 
+0000380721 00000 n 
+0000380767 00000 n 
+0000380944 00000 n 
+0000381002 00000 n 
+0000401355 00000 n 
+0000401620 00000 n 
+0000401784 00000 n 
+0000401842 00000 n 
+0000402025 00000 n 
+0000402082 00000 n 
+0000424068 00000 n 
+0000424357 00000 n 
+0000424414 00000 n 
+0000424582 00000 n 
+0000424749 00000 n 
+0000424919 00000 n 
+0000425091 00000 n 
+0000425251 00000 n 
+0000446818 00000 n 
+0000447091 00000 n 
+0000447148 00000 n 
+0000447317 00000 n 
+0000447486 00000 n 
+0000447655 00000 n 
+0000468873 00000 n 
+0000469138 00000 n 
+0000469289 00000 n 
+0000469428 00000 n 
+0000469486 00000 n 
+0000491197 00000 n 
+0000491486 00000 n 
+0000491654 00000 n 
+0000491801 00000 n 
+0000491950 00000 n 
+0000492101 00000 n 
+0000492240 00000 n 
+0000492298 00000 n 
+0000492848 00000 n 
+0000515593 00000 n 
+0000515882 00000 n 
+0000516050 00000 n 
+0000516197 00000 n 
+0000516346 00000 n 
+0000516497 00000 n 
+0000516636 00000 n 
+0000540028 00000 n 
+0000540333 00000 n 
+0000540390 00000 n 
+0000540560 00000 n 
+0000540731 00000 n 
+0000540899 00000 n 
+0000541072 00000 n 
+0000541251 00000 n 
+0000541413 00000 n 
+0000541591 00000 n 
+0000562286 00000 n 
+0000562551 00000 n 
+0000562608 00000 n 
+0000562777 00000 n 
+0000562966 00000 n 
+0000563024 00000 n 
+0000584729 00000 n 
+0000585002 00000 n 
+0000585165 00000 n 
+0000585222 00000 n 
+0000585409 00000 n 
+0000585571 00000 n 
+0000606379 00000 n 
+0000606660 00000 n 
+0000606717 00000 n 
+0000606892 00000 n 
+0000607064 00000 n 
+0000607122 00000 n 
+0000607292 00000 n 
+0000607461 00000 n 
+0000627744 00000 n 
+0000628033 00000 n 
+0000628208 00000 n 
+0000628372 00000 n 
+0000628536 00000 n 
+0000628594 00000 n 
+0000628652 00000 n 
+0000628823 00000 n 
+0000628994 00000 n 
+0000650522 00000 n 
+0000650803 00000 n 
+0000650946 00000 n 
+0000651121 00000 n 
+0000651285 00000 n 
+0000651331 00000 n 
+0000651502 00000 n 
+0000662703 00000 n 
+0000662976 00000 n 
+0000663131 00000 n 
+0000663188 00000 n 
+0000663337 00000 n 
+0000663486 00000 n 
+0000663630 00000 n 
+0000663775 00000 n 
+0000663940 00000 n 
+0000664096 00000 n 
+0000664254 00000 n 
+0000664401 00000 n 
+0000664563 00000 n 
+0000664705 00000 n 
+0000664870 00000 n 
+0000665014 00000 n 
+0000665171 00000 n 
+0000665317 00000 n 
+0000665473 00000 n 
+0000665618 00000 n 
+0000665773 00000 n 
+0000665917 00000 n 
+0000666076 00000 n 
+0000666224 00000 n 
+0000666382 00000 n 
+0000666529 00000 n 
+0000666684 00000 n 
+0000666829 00000 n 
+0000666989 00000 n 
+0000667138 00000 n 
+0000667296 00000 n 
+0000667443 00000 n 
+0000667598 00000 n 
+0000667743 00000 n 
+0000667912 00000 n 
+0000668060 00000 n 
+0000668221 00000 n 
+0000668371 00000 n 
+0000668527 00000 n 
+0000668673 00000 n 
+0000668831 00000 n 
+0000668978 00000 n 
+0000669169 00000 n 
+0000669339 00000 n 
+0000669499 00000 n 
+0000669648 00000 n 
+0000669808 00000 n 
+0000669957 00000 n 
+0000670148 00000 n 
+0000670318 00000 n 
+0000670489 00000 n 
+0000670639 00000 n 
+0000670798 00000 n 
+0000670946 00000 n 
+0000671106 00000 n 
+0000671255 00000 n 
+0000671426 00000 n 
+0000671587 00000 n 
+0000671757 00000 n 
+0000671906 00000 n 
+0000672065 00000 n 
+0000672213 00000 n 
+0000672370 00000 n 
+0000672517 00000 n 
+0000672677 00000 n 
+0000672826 00000 n 
+0000672993 00000 n 
+0000673139 00000 n 
+0000673311 00000 n 
+0000673462 00000 n 
+0000673623 00000 n 
+0000673773 00000 n 
+0000673932 00000 n 
+0000674080 00000 n 
+0000674272 00000 n 
+0000674453 00000 n 
+0000674623 00000 n 
 0000674772 00000 n 
-0000674931 00000 n 
-0000675069 00000 n 
-0000675228 00000 n 
-0000675377 00000 n 
-0000675539 00000 n 
-0000675682 00000 n 
-0000675852 00000 n 
-0000676001 00000 n 
-0000676160 00000 n 
-0000676309 00000 n 
-0000676478 00000 n 
-0000676626 00000 n 
-0000676780 00000 n 
-0000676923 00000 n 
-0000677082 00000 n 
-0000677231 00000 n 
-0000677400 00000 n 
-0000677548 00000 n 
-0000677702 00000 n 
-0000677846 00000 n 
-0000678016 00000 n 
-0000678165 00000 n 
-0000678325 00000 n 
-0000678475 00000 n 
-0000678645 00000 n 
-0000678794 00000 n 
-0000678949 00000 n 
-0000679093 00000 n 
-0000679263 00000 n 
-0000679412 00000 n 
-0000679571 00000 n 
-0000679720 00000 n 
-0000679890 00000 n 
-0000680039 00000 n 
-0000680206 00000 n 
-0000680352 00000 n 
-0000680524 00000 n 
-0000680675 00000 n 
-0000680834 00000 n 
-0000680983 00000 n 
-0000681152 00000 n 
-0000681300 00000 n 
-0000681455 00000 n 
-0000681600 00000 n 
-0000681772 00000 n 
-0000681923 00000 n 
-0000682083 00000 n 
-0000682233 00000 n 
-0000682402 00000 n 
-0000682550 00000 n 
-0000682717 00000 n 
-0000682863 00000 n 
-0000683036 00000 n 
-0000683188 00000 n 
-0000683349 00000 n 
-0000683500 00000 n 
-0000683671 00000 n 
-0000683821 00000 n 
-0000683976 00000 n 
-0000684121 00000 n 
-0000684294 00000 n 
-0000684446 00000 n 
-0000684607 00000 n 
-0000684758 00000 n 
-0000684928 00000 n 
-0000685077 00000 n 
-0000685238 00000 n 
-0000685380 00000 n 
-0000685551 00000 n 
-0000685701 00000 n 
-0000685848 00000 n 
-0000685985 00000 n 
-0000686143 00000 n 
-0000686280 00000 n 
-0000686431 00000 n 
+0000674919 00000 n 
+0000675055 00000 n 
+0000675202 00000 n 
+0000675338 00000 n 
+0000675492 00000 n 
+0000675625 00000 n 
+0000675784 00000 n 
+0000675922 00000 n 
+0000676081 00000 n 
+0000676230 00000 n 
+0000676393 00000 n 
+0000676537 00000 n 
+0000676707 00000 n 
+0000676856 00000 n 
+0000677015 00000 n 
+0000677164 00000 n 
+0000677333 00000 n 
+0000677481 00000 n 
+0000677636 00000 n 
+0000677780 00000 n 
+0000677939 00000 n 
+0000678088 00000 n 
+0000678257 00000 n 
+0000678405 00000 n 
+0000678559 00000 n 
+0000678703 00000 n 
+0000678873 00000 n 
+0000679022 00000 n 
+0000679182 00000 n 
+0000679332 00000 n 
+0000679502 00000 n 
+0000679651 00000 n 
+0000679807 00000 n 
+0000679952 00000 n 
+0000680122 00000 n 
+0000680271 00000 n 
+0000680430 00000 n 
+0000680579 00000 n 
+0000680749 00000 n 
+0000680898 00000 n 
+0000681065 00000 n 
+0000681211 00000 n 
+0000681383 00000 n 
+0000681534 00000 n 
+0000681693 00000 n 
+0000681842 00000 n 
+0000682011 00000 n 
+0000682159 00000 n 
+0000682314 00000 n 
+0000682459 00000 n 
+0000682631 00000 n 
+0000682782 00000 n 
+0000682942 00000 n 
+0000683092 00000 n 
+0000683261 00000 n 
+0000683409 00000 n 
+0000683576 00000 n 
+0000683722 00000 n 
+0000683895 00000 n 
+0000684047 00000 n 
+0000684208 00000 n 
+0000684359 00000 n 
+0000684530 00000 n 
+0000684680 00000 n 
+0000684836 00000 n 
+0000684982 00000 n 
+0000685155 00000 n 
+0000685307 00000 n 
+0000685468 00000 n 
+0000685619 00000 n 
+0000685789 00000 n 
+0000685938 00000 n 
+0000686099 00000 n 
+0000686241 00000 n 
+0000686412 00000 n 
 0000686562 00000 n 
-0000686722 00000 n 
-0000686860 00000 n 
-0000687019 00000 n 
-0000687167 00000 n 
-0000687325 00000 n 
-0000687471 00000 n 
-0000687640 00000 n 
-0000687787 00000 n 
-0000687951 00000 n 
-0000688093 00000 n 
-0000688264 00000 n 
-0000688413 00000 n 
-0000688572 00000 n 
-0000688720 00000 n 
-0000688878 00000 n 
-0000689024 00000 n 
-0000689193 00000 n 
-0000689340 00000 n 
-0000689501 00000 n 
-0000689643 00000 n 
-0000689814 00000 n 
-0000689963 00000 n 
-0000690123 00000 n 
-0000690272 00000 n 
-0000690431 00000 n 
-0000690578 00000 n 
-0000690748 00000 n 
-0000690896 00000 n 
-0000691050 00000 n 
-0000691192 00000 n 
-0000691363 00000 n 
-0000691512 00000 n 
-0000691672 00000 n 
-0000691821 00000 n 
-0000691992 00000 n 
-0000692141 00000 n 
-0000692305 00000 n 
-0000692449 00000 n 
-0000692608 00000 n 
-0000692756 00000 n 
-0000692925 00000 n 
-0000693072 00000 n 
-0000693274 00000 n 
-0000693456 00000 n 
-0000693628 00000 n 
-0000693778 00000 n 
-0000693938 00000 n 
-0000694087 00000 n 
-0000694256 00000 n 
-0000694403 00000 n 
-0000694603 00000 n 
-0000694781 00000 n 
-0000694954 00000 n 
-0000695105 00000 n 
-0000695266 00000 n 
-0000695416 00000 n 
-0000695587 00000 n 
-0000695736 00000 n 
-0000695903 00000 n 
-0000696048 00000 n 
-0000696221 00000 n 
-0000696372 00000 n 
-0000696533 00000 n 
-0000696683 00000 n 
-0000696842 00000 n 
-0000696989 00000 n 
-0000697156 00000 n 
-0000697301 00000 n 
-0000697456 00000 n 
-0000697599 00000 n 
-0000697746 00000 n 
-0000697882 00000 n 
-0000698040 00000 n 
-0000698176 00000 n 
-0000698334 00000 n 
-0000698481 00000 n 
-0000698629 00000 n 
-0000698766 00000 n 
-0000698935 00000 n 
-0000699082 00000 n 
-0000699269 00000 n 
-0000699434 00000 n 
-0000699605 00000 n 
-0000699754 00000 n 
-0000699913 00000 n 
-0000700061 00000 n 
-0000700230 00000 n 
-0000700377 00000 n 
-0000700546 00000 n 
-0000700693 00000 n 
-0000700866 00000 n 
-0000701017 00000 n 
-0000701175 00000 n 
-0000701321 00000 n 
-0000701486 00000 n 
-0000701639 00000 n 
-0000701803 00000 n 
-0000701956 00000 n 
-0000702137 00000 n 
-0000702296 00000 n 
-0000702464 00000 n 
-0000702610 00000 n 
-0000702777 00000 n 
-0000702922 00000 n 
-0000703090 00000 n 
-0000703236 00000 n 
-0000703396 00000 n 
-0000703545 00000 n 
-0000703708 00000 n 
-0000703849 00000 n 
-0000704014 00000 n 
-0000704168 00000 n 
-0000704334 00000 n 
-0000704478 00000 n 
-0000704648 00000 n 
-0000704796 00000 n 
-0000704980 00000 n 
-0000705144 00000 n 
-0000705321 00000 n 
-0000705476 00000 n 
-0000705641 00000 n 
-0000705784 00000 n 
-0000705960 00000 n 
-0000706114 00000 n 
-0000706283 00000 n 
-0000706430 00000 n 
-0000706597 00000 n 
-0000706742 00000 n 
-0000707027 00000 n 
-0000707106 00000 n 
-0000707270 00000 n 
-0000707461 00000 n 
-0000707689 00000 n 
-0000707906 00000 n 
-0000708076 00000 n 
-0000708294 00000 n 
-0000708540 00000 n 
-0000708713 00000 n 
-0000708894 00000 n 
-0000709159 00000 n 
-0000709344 00000 n 
-0000709525 00000 n 
-0000709782 00000 n 
-0000709967 00000 n 
-0000710148 00000 n 
-0000710405 00000 n 
-0000710582 00000 n 
-0000710781 00000 n 
-0000710976 00000 n 
-0000711158 00000 n 
-0000711478 00000 n 
-0000711663 00000 n 
-0000711844 00000 n 
-0000712168 00000 n 
-0000712358 00000 n 
-0000712545 00000 n 
-0000712726 00000 n 
-0000713010 00000 n 
-0000713199 00000 n 
-0000713398 00000 n 
-0000713594 00000 n 
-0000713776 00000 n 
-0000714072 00000 n 
-0000714261 00000 n 
-0000714448 00000 n 
-0000714629 00000 n 
-0000715009 00000 n 
-0000715198 00000 n 
-0000715398 00000 n 
-0000715579 00000 n 
-0000715888 00000 n 
-0000716082 00000 n 
-0000716272 00000 n 
-0000716569 00000 n 
-0000716762 00000 n 
-0000716965 00000 n 
-0000717151 00000 n 
-0000717435 00000 n 
-0000717624 00000 n 
-0000717809 00000 n 
-0000718130 00000 n 
-0000718324 00000 n 
-0000718515 00000 n 
-0000718700 00000 n 
-0000719084 00000 n 
-0000719277 00000 n 
-0000719481 00000 n 
-0000719666 00000 n 
-0000719979 00000 n 
-0000720173 00000 n 
-0000720377 00000 n 
-0000720563 00000 n 
-0000720864 00000 n 
-0000721058 00000 n 
-0000721263 00000 n 
-0000721449 00000 n 
-0000721759 00000 n 
-0000721954 00000 n 
-0000722159 00000 n 
-0000722333 00000 n 
-0000722686 00000 n 
-0000722880 00000 n 
-0000723084 00000 n 
-0000723270 00000 n 
-0000723587 00000 n 
-0000723782 00000 n 
-0000723987 00000 n 
-0000724173 00000 n 
-0000724538 00000 n 
-0000724721 00000 n 
-0000724925 00000 n 
-0000725125 00000 n 
-0000725311 00000 n 
-0000725697 00000 n 
-0000725891 00000 n 
-0000726095 00000 n 
-0000726283 00000 n 
-0000726469 00000 n 
-0000726858 00000 n 
-0000727052 00000 n 
-0000727256 00000 n 
-0000727457 00000 n 
-0000727643 00000 n 
-0000727925 00000 n 
-0000728119 00000 n 
-0000728311 00000 n 
-0000728497 00000 n 
-0000728786 00000 n 
-0000728976 00000 n 
-0000729162 00000 n 
-0000729543 00000 n 
-0000729738 00000 n 
-0000729942 00000 n 
-0000730129 00000 n 
-0000730478 00000 n 
-0000730661 00000 n 
-0000730865 00000 n 
-0000731051 00000 n 
-0000731413 00000 n 
-0000731607 00000 n 
-0000731812 00000 n 
-0000732013 00000 n 
-0000732200 00000 n 
-0000732445 00000 n 
-0000732624 00000 n 
-0000732810 00000 n 
-0000733091 00000 n 
-0000733281 00000 n 
-0000733467 00000 n 
-0000733771 00000 n 
-0000733965 00000 n 
-0000734169 00000 n 
-0000734356 00000 n 
-0000734584 00000 n 
-0000734786 00000 n 
-0000734971 00000 n 
-0000735196 00000 n 
-0000735421 00000 n 
-0000735665 00000 n 
-0000735857 00000 n 
-0000736045 00000 n 
-0000736242 00000 n 
-0000736451 00000 n 
-0000736627 00000 n 
-0000736851 00000 n 
-0000737040 00000 n 
-0000737248 00000 n 
-0000737520 00000 n 
-0000737753 00000 n 
-0000737938 00000 n 
-0000738167 00000 n 
-0000738359 00000 n 
-0000738533 00000 n 
-0000739088 00000 n 
-0000746956 00000 n 
-0000747172 00000 n 
-0000748535 00000 n 
-0000749604 00000 n 
-0000757210 00000 n 
-0000757431 00000 n 
-0000758794 00000 n 
-0000759873 00000 n 
-0000763134 00000 n 
-0000763360 00000 n 
-0000764723 00000 n 
-0000765839 00000 n 
-0000768042 00000 n 
-0000768256 00000 n 
-0000769619 00000 n 
+0000686709 00000 n 
+0000686846 00000 n 
+0000687004 00000 n 
+0000687141 00000 n 
+0000687293 00000 n 
+0000687425 00000 n 
+0000687585 00000 n 
+0000687723 00000 n 
+0000687882 00000 n 
+0000688030 00000 n 
+0000688188 00000 n 
+0000688334 00000 n 
+0000688503 00000 n 
+0000688650 00000 n 
+0000688815 00000 n 
+0000688958 00000 n 
+0000689129 00000 n 
+0000689278 00000 n 
+0000689437 00000 n 
+0000689585 00000 n 
+0000689743 00000 n 
+0000689889 00000 n 
+0000690058 00000 n 
+0000690205 00000 n 
+0000690367 00000 n 
+0000690510 00000 n 
+0000690681 00000 n 
+0000690830 00000 n 
+0000690990 00000 n 
+0000691139 00000 n 
+0000691298 00000 n 
+0000691445 00000 n 
+0000691615 00000 n 
+0000691763 00000 n 
+0000691918 00000 n 
+0000692061 00000 n 
+0000692232 00000 n 
+0000692381 00000 n 
+0000692541 00000 n 
+0000692690 00000 n 
+0000692861 00000 n 
+0000693010 00000 n 
+0000693174 00000 n 
+0000693318 00000 n 
+0000693477 00000 n 
+0000693625 00000 n 
+0000693794 00000 n 
+0000693941 00000 n 
+0000694143 00000 n 
+0000694325 00000 n 
+0000694497 00000 n 
+0000694647 00000 n 
+0000694807 00000 n 
+0000694956 00000 n 
+0000695125 00000 n 
+0000695272 00000 n 
+0000695472 00000 n 
+0000695650 00000 n 
+0000695823 00000 n 
+0000695974 00000 n 
+0000696135 00000 n 
+0000696285 00000 n 
+0000696456 00000 n 
+0000696605 00000 n 
+0000696772 00000 n 
+0000696917 00000 n 
+0000697090 00000 n 
+0000697241 00000 n 
+0000697402 00000 n 
+0000697552 00000 n 
+0000697711 00000 n 
+0000697858 00000 n 
+0000698025 00000 n 
+0000698170 00000 n 
+0000698325 00000 n 
+0000698468 00000 n 
+0000698615 00000 n 
+0000698751 00000 n 
+0000698909 00000 n 
+0000699045 00000 n 
+0000699203 00000 n 
+0000699350 00000 n 
+0000699498 00000 n 
+0000699635 00000 n 
+0000699804 00000 n 
+0000699951 00000 n 
+0000700138 00000 n 
+0000700303 00000 n 
+0000700474 00000 n 
+0000700623 00000 n 
+0000700782 00000 n 
+0000700930 00000 n 
+0000701099 00000 n 
+0000701246 00000 n 
+0000701415 00000 n 
+0000701562 00000 n 
+0000701735 00000 n 
+0000701886 00000 n 
+0000702044 00000 n 
+0000702190 00000 n 
+0000702355 00000 n 
+0000702508 00000 n 
+0000702672 00000 n 
+0000702825 00000 n 
+0000703006 00000 n 
+0000703165 00000 n 
+0000703333 00000 n 
+0000703479 00000 n 
+0000703646 00000 n 
+0000703791 00000 n 
+0000703959 00000 n 
+0000704105 00000 n 
+0000704265 00000 n 
+0000704414 00000 n 
+0000704577 00000 n 
+0000704718 00000 n 
+0000704883 00000 n 
+0000705037 00000 n 
+0000705203 00000 n 
+0000705347 00000 n 
+0000705517 00000 n 
+0000705665 00000 n 
+0000705849 00000 n 
+0000706013 00000 n 
+0000706190 00000 n 
+0000706345 00000 n 
+0000706510 00000 n 
+0000706653 00000 n 
+0000706829 00000 n 
+0000706983 00000 n 
+0000707152 00000 n 
+0000707299 00000 n 
+0000707466 00000 n 
+0000707611 00000 n 
+0000707896 00000 n 
+0000707975 00000 n 
+0000708139 00000 n 
+0000708330 00000 n 
+0000708558 00000 n 
+0000708775 00000 n 
+0000708945 00000 n 
+0000709163 00000 n 
+0000709409 00000 n 
+0000709582 00000 n 
+0000709763 00000 n 
+0000710028 00000 n 
+0000710213 00000 n 
+0000710394 00000 n 
+0000710651 00000 n 
+0000710836 00000 n 
+0000711017 00000 n 
+0000711274 00000 n 
+0000711451 00000 n 
+0000711650 00000 n 
+0000711845 00000 n 
+0000712027 00000 n 
+0000712347 00000 n 
+0000712532 00000 n 
+0000712713 00000 n 
+0000713037 00000 n 
+0000713227 00000 n 
+0000713414 00000 n 
+0000713595 00000 n 
+0000713879 00000 n 
+0000714068 00000 n 
+0000714267 00000 n 
+0000714463 00000 n 
+0000714645 00000 n 
+0000714941 00000 n 
+0000715130 00000 n 
+0000715317 00000 n 
+0000715498 00000 n 
+0000715878 00000 n 
+0000716067 00000 n 
+0000716267 00000 n 
+0000716448 00000 n 
+0000716757 00000 n 
+0000716951 00000 n 
+0000717141 00000 n 
+0000717438 00000 n 
+0000717631 00000 n 
+0000717834 00000 n 
+0000718020 00000 n 
+0000718304 00000 n 
+0000718493 00000 n 
+0000718678 00000 n 
+0000718999 00000 n 
+0000719193 00000 n 
+0000719384 00000 n 
+0000719569 00000 n 
+0000719953 00000 n 
+0000720146 00000 n 
+0000720350 00000 n 
+0000720535 00000 n 
+0000720848 00000 n 
+0000721042 00000 n 
+0000721246 00000 n 
+0000721432 00000 n 
+0000721733 00000 n 
+0000721927 00000 n 
+0000722132 00000 n 
+0000722318 00000 n 
+0000722628 00000 n 
+0000722823 00000 n 
+0000723028 00000 n 
+0000723202 00000 n 
+0000723555 00000 n 
+0000723749 00000 n 
+0000723953 00000 n 
+0000724139 00000 n 
+0000724456 00000 n 
+0000724651 00000 n 
+0000724856 00000 n 
+0000725042 00000 n 
+0000725407 00000 n 
+0000725590 00000 n 
+0000725794 00000 n 
+0000725994 00000 n 
+0000726180 00000 n 
+0000726566 00000 n 
+0000726760 00000 n 
+0000726964 00000 n 
+0000727152 00000 n 
+0000727338 00000 n 
+0000727727 00000 n 
+0000727921 00000 n 
+0000728125 00000 n 
+0000728326 00000 n 
+0000728512 00000 n 
+0000728794 00000 n 
+0000728988 00000 n 
+0000729180 00000 n 
+0000729366 00000 n 
+0000729655 00000 n 
+0000729845 00000 n 
+0000730031 00000 n 
+0000730412 00000 n 
+0000730607 00000 n 
+0000730811 00000 n 
+0000730998 00000 n 
+0000731347 00000 n 
+0000731530 00000 n 
+0000731734 00000 n 
+0000731920 00000 n 
+0000732282 00000 n 
+0000732476 00000 n 
+0000732681 00000 n 
+0000732882 00000 n 
+0000733069 00000 n 
+0000733314 00000 n 
+0000733493 00000 n 
+0000733679 00000 n 
+0000733960 00000 n 
+0000734150 00000 n 
+0000734336 00000 n 
+0000734640 00000 n 
+0000734834 00000 n 
+0000735038 00000 n 
+0000735225 00000 n 
+0000735453 00000 n 
+0000735655 00000 n 
+0000735840 00000 n 
+0000736065 00000 n 
+0000736290 00000 n 
+0000736534 00000 n 
+0000736726 00000 n 
+0000736914 00000 n 
+0000737111 00000 n 
+0000737320 00000 n 
+0000737496 00000 n 
+0000737720 00000 n 
+0000737909 00000 n 
+0000738117 00000 n 
+0000738389 00000 n 
+0000738622 00000 n 
+0000738807 00000 n 
+0000739036 00000 n 
+0000739229 00000 n 
+0000739403 00000 n 
+0000739958 00000 n 
+0000747826 00000 n 
+0000748042 00000 n 
+0000749405 00000 n 
+0000750474 00000 n 
+0000758080 00000 n 
+0000758301 00000 n 
+0000759664 00000 n 
+0000760743 00000 n 
+0000764004 00000 n 
+0000764230 00000 n 
+0000765593 00000 n 
+0000766709 00000 n 
+0000768912 00000 n 
+0000769126 00000 n 
+0000770489 00000 n 
 trailer
-<< /Size 751
+<< /Size 750
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-770744
+771614
 %%EOF
diff --git a/extra/sql/bulkload/create-tables.sql b/extra/sql/bulkload/create-tables.sql
index 2a7f4c1cc..b4c5bf309 100644
--- a/extra/sql/bulkload/create-tables.sql
+++ b/extra/sql/bulkload/create-tables.sql
@@ -143,9 +143,9 @@
         pdp_group varchar(255),
         pdp_sub_group varchar(255),
         loop_element_model_id varchar(255),
-        loop_id varchar(255) not null,
         policy_model_type varchar(255),
         policy_model_version varchar(255),
+        loop_id varchar(255) not null,
         primary key (name)
     ) engine=InnoDB;
 
@@ -246,12 +246,12 @@
        foreign key (loop_element_model_id) 
        references loop_element_models (name);
 
-    alter table operational_policies 
-       add constraint FK1ddoggk9ni2bnqighv6ecmuwu 
-       foreign key (loop_id) 
-       references loops (name);
-
     alter table operational_policies 
        add constraint FKlsyhfkoqvkwj78ofepxhoctip 
        foreign key (policy_model_type, policy_model_version) 
        references policy_models (policy_model_type, version);
+
+    alter table operational_policies 
+       add constraint FK1ddoggk9ni2bnqighv6ecmuwu 
+       foreign key (loop_id) 
+       references loops (name);
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index 41ca89a70..1dfa208a9 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-02-27 15:08:46.764261','Not found','2020-02-27 15:08:48.172681',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-02 13:24:51.453602','Not found','2020-03-02 13:24:52.167202',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca','Not found','2020-02-27 15:08:47.793512','Not found','2020-02-27 15:08:47.793512','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-49bf6c16-46a7-4962-a667-8be63b66f549',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-1a5feff5-6b1c-4099-9abe-991ed90d0385\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3ce74d04-7349-4318-ac9e-7e002fe56ec0\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-ae12f7f4-adf7-40d7-86d5-8e5d28171a89\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca_3','Not found','2020-02-27 15:08:47.303168','Not found','2020-02-27 15:08:47.303168','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-41007420-32ac-4d57-8541-12faa3554315',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-5b934835-48c1-42f0-aad0-36908cbea8d3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-b0f3df35-6549-4de0-95d3-f274ed3e16f3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-d73cb3bb-6f38-4edd-89a9-004c3fb11c01\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName2_tca_2','Not found','2020-02-27 15:08:46.692894','Not found','2020-02-27 15:08:46.692894','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-e3a75307-db43-4d5a-869d-75ff38d86dda',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-d29c82c3-4632-4f4a-8817-19b82649e34c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a05e8625-c40d-4d24-b50c-2c65734399ea\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-412a95e2-554a-4f62-9887-21105c8d0bb8\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca','Not found','2020-03-02 13:24:52.069749','Not found','2020-03-02 13:24:52.069749','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-7f559db8-bce7-4ae8-af3a-a0601330ef61',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3fc207ac-7b3a-44ce-9a3e-a498b5397b53\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-9a3a9505-ffa6-4c23-b5a1-1a87ce04e748\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-ec28bc33-e13a-4c46-95ab-73ee067cb9bd\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-02 13:24:51.821227','Not found','2020-03-02 13:24:51.821227','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-4ccd66a3-88f2-4882-97bd-867590f69092',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-357046a5-ae45-46b4-88cc-cae1606e06d7\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-62ca7302-7e01-4875-9523-d16196a5b850\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a2d73510-27f4-426a-8ad1-e3c6f48b11a4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-02 13:24:51.431617','Not found','2020-03-02 13:24:51.431617','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-4d04b1b1-9331-47c5-88ad-9ae89c231b97',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-550c063a-9a2f-46a9-9063-546d3a84f5f4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-96cea148-fd6d-4ebf-96e4-eb88d47906b5\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3fd9565f-388c-4922-ba53-38663f82267c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_lCoAC_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,15 +152,13 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Guard','1.0.0','Not found','2020-02-27 15:09:20.557489','Not found','2020-02-27 15:09:21.051644','Guard','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-02-27 15:09:20.518533','Not found','2020-02-27 15:09:20.518533','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-02-27 15:09:20.386878','Not found','2020-02-27 15:09:20.386878','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','1.0.0','Not found','2020-02-27 15:09:20.483188','Not found','2020-02-27 15:09:20.483188','MinMax','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.Operational','1.0.0','Not found','2020-02-27 15:09:20.358225','Not found','2020-02-27 15:09:21.072743','Operational','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"apex\",\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Apex','1.0.0','Not found','2020-02-27 15:09:20.354431','Not found','2020-02-27 15:09:20.354431','Apex','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controloop.operational.Drools','1.0.0','Not found','2020-02-27 15:09:20.354507','Not found','2020-02-27 15:09:20.354507','Drools','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.Monitoring','1.0.0','Not found','2020-02-27 15:09:20.514460','Not found','2020-02-27 15:09:20.514460','Monitoring','',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-02-27 15:08:46.796072','Not found','2020-02-27 15:09:21.107687','app','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n    onap.policies.Monitoring:\n        derived_from: tosca.policies.Root\n        description: a base policy type for all policies that governs monitoring provisioning\n    onap.policies.monitoring.cdap.tca.hi.lo.app:\n        derived_from: onap.policies.Monitoring\n        version: 1.0.0\n        properties:\n            tca_policy:\n                type: map\n                description: TCA Policy JSON\n                entry_schema:\n                    type: onap.datatypes.monitoring.tca_policy\ndata_types:\n    onap.datatypes.monitoring.metricsPerEventName:\n        derived_from: tosca.datatypes.Root\n        properties:\n            controlLoopSchemaType:\n                type: string\n                required: true\n                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n                constraints:\n                  - valid_values:\n                      - VM\n                      - VNF\n            eventName:\n                type: string\n                required: true\n                description: Event name to which thresholds need to be applied\n            policyName:\n                type: string\n                required: true\n                description: TCA Policy Scope Name\n            policyScope:\n                type: string\n                required: true\n                description: TCA Policy Scope\n            policyVersion:\n                type: string\n                required: true\n                description: TCA Policy Scope Version\n            thresholds:\n                type: list\n                required: true\n                description: Thresholds associated with eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.thresholds\n    onap.datatypes.monitoring.tca_policy:\n        derived_from: tosca.datatypes.Root\n        properties:\n            domain:\n                type: string\n                required: true\n                description: Domain name to which TCA needs to be applied\n                default: measurementsForVfScaling\n                constraints:\n                  - equal: measurementsForVfScaling\n            metricsPerEventName:\n                type: list\n                required: true\n                description: Contains eventName and threshold details that need to be applied to given eventName\n                entry_schema:\n                    type: onap.datatypes.monitoring.metricsPerEventName\n    onap.datatypes.monitoring.thresholds:\n        derived_from: tosca.datatypes.Root\n        properties:\n            closedLoopControlName:\n                type: string\n                required: true\n                description: Closed Loop Control Name associated with the threshold\n            closedLoopEventStatus:\n                type: string\n                required: true\n                description: Closed Loop Event Status of the threshold\n                constraints:\n                  - valid_values:\n                      - ONSET\n                      - ABATED\n            direction:\n                type: string\n                required: true\n                description: Direction of the threshold\n                constraints:\n                  - valid_values:\n                      - LESS\n                      - LESS_OR_EQUAL\n                      - GREATER\n                      - GREATER_OR_EQUAL\n                      - EQUAL\n            fieldPath:\n                type: string\n                required: true\n                description: Json field Path as per CEF message which needs to be analyzed for TCA\n                constraints:\n                  - valid_values:\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n                      - $.event.measurementsForVfScalingFields.meanRequestLatency\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n            severity:\n                type: string\n                required: true\n                description: Threshold Event Severity\n                constraints:\n                  - valid_values:\n                      - CRITICAL\n                      - MAJOR\n                      - MINOR\n                      - WARNING\n                      - NORMAL\n            thresholdValue:\n                type: integer\n                required: true\n                description: Threshold value for the field Path inside CEF message\n            version:\n                type: string\n                required: true\n                description: Version number associated with the threshold\n','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-03-02 13:25:10.047752','Not found','2020-03-02 13:25:10.047752','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n   onap.policies.controlloop.Guard:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: Guard Policies for Control Loop Operational Policies\n   onap.policies.controlloop.guard.Blacklist:\n      derived_from: onap.policies.controlloop.Guard\n      version: 1.0.0\n      description: Supports blacklist of VNF\'s from performing control loop actions on.\n      properties:\n         blacklist_policy:\n            type: map\n            description: null\n            entry_schema:\n               type: onap.datatypes.guard.Blacklist\ndata_types:\n   onap.datatypes.guard.Blacklist:\n      derived_from: tosca.datatypes.Root\n      properties:\n         actor:\n            type: string\n            description: Specifies the Actor\n            required: true\n         recipe:\n            type: string\n            description: Specified the Recipe\n            required: true\n         time_range:\n            type: tosca.datatypes.TimeInterval\n            description: An optional range of time during the day the blacklist is valid for.\n            required: false\n         controlLoopName:\n            type: string\n            description: An optional specific control loop to apply this guard to.\n            required: false\n         blacklist:\n            type: list\n            description: List of VNF\'s\n            required: true',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-03-02 13:25:09.987158','Not found','2020-03-02 13:25:09.987158','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n   onap.policies.controlloop.Guard:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: Guard Policies for Control Loop Operational Policies\n   onap.policies.controlloop.guard.FrequencyLimiter:\n      derived_from: onap.policies.controlloop.Guard\n      version: 1.0.0\n      description: Supports limiting the frequency of actions being taken by a Actor.\n      properties:\n         frequency_policy:\n            type: map\n            description: null\n            entry_schema:\n               type: onap.datatypes.guard.FrequencyLimiter\ndata_types:\n   onap.datatypes.guard.FrequencyLimiter:\n      derived_from: tosca.datatypes.Root\n      properties:\n         actor:\n            type: string\n            description: Specifies the Actor\n            required: true\n         recipe:\n            type: string\n            description: Specified the Recipe\n            required: true\n         time_window:\n            type: scalar-unit.time\n            description: The time window to count the actions against.\n            required: true\n         limit:\n            type: integer\n            description: The limit\n            required: true\n            constraints:\n            -  greater_than: 0\n         time_range:\n            type: tosca.datatypes.TimeInterval\n            description: An optional range of time during the day the frequency is valid for.\n            required: false\n         controlLoopName:\n            type: string\n            description: An optional specific control loop to apply this guard to.\n            required: false\n         target:\n            type: string\n            description: An optional specific VNF to apply this guard to.\n            required: false',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','2.0.0','Not found','2020-03-02 13:25:09.987757','Not found','2020-03-02 13:25:09.987757','MinMax','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.Apex','1.0.0','Not found','2020-03-02 13:25:09.987152','Not found','2020-03-02 13:25:09.987152','Apex','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.Drools','1.0.0','Not found','2020-03-02 13:25:09.992687','Not found','2020-03-02 13:25:09.992687','Drools','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-02 13:24:51.467136','Not found','2020-03-02 13:25:10.569587','app','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: map\n            description: TCA Policy JSON\n            entry_schema:\n               type: onap.datatypes.monitoring.tca_policy\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-02 13:24:26.818795','Not found','2020-03-02 13:24:26.818795','OperationalPolicyLegacy','',NULL);
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -182,4 +180,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-02-27 23:10:22
+-- Dump completed on 2020-03-02 21:26:34
diff --git a/src/main/java/org/onap/clamp/clds/config/ClampProperties.java b/src/main/java/org/onap/clamp/clds/config/ClampProperties.java
index 8eae9066d..0b5c951bf 100644
--- a/src/main/java/org/onap/clamp/clds/config/ClampProperties.java
+++ b/src/main/java/org/onap/clamp/clds/config/ClampProperties.java
@@ -23,14 +23,10 @@
 
 package org.onap.clamp.clds.config;
 
-import com.google.gson.JsonElement;
-
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.commons.io.IOUtils;
-import org.onap.clamp.clds.util.JsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
@@ -74,38 +70,6 @@ public class ClampProperties {
         return value;
     }
 
-    /**
-     * Return json as objects that can be updated. The value obtained from the
-     * clds-reference file will be used as a filename.
-     *
-     * @param key The key that will be used to access the clds-reference file
-     * @return A jsonNode
-     * @throws IOException In case of issues with the JSON parser
-     */
-    public JsonElement getJsonTemplate(String key) throws IOException {
-        String fileReference = getStringValue(key);
-        return (fileReference != null)
-                ? JsonUtils.GSON.fromJson(getFileContentFromPath(fileReference), JsonElement.class)
-                : null;
-    }
-
-    /**
-     * Return json as objects that can be updated. First try with combo key (key1 +
-     * "." + key2), otherwise default to just key1. The value obtained from the
-     * clds-reference file will be used as a filename.
-     *
-     * @param key1 The first key
-     * @param key2 The second key after a dot
-     * @return A JsonNode
-     * @throws IOException In case of issues with the JSON parser
-     */
-    public JsonElement getJsonTemplate(String key1, String key2) throws IOException {
-        String fileReference = getStringValue(key1, key2);
-        return (fileReference != null)
-                ? JsonUtils.GSON.fromJson(getFileContentFromPath(fileReference), JsonElement.class)
-                : null;
-    }
-
     /**
      * Return the file content. The value obtained from the clds-reference file will
      * be used as a filename.
diff --git a/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java b/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java
new file mode 100644
index 000000000..7d4b5f8fe
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/config/LegacyOperationalPolicy.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.config;
+
+import javax.annotation.PostConstruct;
+import org.onap.clamp.loop.template.PolicyModel;
+import org.onap.clamp.loop.template.PolicyModelsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("legacy-operational-policy")
+public class LegacyOperationalPolicy {
+
+    @Autowired
+    PolicyModelsService policyModelService;
+
+    public static final String OPERATIONAL_POLICY_LEGACY = "onap.policies.operational.legacy";
+
+    @PostConstruct
+    public void init() {
+        policyModelService.saveOrUpdatePolicyModel(new PolicyModel(OPERATIONAL_POLICY_LEGACY, "", "1.0.0",
+                "OperationalPolicyLegacy"));
+    }
+}
+
diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index 122b4c77f..f185460cf 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -48,6 +48,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.hibernate.annotations.SortNatural;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
@@ -62,6 +63,7 @@ import org.onap.clamp.loop.log.LoopLog;
 import org.onap.clamp.loop.service.Service;
 import org.onap.clamp.loop.template.LoopElementModel;
 import org.onap.clamp.loop.template.LoopTemplate;
+import org.onap.clamp.policy.Policy;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
 
@@ -168,12 +170,18 @@ public class Loop extends AuditEntity implements Serializable {
         this.setModelService(loopTemplate.getModelService());
         loopTemplate.getLoopElementModelsUsed().forEach(element -> {
             if (LoopElementModel.MICRO_SERVICE_TYPE.equals(element.getLoopElementModel().getLoopElementType())) {
-                this.addMicroServicePolicy(new MicroServicePolicy(name,
+                this.addMicroServicePolicy(new MicroServicePolicy(Policy.generatePolicyName("MICROSERVICE_",
+                        loopTemplate.getModelService().getName(),loopTemplate.getModelService().getVersion(),
+                        RandomStringUtils.randomAlphanumeric(3),RandomStringUtils.randomAlphanumeric(3)),
                         element.getLoopElementModel().getPolicyModels().first(), false, element.getLoopElementModel()));
             } else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
                     .equals(element.getLoopElementModel().getLoopElementType())) {
-                this.addOperationalPolicy(new OperationalPolicy(name, null, new JsonObject(),
-                        element.getLoopElementModel().getPolicyModels().first(), element.getLoopElementModel(), null, null));
+                this.addOperationalPolicy(new OperationalPolicy(Policy.generatePolicyName("OPERATIONAL_",
+                        loopTemplate.getModelService().getName(),loopTemplate.getModelService().getVersion(),
+                        RandomStringUtils.randomAlphanumeric(3),RandomStringUtils.randomAlphanumeric(3)), null,
+                        new JsonObject(),
+                        element.getLoopElementModel().getPolicyModels().first(), element.getLoopElementModel(),
+                        null,null));
             }
         });
     }
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index 59b97e1a2..1a67455e8 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -38,11 +38,9 @@ import org.springframework.stereotype.Controller;
 public class LoopController {
 
     private final LoopService loopService;
-    private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {
-    }.getType();
+    private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {}.getType();
 
-    private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {
-    }.getType();
+    private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {}.getType();
 
     @Autowired
     public LoopController(LoopService loopService) {
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
index 47dee1ae9..ebeb84fd6 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -23,28 +23,40 @@
 
 package org.onap.clamp.policy;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
 
 import java.io.UnsupportedEncodingException;
-
+import java.util.Map;
 import javax.persistence.Column;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
-
+import javax.persistence.Transient;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
+import org.json.JSONObject;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.common.AuditEntity;
 import org.onap.clamp.loop.template.LoopElementModel;
+import org.onap.clamp.loop.template.PolicyModel;
+import org.yaml.snakeyaml.Yaml;
 
 @MappedSuperclass
 @TypeDefs({@TypeDef(name = "json", typeClass = StringJsonUserType.class)})
 public abstract class Policy extends AuditEntity {
 
+    @Transient
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(Policy.class);
+
     @Expose
     @Type(type = "json")
     @Column(columnDefinition = "json", name = "json_representation", nullable = false)
@@ -72,7 +84,67 @@ public abstract class Policy extends AuditEntity {
     @Column(name = "pdp_sub_group")
     private String pdpSubgroup;
 
-    public abstract String createPolicyPayload() throws UnsupportedEncodingException;
+    @Expose
+    @ManyToOne(fetch = FetchType.EAGER)
+    @JoinColumns({@JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
+            @JoinColumn(name = "policy_model_version", referencedColumnName = "version")})
+    private PolicyModel policyModel;
+
+    private JsonObject createJsonFromPolicyTosca() {
+        Map<String, Object> map =
+                new Yaml().load(this.getPolicyModel() != null ? this.getPolicyModel().getPolicyModelTosca() : "");
+        JSONObject jsonObject = new JSONObject(map);
+        return new Gson().fromJson(jsonObject.toString(), JsonObject.class);
+    }
+
+    private String getModelPropertyNameFromTosca(JsonObject object, String policyModelType) {
+        return object.getAsJsonObject("policy_types").getAsJsonObject(policyModelType)
+                .getAsJsonObject(
+                        "properties")
+                .keySet().toArray(new String[1])[0];
+    }
+
+    /**
+     * This method create the policy payload that must be sent to PEF.
+     *
+     * @return A String containing the payload
+     * @throws UnsupportedEncodingException In case of failure
+     */
+    public String createPolicyPayload() throws UnsupportedEncodingException {
+        JsonObject toscaJson = createJsonFromPolicyTosca();
+
+        JsonObject policyPayloadResult = new JsonObject();
+
+        policyPayloadResult.add("tosca_definitions_version", toscaJson.get("tosca_definitions_version"));
+
+        JsonObject topologyTemplateNode = new JsonObject();
+        policyPayloadResult.add("topology_template", topologyTemplateNode);
+
+        JsonArray policiesArray = new JsonArray();
+        topologyTemplateNode.add("policies", policiesArray);
+
+        JsonObject thisPolicy = new JsonObject();
+        policiesArray.add(thisPolicy);
+
+        JsonObject policyDetails = new JsonObject();
+        thisPolicy.add(this.getName(), policyDetails);
+        policyDetails.addProperty("type", this.getPolicyModel().getPolicyModelType());
+        policyDetails.addProperty("version", this.getPolicyModel().getVersion());
+
+        JsonObject policyMetadata = new JsonObject();
+        policyDetails.add("metadata", policyMetadata);
+        policyMetadata.addProperty("policy-id", this.getName());
+
+        JsonObject policyProperties = new JsonObject();
+        policyDetails.add("properties", policyProperties);
+        policyProperties
+                .add(this.getModelPropertyNameFromTosca(toscaJson, this.getPolicyModel().getPolicyModelType()),
+                        this.getConfigurationsJson());
+        String policyPayload = new GsonBuilder().setPrettyPrinting().create().toJson(policyPayloadResult);
+        logger.info("Policy payload: " + policyPayload);
+        return policyPayload;
+    }
+
 
     /**
      * Name getter.
@@ -104,6 +176,24 @@ public abstract class Policy extends AuditEntity {
         this.jsonRepresentation = jsonRepresentation;
     }
 
+    /**
+     * policyModel getter.
+     *
+     * @return the policyModel
+     */
+    public PolicyModel getPolicyModel() {
+        return policyModel;
+    }
+
+    /**
+     * policyModel setter.
+     *
+     * @param policyModel The new policyModel
+     */
+    public void setPolicyModel(PolicyModel policyModel) {
+        this.policyModel = policyModel;
+    }
+
     /**
      * configurationsJson getter.
      *
@@ -160,7 +250,7 @@ public abstract class Policy extends AuditEntity {
 
     /**
      * pdpSubgroup getter.
-     * 
+     *
      * @return the pdpSubgroup
      */
     public String getPdpSubgroup() {
@@ -169,7 +259,7 @@ public abstract class Policy extends AuditEntity {
 
     /**
      * pdpSubgroup setter.
-     * 
+     *
      * @param pdpSubgroup the pdpSubgroup to set
      */
     public void setPdpSubgroup(String pdpSubgroup) {
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index 7fd752c31..c4037ffb6 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -25,28 +25,20 @@ package org.onap.clamp.policy.microservice;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
 import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.json.JSONObject;
 import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
@@ -54,7 +46,6 @@ import org.onap.clamp.loop.Loop;
 import org.onap.clamp.loop.template.LoopElementModel;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.policy.Policy;
-import org.yaml.snakeyaml.Yaml;
 
 @Entity
 @Table(name = "micro_service_policies")
@@ -100,12 +91,6 @@ public class MicroServicePolicy extends Policy implements Serializable {
     @Column(name = "dcae_blueprint_id")
     private String dcaeBlueprintId;
 
-    @Expose
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumns({@JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
-            @JoinColumn(name = "policy_model_version", referencedColumnName = "version")})
-    private PolicyModel policyModel;
-
     public MicroServicePolicy() {
         // serialization
     }
@@ -119,20 +104,15 @@ public class MicroServicePolicy extends Policy implements Serializable {
      * @param shared      The flag indicate whether the MicroService is shared
      */
     public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared, LoopElementModel loopElementModel) {
-        this(name,policyModel,shared,JsonUtils.GSON_JPA_MODEL
+        this(name, policyModel, shared, JsonUtils.GSON_JPA_MODEL
                 .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
-                        policyModel.getPolicyModelType()), JsonObject.class),loopElementModel, null, null);
-    }
-
-    private JsonObject createJsonFromPolicyTosca() {
-        Map<String, Object> map = new Yaml().load(this.getPolicyModel().getPolicyModelTosca());
-        JSONObject jsonObject = new JSONObject(map);
-        return new Gson().fromJson(jsonObject.toString(), JsonObject.class);
+                        policyModel.getPolicyModelType()), JsonObject.class), loopElementModel,null,null);
     }
 
     /**
      * The constructor that does not make use of ToscaYamlToJsonConvertor but take
      * the jsonRepresentation instead.
+     *
      * @param name               The name of the MicroService
      * @param policyModel        The policy model type of the MicroService
      * @param shared             The flag indicate whether the MicroService is
@@ -145,7 +125,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
     public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared,
                               JsonObject jsonRepresentation, LoopElementModel loopElementModel, String pdpGroup, String pdpSubgroup) {
         this.name = name;
-        this.policyModel = policyModel;
+        this.setPolicyModel(policyModel);
         this.shared = shared;
         this.setJsonRepresentation(jsonRepresentation);
         this.setLoopElementModel(loopElementModel);
@@ -200,14 +180,6 @@ public class MicroServicePolicy extends Policy implements Serializable {
         this.deviceTypeScope = deviceTypeScope;
     }
 
-    public PolicyModel getPolicyModel() {
-        return policyModel;
-    }
-
-    public void setPolicyModel(PolicyModel policyModel) {
-        this.policyModel = policyModel;
-    }
-
     /**
      * dcaeDeploymentId getter.
      *
@@ -288,48 +260,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
             }
         } else if (!name.equals(other.name)) {
             return false;
-        }        return true;
-    }
-
-    private String getMicroServicePropertyNameFromTosca(JsonObject object) {
-        return object.getAsJsonObject("policy_types").getAsJsonObject(this.getPolicyModel().getPolicyModelType())
-                .getAsJsonObject(
-                        "properties")
-                .keySet().toArray(new String[1])[0];
-    }
-
-    @Override
-    public String createPolicyPayload() {
-        JsonObject toscaJson = createJsonFromPolicyTosca();
-
-        JsonObject policyPayloadResult = new JsonObject();
-
-        policyPayloadResult.add("tosca_definitions_version", toscaJson.get("tosca_definitions_version"));
-
-        JsonObject topologyTemplateNode = new JsonObject();
-        policyPayloadResult.add("topology_template", topologyTemplateNode);
-
-        JsonArray policiesArray = new JsonArray();
-        topologyTemplateNode.add("policies", policiesArray);
-
-        JsonObject thisPolicy = new JsonObject();
-        policiesArray.add(thisPolicy);
-
-        JsonObject policyDetails = new JsonObject();
-        thisPolicy.add(this.getName(), policyDetails);
-        policyDetails.addProperty("type", this.getPolicyModel().getPolicyModelType());
-        policyDetails.addProperty("version", this.getPolicyModel().getVersion());
-
-        JsonObject policyMetadata = new JsonObject();
-        policyDetails.add("metadata", policyMetadata);
-        policyMetadata.addProperty("policy-id", this.getName());
-
-        JsonObject policyProperties = new JsonObject();
-        policyDetails.add("properties", policyProperties);
-        policyProperties.add(this.getMicroServicePropertyNameFromTosca(toscaJson), this.getConfigurationsJson());
-        String policyPayload = new GsonBuilder().setPrettyPrinting().create().toJson(policyPayloadResult);
-        logger.info("Micro service policy payload: " + policyPayload);
-        return policyPayload;
+        }
+        return true;
     }
-
 }
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index aab30bfb6..82cfcf4ef 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -50,6 +50,8 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
+import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.loop.template.LoopElementModel;
@@ -79,12 +81,6 @@ public class OperationalPolicy extends Policy implements Serializable {
     @JoinColumn(name = "loop_id", nullable = false)
     private Loop loop;
 
-    @Expose
-    @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumns({@JoinColumn(name = "policy_model_type", referencedColumnName = "policy_model_type"),
-            @JoinColumn(name = "policy_model_version", referencedColumnName = "version")})
-    private PolicyModel policyModel;
-
     public OperationalPolicy() {
         // Serialization
     }
@@ -110,16 +106,32 @@ public class OperationalPolicy extends Policy implements Serializable {
         this.setPdpGroup(pdpGroup);
         this.setPdpSubgroup(pdpSubgroup);
         this.setLoopElementModel(loopElementModel);
-        if (policyModel != null && policyModel.getPolicyModelType().contains("legacy")) {
-            LegacyOperationalPolicy.preloadConfiguration(configurationsJson, loop);
+        this.setJsonRepresentation(this.generateJsonRepresentation(policyModel));
+
+    }
+
+    private JsonObject generateJsonRepresentation(PolicyModel policyModel) {
+        JsonObject jsonReturned = new JsonObject();
+        if (policyModel == null) {
+            return new JsonObject();
         }
         try {
-            this.setJsonRepresentation(
-                OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+            if (isLegacy()) {
+                // Op policy Legacy case
+                LegacyOperationalPolicy.preloadConfiguration(jsonReturned, loop);
+                this.setJsonRepresentation(
+                        OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+            } else {
+                // Generic Case
+                this.setJsonRepresentation(JsonUtils.GSON
+                        .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
+                                policyModel.getPolicyModelType()), JsonObject.class));
+            }
         } catch (JsonSyntaxException | IOException | NullPointerException e) {
             logger.error("Unable to generate the operational policy Schema ... ", e);
             this.setJsonRepresentation(new JsonObject());
         }
+        return jsonReturned;
     }
 
     public void setLoop(Loop loopName) {
@@ -145,24 +157,6 @@ public class OperationalPolicy extends Policy implements Serializable {
         this.name = name;
     }
 
-    /**
-     * policyModel getter.
-     *
-     * @return the policyModel
-     */
-    public PolicyModel getPolicyModel() {
-        return policyModel;
-    }
-
-    /**
-     * policyModel setter.
-     *
-     * @param policyModel the policyModel to set
-     */
-    public void setPolicyModel(PolicyModel policyModel) {
-        this.policyModel = policyModel;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -193,6 +187,10 @@ public class OperationalPolicy extends Policy implements Serializable {
         return true;
     }
 
+    public Boolean isLegacy() {
+        return (this.getPolicyModel() != null) && this.getPolicyModel().getPolicyModelType().contains("legacy");
+    }
+
     /**
      * Create policy Yaml from json defined here.
      *
@@ -235,17 +233,22 @@ public class OperationalPolicy extends Policy implements Serializable {
 
     @Override
     public String createPolicyPayload() throws UnsupportedEncodingException {
-        // Now using the legacy payload fo Dublin
-        JsonObject payload = new JsonObject();
-        payload.addProperty("policy-id", this.getName());
-        payload.addProperty("content",
-                URLEncoder.encode(
-                        LegacyOperationalPolicy
-                                .createPolicyPayloadYamlLegacy(this.getConfigurationsJson().get("operational_policy")),
-                        StandardCharsets.UTF_8.toString()));
-        String opPayload = new GsonBuilder().setPrettyPrinting().create().toJson(payload);
-        logger.info("Operational policy payload: " + opPayload);
-        return opPayload;
+        if (isLegacy()) {
+            // Now using the legacy payload fo Dublin
+            JsonObject payload = new JsonObject();
+            payload.addProperty("policy-id", this.getName());
+            payload.addProperty("content",
+                    URLEncoder.encode(
+                            LegacyOperationalPolicy
+                                    .createPolicyPayloadYamlLegacy(
+                                            this.getConfigurationsJson().get("operational_policy")),
+                            StandardCharsets.UTF_8.toString()));
+            String opPayload = new GsonBuilder().setPrettyPrinting().create().toJson(payload);
+            logger.info("Operational policy payload: " + opPayload);
+            return opPayload;
+        } else {
+            return super.createPolicyPayload();
+        }
     }
 
     /**
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 23844cb23..9c4c9fff2 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,25 +444,25 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route30">2.1. GET /v1/healthcheck</a>
+<li><a href="#_route61">2.1. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route31">2.2. GET /v1/user/getUser</a>
+<li><a href="#_route62">2.2. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route18">2.3. GET /v2/dictionary</a>
+<li><a href="#_route49">2.3. GET /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route20">2.4. PUT /v2/dictionary</a>
+<li><a href="#_route51">2.4. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters">2.4.1. Parameters</a></li>
 <li><a href="#_responses_4">2.4.2. Responses</a></li>
@@ -491,7 +491,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_7">2.7.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route22">2.8. DELETE /v2/dictionary/{name}</a>
+<li><a href="#_route53">2.8. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_4">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
@@ -505,75 +505,75 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route14">2.10. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route45">2.10. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_6">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
 </ul>
 </li>
-<li><a href="#_route8">2.11. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route39">2.11. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_7">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
 <li><a href="#_produces_10">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route2">2.12. GET /v2/loop/getAllNames</a>
+<li><a href="#_route33">2.12. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_12">2.12.1. Responses</a></li>
 <li><a href="#_produces_11">2.12.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route15">2.13. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route46">2.13. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_8">2.13.1. Parameters</a></li>
 <li><a href="#_responses_13">2.13.2. Responses</a></li>
 <li><a href="#_produces_12">2.13.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route9">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
+<li><a href="#_route40">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route12">2.15. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route43">2.15. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_10">2.15.1. Parameters</a></li>
 <li><a href="#_responses_15">2.15.2. Responses</a></li>
 <li><a href="#_produces_14">2.15.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route11">2.16. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route42">2.16. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_11">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route13">2.17. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route44">2.17. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_12">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
 <li><a href="#_produces_16">2.17.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route4">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route35">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_13">2.18.1. Parameters</a></li>
 <li><a href="#_responses_18">2.18.2. Responses</a></li>
 <li><a href="#_produces_17">2.18.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route10">2.19. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route41">2.19. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_14">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
 <li><a href="#_produces_18">2.19.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route5">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route36">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_15">2.20.1. Parameters</a></li>
 <li><a href="#_responses_20">2.20.2. Responses</a></li>
@@ -581,7 +581,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_19">2.20.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route7">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route38">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_16">2.21.1. Parameters</a></li>
 <li><a href="#_responses_21">2.21.2. Responses</a></li>
@@ -589,7 +589,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_20">2.21.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route6">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route37">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_17">2.22.1. Parameters</a></li>
 <li><a href="#_responses_22">2.22.2. Responses</a></li>
@@ -597,14 +597,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_21">2.22.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route3">2.23. GET /v2/loop/{loopName}</a>
+<li><a href="#_route34">2.23. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_18">2.23.1. Parameters</a></li>
 <li><a href="#_responses_23">2.23.2. Responses</a></li>
 <li><a href="#_produces_22">2.23.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route25">2.24. GET /v2/policyToscaModels</a>
+<li><a href="#_route56">2.24. GET /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_24">2.24.1. Responses</a></li>
 <li><a href="#_produces_23">2.24.2. Produces</a></li>
@@ -624,7 +624,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_25">2.26.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route26">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
+<li><a href="#_route57">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_21">2.27.1. Parameters</a></li>
 <li><a href="#_responses_27">2.27.2. Responses</a></li>
@@ -632,7 +632,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_26">2.27.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route29">2.28. GET /v2/templates</a>
+<li><a href="#_route60">2.28. GET /v2/templates</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_28">2.28.1. Responses</a></li>
 <li><a href="#_produces_27">2.28.2. Produces</a></li>
@@ -692,7 +692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:37295<br>
+<p><em>Host</em> : localhost:39099<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -703,7 +703,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.1. GET /v1/healthcheck</a></h3>
+<h3 id="_route61"><a class="anchor" href="#_route61"></a><a class="link" href="#_route61">2.1. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -740,7 +740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route31"><a class="anchor" href="#_route31"></a><a class="link" href="#_route31">2.2. GET /v1/user/getUser</a></h3>
+<h3 id="_route62"><a class="anchor" href="#_route62"></a><a class="link" href="#_route62">2.2. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -774,7 +774,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.3. GET /v2/dictionary</a></h3>
+<h3 id="_route49"><a class="anchor" href="#_route49"></a><a class="link" href="#_route49">2.3. GET /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -811,7 +811,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route20"><a class="anchor" href="#_route20"></a><a class="link" href="#_route20">2.4. PUT /v2/dictionary</a></h3>
+<h3 id="_route51"><a class="anchor" href="#_route51"></a><a class="link" href="#_route51">2.4. PUT /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.4.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1060,7 +1060,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route22"><a class="anchor" href="#_route22"></a><a class="link" href="#_route22">2.8. DELETE /v2/dictionary/{name}</a></h3>
+<h3 id="_route53"><a class="anchor" href="#_route53"></a><a class="link" href="#_route53">2.8. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1184,7 +1184,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route45"><a class="anchor" href="#_route45"></a><a class="link" href="#_route45">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1233,7 +1233,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route39"><a class="anchor" href="#_route39"></a><a class="link" href="#_route39">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1295,7 +1295,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.12. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route33"><a class="anchor" href="#_route33"></a><a class="link" href="#_route33">2.12. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
 <h4 id="_responses_12"><a class="anchor" href="#_responses_12"></a><a class="link" href="#_responses_12">2.12.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1332,7 +1332,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route46"><a class="anchor" href="#_route46"></a><a class="link" href="#_route46">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.13.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1394,7 +1394,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
+<h3 id="_route40"><a class="anchor" href="#_route40"></a><a class="link" href="#_route40">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1456,7 +1456,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route43"><a class="anchor" href="#_route43"></a><a class="link" href="#_route43">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.15.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1518,7 +1518,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route42"><a class="anchor" href="#_route42"></a><a class="link" href="#_route42">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1580,7 +1580,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route44"><a class="anchor" href="#_route44"></a><a class="link" href="#_route44">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1642,7 +1642,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route35"><a class="anchor" href="#_route35"></a><a class="link" href="#_route35">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.18.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1704,7 +1704,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route41"><a class="anchor" href="#_route41"></a><a class="link" href="#_route41">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1766,7 +1766,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route36"><a class="anchor" href="#_route36"></a><a class="link" href="#_route36">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.20.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1844,7 +1844,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route38"><a class="anchor" href="#_route38"></a><a class="link" href="#_route38">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.21.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1922,7 +1922,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route37"><a class="anchor" href="#_route37"></a><a class="link" href="#_route37">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.22.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2000,7 +2000,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.23. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route34"><a class="anchor" href="#_route34"></a><a class="link" href="#_route34">2.23. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.23.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2062,7 +2062,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.24. GET /v2/policyToscaModels</a></h3>
+<h3 id="_route56"><a class="anchor" href="#_route56"></a><a class="link" href="#_route56">2.24. GET /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_responses_24"><a class="anchor" href="#_responses_24"></a><a class="link" href="#_responses_24">2.24.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2223,7 +2223,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route26"><a class="anchor" href="#_route26"></a><a class="link" href="#_route26">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
+<h3 id="_route57"><a class="anchor" href="#_route57"></a><a class="link" href="#_route57">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.27.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2301,7 +2301,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.28. GET /v2/templates</a></h3>
+<h3 id="_route60"><a class="anchor" href="#_route60"></a><a class="link" href="#_route60">2.28. GET /v2/templates</a></h3>
 <div class="sect3">
 <h4 id="_responses_28"><a class="anchor" href="#_responses_28"></a><a class="link" href="#_responses_28">2.28.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -3617,6 +3617,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_jsonobject">JsonObject</a></p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>legacy</strong><br>
+<em>optional</em></p></td>
+<td class="tableblock halign-left valign-middle"><p class="tableblock">boolean</p></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>loop</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock"><a href="#_loop">Loop</a></p></td>
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index 69d16875c..320e0c2a3 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -21,11 +21,6 @@
 #
 ###
 
-info.build.artifact=@project.artifactId@
-info.build.name=@project.name@
-info.build.description=@project.description@
-info.build.version=@project.version@
-
 ### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).
 ### (See below for the parameter 'server.http.port' if you want to have both enabled)
 ### To have only HTTP, keep the lines server.ssl.* commented
@@ -73,7 +68,7 @@ clamp.config.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile
 
 server.servlet.context-path=/
 #Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller
+spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller,legacy-operational-policy
 spring.http.converters.preferred-json-mapper=gson
 
 #The max number of active threads in this pool
@@ -145,12 +140,7 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
 clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
 clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
 
-# Properties for Clamp
-# DCAE request build properties
-#
-clamp.config.dcae.template=classpath:/clds/templates/dcae-template.json
-clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json
-#
+
 #
 # Configuration Settings for Policy Engine Components
 clamp.config.policy.api.url=http4://localhost:8085
@@ -160,36 +150,9 @@ clamp.config.policy.pap.url=http4://localhost:8085
 clamp.config.policy.pap.userName=healthcheck
 clamp.config.policy.pap.password=zb!XztG34
 
-# TCA MicroService Policy request build properties
-#
-clamp.config.tca.policyid.prefix=DCAE.Config_
-clamp.config.tca.policy.template=classpath:/clds/templates/tca-policy-template.json
-clamp.config.tca.template=classpath:/clds/templates/tca-template.json
-clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json
-
-#
-#
-# Operational Policy request build properties
-#
-clamp.config.op.policyDescription=from CLAMP
-# default
-clamp.config.op.templateName=ClosedLoopControlName
-clamp.config.op.operationTopic=APPC-CL
-clamp.config.op.notificationTopic=POLICY-CL-MGT
-clamp.config.op.controller=amsterdam
-clamp.config.op.policy.appc=APPC
 #
 # Sdc service properties
 clamp.config.sdc.csarFolder = /tmp/sdc-controllers
-clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
-#
-clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
-#
-# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request
-clamp.config.action.test.override=false
-# if action.insert.test.event is true, then insert event even if the action is set to test
-clamp.config.action.insert.test.event=false
-clamp.config.clds.service.cache.invalidate.after.seconds=120
 
 #DCAE Inventory Url Properties
 clamp.config.dcae.inventory.url=http4://localhost:8085
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 695319d5b..e856743a8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -73,7 +73,7 @@ server.ssl.trust-store-password=enc:iDnPBBLq_EMidXlMa1FEuBR8TZzYxrCg66vq_XfLHdJ
 
 server.servlet.context-path=/
 #Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller
+spring.profiles.active=clamp-default,clamp-aaf-authentication,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller,legacy-operational-policy
 spring.http.converters.preferred-json-mapper=gson
 
 #The max number of active threads in this pool
@@ -143,12 +143,6 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
 clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
 clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
 
-# Properties for Clamp
-# DCAE request build properties
-#
-clamp.config.dcae.template=classpath:/clds/templates/dcae-template.json
-clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json
-#
 #
 # Configuration Settings for Policy Engine Components
 clamp.config.policy.api.url=http4://policy.api.simpledemo.onap.org:6969
@@ -158,36 +152,9 @@ clamp.config.policy.pap.url=http4://policy.api.simpledemo.onap.org:6969
 clamp.config.policy.pap.userName=healthcheck
 clamp.config.policy.pap.password=zb!XztG34
 
-# TCA MicroService Policy request build properties
-#
-clamp.config.tca.policyid.prefix=DCAE.Config_
-clamp.config.tca.policy.template=classpath:/clds/templates/tca-policy-template.json
-clamp.config.tca.template=classpath:/clds/templates/tca-template.json
-clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json
-
-#
-#
-# Operational Policy request build properties
-#
-clamp.config.op.policyDescription=from CLAMP
-# default
-clamp.config.op.templateName=ClosedLoopControlName
-clamp.config.op.operationTopic=APPC-CL
-clamp.config.op.notificationTopic=POLICY-CL-MGT
-clamp.config.op.controller=amsterdam
-clamp.config.op.policy.appc=APPC
 #
 # Sdc service properties
 clamp.config.sdc.csarFolder = /tmp/sdc-controllers
-clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
-#
-clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
-#
-# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request
-clamp.config.action.test.override=false
-# if action.insert.test.event is true, then insert event even if the action is set to test
-clamp.config.action.insert.test.event=false
-clamp.config.clds.service.cache.invalidate.after.seconds=120
 
 #DCAE Inventory Url Properties
 clamp.config.dcae.inventory.url=http4://dcae.api.simpledemo.onap.org:8080
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 3ed272e7c..fbf90712a 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -377,51 +377,56 @@
 					<split>
 						<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
 						</simple>
-						<setProperty propertyName="microServicePolicy">
+						<setProperty propertyName="policy">
 							<simple>${body}</simple>
 						</setProperty>
 						<log loggingLevel="INFO"
-							message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" />
+							message="Processing Micro Service Policy: ${exchangeProperty[policy].getName()}" />
 						<setProperty propertyName="raiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
 						</setProperty>
-						<to uri="direct:delete-micro-service-policy" />
-						<to uri="direct:create-micro-service-policy" />
+						<to uri="direct:delete-policy" />
+						<to uri="direct:create-policy" />
 					</split>
 					<log loggingLevel="INFO"
 						message="Processing all OPERATIONAL policies defined in loop ${exchangeProperty[loopObject].getName()}" />
 					<split>
 						<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
 						</simple>
-						<setProperty propertyName="operationalPolicy">
+						<setProperty propertyName="policy">
 							<simple>${body}</simple>
 						</setProperty>
 						<log loggingLevel="INFO"
-							message="Processing Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" />
+							message="Processing Operational Policy: ${exchangeProperty[policy].getName()}" />
 						<setProperty propertyName="raiseHttpExceptionFlag">
 							<simple resultType="java.lang.Boolean">false</simple>
 						</setProperty>
 
-						<to uri="direct:delete-operational-policy" />
-						<to uri="direct:create-operational-policy" />
-
-						<log loggingLevel="INFO"
-							message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-						<split>
-							<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-							</simple>
-							<setProperty propertyName="guardPolicy">
-								<simple>${body}</simple>
-							</setProperty>
-							<log loggingLevel="INFO"
-								message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
+						<to uri="direct:delete-policy" />
+						<to uri="direct:create-policy" />
+						<choice>
+							<when>
+								<simple>${exchangeProperty['policy'].isLegacy()} == true
+								</simple>
+								<log loggingLevel="INFO"
+									message="Processing all GUARD policies (LEGACY) defined in loop ${exchangeProperty[loopObject].getName()}" />
+								<split>
+									<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
+									</simple>
+									<setProperty propertyName="guardPolicy">
+										<simple>${body}</simple>
+									</setProperty>
+									<log loggingLevel="INFO"
+										message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
 
-							<setProperty propertyName="raiseHttpExceptionFlag">
-								<simple resultType="java.lang.Boolean">false</simple>
-							</setProperty>
-							<to uri="direct:delete-guard-policy" />
-							<to uri="direct:create-guard-policy" />
-						</split>
+									<setProperty propertyName="raiseHttpExceptionFlag">
+										<simple resultType="java.lang.Boolean">false</simple>
+									</setProperty>
+									<to uri="direct:delete-guard-policy" />
+									<to uri="direct:create-guard-policy" />
+								</split>
+							</when>
+						</choice>
 					</split>
 
 					<delay>
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
index afc5f952a..48e518da9 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/src/main/resources/clds/camel/routes/policy-flows.xml
@@ -183,6 +183,102 @@
 						</doFinally>
 				</doTry>
 		</route>
+		<route id="create-policy">
+			<from uri="direct:create-policy"/>
+			<doTry>
+				<log loggingLevel="INFO"
+					 message="Creating Policy: ${exchangeProperty[policy].getName()}"/>
+				<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
+				<setBody>
+					<simple>${exchangeProperty[policy].createPolicyPayload()}
+					</simple>
+				</setBody>
+				<setHeader headerName="CamelHttpMethod">
+					<constant>POST</constant>
+				</setHeader>
+				<setHeader headerName="Content-Type">
+					<constant>application/json</constant>
+				</setHeader>
+				<setHeader headerName="X-ONAP-RequestID">
+					<simple>${exchangeProperty[X-ONAP-RequestID]}
+					</simple>
+				</setHeader>
+				<setHeader headerName="X-ONAP-InvocationID">
+					<simple>${exchangeProperty[X-ONAP-InvocationID]}
+					</simple>
+				</setHeader>
+				<setHeader headerName="X-ONAP-PartnerName">
+					<simple>${exchangeProperty[X-ONAP-PartnerName]}
+					</simple>
+				</setHeader>
+				<log loggingLevel="INFO"
+					 message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies"></log>
+				<toD
+						uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+				<doFinally>
+					<to uri="direct:reset-raise-http-exception-flag"/>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+					<setProperty propertyName="logMessage">
+						<simple>${exchangeProperty[policy].getName()} creation
+							status
+						</simple>
+					</setProperty>
+					<setProperty propertyName="logComponent">
+						<simple>POLICY</simple>
+					</setProperty>
+					<to uri="direct:dump-loop-log-http-response"/>
+				</doFinally>
+			</doTry>
+		</route>
+
+		<route id="delete-policy">
+			<from uri="direct:delete-policy"/>
+			<doTry>
+				<log loggingLevel="INFO"
+					 message="Deleting Policy: ${exchangeProperty[policy].getName()}"/>
+				<to
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy')"/>
+				<setBody>
+					<constant>null</constant>
+				</setBody>
+				<setHeader headerName="CamelHttpMethod">
+					<constant>DELETE</constant>
+				</setHeader>
+				<setHeader headerName="X-ONAP-RequestID">
+					<simple>${exchangeProperty[X-ONAP-RequestID]}
+					</simple>
+				</setHeader>
+				<setHeader headerName="X-ONAP-InvocationID">
+					<simple>${exchangeProperty[X-ONAP-InvocationID]}
+					</simple>
+				</setHeader>
+				<setHeader headerName="X-ONAP-PartnerName">
+					<simple>${exchangeProperty[X-ONAP-PartnerName]}
+					</simple>
+				</setHeader>
+				<log loggingLevel="INFO"
+					 message="Endpoint to delete microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/1.0.0"></log>
+				<toD
+						uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+
+				<doFinally>
+					<to uri="direct:reset-raise-http-exception-flag"/>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+					<setProperty propertyName="logMessage">
+						<simple>${exchangeProperty[policy].getName()} removal
+							status
+						</simple>
+					</setProperty>
+					<setProperty propertyName="logComponent">
+						<simple>POLICY</simple>
+					</setProperty>
+					<to uri="direct:dump-loop-log-http-response"/>
+				</doFinally>
+			</doTry>
+		</route>
 		<route id="create-micro-service-policy">
 				<from uri="direct:create-micro-service-policy"/>
 				<doTry>
diff --git a/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java b/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
index c25415ecc..4bf2de030 100644
--- a/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/config/CldsReferencePropertiesItCase.java
@@ -24,17 +24,11 @@
 package org.onap.clamp.clds.it.config;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.google.gson.JsonElement;
-
 import java.io.IOException;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -57,37 +51,6 @@ public class CldsReferencePropertiesItCase {
         assertEquals("healthcheck", refProp.getStringValue("policy.api.userName"));
     }
 
-    @Test
-    public void shouldReturnJsonFromTemplate() throws IOException {
-        // when
-        JsonElement root = refProp.getJsonTemplate("ui.location.default");
-
-        // then
-        assertNotNull(root);
-        assertTrue(root.isJsonObject());
-        assertEquals("Data Center 1", root.getAsJsonObject().get("DC1").getAsString());
-    }
-
-    @Test
-    public void shouldReturnJsonFromTemplate_2() throws IOException {
-        // when
-        JsonElement root = refProp.getJsonTemplate("ui.location", "default");
-
-        // then
-        assertNotNull(root);
-        assertTrue(root.isJsonObject());
-        assertEquals("Data Center 1", root.getAsJsonObject().get("DC1").getAsString());
-    }
-
-    @Test
-    public void shouldReturnNullIfPropertyNotFound() throws IOException {
-        // when
-        JsonElement root = refProp.getJsonTemplate("ui.location", "");
-
-        // then
-        assertNull(root);
-    }
-
     /**
      * Test getting prop value as a JSON Node / template.
      *
@@ -95,12 +58,9 @@ public class CldsReferencePropertiesItCase {
      */
     @Test
     public void testGetFileContent() throws IOException {
-        String location = "{\n\t\"DC1\": \"Data Center 1\","
-                + "\n\t\"DC2\": \"Data Center 2\",\n\t\"DC3\": \"Data Center 3\"\n}\n";
-        String content = refProp.getFileContent("ui.location.default");
-        assertEquals(location, content);
+        String users = ResourceFileUtil.getResourceAsString("clds/clds-users.json");
+        assertEquals(users, refProp.getFileContent("files.cldsUsers"));
         // Test composite key
-        content = refProp.getFileContent("ui.location", "default");
-        assertEquals(location, content);
+        assertEquals(users, refProp.getFileContent("files", "cldsUsers"));
     }
 }
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index a1499f720..fd215dd39 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -34,9 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
 import javax.transaction.Transactional;
-
 import org.apache.commons.lang3.RandomStringUtils;
 import org.json.JSONException;
 import org.junit.Assert;
@@ -44,6 +42,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.onap.clamp.clds.Application;
+import org.onap.clamp.clds.config.LegacyOperationalPolicy;
 import org.onap.clamp.clds.exception.sdc.controller.BlueprintParserException;
 import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
 import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
@@ -74,7 +73,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
-@ActiveProfiles(profiles = "clamp-default,clamp-default-user,clamp-sdc-controller")
+@ActiveProfiles(profiles = "clamp-default,clamp-default-user,clamp-sdc-controller,legacy-operational-policy")
 public class CsarInstallerItCase {
 
     private static final String CSAR_ARTIFACT_NAME = "example/sdc/service_Vloadbalancerms_csar.csar";
@@ -160,6 +159,13 @@ public class CsarInstallerItCase {
         return csarHandler;
     }
 
+    @Test
+    @Transactional
+    public void testPolicyModelAddedAtStartup() {
+        assertThat(policyModelsRepository.findByPolicyModelType(
+                LegacyOperationalPolicy.OPERATIONAL_POLICY_LEGACY).get(0)).isNotNull();
+    }
+
     @Test
     @Transactional
     public void testGetPolicyModelYaml() throws IOException, SdcToscaParserException, CsarHandlerException {
diff --git a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
index 47b4b65c3..164625fef 100644
--- a/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopRepositoriesItCase.java
@@ -90,7 +90,8 @@ public class LoopRepositoriesItCase {
     }
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name, PolicyModel policyModel) {
-        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel, null, null, null);
+        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel,
+                null, null, null);
     }
 
     private LoopElementModel getLoopElementModel(String yaml, String name, String policyType, String createdBy,
@@ -105,11 +106,13 @@ public class LoopRepositoriesItCase {
         return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
     }
 
-    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation, String createdBy,
-                                         Integer maxInstancesAllowed) {
+    private LoopTemplate getLoopTemplates(String name, String blueprint, String svgRepresentation, String createdBy,
+                                          Integer maxInstancesAllowed) {
         LoopTemplate template = new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);
         template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "org.onap.policy.drools", createdBy,
                 getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools")));
+        template.addLoopElementModel(getLoopElementModel("yaml", "oppolicy1", "org.onap.policy.drools.legacy",
+                createdBy, getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "DroolsLegacy")));
         loopTemplateRepository.save(template);
         return template;
     }
@@ -123,7 +126,7 @@ public class LoopRepositoriesItCase {
         loop.setLastComputedState(LoopState.DESIGN);
         loop.setDcaeDeploymentId(dcaeId);
         loop.setDcaeDeploymentStatusUrl(dcaeUrl);
-        loop.setLoopTemplate(getLoopTemplate("templateName", "yaml", "svg", "toto", 1));
+        loop.setLoopTemplate(getLoopTemplates("templateName", "yaml", "svg", "toto", 1));
         return loop;
     }
 
@@ -149,7 +152,7 @@ public class LoopRepositoriesItCase {
         Loop loopTest = getLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
                 "123456789", "https://dcaetest.org", "UUID-blueprint");
         OperationalPolicy opPolicy = this.getOperationalPolicy("{\"type\":\"GUARD\"}", "GuardOpPolicyTest",
-                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools"));
+                getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "DroolsLegacy"));
         loopTest.addOperationalPolicy(opPolicy);
         MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "{\"configtype\":\"json\"}",
                 "{\"param1\":\"value1\"}", true, getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools"));
diff --git a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
index de2ef145a..6c7836e50 100644
--- a/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
+++ b/src/test/java/org/onap/clamp/loop/LoopToJsonTest.java
@@ -37,6 +37,7 @@ import java.util.Random;
 import org.junit.Test;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.loop.components.external.PolicyComponent;
 import org.onap.clamp.loop.log.LogType;
 import org.onap.clamp.loop.log.LoopLog;
 import org.onap.clamp.loop.service.Service;
@@ -45,6 +46,7 @@ import org.onap.clamp.loop.template.LoopTemplate;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 public class LoopToJsonTest {
 
@@ -52,7 +54,7 @@ public class LoopToJsonTest {
 
     private OperationalPolicy getOperationalPolicy(String configJson, String name) {
         return new OperationalPolicy(name, null, gson.fromJson(configJson, JsonObject.class),
-                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"), null, null, null);
+                getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "Drools", "type1"), null,null,null);
     }
 
     private Loop getLoop(String name, String svgRepresentation, String blueprint, String globalPropertiesJson,
diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
index 370c319b3..89d3e6172 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
@@ -24,9 +24,9 @@
 package org.onap.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-
 import java.io.IOException;
 import java.util.HashSet;
 import org.apache.camel.Exchange;
@@ -44,13 +44,13 @@ import org.onap.clamp.policy.operational.OperationalPolicy;
 public class PolicyComponentTest {
 
     /**
-    * Test the computeState method. 
-    * oldState           newState        expectedFinalState
-    * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
-    * NOT_SENT             SENT                NOT_SENT
-    * NOT_SENT           NOT_SENT              NOT_SENT
-    * NOT_SENT           IN_ERROR              IN_ERROR
-    */
+     * Test the computeState method.
+     * oldState           newState        expectedFinalState
+     * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
+     * NOT_SENT             SENT                NOT_SENT
+     * NOT_SENT           NOT_SENT              NOT_SENT
+     * NOT_SENT           IN_ERROR              IN_ERROR
+     */
     @Test
     public void computeStateTestOriginalStateUnknown() {
         Exchange exchange = Mockito.mock(Exchange.class);
@@ -81,14 +81,15 @@ public class PolicyComponentTest {
         ExternalComponentState state3 = policy.computeState(exchange);
         assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
     }
+
     /**
-    * Test the computeState method. 
-    * oldState           newState        expectedFinalState
-    * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
-    * NOT_SENT             SENT                NOT_SENT
-    * NOT_SENT           NOT_SENT              NOT_SENT
-    * NOT_SENT           IN_ERROR              IN_ERROR
-    */
+     * Test the computeState method.
+     * oldState           newState        expectedFinalState
+     * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
+     * NOT_SENT             SENT                NOT_SENT
+     * NOT_SENT           NOT_SENT              NOT_SENT
+     * NOT_SENT           IN_ERROR              IN_ERROR
+     */
     @Test
     public void computeStateTestOriginalStateNotSent() {
         Exchange exchange = Mockito.mock(Exchange.class);
@@ -124,13 +125,13 @@ public class PolicyComponentTest {
 
 
     /**
-    * Test the computeState method. 
-    * oldState           newState        expectedFinalState
-    * SENT                 SENT                SENT
-    * SENT          SENT_AND_DEPLOYED          SENT
-    * SENT              IN_ERROR              IN_ERROR
-    * SENT              NOT_SENT              NOT_SENT
-    */
+     * Test the computeState method.
+     * oldState           newState        expectedFinalState
+     * SENT                 SENT                SENT
+     * SENT          SENT_AND_DEPLOYED          SENT
+     * SENT              IN_ERROR              IN_ERROR
+     * SENT              NOT_SENT              NOT_SENT
+     */
     @Test
     public void computeStateTestOriginalStateSent() throws IOException {
         Exchange exchange = Mockito.mock(Exchange.class);
@@ -166,13 +167,13 @@ public class PolicyComponentTest {
     }
 
     /**
-    * Test the computeState method. 
-    * oldState                   newState        expectedFinalState
-    * SENT_AND_DEPLOYED     SENT_AND_DEPLOYED    SENT_AND_DEPLOYED
-    * SENT_AND_DEPLOYED            SENT                SENT
-    * SENT_AND_DEPLOYED          IN_ERROR            IN_ERROR
-    * SENT_AND_DEPLOYED          NOT_SENT            NOT_SENT
-    */
+     * Test the computeState method.
+     * oldState                   newState        expectedFinalState
+     * SENT_AND_DEPLOYED     SENT_AND_DEPLOYED    SENT_AND_DEPLOYED
+     * SENT_AND_DEPLOYED            SENT                SENT
+     * SENT_AND_DEPLOYED          IN_ERROR            IN_ERROR
+     * SENT_AND_DEPLOYED          NOT_SENT            NOT_SENT
+     */
     @Test
     public void computeStateTestOriginalStateSentAndDeployed() throws IOException {
         Exchange exchange = Mockito.mock(Exchange.class);
@@ -209,13 +210,13 @@ public class PolicyComponentTest {
 
 
     /**
-    * Test the computeState method. 
-    * oldState           newState        expectedFinalState
-    * IN_ERROR     SENT_AND_DEPLOYED         IN_ERROR
-    * IN_ERROR            SENT               IN_ERROR
-    * IN_ERROR          IN_ERROR             IN_ERROR
-    * IN_ERROR          NOT_SENT             IN_ERROR
-    */
+     * Test the computeState method.
+     * oldState           newState        expectedFinalState
+     * IN_ERROR     SENT_AND_DEPLOYED         IN_ERROR
+     * IN_ERROR            SENT               IN_ERROR
+     * IN_ERROR          IN_ERROR             IN_ERROR
+     * IN_ERROR          NOT_SENT             IN_ERROR
+     */
     @Test
     public void computeStateTestOriginalStateInError() throws IOException {
         Exchange exchange = Mockito.mock(Exchange.class);
@@ -265,7 +266,8 @@ public class PolicyComponentTest {
 
         PolicyModel policyModel2 = new PolicyModel("onap.policies.controlloop.Operational", null, "1.0.0");
         OperationalPolicy opPolicy = new OperationalPolicy("opPolicy", loopTest,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), policyModel2, null, "pdpGroup2", "pdpSubgroup2");
+                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), policyModel2, null, "pdpGroup2",
+                "pdpSubgroup2");
         loopTest.addOperationalPolicy(opPolicy);
 
         LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", "svg", 1, null);
diff --git a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
index d918a8e6d..b16aa558d 100644
--- a/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyModelServiceItCase.java
@@ -119,7 +119,7 @@ public class PolicyModelServiceItCase {
     /**
      * This tests a create Policy Model from Tosca.
      *
-     * @throws IOException
+     * @throws IOException In case of failure
      */
     @Test
     @Transactional
@@ -137,7 +137,7 @@ public class PolicyModelServiceItCase {
     /**
      * This tests a update Policy Model.
      *
-     * @throws IOException
+     * @throws IOException In case of failure
      */
     @Test
     @Transactional
diff --git a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
index 3f502ff78..2cd301850 100644
--- a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
@@ -68,9 +68,12 @@ public class PolicyEngineControllerTestItCase {
         Instant firstExecution = policyController.getLastInstantExecuted();
         assertThat(firstExecution).isNotNull();
         List<PolicyModel> policyModelsList = policyModelsRepository.findAll();
-        assertThat(policyModelsList.size()).isGreaterThanOrEqualTo(8);
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.Monitoring", null, "1.0.0"));
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.Operational", null, "1.0.0"));
+        assertThat(policyModelsList.size()).isGreaterThanOrEqualTo(5);
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.Drools", null, "1.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.Apex", null, "1.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.FrequencyLimiter", null, "1.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.Blacklist", null, "1.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.MinMax", null, "2.0.0"));
 
         // Re-do it to check that there is no issue with duplicate key
         policyController.synchronizeAllPolicies();
diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
index 5686bc161..4b8eee921 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.util.Map;
 import org.junit.Test;
 import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.policy.operational.LegacyOperationalPolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -38,10 +39,11 @@ import org.skyscreamer.jsonassert.JSONAssert;
 public class OperationalPolicyPayloadTest {
 
     @Test
-    public void testOperationalPolicyPayloadConstruction() throws IOException {
+    public void testOperationalPolicyLegacyPayloadConstruction() throws IOException {
         JsonObject jsonConfig = new GsonBuilder().create().fromJson(
                 ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig, null, null, null, null);
+        OperationalPolicy policy = new OperationalPolicy("testPolicy.legacy", null, jsonConfig,
+                new PolicyModel("onap.policies.controlloop.Operational.legacy","","1.0.0","test"), null,null,null);
 
         assertThat(policy.createPolicyPayloadYaml())
                 .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.yaml"));
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 5b921e9e3..e842abd4c 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -128,12 +128,6 @@ clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
 clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
 clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
 
-# Properties for Clamp
-# DCAE request build properties
-#
-clamp.config.dcae.template=classpath:/clds/templates/dcae-template.json
-clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json
-#
 #
 # Configuration Settings for Policy Engine Components
 clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host}
@@ -143,37 +137,9 @@ clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host}
 clamp.config.policy.pap.userName=healthcheck
 clamp.config.policy.pap.password=zb!XztG34
 
-# TCA MicroService Policy request build properties
-#
-clamp.config.tca.policyid.prefix=DCAE.Config_
-clamp.config.tca.policy.template=classpath:/clds/templates/tca-policy-template.json
-clamp.config.tca.template=classpath:/clds/templates/tca-template.json
-clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json
-
-#
-#
-# Operational Policy request build properties
-#
-clamp.config.op.policyDescription=from clds
-# default
-clamp.config.op.templateName=ClosedLoopControlName
-clamp.config.op.operationTopic=APPC-CL
-clamp.config.op.notificationTopic=POLICY-CL-MGT
-clamp.config.op.controller=amsterdam
-clamp.config.op.policy.appc=APPC
-#
 # Sdc service properties
 #
 clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
-clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
-#
-clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
-#
-# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request
-clamp.config.action.test.override=false
-# if action.insert.test.event is true, then insert event even if the action is set to test
-clamp.config.action.insert.test.event=false
-clamp.config.clds.service.cache.invalidate.after.seconds=120
 
 #DCAE Inventory Url Properties
 clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host}
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
index ab3b40e2f..4b27438cc 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
@@ -1,40 +1,19 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-  - onap.policies.Monitoring:
-      version: 1.0.0
-      description: A base policy type for all policies that govern monitoring provision
-      derived_from: tosca.policies.Root
-      properties:
-        # Omitted for brevity, see Section 1
-
-  - onap.policies.controlloop.Operational:
-      version: 1.0.0
-      description: Operational Policy for Control Loops
-      derived_from: tosca.policies.Root
-      properties:
-        # Omitted for brevity, see Section 1
-
-  - onap.policies.controloop.operational.Drools:
+  - onap.policies.controlloop.operational.Drools:
       version: 1.0.0
       description: Operational Policy for Control Loops using the Drools PDP
-      derived_from: onap.policies.controlloop.Operational
+      derived_from: onapy.policies.controlloop.Operational
       properties:
         # Omitted for brevity, see Section 1
 
-  - onap.policies.controloop.operational.Apex:
+  - onap.policies.controlloop.operational.Apex:
       version: 1.0.0
       description: Operational Policy for Control Loops using the APEX PDP
       derived_from: onap.policies.controlloop.Operational
       properties:
         # Omitted for brevity, see Section 1
 
-  - onap.policies.controlloop.Guard:
-      version: 1.0.0
-      description: Operational Policy for Control Loops
-      derived_from: tosca.policies.Root
-      properties:
-        # Omitted for brevity, see Section 1
-
   - onap.policies.controlloop.guard.FrequencyLimiter:
       version: 1.0.0
       description: Supports limiting the frequency of actions being taken by a Actor.
@@ -50,7 +29,7 @@ policy_types:
         # Omitted for brevity, see Section 1
 
   - onap.policies.controlloop.guard.MinMax:
-      version: 1.0.0
+      version: 2.0.0
       description: Supports Min/Max number of VF Modules
       derived_from: onap.policies.controlloop.Guard
       properties:
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index b0119f887..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index b0119f887..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index b0119f887..91a825212 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -1,158 +1,40 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
+   onap.policies.controlloop.Guard:
+      derived_from: tosca.policies.Root
+      version: 1.0.0
+      description: Guard Policies for Control Loop Operational Policies
+   onap.policies.controlloop.guard.Blacklist:
+      derived_from: onap.policies.controlloop.Guard
+      version: 1.0.0
+      description: Supports blacklist of VNF's from performing control loop actions on.
+      properties:
+         blacklist_policy:
+            type: map
+            description: null
+            entry_schema:
+               type: onap.datatypes.guard.Blacklist
 data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
+   onap.datatypes.guard.Blacklist:
+      derived_from: tosca.datatypes.Root
+      properties:
+         actor:
+            type: string
+            description: Specifies the Actor
+            required: true
+         recipe:
+            type: string
+            description: Specified the Recipe
+            required: true
+         time_range:
+            type: tosca.datatypes.TimeInterval
+            description: An optional range of time during the day the blacklist is valid for.
+            required: false
+         controlLoopName:
+            type: string
+            description: An optional specific control loop to apply this guard to.
+            required: false
+         blacklist:
+            type: list
+            description: List of VNF's
+            required: true
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index b0119f887..45e5471fc 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -1,158 +1,50 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
+   onap.policies.controlloop.Guard:
+      derived_from: tosca.policies.Root
+      version: 1.0.0
+      description: Guard Policies for Control Loop Operational Policies
+   onap.policies.controlloop.guard.FrequencyLimiter:
+      derived_from: onap.policies.controlloop.Guard
+      version: 1.0.0
+      description: Supports limiting the frequency of actions being taken by a Actor.
+      properties:
+         frequency_policy:
+            type: map
+            description: null
+            entry_schema:
+               type: onap.datatypes.guard.FrequencyLimiter
 data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
+   onap.datatypes.guard.FrequencyLimiter:
+      derived_from: tosca.datatypes.Root
+      properties:
+         actor:
+            type: string
+            description: Specifies the Actor
+            required: true
+         recipe:
+            type: string
+            description: Specified the Recipe
+            required: true
+         time_window:
+            type: scalar-unit.time
+            description: The time window to count the actions against.
+            required: true
+         limit:
+            type: integer
+            description: The limit
+            required: true
+            constraints:
+            -  greater_than: 0
+         time_range:
+            type: tosca.datatypes.TimeInterval
+            description: An optional range of time during the day the frequency is valid for.
+            required: false
+         controlLoopName:
+            type: string
+            description: An optional specific control loop to apply this guard to.
+            required: false
+         target:
+            type: string
+            description: An optional specific VNF to apply this guard to.
+            required: false
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index b0119f887..54c4204e2 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -1,158 +1,44 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
+   onap.policies.controlloop.Guard:
+      derived_from: tosca.policies.Root
+      version: 1.0.0
+      description: Guard Policies for Control Loop Operational Policies
+   onap.policies.controlloop.guard.MinMax:
+      derived_from: onap.policies.controlloop.Guard
+      version: 1.0.0
+      description: Supports Min/Max number of VF Modules
+      properties:
+         minmax_policy:
+            type: map
+            description: null
+            entry_schema:
+               type: onap.datatypes.guard.MinMax
 data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
+   onap.datatypes.guard.MinMax:
+      derived_from: tosca.datatypes.Root
+      properties:
+         actor:
+            type: string
+            description: Specifies the Actor
+            required: true
+         recipe:
+            type: string
+            description: Specified the Recipe
+            required: true
+         time_range:
+            type: tosca.datatypes.TimeInterval
+            description: An optional range of time during the day the Min/Max limit is valid for.
+            required: false
+         controlLoopName:
+            type: string
+            description: An optional specific control loop to apply this guard to.
+            required: false
+         min_vf_module_instances:
+            type: integer
+            required: true
+            description: The minimum instances of this VF-Module
+         max_vf_module_instances:
+            type: integer
+            required: false
+            description: The maximum instances of this VF-Module
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index b0119f887..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index b0119f887..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controloop.operational.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index b0119f887..5fa4308db 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -1,158 +1,159 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
+   onap.policies.Monitoring:
+      derived_from: tosca.policies.Root
+      version: 1.0.0
+      description: a base policy type for all policies that govern monitoring provisioning
+   onap.policies.monitoring.cdap.tca.hi.lo.app:
+      derived_from: onap.policies.Monitoring
+      version: 1.0.0
+      properties:
+         tca_policy:
+            type: map
+            description: TCA Policy JSON
+            entry_schema:
+               type: onap.datatypes.monitoring.tca_policy
 data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
+   onap.datatypes.monitoring.metricsPerEventName:
+      derived_from: tosca.datatypes.Root
+      properties:
+         controlLoopSchemaType:
+            type: string
+            required: true
+            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
+            constraints:
+            -  valid_values:
+               - VM
+               - VNF
+         eventName:
+            type: string
+            required: true
+            description: Event name to which thresholds need to be applied
+         policyName:
+            type: string
+            required: true
+            description: TCA Policy Scope Name
+         policyScope:
+            type: string
+            required: true
+            description: TCA Policy Scope
+         policyVersion:
+            type: string
+            required: true
+            description: TCA Policy Scope Version
+         thresholds:
+            type: list
+            required: true
+            description: Thresholds associated with eventName
+            entry_schema:
+               type: onap.datatypes.monitoring.thresholds
+   onap.datatypes.monitoring.tca_policy:
+      derived_from: tosca.datatypes.Root
+      properties:
+         domain:
+            type: string
+            required: true
+            description: Domain name to which TCA needs to be applied
+            default: measurementsForVfScaling
+            constraints:
+            -  equal: measurementsForVfScaling
+         metricsPerEventName:
+            type: list
+            required: true
+            description: Contains eventName and threshold details that need to be applied to given eventName
+            entry_schema:
+               type: onap.datatypes.monitoring.metricsPerEventName
+   onap.datatypes.monitoring.thresholds:
+      derived_from: tosca.datatypes.Root
+      properties:
+         closedLoopControlName:
+            type: string
+            required: true
+            description: Closed Loop Control Name associated with the threshold
+         closedLoopEventStatus:
+            type: string
+            required: true
+            description: Closed Loop Event Status of the threshold
+            constraints:
+            -  valid_values:
+               - ONSET
+               - ABATED
+         direction:
+            type: string
+            required: true
+            description: Direction of the threshold
+            constraints:
+            -  valid_values:
+               - LESS
+               - LESS_OR_EQUAL
+               - GREATER
+               - GREATER_OR_EQUAL
+               - EQUAL
+         fieldPath:
+            type: string
+            required: true
+            description: Json field Path as per CEF message which needs to be analyzed for TCA
+            constraints:
+            -  valid_values:
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
+               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
+               - $.event.measurementsForVfScalingFields.meanRequestLatency
+               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
+               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
+               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
+               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
+               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
+               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
+         severity:
+            type: string
+            required: true
+            description: Threshold Event Severity
+            constraints:
+            -  valid_values:
+               - CRITICAL
+               - MAJOR
+               - MINOR
+               - WARNING
+               - NORMAL
+         thresholdValue:
+            type: integer
+            required: true
+            description: Threshold value for the field Path inside CEF message
+         version:
+            type: string
+            required: true
+            description: Version number associated with the threshold
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-payload.json b/src/test/resources/tosca/operational-policy-payload.json
index bfb109ec1..033eecd17 100644
--- a/src/test/resources/tosca/operational-policy-payload.json
+++ b/src/test/resources/tosca/operational-policy-payload.json
@@ -1,4 +1,4 @@
 {
-  "policy-id": "testPolicy",
+  "policy-id": "testPolicy.legacy",
   "content": "controlLoop%3A%0A++abatement%3A+true%0A++controlLoopName%3A+LOOP_ASJOy_v1_0_ResourceInstanceName1_tca%0A++timeout%3A+0%0A++trigger_policy%3A+policy1%0Apolicies%3A%0A-+actor%3A+APPC%0A++failure%3A+policy2%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy1%0A++payload%3A%0A++++configurationParameters%3A+%27%5B%7B%22ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B10%5D.value%22%2C%22oam-ip-addr%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B15%5D.value%22%2C%22enabled%22%3A%22%24.vf-module-topology.vf-module-parameters.param%5B22%5D.value%22%7D%5D%27%0A++++requestParameters%3A+%27%7B%22usePreload%22%3Atrue%2C%22userParams%22%3A%5B%5D%7D%27%0A++recipe%3A+Restart%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++resourceID%3A+vLoadBalancerMS%0A++++type%3A+VNF%0A++timeout%3A+0%0A-+actor%3A+SO%0A++failure%3A+final_failure%0A++failure_exception%3A+final_failure_exception%0A++failure_guard%3A+final_failure_guard%0A++failure_retries%3A+final_failure_retries%0A++failure_timeout%3A+final_failure_timeout%0A++id%3A+policy2%0A++recipe%3A+VF+Module+Create%0A++retry%3A+0%0A++success%3A+final_success%0A++target%3A%0A++++modelCustomizationId%3A+1bffdc31-a37d-4dee-b65c-dde623a76e52%0A++++modelInvariantId%3A+ca052563-eb92-4b5b-ad41-9111768ce043%0A++++modelName%3A+Vloadbalancerms..vpkg..module-1%0A++++modelVersion%3A+1%0A++++modelVersionId%3A+1e725ccc-b823-4f67-82b9-4f4367070dbc%0A++++resourceID%3A+Vloadbalancerms..vpkg..module-1%0A++++type%3A+VFMODULE%0A++timeout%3A+0%0A"
 }
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-payload.yaml b/src/test/resources/tosca/operational-policy-payload.yaml
index ed03842f5..4e667e59b 100644
--- a/src/test/resources/tosca/operational-policy-payload.yaml
+++ b/src/test/resources/tosca/operational-policy-payload.yaml
@@ -1,11 +1,11 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 topology_template:
   policies:
-  - testPolicy:
+  - testPolicy.legacy:
       type: onap.policies.controlloop.Operational
       version: 1.0.0
       metadata:
-        policy-id: testPolicy
+        policy-id: testPolicy.legacy
       properties:
         controlLoop:
           timeout: '0'
diff --git a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
index 5b0dc1e01..29422a1f5 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
@@ -9,11 +9,7 @@ export default class LoopComponentConverter {
 		}
 		if (typeof (loopCache.getOperationalPolicies()) !== "undefined") {
 			loopCache.getOperationalPolicies().forEach(op => {
-				if (op.name.includes("legacy")) {
-					componentsMap.set(op.name,"/operationalPolicyModal");
-				} else {
-					componentsMap.set(op.name, "/policyModal/OPERATIONAL-POLICY/"+op.name);
-				}
+				componentsMap.set(op.name, "/policyModal/OPERATIONAL-POLICY/"+op.name);
 			})
 		}
 		return componentsMap;
-- 
cgit 1.2.3-korg


From 5032095d221292ad2909f0cb9c9c99d3d5111d0c Mon Sep 17 00:00:00 2001
From: drveerendra <vrajasekharaiah@att.com>
Date: Wed, 4 Mar 2020 20:30:44 -0500
Subject: Adding manage dictionary UI feature

Adding manage dictionaries.js, its test file and respective changes in
loopui, menu js files

Issue-ID: CLAMP-589
Change-Id: Ib0440a7a966f3736682d2964e3329e08c91578d3
Signed-off-by: drveerendra <vrajasekharaiah@att.com>
---
 ui-react/src/LoopUI.js                             |   2 +
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   4 +
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   4 +
 ui-react/src/api/TemplateService.js                | 173 ++++++-
 .../ManageDictionaries/ManageDictionaries.js       | 559 +++++++++++++++++++++
 .../ManageDictionaries/ManageDictionaries.test.js  | 202 ++++++++
 .../__snapshots__/ManageDictionaries.test.js.snap  | 195 +++++++
 ui-react/src/components/menu/MenuBar.js            |   3 +
 .../menu/__snapshots__/MenuBar.test.js.snap        |  55 ++
 9 files changed, 1180 insertions(+), 17 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
 create mode 100644 ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
 create mode 100644 ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 471e87200..bc3f2355e 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -49,6 +49,7 @@ import LoopService from './api/LoopService';
 import UploadToscaPolicyModal from './components/dialogs/Tosca/UploadToscaPolicyModal';
 import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal';
 import ViewLoopTemplatesModal from './components/dialogs/Tosca/ViewLoopTemplatesModal';
+import ManageDictionaries from './components/dialogs/ManageDictionaries/ManageDictionaries';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoopModal from './components/dialogs/Loop/DeployLoopModal';
@@ -255,6 +256,7 @@ export default class LoopUI extends React.Component {
 				<Route path="/uploadToscaPolicyModal" render={(routeProps) => (<UploadToscaPolicyModal {...routeProps} />)} />
 				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
 				<Route path="/ViewLoopTemplatesModal" render={(routeProps) => (<ViewLoopTemplatesModal {...routeProps} />)} />
+				<Route path="/ManageDictionaries" render={(routeProps) => (<ManageDictionaries {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
 					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
 				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 7d2c4467e..9de232dd6 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -16,6 +16,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/ViewLoopTemplatesModal"
     render={[Function]}
   />
+  <Route
+    path="/ManageDictionaries"
+    render={[Function]}
+  />
   <Route
     path="/operationalPolicyModal"
     render={[Function]}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index e195523b9..91812b7c5 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -41,6 +41,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/ViewLoopTemplatesModal"
       render={[Function]}
     />
+    <Route
+      path="/ManageDictionaries"
+      render={[Function]}
+    />
     <Route
       path="/operationalPolicyModal"
       render={[Function]}
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index 6a65d9a04..124d29c27 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -38,20 +38,159 @@ export default class TemplateService {
 			});
 	}
 
-  static getBlueprintMicroServiceTemplates() {
-    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
-      .then(function (response) {
-        console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
-        if (response.ok) {
-          return response.json();
-        } else {
-          console.error("getBlueprintMicroServiceTemplates query failed");
-          return {};
-        }
-      })
-      .catch(function (error) {
-        console.error("getBlueprintMicroServiceTemplates error received", error);
-        return {};
-      });
-  }
-}
+	static getBlueprintMicroServiceTemplates() {
+	    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
+	        .then(function (response) {
+	            console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
+	            if (response.ok) {
+	                return response.json();
+	            } else {
+	                console.error("getBlueprintMicroServiceTemplates query failed");
+	                return {};
+	            }
+	        })
+	        .catch(function (error) {
+	            console.error("getBlueprintMicroServiceTemplates error received", error);
+	            return {};
+	        });
+	    }
+	
+	static getDictionary() {
+	    return fetch('restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', })
+	      .then(function (response) {
+	        console.debug("getDictionary response received: ", response.status);
+	        if (response.ok) {
+	          return response.json();
+	        } else {
+	          console.error("getDictionary query failed");
+	          return {};
+	        }
+	      })
+	      .catch(function (error) {
+	        console.error("getDictionary error received", error);
+	        return {};
+	      });
+	  }
+
+	  static getDictionaryElements(dictionaryName) {
+	    return fetch('restservices/clds/v2/dictionary/' + dictionaryName, {
+	      method: 'GET',
+	      headers: {
+	        "Content-Type": "application/json",
+	      },
+	      credentials: 'same-origin',
+	    })
+	      .then(function (response) {
+	        console.debug("getDictionaryElements response received: ", response.status);
+	        if (response.ok) {
+	          return response.json();
+	        } else {
+	          console.error("getDictionaryElements query failed");
+	          return {};
+	        }
+	      })
+	      .catch(function (error) {
+	        console.error("getDictionaryElements error received", error);
+	        return {};
+	      });
+	  }
+
+	  static insDictionary(jsonData) {
+	    console.log("dictionaryName is", jsonData.name)
+	    return fetch('/restservices/clds/v2/dictionary/', {
+	      method: 'PUT',
+	      credentials: 'same-origin',
+	      headers: {
+	        "Content-Type": "application/json",
+	      },
+	      body: JSON.stringify(jsonData)
+	    })
+	      .then(function (response) {
+	        console.debug("insDictionary response received: ", response.status);
+	        if (response.ok) {
+	          return response.status;
+	        } else {
+	          var errorMessage = response.status;
+	          console.error("insDictionary query failed", response.status);
+	          return errorMessage;
+	        }
+	      })
+	      .catch(function (error) {
+	        console.error("insDictionary error received", error);
+	        return "";
+	      });
+	  }
+
+	  static insDictionaryElements(jsonData) {
+	    console.log("dictionaryName is", jsonData.name)
+	    return fetch('/restservices/clds/v2/dictionary/' + jsonData.name, {
+	      method: 'PUT',
+	      credentials: 'same-origin',
+	      headers: {
+	        "Content-Type": "application/json",
+	      },
+	      body: JSON.stringify(jsonData)
+	    })
+	      .then(function (response) {
+	        console.debug("insDictionary response received: ", response.status);
+	        if (response.ok) {
+	          return response.status;
+	        } else {
+	          var errorMessage = response.status;
+	          console.error("insDictionary query failed", response.status);
+	          return errorMessage;
+	        }
+	      })
+	      .catch(function (error) {
+	        console.error("insDictionary error received", error);
+	        return "";
+	      });
+	  }
+
+	  static deleteDictionary(dictionaryName) {
+	    console.log("inside templaemenu service", dictionaryName)
+	    return fetch('restservices/clds/v2/dictionary/' + dictionaryName, {
+	      method: 'DELETE',
+	      headers: {
+	        "Content-Type": "application/json",
+	      },
+	      credentials: 'same-origin',
+	    })
+	      .then(function (response) {
+	        console.debug("deleteDictionary response received: ", response.status);
+	        if (response.ok) {
+	          return response.status;
+	        } else {
+	          console.error("deleteDictionary query failed");
+	          return {};
+	        }
+	      })
+	      .catch(function (error) {
+	        console.error("deleteDictionary error received", error);
+	        return {};
+	      });
+	  }
+
+	  static deleteDictionaryElements(dictionaryData) {
+	    return fetch('restservices/clds/v2/dictionary/' + dictionaryData.name + '/elements/' + dictionaryData.shortName , {
+	      method: 'DELETE',
+	      headers: {
+	        "Content-Type": "application/json",
+	      },
+	      credentials: 'same-origin',
+	    })
+	      .then(function (response) {
+	        console.debug("deleteDictionary response received: ", response.status);
+	        if (response.ok) {
+	          return response.status;
+	        } else {
+	          console.error("deleteDictionary query failed");
+	          return {};
+	        }
+	      })
+	      .catch(function (error) {
+	        console.error("deleteDictionary error received", error);
+	        return {};
+	      });
+	  }
+    }
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
new file mode 100644
index 000000000..189523765
--- /dev/null
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -0,0 +1,559 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+
+import React from 'react';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import TemplateMenuService from '../../../api/TemplateService';
+import MaterialTable, {MTableToolbar} from "material-table";
+import IconButton from '@material-ui/core/IconButton';
+import Tooltip from '@material-ui/core/Tooltip';
+import Grid from '@material-ui/core/Grid';
+import { forwardRef }  from 'react';
+import AddBox from '@material-ui/icons/AddBox';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import Check from '@material-ui/icons/Check';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import VerticalAlignTopIcon from '@material-ui/icons/VerticalAlignTop';
+import VerticalAlignBottomIcon from '@material-ui/icons/VerticalAlignBottom';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import DeleteOutline from '@material-ui/icons/DeleteOutline';
+import Edit from '@material-ui/icons/Edit';
+import FilterList from '@material-ui/icons/FilterList';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Remove from '@material-ui/icons/Remove';
+import Search from '@material-ui/icons/Search';
+import ViewColumn from '@material-ui/icons/ViewColumn';
+
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const cellStyle = { border: '1px solid black' };
+const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
+const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+var dictList = [];
+
+function SelectSubDictType(props) {
+	const {onChange} = props;
+	const selectedValues = (e) => {
+		var options = e.target.options;
+		var SelectedDictTypes = '';
+		for (var dictType = 0, values = options.length; dictType < values; dictType++) {
+			if (options[dictType].selected) {
+				SelectedDictTypes = SelectedDictTypes.concat(options[dictType].value);
+				SelectedDictTypes = SelectedDictTypes.concat('|');
+			}
+		}
+		SelectedDictTypes = SelectedDictTypes.slice(0,-1);
+		onChange(SelectedDictTypes);
+	}
+	return(
+		<div>
+			<select multiple={true}  onChange={selectedValues}>
+				<option value="string">string</option>
+				<option value="number">number</option>
+				<option value="datetime">datetime</option>
+				<option value="map">map</option>
+				<option value="json">json</option>
+			</select>
+		</div>
+	)
+}
+
+function SubDict(props) {
+	const {onChange} = props;
+	const subDicts = [];
+	subDicts.push('Default');
+	for(var item in dictList) {
+		if(dictList[item].secondLevelDictionary === 1) {
+			subDicts.push(dictList[item].name);
+		}
+	};
+	subDicts.push('');
+ 	var optionItems = subDicts.map(
+		(item) => <option key={item}>{item}</option>
+	  );
+ 	function selectedValue (e) {
+		onChange(e.target.value);
+	}
+	return(
+		<select onChange={selectedValue} >
+			{optionItems}
+		</select>
+	)
+}
+
+export default class ManageDictionaries extends React.Component {
+	constructor(props, context) {
+		super(props, context);
+		this.handleClose = this.handleClose.bind(this);
+		this.getDictionary = this.getDictionary.bind(this);
+		this.getDictionaryElements = this.getDictionaryElements.bind(this);
+		this.clickHandler = this.clickHandler.bind(this);
+		this.addDictionary = this.addDictionary.bind(this);
+		this.deleteDictionary = this.deleteDictionary.bind(this);
+		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
+		this.state = {
+			show: true,
+			selectedFile: '',
+			dictNameFlag: false,
+			exportFilename: '',
+			content: null,
+			newDict: '',
+			newDictItem: '',
+			delDictItem: '',
+			addDict: false,
+			delData: '',
+			delDict: false,
+			validImport: false,
+			dictionaryNames: [],
+			dictionaryElements: [],
+      tableIcons: {
+		Add: forwardRef((props, ref) => <AddBox {...props} ref={ref} />),
+        Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
+        Clear: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+        Delete: forwardRef((props, ref) => <DeleteOutline {...props} ref={ref} />),
+        DetailPanel: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+        Edit: forwardRef((props, ref) => <Edit {...props} ref={ref} />),
+        Export: forwardRef((props, ref) => <VerticalAlignBottomIcon {...props} ref={ref} />),
+        Filter: forwardRef((props, ref) => <FilterList {...props} ref={ref} />),
+        FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+        LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+        NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+        PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+        ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+        Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+        SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />),
+        ThirdStateCheck: forwardRef((props, ref) => <Remove {...props} ref={ref} />),
+        ViewColumn: forwardRef((props, ref) => <ViewColumn {...props} ref={ref} />)
+      },
+			dictColumns: [
+				{
+					title: "Dictionary Name", field: "name",editable: 'onAdd',
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+				{
+					title: "Sub Dictionary ?", field: "secondLevelDictionary", lookup: {0: 'No', 1: 'Yes'},
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+				{
+					title: "Dictionary Type", field: "subDictionaryType",lookup: {string: 'string', number: 'number'},
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+				{
+					title: "Updated By", field: "updatedBy", editable: 'never',
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+				{
+					title: "Last Updated Date", field: "updatedDate", editable: 'never',
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				}
+			],
+			dictElementColumns: [
+				{
+					title: "Element Short Name", field: "shortName",editable: 'onAdd',
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+        {
+					title: "Element Name", field: "name",
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+				{
+					title: "Element Description", field: "description",
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				 },
+				 {
+					title: "Element Type", field: "type",
+					editComponent: props => (
+						<div>
+							<SelectSubDictType  value={props.value} onChange={props.onChange} />
+						</div>
+					),
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				 },
+				 {  
+				    title: "Sub-Dictionary", field: "subDictionary",
+				      editComponent: props => (
+						 <div>
+							 <SubDict  value={props.value} onChange={props.onChange} />
+						 </div>
+				      ),
+				    cellStyle: cellStyle,
+				    headerStyle: headerStyle
+				 },
+				{     
+					title: "Updated By", field: "updatedBy", editable: 'never',
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				},
+				{
+					title: "Updated Date", field: "updatedDate", editable: 'never',
+					cellStyle: cellStyle,
+					headerStyle: headerStyle
+				}
+			]
+		}
+	}
+
+	componentWillMount() {
+        this.getDictionary();
+    }
+
+    getDictionary() {
+        TemplateMenuService.getDictionary().then(dictionaryNames => {
+            this.setState({ dictionaryNames: dictionaryNames })
+        });
+        var dictNamesingetDict = this.state.dictionaryNames;
+    }
+
+    getDictionaryElements(dictionaryName) {
+        TemplateMenuService.getDictionaryElements(dictionaryName).then(dictionaryElements => {
+            dictList = this.state.dictionaryNames;
+            this.setState({ dictionaryElements: dictionaryElements.dictionaryElements});
+        });
+    }
+
+    clickHandler(rowData)   {
+        this.setState({
+            dictNameFlag: false,
+            addDict: false,
+    });
+    }
+
+    handleClose() {
+        this.setState({ show: false });
+        this.props.history.push('/');
+    }
+
+    addDictionary() {
+        var modifiedData = [];
+        if(this.state.newDict !== '') {
+            modifiedData = this.state.newDict;
+        } else {
+            modifiedData = {"name": this.state.dictionaryName, 'dictionaryElements': this.state.newDictItem};
+        }
+        if(this.state.newDictItem === '') {
+            TemplateMenuService.insDictionary(modifiedData).then(resp => {
+            });
+        } else {
+            TemplateMenuService.insDictionaryElements(modifiedData).then(resp => {
+            });
+        }
+    }
+
+    deleteDictionary() {
+        var modifiedData = [];
+        if(this.state.delData !== '') {
+            modifiedData = this.state.delData.name;
+        } else {
+            modifiedData = {"name": this.state.dictionaryName, "shortName": this.state.delDictItem.shortName};
+        }
+        if(this.state.delDictItem === '') {
+            TemplateMenuService.deleteDictionary(modifiedData).then(resp => {
+            });
+        } else {
+            TemplateMenuService.deleteDictionaryElements(modifiedData).then(resp => {
+            });
+        }
+    }
+
+    fileSelectedHandler = (event) => {
+        const text = this;
+        var dictionaryElements = [];
+        if (event.target.files[0].type === 'text/csv' ) {
+            if (event.target.files && event.target.files[0]) {
+                let reader = new FileReader();
+                reader.onload = function(e) {
+                    var dictElems = reader.result.split('\n');
+                    var jsonObj = [];
+                    var headers = dictElems[0].split(',');
+                    for(var i = 0; i < dictElems.length; i++) {
+                        var data = dictElems[i].split(',');
+                        var obj = {};
+                        for(var j = 0; j < data.length; j++) {
+                            obj[headers[j].trim()] = data[j].trim();
+                        }
+                        jsonObj.push(obj);
+                    }
+                    JSON.stringify(jsonObj);
+                    const dictKeys = ['Element Short Name','Element Name','Element Description','Element Type','Sub-Dictionary'];
+                    const mandatoryKeys = [ 'Element Short Name', 'Element Name', 'Element Type' ];
+                    const validTypes = ['string','number','datetime','json','map'];
+                    if (!dictElems){
+                        
+                        text.setState({validData: false});
+                    } else if (headers.length !== dictKeys.length){
+                        text.setState({validImport: false});
+                    } else {
+                        var subDictionaries = [];
+                        for(var item in dictList) {
+                            if(dictList[item].secondLevelDictionary === 1) {
+                                subDictionaries.push(dictList[item].name);
+                            }
+                        };
+                        subDictionaries = subDictionaries.toString();
+                        var row = 0;
+                        for (var dictElem of jsonObj){
+                            ++row;
+                            for (var itemKey in dictElem){
+                                var value = dictElem[itemKey].trim();
+                                if (dictKeys.indexOf(itemKey) < 0){
+                                    var errorMessage = 'unknown field name of, ' + itemKey + ', found in CSV header';
+                                    text.setState({validImport: false});
+                                    alert(errorMessage);
+                                    break;
+                                } else if (value === "" && mandatoryKeys.indexOf(itemKey) >= 0){
+                                    errorMessage = 'value for ' + itemKey + ', at row #, ' + row + ', is empty but required';
+                                    text.setState({validImport: false});
+                                    alert(errorMessage);
+                                    break;
+                                } else if (itemKey === 'Element Type' && validTypes.indexOf(value) < 0 && row > 1) {
+                                    errorMessage = 'invalid dictElemenType of ' + value + ' at row #' + row;
+                                    text.setState({validImport: false});
+                                    alert(errorMessage);
+                                    break;
+                                } else if (value !== "" && itemKey === 'Sub-Dictionary' && subDictionaries.indexOf(value) < 0 && row > 1) {
+                                    errorMessage = 'invalid subDictionary of ' + value + ' at row #' + row;
+                                    text.setState({validImport: false});
+                                    alert(errorMessage);
+                                }
+                            }
+                        }
+                    }
+                    const headerKeys = ['shortName','name','description','type','subDictionary'];
+
+                    for(i = 1; i < dictElems.length; i++) {
+                        data = dictElems[i].split(',');
+                        obj = {};
+                        for(j = 0; j < data.length; j++) {
+                            obj[headerKeys[j].trim()] = data[j].trim();
+                        }
+                        dictionaryElements.push(obj);
+                    }
+                    text.setState({newDictItem: dictionaryElements, addDict: true});
+                }
+                reader.readAsText(event.target.files[0]);
+            }
+            this.setState({selectedFile: event.target.files[0]})
+        } else {
+            text.setState({validImport: false});
+            alert('Please upload .csv extention files only.');
+        }
+
+    }
+    
+    render() {
+        return (
+            <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+                <Modal.Header closeButton>
+                    <Modal.Title>Manage Dictionaries</Modal.Title>
+                </Modal.Header>
+                <Modal.Body>
+                    {!this.state.dictNameFlag? <MaterialTable
+                        title={"Dictionary List"}
+                        data={this.state.dictionaryNames}
+                        columns={this.state.dictColumns}
+                        icons={this.state.tableIcons}
+                        onRowClick={(event, rowData) => {this.getDictionaryElements(rowData.name);this.setState({dictNameFlag: true, exportFilename: rowData.name, dictionaryName: rowData.name})}}
+                        options={{
+                            headerStyle: rowHeaderStyle,
+                        }}
+                        editable={{
+                            onRowAdd: newData =>
+                            new Promise((resolve, reject) => {
+                                setTimeout(() => {
+                                    {
+                                        const dictionaryNames = this.state.dictionaryNames;
+                                        var validData =  true;
+                                        if(/[^a-zA-Z0-9-_.]/.test(newData.name)) {
+                                            validData = false;
+                                            alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
+                                        }
+                                        for (var i = 0; i < this.state.dictionaryNames.length; i++) {
+                                            if (this.state.dictionaryNames[i].name === newData.name) {
+                                                validData = false;
+                                                alert(newData.name + ' dictionary name already exists')
+                                            }
+                                        }
+                                        if(validData){
+                                            dictionaryNames.push(newData);
+                                            this.setState({ dictionaryNames }, () => resolve());
+                                            this.setState({addDict: true, newDict: newData});
+                                        }
+                                    }
+                                    resolve();
+                                }, 1000);
+                            }),
+                            onRowUpdate: (newData, oldData) =>
+                            new Promise((resolve, reject) => {
+                                setTimeout(() => {
+                                    {
+                                        const dictionaryNames = this.state.dictionaryNames;
+                                        var validData =  true;
+                                        if(/[^a-zA-Z0-9-_.]/.test(newData.name)) {
+                                            validData = false;
+                                            alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
+                                        }
+                                        if(validData){
+                                            const index = dictionaryNames.indexOf(oldData);
+                                            dictionaryNames[index] = newData;
+                                            this.setState({ dictionaryNames }, () => resolve());
+                                            this.setState({addDict: true, newDict: newData});
+                                        }
+                                    }
+                                    resolve();
+                                }, 1000);
+                            }),
+                            onRowDelete: oldData =>
+                new Promise((resolve, reject) => {
+                                setTimeout(() => {
+                                    {
+                                        let data = this.state.dictionaryNames;
+                    const index = data.indexOf(oldData);
+                    data.splice(index, 1);
+                    this.setState({ data }, () => resolve());
+                                        this.setState({delDict: true, delData: oldData})
+                    }
+                    resolve()
+                }, 1000)
+                })
+                        }}
+                        />:""
+                    }
+                    {this.state.dictNameFlag? <MaterialTable
+                        title={"Dictionary Elements List"}
+                        data={this.state.dictionaryElements}
+                        columns={this.state.dictElementColumns}
+                        icons={this.state.tableIcons}
+                        options={{
+                            exportButton: true,
+                            exportFileName: this.state.exportFilename,
+                            headerStyle:{backgroundColor:'white',  fontSize: '15pt', text: 'bold', border: '1px solid black'}
+                        }}
+                        components={{
+                            Toolbar: props => (
+                                <div>
+                                    <MTableToolbar {...props} />
+                                <div>
+                                    <Grid item container xs={12} alignItems="flex-end" direction="column" justify="flex-end">
+                                        <Tooltip title="Import" placement = "bottom">
+                                            <IconButton aria-label="import" onClick={() => this.fileUpload.click()}>
+                                                <VerticalAlignTopIcon />
+                                            </IconButton>
+                                        </Tooltip>
+                                    </Grid>
+                                </div>
+                                <input type="file" ref={(fileUpload) => {this.fileUpload = fileUpload;}} style={{ visibility: 'hidden'}} onChange={this.fileSelectedHandler} />
+                                </div>
+                            )
+                        }}
+                        editable={{
+                            onRowAdd: newData =>
+                            new Promise((resolve, reject) => {
+                                setTimeout(() => {
+                                    {
+                                        const dictionaryElements = this.state.dictionaryElements;
+                                        var validData =  true;
+                                        for (var i = 0; i < this.state.dictionaryElements.length; i++) {
+                                            if (this.state.dictionaryElements[i].shortName === newData.shortName) {
+                                                validData = false;
+                                                alert(newData.shortname + 'short name already exists')
+                                            }
+                                        }
+                                        if(/[^a-zA-Z0-9-_.]/.test(newData.shortName)) {
+                                            validData = false;
+                                            alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
+                                        }
+                                        if(!newData.type){
+                                            validData = false;
+                                            alert('Element Type cannot be null');
+                                        }
+                                        if(validData){
+                                            dictionaryElements.push(newData);
+                                            this.setState({ dictionaryElements }, () => resolve());
+                                            this.setState({addDict: true, newDictItem: [newData]});
+                                        }
+                                    }
+                                    resolve();
+                                }, 1000);
+                            }),
+                            onRowUpdate: (newData, oldData) =>
+                            new Promise((resolve, reject) => {
+                                setTimeout(() => {
+                                    {
+                                        const dictionaryElements = this.state.dictionaryElements;
+                                        var validData =  true;
+                                        if(!newData.type){
+                                            validData = false;
+                                            alert('Element Type cannot be null');
+                                        }
+                                        if(validData){
+                                            const index = dictionaryElements.indexOf(oldData);
+                                            dictionaryElements[index] = newData;
+                                            this.setState({ dictionaryElements }, () => resolve());
+                                            this.setState({addDict: true, newDictItem: [newData]});
+                                        }
+                                    }
+                                    resolve();
+                                }, 1000);
+                            }),
+                            onRowDelete: oldData =>
+                new Promise((resolve, reject) => {
+                                setTimeout(() => {
+                                    {
+                                        let data = this.state.dictionaryElements;
+                    const index = data.indexOf(oldData);
+                    data.splice(index, 1);
+                    this.setState({ data }, () => resolve());
+                                        this.setState({delDict: true, delDictItem: oldData})
+                    }
+                    resolve()
+                }, 1000)
+                })
+                        }}
+                        />:""
+                    }
+                    {this.state.dictNameFlag?<button onClick={this.clickHandler} style={{marginTop: '25px'}}>Go Back to Dictionaries List</button>:""}
+                    {this.state.addDict && this.addDictionary()}
+                    {this.state.delDict && this.deleteDictionary()}
+                </Modal.Body>
+                <Modal.Footer>
+                    <Button variant="secondary" type="null" onClick={this.handleClose}>Close</Button>
+                </Modal.Footer>
+            </ModalStyled>
+        );
+    }
+}					
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
new file mode 100644
index 000000000..4363da923
--- /dev/null
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
@@ -0,0 +1,202 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import { mount } from 'enzyme';
+import { render } from 'enzyme';
+import ManageDictionaries from './ManageDictionaries';
+import TemplateMenuService from '../../../api/TemplateService'
+
+describe('Verify ManageDictionaries', () => {
+	beforeEach(() => {
+		fetch.resetMocks();
+	});
+
+	it('Test API Successful', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"name": "vtest",
+						"secondLevelDictionary": "1",
+						"subDictionaryType": "string",
+						"updatedBy": "test",
+						"updatedDate": "05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ManageDictionaries />);
+		expect(component).toMatchSnapshot();
+	});
+
+	it('Test API Exception', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: false,
+				status: 500,
+				json: () => {
+					return Promise.resolve({
+						"name": "vtest",
+            "secondLevelDictionary": "1",
+						"subDictionaryType": "string",
+        		"updatedBy": "test",
+            "updatedDate": "05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = shallow(<ManageDictionaries />);
+	});
+
+	it('Test API Rejection', () => {
+		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
+		setTimeout( () => myMockFunc().catch(e => {
+			console.log(e);
+		}),
+		100
+		);
+		new Promise(resolve => setTimeout(resolve, 200));
+		const component = shallow(<ManageDictionaries />);
+		expect(myMockFunc.mock.calls.length).toBe(1);
+	});
+
+	it('Test Table icons', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"name": "vtest",
+	          "secondLevelDictionary": "1",
+						"subDictionaryType": "string",
+	       		"updatedBy": "test",
+	          "updatedDate": "05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const component = mount(<ManageDictionaries />);
+		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
+	});
+
+	test('Test get dictionaryNames/dictionaryElements, add/delete dictionary functions', async () => {
+		const historyMock = { push: jest.fn() };
+		TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
+			return Promise.resolve("test");
+		});
+		TemplateMenuService.getDictionaryElements = jest.fn().mockImplementation(() => {
+			return Promise.resolve({dictionaryElements:"testitem"});
+		});
+		TemplateMenuService.insDictionary = jest.fn().mockImplementation(() => {
+			return Promise.resolve(200);
+		});
+		TemplateMenuService.deleteDictionary = jest.fn().mockImplementation(() => {
+			return Promise.resolve(200);
+		});
+		const flushPromises = () => new Promise(setImmediate);
+		const component = shallow(<ManageDictionaries history={historyMock} />)
+		component.setState({ newDict: {
+			"name": "test",
+			"secondLevelDictionary": "0",
+			"subDictionaryType": "string"
+			}
+		});
+		component.setState({ delData: {
+			"name": "test",
+			"secondLevelDictionary": "0",
+			"subDictionaryType": "string"
+			}
+		});
+		const instance = component.instance();
+		instance.getDictionaryElements("test");
+		instance.clickHandler();
+		instance.addDictionary();
+		instance.deleteDictionary();
+		await flushPromises();
+		expect(component.state('dictionaryNames')).toEqual("test");
+		expect(component.state('dictionaryElements')).toEqual("testitem");
+		expect(component.state('dictNameFlag')).toEqual(false);
+	});
+
+	test('Test adding and deleting dictionaryelements', async () => {
+		const historyMock = { push: jest.fn() };
+		TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
+			return Promise.resolve("test");
+		});
+		TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
+			return Promise.resolve(200);
+		});
+		TemplateMenuService.deleteDictionaryElements = jest.fn().mockImplementation(() => {
+			return Promise.resolve(200);
+		});
+		const flushPromises = () => new Promise(setImmediate);
+		const component = shallow(<ManageDictionaries history={historyMock}/>)
+		component.setState({ newDictItem: {
+			"name": "test",
+			"dictionaryElements" : {
+				"shortName": "shorttest",
+				}
+		}});
+		component.setState({ delDictItem: {
+			"name": "test",
+			"dictionaryElements" : {
+				"shortName": "shortTest",
+				}
+		}});
+		const instance = component.instance();
+		instance.addDictionary();
+		instance.deleteDictionary();
+		await flushPromises();
+		expect(component.state('dictionaryNames')).toEqual("test");
+	});
+
+	it('Test handleClose', () => {
+		fetch.mockImplementationOnce(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {
+					return Promise.resolve({
+						"name": "vtest",
+		      	"secondLevelDictionary": "1",
+						"subDictionaryType": "string",
+		      	"updatedBy": "test",
+		      	"updatedDate": "05-07-2019 19:09:42"
+					});
+				}
+			});
+		});
+		const historyMock = { push: jest.fn() };
+		const handleClose = jest.spyOn(ManageDictionaries.prototype,'handleClose');
+		const component = shallow(<ManageDictionaries history={historyMock} />)
+		component.find('[variant="secondary"]').prop('onClick')();
+		expect(handleClose).toHaveBeenCalledTimes(1);
+		expect(component.state('show')).toEqual(false);
+		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+		handleClose.mockClear();
+	});
+});
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
new file mode 100644
index 000000000..e78292216
--- /dev/null
+++ b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
@@ -0,0 +1,195 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify ManageDictionaries Test API Successful 1`] = `
+<Styled(Bootstrap(Modal))
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Manage Dictionaries
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <WithStyles(Component)
+      columns={
+        Array [
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "onAdd",
+            "field": "name",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Dictionary Name",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "secondLevelDictionary",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "lookup": Object {
+              "0": "No",
+              "1": "Yes",
+            },
+            "title": "Sub Dictionary ?",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "field": "subDictionaryType",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "lookup": Object {
+              "number": "number",
+              "string": "string",
+            },
+            "title": "Dictionary Type",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "updatedBy",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Updated By",
+          },
+          Object {
+            "cellStyle": Object {
+              "border": "1px solid black",
+            },
+            "editable": "never",
+            "field": "updatedDate",
+            "headerStyle": Object {
+              "backgroundColor": "#ddd",
+              "border": "2px solid black",
+            },
+            "title": "Last Updated Date",
+          },
+        ]
+      }
+      data={Array []}
+      editable={
+        Object {
+          "onRowAdd": [Function],
+          "onRowDelete": [Function],
+          "onRowUpdate": [Function],
+        }
+      }
+      icons={
+        Object {
+          "Add": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Check": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Clear": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Delete": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "DetailPanel": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Edit": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Export": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Filter": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "FirstPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "LastPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "NextPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "PreviousPage": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ResetSearch": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "Search": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "SortArrow": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ThirdStateCheck": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+          "ViewColumn": Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "render": [Function],
+          },
+        }
+      }
+      onRowClick={[Function]}
+      options={
+        Object {
+          "headerStyle": Object {
+            "backgroundColor": "#ddd",
+            "border": "1px solid black",
+            "fontSize": "15pt",
+            "text": "bold",
+          },
+        }
+      }
+      title="Dictionary List"
+    />
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Close
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 92380ab6c..4eafaa448 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -93,6 +93,9 @@ export default class MenuBar extends React.Component {
 					<StyledNavDropdown title="Policy Models">
                     	    <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Model</NavDropdown.Item>
                     		<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item>
+                    </StyledNavDropdown>
+                    <StyledNavDropdown title="Dictionaries">
+                            <NavDropdown.Item as={StyledLink} to="/ManageDictionaries">Manage Dictionaries</NavDropdown.Item>
                     </StyledNavDropdown>
 					<StyledNavDropdown title="Loop Instance">
 					        <NavDropdown.Item as={StyledLink} to="/createLoop">Create</NavDropdown.Item>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index dfc6a5682..9070e87e9 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -163,6 +163,61 @@ exports[`Verify MenuBar Test the render method 1`] = `
       View Tosca Models
     </DropdownItem>
   </Styled(NavDropdown)>
+  <Styled(NavDropdown)
+    title="Dictionaries"
+  >
+    <DropdownItem
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "attrs": Array [],
+          "componentStyle": ComponentStyle {
+            "componentId": "sc-bdVaJa",
+            "isStatic": false,
+            "rules": Array [
+              "
+	color: ",
+              [Function],
+              ";
+	background-color: ",
+              [Function],
+              ";
+	font-weight: normal;
+	display: block;
+	width: 100%;
+	padding: .25rem 1.5rem;
+	clear: both;
+	text-align: inherit;
+	white-space: nowrap;
+	border: 0;
+	:hover {
+		text-decoration: none;
+		background-color: ",
+              [Function],
+              ";
+		color:  ",
+              [Function],
+              ";
+	}
+",
+            ],
+          },
+          "displayName": "Styled(Link)",
+          "foldedComponentIds": Array [],
+          "render": [Function],
+          "styledComponentId": "sc-bdVaJa",
+          "target": [Function],
+          "toString": [Function],
+          "warnTooManyClasses": [Function],
+          "withComponent": [Function],
+        }
+      }
+      disabled={false}
+      to="/ManageDictionaries"
+    >
+      Manage Dictionaries
+    </DropdownItem>
+  </Styled(NavDropdown)>
   <Styled(NavDropdown)
     title="Loop Instance"
   >
-- 
cgit 1.2.3-korg


From 2dd4e997c1ccf5dab4dfb7665ce74c0fd1f13e49 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 4 Mar 2020 15:47:39 -0800
Subject: Rework tosca converter

New code to convert the Policy Tosca Yaml to Json Schema for the Clamp
UI

Issue-ID: CLAMP-647
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Id15ddedc1910f6a40bf6e407b34e343e00135571
---
 docs/swagger/swagger.json                          | 380 ++++++++++-----------
 docs/swagger/swagger.pdf                           | 106 +++---
 extra/sql/dump/test-data.sql                       |  30 +-
 pom.xml                                            |   1 +
 .../onap/clamp/clds/tosca/update/Extractor.java    |  18 +-
 .../onap/clamp/clds/tosca/update/ParserToJson.java |  72 +++-
 .../clds/tosca/update/TemplateManagement.java      |   7 +-
 src/main/java/org/onap/clamp/policy/Policy.java    |  23 +-
 .../policy/microservice/MicroServicePolicy.java    |  19 +-
 .../policy/operational/OperationalPolicy.java      |  16 +-
 src/main/resources/META-INF/resources/swagger.html |  94 ++---
 .../clds/tosca_update/defaultToscaTypes.yaml       |  87 +++++
 .../clamp/clds/tosca/update/ArrayFieldTest.java    |   3 +-
 .../clamp/clds/tosca/update/ComponentTest.java     |   1 +
 .../clamp/clds/tosca/update/ConstraintTest.java    |   3 +-
 .../onap/clamp/clds/tosca/update/PropertyTest.java |   2 +
 .../clds/tosca/update/TemplateManagementTest.java  |  85 +++++
 .../PolicyEngineControllerTestItCase.java          |  14 +-
 .../.file                                          |  10 +-
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  40 ---
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  50 ---
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  44 ---
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 -
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  38 +++
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 +
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |  47 +++
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 +
 .../2.0.0&#63;connectionTimeToLive=5000/.file      |  40 +++
 .../2.0.0&#63;connectionTimeToLive=5000/.header    |   1 +
 .../1.0.0&#63;connectionTimeToLive=5000/.file      | 158 +++++++++
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 +
 .../1.0.0&#63;connectionTimeToLive=5000/.file      | 146 ++++++++
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |   1 +
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |   7 +-
 .../v1/pdps&#63;connectionTimeToLive=5000/.file    |   6 +-
 .../resources/tosca/new-converter/tca-schema.json  | 175 ++++++++++
 src/test/resources/tosca/templates.properties      |   7 -
 ui-react/src/api/LoopCache.js                      |  16 +-
 .../ConfigurationPolicyModal.js                    |  23 +-
 .../ConfigurationPolicyModal.test.js               |   1 -
 .../OperationalPolicy/OperationalPolicyModal.js    |  30 +-
 .../src/components/dialogs/Policy/PolicyModal.js   |  83 +++--
 44 files changed, 1310 insertions(+), 580 deletions(-)
 create mode 100644 src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 delete mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.file
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.header
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header
 create mode 100644 src/test/resources/tosca/new-converter/tca-schema.json
 delete mode 100644 src/test/resources/tosca/templates.properties

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index d9a0b8279..e35fba278 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,13 +4,13 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:39099",
+  "host" : "localhost:40597",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
     "/v2/dictionary" : {
       "get" : {
-        "operationId" : "route49",
+        "operationId" : "route80",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -20,11 +20,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route49"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route80"
       },
       "put" : {
-        "operationId" : "route51",
+        "operationId" : "route82",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -43,8 +43,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route51"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route82"
       }
     },
     "/v2/dictionary/{dictionaryName}" : {
@@ -64,7 +64,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -93,11 +93,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       },
       "delete" : {
-        "operationId" : "route53",
+        "operationId" : "route84",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "name",
@@ -108,8 +108,8 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route53"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route84"
       }
     },
     "/v2/dictionary/{name}/elements/{shortName}" : {
@@ -129,7 +129,7 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -147,13 +147,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v2/loop/{loopName}" : {
       "get" : {
-        "operationId" : "route34",
+        "operationId" : "route65",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -169,13 +169,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route34"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route65"
       }
     },
     "/v2/loop/delete/{loopName}" : {
       "put" : {
-        "operationId" : "route45",
+        "operationId" : "route76",
         "parameters" : [ {
           "name" : "loopName",
           "in" : "path",
@@ -185,13 +185,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route45"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route76"
       }
     },
     "/v2/loop/deploy/{loopName}" : {
       "put" : {
-        "operationId" : "route39",
+        "operationId" : "route70",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -207,13 +207,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route39"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route70"
       }
     },
     "/v2/loop/getAllNames" : {
       "get" : {
-        "operationId" : "route33",
+        "operationId" : "route64",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -226,13 +226,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route33"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route64"
       }
     },
     "/v2/loop/getstatus/{loopName}" : {
       "get" : {
-        "operationId" : "route46",
+        "operationId" : "route77",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -248,13 +248,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route46"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route77"
       }
     },
     "/v2/loop/refreshOpPolicyJsonSchema/{loopName}" : {
       "put" : {
-        "operationId" : "route40",
+        "operationId" : "route71",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -270,13 +270,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route40"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route71"
       }
     },
     "/v2/loop/restart/{loopName}" : {
       "put" : {
-        "operationId" : "route43",
+        "operationId" : "route74",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -292,13 +292,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route43"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route74"
       }
     },
     "/v2/loop/stop/{loopName}" : {
       "put" : {
-        "operationId" : "route42",
+        "operationId" : "route73",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -314,13 +314,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route42"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route73"
       }
     },
     "/v2/loop/submit/{loopName}" : {
       "put" : {
-        "operationId" : "route44",
+        "operationId" : "route75",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -336,13 +336,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route44"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route75"
       }
     },
     "/v2/loop/svgRepresentation/{loopName}" : {
       "get" : {
-        "operationId" : "route35",
+        "operationId" : "route66",
         "produces" : [ "application/xml" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -358,13 +358,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route35"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route66"
       }
     },
     "/v2/loop/undeploy/{loopName}" : {
       "put" : {
-        "operationId" : "route41",
+        "operationId" : "route72",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "loopName",
@@ -380,13 +380,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route41"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route72"
       }
     },
     "/v2/loop/updateGlobalProperties/{loopName}" : {
       "post" : {
-        "operationId" : "route36",
+        "operationId" : "route67",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -410,13 +410,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route36"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route67"
       }
     },
     "/v2/loop/updateMicroservicePolicy/{loopName}" : {
       "post" : {
-        "operationId" : "route38",
+        "operationId" : "route69",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -440,13 +440,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route38"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route69"
       }
     },
     "/v2/loop/updateOperationalPolicies/{loopName}" : {
       "post" : {
-        "operationId" : "route37",
+        "operationId" : "route68",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -470,13 +470,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route37"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route68"
       }
     },
     "/v2/policyToscaModels" : {
       "get" : {
-        "operationId" : "route56",
+        "operationId" : "route87",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -486,8 +486,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route56"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route87"
       }
     },
     "/v2/policyToscaModels/{policyModelType}" : {
@@ -507,11 +507,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       },
       "put" : {
-        "operationId" : "route57",
+        "operationId" : "route88",
         "consumes" : [ "plain/text" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -535,8 +535,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route57"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route88"
       }
     },
     "/v2/policyToscaModels/yaml/{policyModelType}" : {
@@ -556,13 +556,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v2/templates" : {
       "get" : {
-        "operationId" : "route60",
+        "operationId" : "route91",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -572,8 +572,8 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route60"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route91"
       }
     },
     "/v2/templates/{templateName}" : {
@@ -593,7 +593,7 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
@@ -611,13 +611,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
+        "x-camelContextId" : "camel-3",
         "x-routeId" : null
       }
     },
     "/v1/healthcheck" : {
       "get" : {
-        "operationId" : "route61",
+        "operationId" : "route92",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -627,19 +627,19 @@
             }
           }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route61"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route92"
       }
     },
     "/v1/user/getUser" : {
       "get" : {
-        "operationId" : "route62",
+        "operationId" : "route93",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-2",
-        "x-routeId" : "route62"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route93"
       }
     }
   },
@@ -803,31 +803,34 @@
     "JsonPrimitive" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
-        "boolean" : {
+        "asBoolean" : {
           "type" : "boolean"
         },
-        "asBoolean" : {
+        "number" : {
           "type" : "boolean"
         },
+        "asString" : {
+          "type" : "string"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -845,27 +848,21 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "number" : {
+        "boolean" : {
           "type" : "boolean"
         },
-        "asString" : {
-          "type" : "string"
-        },
         "string" : {
           "type" : "boolean"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
         "jsonArray" : {
           "type" : "boolean"
         },
@@ -877,6 +874,9 @@
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
         }
       }
     },
@@ -909,7 +909,7 @@
         "pdpGroup" : {
           "type" : "string"
         },
-        "pdpSubGroup" : {
+        "pdpSubgroup" : {
           "type" : "string"
         },
         "policyModel" : {
@@ -952,31 +952,55 @@
     "JsonObject" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asBoolean" : {
+          "type" : "boolean"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "jsonObject" : {
+          "type" : "boolean"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "asBoolean" : {
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "asString" : {
+          "type" : "string"
+        },
+        "jsonArray" : {
           "type" : "boolean"
         },
+        "jsonPrimitive" : {
+          "type" : "boolean"
+        },
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -993,30 +1017,6 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
-        },
-        "jsonObject" : {
-          "type" : "boolean"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "jsonPrimitive" : {
-          "type" : "boolean"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
         }
       },
       "x-className" : {
@@ -1133,7 +1133,7 @@
         "pdpGroup" : {
           "type" : "string"
         },
-        "pdpSubGroup" : {
+        "pdpSubgroup" : {
           "type" : "string"
         },
         "policyModel" : {
@@ -1153,31 +1153,55 @@
     "JsonNull" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
+        "asBoolean" : {
+          "type" : "boolean"
         },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
+        "jsonObject" : {
+          "type" : "boolean"
         },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "asBoolean" : {
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
+        "asString" : {
+          "type" : "string"
+        },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
+        "jsonNull" : {
+          "type" : "boolean"
+        },
+        "asJsonPrimitive" : {
+          "$ref" : "#/definitions/JsonPrimitive"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1194,58 +1218,37 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
-        },
-        "jsonObject" : {
-          "type" : "boolean"
-        },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
-        "jsonArray" : {
-          "type" : "boolean"
-        },
-        "jsonPrimitive" : {
-          "type" : "boolean"
-        },
-        "jsonNull" : {
-          "type" : "boolean"
-        },
-        "asJsonPrimitive" : {
-          "$ref" : "#/definitions/JsonPrimitive"
         }
       }
     },
     "JsonArray" : {
       "type" : "object",
       "properties" : {
-        "asInt" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "asDouble" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "asLong" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
         "asBoolean" : {
           "type" : "boolean"
         },
+        "asString" : {
+          "type" : "string"
+        },
         "asNumber" : {
           "$ref" : "#/definitions/Number"
         },
+        "asDouble" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "asFloat" : {
           "type" : "number",
           "format" : "float"
         },
+        "asLong" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "asInt" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1263,21 +1266,15 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "asString" : {
-          "type" : "string"
-        },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "asJsonObject" : {
-          "$ref" : "#/definitions/JsonObject"
-        },
         "asJsonArray" : {
           "$ref" : "#/definitions/JsonArray"
         },
+        "asJsonObject" : {
+          "$ref" : "#/definitions/JsonObject"
+        },
         "jsonArray" : {
           "type" : "boolean"
         },
@@ -1289,6 +1286,9 @@
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
+        },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
         }
       },
       "x-className" : {
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index d992107ee..b97c2cfd4 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200302132601-08'00')
-/ModDate (D:20200302132601-08'00')
+/CreationDate (D:20200309090008-07'00')
+/ModDate (D:20200309090008-07'00')
 >>
 endobj
 2 0 obj
@@ -5910,7 +5910,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3339303939> Tj
+<203a206c6f63616c686f73743a3430353937> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -10857,8 +10857,8 @@ endobj
 [72 0 R /XYZ 0 108.12000000000052 null]
 endobj
 82 0 obj
-<< /Limits [(_route46) (_version_information)]
-/Names [(_route46) 94 0 R (_route49) 37 0 R (_route51) 41 0 R (_route53) 69 0 R (_route56) 169 0 R (_route57) 184 0 R (_route60) 193 0 R (_route61) 29 0 R (_route62) 34 0 R (_service) 303 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R]
+<< /Limits [(_route77) (_version_information)]
+/Names [(_route77) 94 0 R (_route80) 37 0 R (_route82) 41 0 R (_route84) 69 0 R (_route87) 169 0 R (_route88) 184 0 R (_route91) 193 0 R (_route92) 29 0 R (_route93) 34 0 R (_service) 303 0 R (_uri_scheme) 25 0 R (_v2_dictionary_dictionaryname_get) 55 0 R (_v2_dictionary_name_elements_shortname_delete) 75 0 R (_v2_dictionary_name_put) 62 0 R (_v2_dictionary_secondary_names_get) 50 0 R (_v2_policytoscamodels_policymodeltype_get) 179 0 R (_v2_policytoscamodels_yaml_policymodeltype_get) 173 0 R (_v2_templates_names_get) 198 0 R (_v2_templates_templatename_get) 201 0 R (_version_information) 23 0 R]
 >>
 endobj
 83 0 obj
@@ -14929,8 +14929,8 @@ endobj
 [110 0 R /XYZ 0 481.68000000000046 null]
 endobj
 116 0 obj
-<< /Limits [(_responses_5) (_route45)]
-/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route33) 91 0 R (_route34) 162 0 R (_route35) 126 0 R (_route36) 138 0 R (_route37) 154 0 R (_route38) 145 0 R (_route39) 85 0 R (_route40) 101 0 R (_route41) 131 0 R (_route42) 113 0 R (_route43) 106 0 R (_route44) 119 0 R (_route45) 79 0 R]
+<< /Limits [(_responses_5) (_route76)]
+/Names [(_responses_5) 51 0 R (_responses_6) 59 0 R (_responses_7) 65 0 R (_responses_8) 73 0 R (_responses_9) 77 0 R (_route64) 91 0 R (_route65) 162 0 R (_route66) 126 0 R (_route67) 138 0 R (_route68) 154 0 R (_route69) 145 0 R (_route70) 85 0 R (_route71) 101 0 R (_route72) 131 0 R (_route73) 113 0 R (_route74) 106 0 R (_route75) 119 0 R (_route76) 79 0 R]
 >>
 endobj
 117 0 obj
@@ -41690,7 +41690,7 @@ S
 BT
 51.24 603.7930000000001 Td
 /F2.0 10.5 Tf
-<70647053756247726f7570> Tj
+<70647053756267726f7570> Tj
 ET
 
 
@@ -43379,7 +43379,7 @@ S
 BT
 51.24 566.233 Td
 /F2.0 10.5 Tf
-<70647053756247726f7570> Tj
+<70647053756267726f7570> Tj
 ET
 
 
@@ -45551,7 +45551,7 @@ endobj
 endobj
 314 0 obj
 << /Border [0 0 0]
-/Dest (_route61)
+/Dest (_route92)
 /Subtype /Link
 /Rect [60.24000000000001 621.7799999999997 181.64100000000002 636.0599999999998]
 /Type /Annot
@@ -45559,7 +45559,7 @@ endobj
 endobj
 315 0 obj
 << /Border [0 0 0]
-/Dest (_route61)
+/Dest (_route92)
 /Subtype /Link
 /Rect [557.8905 621.7799999999997 563.76 636.0599999999998]
 /Type /Annot
@@ -45599,7 +45599,7 @@ endobj
 endobj
 320 0 obj
 << /Border [0 0 0]
-/Dest (_route62)
+/Dest (_route93)
 /Subtype /Link
 /Rect [60.24000000000001 566.3399999999997 183.8775 580.6199999999998]
 /Type /Annot
@@ -45607,7 +45607,7 @@ endobj
 endobj
 321 0 obj
 << /Border [0 0 0]
-/Dest (_route62)
+/Dest (_route93)
 /Subtype /Link
 /Rect [557.8905 566.3399999999997 563.76 580.6199999999998]
 /Type /Annot
@@ -45647,7 +45647,7 @@ endobj
 endobj
 326 0 obj
 << /Border [0 0 0]
-/Dest (_route49)
+/Dest (_route80)
 /Subtype /Link
 /Rect [60.24000000000001 510.89999999999975 172.716 525.1799999999997]
 /Type /Annot
@@ -45655,7 +45655,7 @@ endobj
 endobj
 327 0 obj
 << /Border [0 0 0]
-/Dest (_route49)
+/Dest (_route80)
 /Subtype /Link
 /Rect [557.8905 510.89999999999975 563.76 525.1799999999997]
 /Type /Annot
@@ -45695,7 +45695,7 @@ endobj
 endobj
 332 0 obj
 << /Border [0 0 0]
-/Dest (_route51)
+/Dest (_route82)
 /Subtype /Link
 /Rect [60.24000000000001 455.4599999999997 172.548 469.73999999999967]
 /Type /Annot
@@ -45703,7 +45703,7 @@ endobj
 endobj
 333 0 obj
 << /Border [0 0 0]
-/Dest (_route51)
+/Dest (_route82)
 /Subtype /Link
 /Rect [557.8905 455.4599999999997 563.76 469.73999999999967]
 /Type /Annot
@@ -45967,7 +45967,7 @@ endobj
 endobj
 366 0 obj
 << /Border [0 0 0]
-/Dest (_route53)
+/Dest (_route84)
 /Subtype /Link
 /Rect [60.24000000000001 141.29999999999953 232.70250000000001 155.57999999999953]
 /Type /Annot
@@ -45975,7 +45975,7 @@ endobj
 endobj
 367 0 obj
 << /Border [0 0 0]
-/Dest (_route53)
+/Dest (_route84)
 /Subtype /Link
 /Rect [557.8905 141.29999999999953 563.76 155.57999999999953]
 /Type /Annot
@@ -46095,7 +46095,7 @@ endobj
 endobj
 382 0 obj
 << /Border [0 0 0]
-/Dest (_route45)
+/Dest (_route76)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 245.15550000000002 719.04]
 /Type /Annot
@@ -46103,7 +46103,7 @@ endobj
 endobj
 383 0 obj
 << /Border [0 0 0]
-/Dest (_route45)
+/Dest (_route76)
 /Subtype /Link
 /Rect [557.8905 704.7599999999999 563.76 719.04]
 /Type /Annot
@@ -46143,7 +46143,7 @@ endobj
 endobj
 388 0 obj
 << /Border [0 0 0]
-/Dest (_route39)
+/Dest (_route70)
 /Subtype /Link
 /Rect [60.24000000000001 649.3199999999998 248.431294921875 663.5999999999999]
 /Type /Annot
@@ -46151,7 +46151,7 @@ endobj
 endobj
 389 0 obj
 << /Border [0 0 0]
-/Dest (_route39)
+/Dest (_route70)
 /Subtype /Link
 /Rect [557.8905 649.3199999999998 563.76 663.5999999999999]
 /Type /Annot
@@ -46207,7 +46207,7 @@ endobj
 endobj
 396 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route64)
 /Subtype /Link
 /Rect [60.24000000000001 575.3999999999997 214.8735 589.6799999999998]
 /Type /Annot
@@ -46215,7 +46215,7 @@ endobj
 endobj
 397 0 obj
 << /Border [0 0 0]
-/Dest (_route33)
+/Dest (_route64)
 /Subtype /Link
 /Rect [557.8905 575.3999999999997 563.76 589.6799999999998]
 /Type /Annot
@@ -46255,7 +46255,7 @@ endobj
 endobj
 402 0 obj
 << /Border [0 0 0]
-/Dest (_route46)
+/Dest (_route77)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 259.467 534.2399999999998]
 /Type /Annot
@@ -46263,7 +46263,7 @@ endobj
 endobj
 403 0 obj
 << /Border [0 0 0]
-/Dest (_route46)
+/Dest (_route77)
 /Subtype /Link
 /Rect [557.8905 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
@@ -46319,7 +46319,7 @@ endobj
 endobj
 410 0 obj
 << /Border [0 0 0]
-/Dest (_route40)
+/Dest (_route71)
 /Subtype /Link
 /Rect [60.24000000000001 446.03999999999974 355.8885 460.3199999999997]
 /Type /Annot
@@ -46327,7 +46327,7 @@ endobj
 endobj
 411 0 obj
 << /Border [0 0 0]
-/Dest (_route40)
+/Dest (_route71)
 /Subtype /Link
 /Rect [557.8905 446.03999999999974 563.76 460.3199999999997]
 /Type /Annot
@@ -46383,7 +46383,7 @@ endobj
 endobj
 418 0 obj
 << /Border [0 0 0]
-/Dest (_route43)
+/Dest (_route74)
 /Subtype /Link
 /Rect [60.24000000000001 372.11999999999966 248.45250000000001 386.39999999999964]
 /Type /Annot
@@ -46391,7 +46391,7 @@ endobj
 endobj
 419 0 obj
 << /Border [0 0 0]
-/Dest (_route43)
+/Dest (_route74)
 /Subtype /Link
 /Rect [557.8905 372.11999999999966 563.76 386.39999999999964]
 /Type /Annot
@@ -46447,7 +46447,7 @@ endobj
 endobj
 426 0 obj
 << /Border [0 0 0]
-/Dest (_route42)
+/Dest (_route73)
 /Subtype /Link
 /Rect [60.24000000000001 298.1999999999996 235.842 312.47999999999956]
 /Type /Annot
@@ -46455,7 +46455,7 @@ endobj
 endobj
 427 0 obj
 << /Border [0 0 0]
-/Dest (_route42)
+/Dest (_route73)
 /Subtype /Link
 /Rect [557.8905 298.1999999999996 563.76 312.47999999999956]
 /Type /Annot
@@ -46511,7 +46511,7 @@ endobj
 endobj
 434 0 obj
 << /Border [0 0 0]
-/Dest (_route44)
+/Dest (_route75)
 /Subtype /Link
 /Rect [60.24000000000001 224.27999999999952 249.70200000000003 238.55999999999952]
 /Type /Annot
@@ -46519,7 +46519,7 @@ endobj
 endobj
 435 0 obj
 << /Border [0 0 0]
-/Dest (_route44)
+/Dest (_route75)
 /Subtype /Link
 /Rect [557.8905 224.27999999999952 563.76 238.55999999999952]
 /Type /Annot
@@ -46575,7 +46575,7 @@ endobj
 endobj
 442 0 obj
 << /Border [0 0 0]
-/Dest (_route35)
+/Dest (_route66)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 307.641 164.63999999999956]
 /Type /Annot
@@ -46583,7 +46583,7 @@ endobj
 endobj
 443 0 obj
 << /Border [0 0 0]
-/Dest (_route35)
+/Dest (_route66)
 /Subtype /Link
 /Rect [557.8905 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
@@ -46639,7 +46639,7 @@ endobj
 endobj
 450 0 obj
 << /Border [0 0 0]
-/Dest (_route41)
+/Dest (_route72)
 /Subtype /Link
 /Rect [60.24000000000001 76.4399999999996 261.860794921875 90.7199999999996]
 /Type /Annot
@@ -46647,7 +46647,7 @@ endobj
 endobj
 451 0 obj
 << /Border [0 0 0]
-/Dest (_route41)
+/Dest (_route72)
 /Subtype /Link
 /Rect [557.8905 76.4399999999996 563.76 90.7199999999996]
 /Type /Annot
@@ -46703,7 +46703,7 @@ endobj
 endobj
 458 0 obj
 << /Border [0 0 0]
-/Dest (_route36)
+/Dest (_route67)
 /Subtype /Link
 /Rect [60.24000000000001 704.7599999999999 339.560794921875 719.04]
 /Type /Annot
@@ -46711,7 +46711,7 @@ endobj
 endobj
 459 0 obj
 << /Border [0 0 0]
-/Dest (_route36)
+/Dest (_route67)
 /Subtype /Link
 /Rect [552.021 704.7599999999999 563.76 719.04]
 /Type /Annot
@@ -46783,7 +46783,7 @@ endobj
 endobj
 468 0 obj
 << /Border [0 0 0]
-/Dest (_route38)
+/Dest (_route69)
 /Subtype /Link
 /Rect [60.24000000000001 612.3599999999998 350.38629492187505 626.6399999999999]
 /Type /Annot
@@ -46791,7 +46791,7 @@ endobj
 endobj
 469 0 obj
 << /Border [0 0 0]
-/Dest (_route38)
+/Dest (_route69)
 /Subtype /Link
 /Rect [552.021 612.3599999999998 563.76 626.6399999999999]
 /Type /Annot
@@ -46863,7 +46863,7 @@ endobj
 endobj
 478 0 obj
 << /Border [0 0 0]
-/Dest (_route37)
+/Dest (_route68)
 /Subtype /Link
 /Rect [60.24000000000001 519.9599999999998 352.81158984375 534.2399999999998]
 /Type /Annot
@@ -46871,7 +46871,7 @@ endobj
 endobj
 479 0 obj
 << /Border [0 0 0]
-/Dest (_route37)
+/Dest (_route68)
 /Subtype /Link
 /Rect [552.021 519.9599999999998 563.76 534.2399999999998]
 /Type /Annot
@@ -46943,7 +46943,7 @@ endobj
 endobj
 488 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_route65)
 /Subtype /Link
 /Rect [60.24000000000001 427.5599999999997 212.0595 441.8399999999997]
 /Type /Annot
@@ -46951,7 +46951,7 @@ endobj
 endobj
 489 0 obj
 << /Border [0 0 0]
-/Dest (_route34)
+/Dest (_route65)
 /Subtype /Link
 /Rect [552.021 427.5599999999997 563.76 441.8399999999997]
 /Type /Annot
@@ -47007,7 +47007,7 @@ endobj
 endobj
 496 0 obj
 << /Border [0 0 0]
-/Dest (_route56)
+/Dest (_route87)
 /Subtype /Link
 /Rect [60.24000000000001 353.63999999999965 221.091755859375 367.9199999999996]
 /Type /Annot
@@ -47015,7 +47015,7 @@ endobj
 endobj
 497 0 obj
 << /Border [0 0 0]
-/Dest (_route56)
+/Dest (_route87)
 /Subtype /Link
 /Rect [552.021 353.63999999999965 563.76 367.9199999999996]
 /Type /Annot
@@ -47183,7 +47183,7 @@ endobj
 endobj
 518 0 obj
 << /Border [0 0 0]
-/Dest (_route57)
+/Dest (_route88)
 /Subtype /Link
 /Rect [60.24000000000001 150.35999999999956 318.73125585937504 164.63999999999956]
 /Type /Annot
@@ -47191,7 +47191,7 @@ endobj
 endobj
 519 0 obj
 << /Border [0 0 0]
-/Dest (_route57)
+/Dest (_route88)
 /Subtype /Link
 /Rect [552.021 150.35999999999956 563.76 164.63999999999956]
 /Type /Annot
@@ -47263,7 +47263,7 @@ endobj
 endobj
 528 0 obj
 << /Border [0 0 0]
-/Dest (_route60)
+/Dest (_route91)
 /Subtype /Link
 /Rect [60.24000000000001 57.95999999999961 175.8555 72.23999999999961]
 /Type /Annot
@@ -47271,7 +47271,7 @@ endobj
 endobj
 529 0 obj
 << /Border [0 0 0]
-/Dest (_route60)
+/Dest (_route91)
 /Subtype /Link
 /Rect [552.021 57.95999999999961 563.76 72.23999999999961]
 /Type /Annot
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index 1dfa208a9..e85d9379c 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-02 13:24:51.453602','Not found','2020-03-02 13:24:52.167202',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-09 08:58:58.510214','Not found','2020-03-09 08:58:59.405979',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca','Not found','2020-03-02 13:24:52.069749','Not found','2020-03-02 13:24:52.069749','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-7f559db8-bce7-4ae8-af3a-a0601330ef61',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3fc207ac-7b3a-44ce-9a3e-a498b5397b53\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-9a3a9505-ffa6-4c23-b5a1-1a87ce04e748\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-ec28bc33-e13a-4c46-95ab-73ee067cb9bd\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-02 13:24:51.821227','Not found','2020-03-02 13:24:51.821227','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-4ccd66a3-88f2-4882-97bd-867590f69092',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-357046a5-ae45-46b4-88cc-cae1606e06d7\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-62ca7302-7e01-4875-9523-d16196a5b850\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a2d73510-27f4-426a-8ad1-e3c6f48b11a4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-02 13:24:51.431617','Not found','2020-03-02 13:24:51.431617','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-4d04b1b1-9331-47c5-88ad-9ae89c231b97',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-550c063a-9a2f-46a9-9063-546d3a84f5f4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-96cea148-fd6d-4ebf-96e4-eb88d47906b5\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3fd9565f-388c-4922-ba53-38663f82267c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_CNV61_v1_0_ResourceInstanceName1_tca','Not found','2020-03-09 08:58:59.283217','Not found','2020-03-09 08:58:59.283217','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-c6394acf-9604-4766-bab5-3c282683742c',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-ff8e42fd-2556-4455-a947-0beb03e0e43a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-95f5e5d1-7bac-400d-8f16-a9892b9c57b9\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-88783917-a101-4b9f-b180-6fef42c6cf07\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_CNV61_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-09 08:58:58.973526','Not found','2020-03-09 08:58:58.973526','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-1999c0ba-00a3-4121-8fa3-5332a231a56b',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-85de1b7b-aa37-4d4f-8c32-8cc3aaaf573e\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-0f82b7c5-ce03-4925-af74-deca643aafe3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-f7568e7a-da1d-4cef-a3d5-d7eac1ea8afb\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_CNV61_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-09 08:58:58.462343','Not found','2020-03-09 08:58:58.462343','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-7d0946d1-cd25-4aea-aca1-e9189029c8aa',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-f1d89a33-e32a-4d64-84b7-7cb3065d15fc\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-17622590-c6b4-4c0e-b61f-c4dfef5bfda8\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-453bb83c-0cb3-4658-89bd-16fc4f1c485c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_OlECc_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_CNV61_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_CNV61_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_CNV61_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,13 +152,13 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.Blacklist','1.0.0','Not found','2020-03-02 13:25:10.047752','Not found','2020-03-02 13:25:10.047752','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n   onap.policies.controlloop.Guard:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: Guard Policies for Control Loop Operational Policies\n   onap.policies.controlloop.guard.Blacklist:\n      derived_from: onap.policies.controlloop.Guard\n      version: 1.0.0\n      description: Supports blacklist of VNF\'s from performing control loop actions on.\n      properties:\n         blacklist_policy:\n            type: map\n            description: null\n            entry_schema:\n               type: onap.datatypes.guard.Blacklist\ndata_types:\n   onap.datatypes.guard.Blacklist:\n      derived_from: tosca.datatypes.Root\n      properties:\n         actor:\n            type: string\n            description: Specifies the Actor\n            required: true\n         recipe:\n            type: string\n            description: Specified the Recipe\n            required: true\n         time_range:\n            type: tosca.datatypes.TimeInterval\n            description: An optional range of time during the day the blacklist is valid for.\n            required: false\n         controlLoopName:\n            type: string\n            description: An optional specific control loop to apply this guard to.\n            required: false\n         blacklist:\n            type: list\n            description: List of VNF\'s\n            required: true',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.FrequencyLimiter','1.0.0','Not found','2020-03-02 13:25:09.987158','Not found','2020-03-02 13:25:09.987158','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n   onap.policies.controlloop.Guard:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: Guard Policies for Control Loop Operational Policies\n   onap.policies.controlloop.guard.FrequencyLimiter:\n      derived_from: onap.policies.controlloop.Guard\n      version: 1.0.0\n      description: Supports limiting the frequency of actions being taken by a Actor.\n      properties:\n         frequency_policy:\n            type: map\n            description: null\n            entry_schema:\n               type: onap.datatypes.guard.FrequencyLimiter\ndata_types:\n   onap.datatypes.guard.FrequencyLimiter:\n      derived_from: tosca.datatypes.Root\n      properties:\n         actor:\n            type: string\n            description: Specifies the Actor\n            required: true\n         recipe:\n            type: string\n            description: Specified the Recipe\n            required: true\n         time_window:\n            type: scalar-unit.time\n            description: The time window to count the actions against.\n            required: true\n         limit:\n            type: integer\n            description: The limit\n            required: true\n            constraints:\n            -  greater_than: 0\n         time_range:\n            type: tosca.datatypes.TimeInterval\n            description: An optional range of time during the day the frequency is valid for.\n            required: false\n         controlLoopName:\n            type: string\n            description: An optional specific control loop to apply this guard to.\n            required: false\n         target:\n            type: string\n            description: An optional specific VNF to apply this guard to.\n            required: false',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.MinMax','2.0.0','Not found','2020-03-02 13:25:09.987757','Not found','2020-03-02 13:25:09.987757','MinMax','',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.Apex','1.0.0','Not found','2020-03-02 13:25:09.987152','Not found','2020-03-02 13:25:09.987152','Apex','',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.Drools','1.0.0','Not found','2020-03-02 13:25:09.992687','Not found','2020-03-02 13:25:09.992687','Drools','',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-02 13:24:51.467136','Not found','2020-03-02 13:25:10.569587','app','tosca_definitions_version: tosca_simple_yaml_1_0_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: map\n            description: TCA Policy JSON\n            entry_schema:\n               type: onap.datatypes.monitoring.tca_policy\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-02 13:24:26.818795','Not found','2020-03-02 13:24:26.818795','OperationalPolicyLegacy','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-03-09 08:59:10.073127','Not found','2020-03-09 08:59:10.390629','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-03-09 08:59:10.071862','Not found','2020-03-09 08:59:10.403262','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                - valid_values: [\"second\", \"minute\", \"hour\", \"day\", \"week\", \"month\", \"year\"]\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-03-09 08:59:10.074684','Not found','2020-03-09 08:59:10.074684','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-03-09 08:59:10.073775','Not found','2020-03-09 08:59:10.413855','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Apex:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Apex PDP\n        properties:\n            engineServiceParameters:\n                type: string\n                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.\n                required: true\n            eventInputParameters:\n                type: string\n                description: The event input parameters.\n                required: true\n            eventOutputParameters:\n                type: string\n                description: The event output parameters.\n                required: true\n            javaProperties:\n                type: string\n                description: Name/value pairs of properties to be set for APEX if needed.\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-03-09 08:59:10.138733','Not found','2020-03-09 08:59:10.429203','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-09 08:58:58.533621','Not found','2020-03-09 08:59:10.447184','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: onap.datatypes.monitoring.tca_policy\n            description: TCA Policy JSON\n            required: true\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-09 08:58:07.743663','Not found','2020-03-09 08:58:07.743663','OperationalPolicyLegacy','',NULL);
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -180,4 +180,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-03-02 21:26:34
+-- Dump completed on 2020-03-09 16:00:40
diff --git a/pom.xml b/pom.xml
index 8acdb498f..633109bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1191,6 +1191,7 @@
 						</goals>
 						<phase>test</phase>
 						<configuration>
+							<skip>${maven.test.skip}</skip>
 							<arguments>run-script test:coverage</arguments>
 							<workingDirectory>${project.build.directory}/${ui.react.src}</workingDirectory>
 						</configuration>
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java b/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
index 032edbaa8..b0bf82780 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
@@ -23,19 +23,24 @@
 
 package org.onap.clamp.clds.tosca.update;
 
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 import org.yaml.snakeyaml.Yaml;
 
 public class Extractor {
-
-    private LinkedHashMap<String, Component> allItems = new LinkedHashMap<>();
+    private LinkedHashMap<String, Component> allItems;
     private String source;
+    private String nativeComponent;
 
     @SuppressWarnings("unchecked")
-    public Extractor(String toParse) {
+    public Extractor(String toParse, String nativeComponent) throws IOException {
+
         this.source = toParse;
+        this.nativeComponent = nativeComponent;
+        allItems = new LinkedHashMap<String, Component>();
         getAllAsMaps();
+
     }
 
     public LinkedHashMap<String, Component> getAllItems() {
@@ -60,10 +65,17 @@ public class Extractor {
                 (LinkedHashMap<String, LinkedHashMap<String, Object>>) contentFile;
         // Get DataTypes
         LinkedHashMap<String, Object> dataTypes = file.get("data_types");
+        dataTypes = (dataTypes == null) ? (new LinkedHashMap<>()) : dataTypes;
         // Get Policies : first, get topology and after extract policies from it
         LinkedHashMap<String, Object> policyTypes = file.get("policy_types");
         // Put the policies and datatypes in the same collection
         dataTypes.putAll(policyTypes);
+
+        Object contentNativeFile = yaml.load(nativeComponent);
+        LinkedHashMap<String, Object> dataTypesEmbedded =
+                ((LinkedHashMap<String, LinkedHashMap<String, Object>>) contentNativeFile).get("data_types");
+        dataTypes.putAll(dataTypesEmbedded);
+
         parseInComponent(dataTypes);
         return dataTypes;
     }
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java b/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
index 6da55eaec..7bf629d61 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
@@ -45,14 +45,16 @@ public class ParserToJson {
      * @param nameComponent name components
      * @return return
      */
-    public JsonObject getJsonProcess(String nameComponent) {
-        JsonObject glob = this.getGeneralField(matchComponent(nameComponent));
-        if (templates.get("object").hasFields("required")) {
-            glob.add("required", this.getRequirements(nameComponent));
+    public JsonObject getJsonProcess(String nameComponent, String typeComponent) {
+        JsonObject glob = new JsonObject();
+
+        if (typeComponent.equals("object")) {
+            glob = this.getFieldAsObject(matchComponent(nameComponent));
         }
-        if (templates.get("object").hasFields("properties")) {
-            glob.add("properties", this.deploy(nameComponent));
+        else {
+            /*glob = this.getFieldAsArray(matchComponent(nameComponent));*/
         }
+
         return glob;
     }
 
@@ -62,7 +64,7 @@ public class ParserToJson {
      * @param component the compo
      * @return a json object
      */
-    public JsonObject getGeneralField(Component component) {
+    public JsonObject getFieldAsObject(Component component) {
 
         JsonObject globalFields = new JsonObject();
         if (templates.get("object").hasFields("title")) {
@@ -76,6 +78,12 @@ public class ParserToJson {
                 globalFields.addProperty("description", component.getDescription());
             }
         }
+        if (templates.get("object").hasFields("required")) {
+            globalFields.add("required", this.getRequirements(component.getName()));
+        }
+        if (templates.get("object").hasFields("properties")) {
+            globalFields.add("properties", this.deploy(component.getName()));
+        }
         return globalFields;
     }
 
@@ -124,7 +132,7 @@ public class ParserToJson {
         for (Entry<String, Property> property : toParse.getProperties().entrySet()) {
             if (matchComponent((String) property.getValue().getItems().get("type")) != null) {
                 jsonSchema.add(property.getValue().getName(),
-                        this.getJsonProcess((String) property.getValue().getItems().get("type")));
+                        this.getJsonProcess((String) property.getValue().getItems().get("type"), "object"));
             }
             else {
                 jsonSchema.add(property.getValue().getName(), this.complexParse(property.getValue()));
@@ -166,8 +174,11 @@ public class ParserToJson {
             switch (propertyField) {
                 case "type":
                     if (currentPropertyTemplate.hasFields(propertyField)) {
-                        switch ((String) property.getItems().get(propertyField)) {
+                        String fieldtype = (String) property.getItems().get(propertyField);
+                        switch (fieldtype.toLowerCase()) {
                             case "list":
+                                propertiesInJson.addProperty("type", "array");
+                                break;
                             case "map":
                                 propertiesInJson.addProperty("type", "object");
                                 break;
@@ -180,6 +191,9 @@ public class ParserToJson {
                                 propertiesInJson.addProperty("type", "string");
                                 propertiesInJson.addProperty("format", "date-time");
                                 break;
+                            case "float":
+                                propertiesInJson.addProperty("type", "number");
+                                break;
                             case "range":
                                 propertiesInJson.addProperty("type", "integer");
                                 if (!checkConstraintPresence(property, "greater_than")
@@ -205,16 +219,38 @@ public class ParserToJson {
                             currentPropertyTemplate);
                     break;
                 case "entry_schema":
+                    //Here, a way to check if entry is a component (datatype) or a simple string
                     if (matchComponent(this.extractSpecificFieldFromMap(property, "entry_schema")) != null) {
+                        String nameComponent = this.extractSpecificFieldFromMap(property, "entry_schema");
                         ParserToJson child = new ParserToJson(components, templates);
-                        JsonObject componentAsProperty =
-                                child.getJsonProcess(this.extractSpecificFieldFromMap(property, "entry_schema"));
                         JsonObject propertiesContainer = new JsonObject();
-                        propertiesContainer
-                                .add(this.extractSpecificFieldFromMap(property, "entry_schema"), componentAsProperty);
-                        if (currentPropertyTemplate.hasFields("properties")) {
-                            propertiesInJson.add("properties", propertiesContainer);
+
+                        switch ((String) property.getItems().get("type")) {
+                            case "map": // Get it as an object
+                                JsonObject componentAsProperty = child.getJsonProcess(nameComponent,"object");
+                                propertiesContainer.add(nameComponent, componentAsProperty);
+                                if (currentPropertyTemplate.hasFields("properties")) {
+                                    propertiesInJson.add("properties", propertiesContainer);
+                                }
+                                break;
+                            default://list : get it as an Array
+                                JsonObject componentAsItem = child.getJsonProcess(nameComponent, "object");
+                                if (currentPropertyTemplate.hasFields("properties")) {
+                                    propertiesInJson.add("items", componentAsItem);
+                                }
+                                break;
                         }
+
+                    }
+                    // Native cases
+                    else if (property.getItems().get("type").equals("list")) {
+                        JsonObject itemContainer = new JsonObject();
+                        String valueInEntrySchema = this.extractSpecificFieldFromMap(property, "entry_schema");
+                        itemContainer.addProperty("type", valueInEntrySchema);
+                          propertiesInJson.add("items", itemContainer);
+                    }
+                    else {//map
+                        // propertiesInJson.add("key?", valueInEntrySchema);
                     }
                     break;
                 default://Each classical field : type, description, default..
@@ -236,8 +272,10 @@ public class ParserToJson {
      */
     public Component matchComponent(String name) {
         Component correspondingComponent = null;
-        Collection<Component> listofComponent = components.values();
-        for (Component component : listofComponent) {
+        if (components == null) {
+            return null;
+        }
+        for (Component component : components.values()) {
             if (component.getName().equals(name)) {
                 correspondingComponent = component;
             }
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
index 4b510cb75..ce5cdb817 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
@@ -46,9 +46,10 @@ public class TemplateManagement {
      * @param templateProperties template properties as string
      * @throws IOException in case of failure
      */
-    public TemplateManagement(String yamlContent, String templateProperties) throws IOException {
+    public TemplateManagement(String yamlContent, String nativeComponent, String templateProperties)
+            throws IOException {
         if (yamlContent != null && !yamlContent.isEmpty()) {
-            this.extractor = new Extractor(yamlContent);
+            this.extractor = new Extractor(yamlContent, nativeComponent);
             this.components = extractor.getAllItems();
             this.templates = initializeTemplates(templateProperties);
         }
@@ -155,7 +156,7 @@ public class TemplateManagement {
         if (parserToJson.matchComponent(componentName) == null) {
             throw new UnknownComponentException(componentName);
         }
-        return parserToJson.getJsonProcess(componentName);
+        return parserToJson.getJsonProcess(componentName, "object");
     }
 
     /**
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
index ebeb84fd6..004c450af 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -30,7 +30,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
-
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
 import javax.persistence.Column;
@@ -44,6 +44,9 @@ import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.json.JSONObject;
+import org.onap.clamp.clds.tosca.update.TemplateManagement;
+import org.onap.clamp.clds.tosca.update.UnknownComponentException;
+import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.common.AuditEntity;
 import org.onap.clamp.loop.template.LoopElementModel;
@@ -284,4 +287,22 @@ public abstract class Policy extends AuditEntity {
         return buffer.toString().replace('.', '_').replaceAll(" ", "");
     }
 
+    /**
+     * This method can be used to generate the json Schema used by the UI.
+     *
+     * @param policyToscaModel The tosca model as String that must be converted
+     * @param policyModelType The tosca model type (the policy_type entry in the tosca) that will used to create the
+     *                        json schema
+     * @return THe Json Schema as JsonObject
+     * @throws IOException In case of failure when opening the templates.properties file
+     * @throws UnknownComponentException If the policyModelType is not found in the tosca model
+     */
+    public static JsonObject generateJsonRepresentationFromToscaModel(String policyToscaModel,
+                                                                      String policyModelType)
+            throws IOException, UnknownComponentException {
+        return new TemplateManagement(policyToscaModel,ResourceFileUtil.getResourceAsString(
+                "clds/tosca_update/defaultToscaTypes.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"))
+                .launchTranslation(policyModelType);
+    }
 }
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index c4037ffb6..96b3a09bd 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -27,6 +27,7 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -39,8 +40,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.tosca.update.UnknownComponentException;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.loop.template.LoopElementModel;
@@ -104,9 +104,16 @@ public class MicroServicePolicy extends Policy implements Serializable {
      * @param shared      The flag indicate whether the MicroService is shared
      */
     public MicroServicePolicy(String name, PolicyModel policyModel, Boolean shared, LoopElementModel loopElementModel) {
-        this(name, policyModel, shared, JsonUtils.GSON_JPA_MODEL
-                .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
-                        policyModel.getPolicyModelType()), JsonObject.class), loopElementModel,null,null);
+        this.name = name;
+        this.setPolicyModel(policyModel);
+        this.shared = shared;
+        try {
+            this.setJsonRepresentation(Policy.generateJsonRepresentationFromToscaModel(policyModel.getPolicyModelTosca(),policyModel.getPolicyModelType()));
+        } catch (UnknownComponentException | NullPointerException | IOException e) {
+            logger.error("Unable to generate the microservice policy Schema ... ", e);
+            this.setJsonRepresentation(new JsonObject());
+        }
+        this.setLoopElementModel(loopElementModel);
     }
 
     /**
@@ -116,7 +123,7 @@ public class MicroServicePolicy extends Policy implements Serializable {
      * @param name               The name of the MicroService
      * @param policyModel        The policy model type of the MicroService
      * @param shared             The flag indicate whether the MicroService is
- *                           shared
+     *                           shared
      * @param jsonRepresentation The UI representation in json format
      * @param loopElementModel   The loop element model from which this instance should be created
      * @param pdpGroup           The Pdp Group info
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 82cfcf4ef..975674266 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -44,14 +44,12 @@ import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
-import org.onap.clamp.clds.tosca.ToscaYamlToJsonConvertor;
-import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.clds.tosca.update.UnknownComponentException;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.loop.template.LoopElementModel;
@@ -119,17 +117,15 @@ public class OperationalPolicy extends Policy implements Serializable {
             if (isLegacy()) {
                 // Op policy Legacy case
                 LegacyOperationalPolicy.preloadConfiguration(jsonReturned, loop);
-                this.setJsonRepresentation(
-                        OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
+                jsonReturned =
+                        OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService());
             } else {
                 // Generic Case
-                this.setJsonRepresentation(JsonUtils.GSON
-                        .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyModel.getPolicyModelTosca(),
-                                policyModel.getPolicyModelType()), JsonObject.class));
+                jsonReturned = Policy.generateJsonRepresentationFromToscaModel(policyModel.getPolicyModelTosca(),
+                        policyModel.getPolicyModelType());
             }
-        } catch (JsonSyntaxException | IOException | NullPointerException e) {
+        } catch (UnknownComponentException | IOException | NullPointerException e) {
             logger.error("Unable to generate the operational policy Schema ... ", e);
-            this.setJsonRepresentation(new JsonObject());
         }
         return jsonReturned;
     }
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 9c4c9fff2..62f30005c 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,25 +444,25 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route61">2.1. GET /v1/healthcheck</a>
+<li><a href="#_route92">2.1. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route62">2.2. GET /v1/user/getUser</a>
+<li><a href="#_route93">2.2. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route49">2.3. GET /v2/dictionary</a>
+<li><a href="#_route80">2.3. GET /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route51">2.4. PUT /v2/dictionary</a>
+<li><a href="#_route82">2.4. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters">2.4.1. Parameters</a></li>
 <li><a href="#_responses_4">2.4.2. Responses</a></li>
@@ -491,7 +491,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_7">2.7.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route53">2.8. DELETE /v2/dictionary/{name}</a>
+<li><a href="#_route84">2.8. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_4">2.8.1. Parameters</a></li>
 <li><a href="#_responses_8">2.8.2. Responses</a></li>
@@ -505,75 +505,75 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_9">2.9.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route45">2.10. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route76">2.10. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_6">2.10.1. Parameters</a></li>
 <li><a href="#_responses_10">2.10.2. Responses</a></li>
 </ul>
 </li>
-<li><a href="#_route39">2.11. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route70">2.11. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_7">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
 <li><a href="#_produces_10">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route33">2.12. GET /v2/loop/getAllNames</a>
+<li><a href="#_route64">2.12. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_12">2.12.1. Responses</a></li>
 <li><a href="#_produces_11">2.12.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route46">2.13. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route77">2.13. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_8">2.13.1. Parameters</a></li>
 <li><a href="#_responses_13">2.13.2. Responses</a></li>
 <li><a href="#_produces_12">2.13.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route40">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
+<li><a href="#_route71">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route43">2.15. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route74">2.15. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_10">2.15.1. Parameters</a></li>
 <li><a href="#_responses_15">2.15.2. Responses</a></li>
 <li><a href="#_produces_14">2.15.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route42">2.16. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route73">2.16. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_11">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route44">2.17. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route75">2.17. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_12">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
 <li><a href="#_produces_16">2.17.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route35">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route66">2.18. GET /v2/loop/svgRepresentation/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_13">2.18.1. Parameters</a></li>
 <li><a href="#_responses_18">2.18.2. Responses</a></li>
 <li><a href="#_produces_17">2.18.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route41">2.19. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route72">2.19. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_14">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
 <li><a href="#_produces_18">2.19.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route36">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route67">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_15">2.20.1. Parameters</a></li>
 <li><a href="#_responses_20">2.20.2. Responses</a></li>
@@ -581,7 +581,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_19">2.20.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route38">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route69">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_16">2.21.1. Parameters</a></li>
 <li><a href="#_responses_21">2.21.2. Responses</a></li>
@@ -589,7 +589,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_20">2.21.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route37">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route68">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_17">2.22.1. Parameters</a></li>
 <li><a href="#_responses_22">2.22.2. Responses</a></li>
@@ -597,14 +597,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_21">2.22.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route34">2.23. GET /v2/loop/{loopName}</a>
+<li><a href="#_route65">2.23. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_18">2.23.1. Parameters</a></li>
 <li><a href="#_responses_23">2.23.2. Responses</a></li>
 <li><a href="#_produces_22">2.23.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route56">2.24. GET /v2/policyToscaModels</a>
+<li><a href="#_route87">2.24. GET /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_24">2.24.1. Responses</a></li>
 <li><a href="#_produces_23">2.24.2. Produces</a></li>
@@ -624,7 +624,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_25">2.26.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route57">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
+<li><a href="#_route88">2.27. PUT /v2/policyToscaModels/{policyModelType}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_21">2.27.1. Parameters</a></li>
 <li><a href="#_responses_27">2.27.2. Responses</a></li>
@@ -632,7 +632,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_26">2.27.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route60">2.28. GET /v2/templates</a>
+<li><a href="#_route91">2.28. GET /v2/templates</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_28">2.28.1. Responses</a></li>
 <li><a href="#_produces_27">2.28.2. Produces</a></li>
@@ -692,7 +692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:39099<br>
+<p><em>Host</em> : localhost:40597<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -703,7 +703,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route61"><a class="anchor" href="#_route61"></a><a class="link" href="#_route61">2.1. GET /v1/healthcheck</a></h3>
+<h3 id="_route92"><a class="anchor" href="#_route92"></a><a class="link" href="#_route92">2.1. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -740,7 +740,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route62"><a class="anchor" href="#_route62"></a><a class="link" href="#_route62">2.2. GET /v1/user/getUser</a></h3>
+<h3 id="_route93"><a class="anchor" href="#_route93"></a><a class="link" href="#_route93">2.2. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -774,7 +774,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route49"><a class="anchor" href="#_route49"></a><a class="link" href="#_route49">2.3. GET /v2/dictionary</a></h3>
+<h3 id="_route80"><a class="anchor" href="#_route80"></a><a class="link" href="#_route80">2.3. GET /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -811,7 +811,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route51"><a class="anchor" href="#_route51"></a><a class="link" href="#_route51">2.4. PUT /v2/dictionary</a></h3>
+<h3 id="_route82"><a class="anchor" href="#_route82"></a><a class="link" href="#_route82">2.4. PUT /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.4.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1060,7 +1060,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route53"><a class="anchor" href="#_route53"></a><a class="link" href="#_route53">2.8. DELETE /v2/dictionary/{name}</a></h3>
+<h3 id="_route84"><a class="anchor" href="#_route84"></a><a class="link" href="#_route84">2.8. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.8.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1184,7 +1184,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route45"><a class="anchor" href="#_route45"></a><a class="link" href="#_route45">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route76"><a class="anchor" href="#_route76"></a><a class="link" href="#_route76">2.10. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.10.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1233,7 +1233,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route39"><a class="anchor" href="#_route39"></a><a class="link" href="#_route39">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route70"><a class="anchor" href="#_route70"></a><a class="link" href="#_route70">2.11. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1295,7 +1295,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route33"><a class="anchor" href="#_route33"></a><a class="link" href="#_route33">2.12. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route64"><a class="anchor" href="#_route64"></a><a class="link" href="#_route64">2.12. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
 <h4 id="_responses_12"><a class="anchor" href="#_responses_12"></a><a class="link" href="#_responses_12">2.12.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1332,7 +1332,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route46"><a class="anchor" href="#_route46"></a><a class="link" href="#_route46">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route77"><a class="anchor" href="#_route77"></a><a class="link" href="#_route77">2.13. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.13.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1394,7 +1394,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route40"><a class="anchor" href="#_route40"></a><a class="link" href="#_route40">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
+<h3 id="_route71"><a class="anchor" href="#_route71"></a><a class="link" href="#_route71">2.14. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1456,7 +1456,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route43"><a class="anchor" href="#_route43"></a><a class="link" href="#_route43">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route74"><a class="anchor" href="#_route74"></a><a class="link" href="#_route74">2.15. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.15.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1518,7 +1518,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route42"><a class="anchor" href="#_route42"></a><a class="link" href="#_route42">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route73"><a class="anchor" href="#_route73"></a><a class="link" href="#_route73">2.16. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1580,7 +1580,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route44"><a class="anchor" href="#_route44"></a><a class="link" href="#_route44">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route75"><a class="anchor" href="#_route75"></a><a class="link" href="#_route75">2.17. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1642,7 +1642,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route35"><a class="anchor" href="#_route35"></a><a class="link" href="#_route35">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route66"><a class="anchor" href="#_route66"></a><a class="link" href="#_route66">2.18. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.18.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1704,7 +1704,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route41"><a class="anchor" href="#_route41"></a><a class="link" href="#_route41">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route72"><a class="anchor" href="#_route72"></a><a class="link" href="#_route72">2.19. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1766,7 +1766,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route36"><a class="anchor" href="#_route36"></a><a class="link" href="#_route36">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route67"><a class="anchor" href="#_route67"></a><a class="link" href="#_route67">2.20. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.20.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1844,7 +1844,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route38"><a class="anchor" href="#_route38"></a><a class="link" href="#_route38">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route69"><a class="anchor" href="#_route69"></a><a class="link" href="#_route69">2.21. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.21.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1922,7 +1922,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route37"><a class="anchor" href="#_route37"></a><a class="link" href="#_route37">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route68"><a class="anchor" href="#_route68"></a><a class="link" href="#_route68">2.22. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.22.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2000,7 +2000,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route34"><a class="anchor" href="#_route34"></a><a class="link" href="#_route34">2.23. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route65"><a class="anchor" href="#_route65"></a><a class="link" href="#_route65">2.23. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.23.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2062,7 +2062,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route56"><a class="anchor" href="#_route56"></a><a class="link" href="#_route56">2.24. GET /v2/policyToscaModels</a></h3>
+<h3 id="_route87"><a class="anchor" href="#_route87"></a><a class="link" href="#_route87">2.24. GET /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_responses_24"><a class="anchor" href="#_responses_24"></a><a class="link" href="#_responses_24">2.24.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2223,7 +2223,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route57"><a class="anchor" href="#_route57"></a><a class="link" href="#_route57">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
+<h3 id="_route88"><a class="anchor" href="#_route88"></a><a class="link" href="#_route88">2.27. PUT /v2/policyToscaModels/{policyModelType}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.27.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2301,7 +2301,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route60"><a class="anchor" href="#_route60"></a><a class="link" href="#_route60">2.28. GET /v2/templates</a></h3>
+<h3 id="_route91"><a class="anchor" href="#_route91"></a><a class="link" href="#_route91">2.28. GET /v2/templates</a></h3>
 <div class="sect3">
 <h4 id="_responses_28"><a class="anchor" href="#_responses_28"></a><a class="link" href="#_responses_28">2.28.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -3544,7 +3544,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpSubGroup</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpSubgroup</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
@@ -3642,7 +3642,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpSubGroup</strong><br>
+<td class="tableblock halign-left valign-middle"><p class="tableblock"><strong>pdpSubgroup</strong><br>
 <em>optional</em></p></td>
 <td class="tableblock halign-left valign-middle"><p class="tableblock">string</p></td>
 </tr>
diff --git a/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml b/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
new file mode 100644
index 000000000..a11a73698
--- /dev/null
+++ b/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
@@ -0,0 +1,87 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+data_types:
+  tosca.datatypes.Root:
+    description: The TOSCA root Data Type all other TOSCA base Data Types derive from
+  tosca.datatypes.Credential:
+    derived_from: tosca.datatypes.Root
+    properties:
+      protocol:
+        type: string
+        required: false
+      token_type:
+        type: string
+        default: password
+      token:
+        type: string
+      keys:
+        type: map
+        required: false
+        entry_schema:
+          type: string
+      user:
+        type: string
+        required: false
+  tosca.datatypes.TimeInterval:
+    derived_from: tosca.datatypes.Root
+    properties:
+      start_time:
+        type: timestamp
+        required: true
+      end_time:
+        type: timestamp
+        required: true
+  tosca.datatypes.network.NetworkInfo:
+    derived_from: tosca.datatypes.Root
+    properties:
+      network_name:
+        type: string
+      network_id:
+        type: string
+      addresses:
+        type: list
+        entry_schema:
+          type: string
+  tosca.datatypes.network.PortInfo:
+    derived_from: tosca.datatypes.Root
+    properties:
+      port_name:
+        type: string
+      port_id:
+        type: string
+      network_id:
+        type: string
+      mac_address:
+        type: string
+      addresses:
+        type: list
+      entry_schema:
+        type: string
+  # tosca.datatypes.network.PortDef:
+  #     derived_from: integer
+  #     constraints:
+  #     - in_range: [ 1, 65535 ]
+  # tosca.datatypes.network.PortSpec:
+  #     derived_from: tosca.datatypes.Root
+  #     properties:
+  #         protocol:
+  #             type: string
+  #             required: true
+  #             default: tcp
+  #             constraints:
+  #             - valid_values: [ udp, tcp, igmp ]
+  #         target:
+  #             type: PortDef
+  #             required: false
+  #         target_range:
+  #             type: range
+  #             required: false
+  #             constraints:
+  #             - in_range: [ 1, 65535 ]
+  #         source:
+  #             type: PortDef
+  #             required: false
+  #         source_range:
+  #             type: range
+  #             required: false
+  #             constraints:
+  #             - in_range: [ 1, 65535 ]
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
index abf65c366..c65c84a45 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
@@ -38,7 +38,8 @@ public class ArrayFieldTest extends TestCase {
      */
     public void testDeploy() throws IOException {
         TemplateManagement templateManagement = new TemplateManagement(ResourceFileUtil.getResourceAsString(
-                "tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),
+                "tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),ResourceFileUtil.getResourceAsString(
+                "clds/tosca_update/defaultToscaTypes.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
         Property property = component.getProperties().get("actor");
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java
index 0494ee11d..f5d2fe6ee 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java
@@ -41,6 +41,7 @@ public class ComponentTest extends TestCase {
         TemplateManagement templateManagement =
                 new TemplateManagement(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                         ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
         assertEquals(reference, component.propertiesNames());
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
index a71ea8ac4..6f1046ea9 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
@@ -33,6 +33,7 @@ public class ConstraintTest extends TestCase {
 
     TemplateManagement templateManagement = new TemplateManagement(
             ResourceFileUtil.getResourceAsString("tosca/new-converter/constraints.yaml"),
+            ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
             ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
 
     Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Operation");
@@ -41,7 +42,7 @@ public class ConstraintTest extends TestCase {
     }
 
     /**
-     *  Test get value array.
+     * Test get value array.
      */
     public void testGetValuesArray() {
         Property property = component.getProperties().get("timeout");
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
index cf183af81..5a9955999 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
@@ -42,6 +42,7 @@ public class PropertyTest extends TestCase {
     public void testParseArray() throws IOException {
         TemplateManagement templateManagement = new TemplateManagement(
                 ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
         Property property = component.getProperties().get("actor");
@@ -57,6 +58,7 @@ public class PropertyTest extends TestCase {
     public void testAddConstraintsAsJson() throws IOException {
         TemplateManagement templateManagement = new TemplateManagement(
                 ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         Component component = templateManagement.getComponents().get("onap.datatype.controlloop.operation.Failure");
         Property property = component.getProperties().get("category");
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java
index 8e411069c..4447a98cd 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java
@@ -31,6 +31,86 @@ import org.onap.clamp.clds.util.ResourceFileUtil;
 
 public class TemplateManagementTest extends TestCase {
 
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationTca() throws IOException, UnknownComponentException {
+        TemplateManagement templateManagement =
+                new TemplateManagement(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/defaultToscaTypes.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
+        assertNull(templateManagement.getParseToJson());
+        String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
+        templateManagement.launchTranslation(componentName);
+        assertNotNull(templateManagement.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationFrequencyLimiter() throws IOException, UnknownComponentException {
+        TemplateManagement templateManagement =
+                new TemplateManagement(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/defaultToscaTypes.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
+        assertNull(templateManagement.getParseToJson());
+        String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
+        templateManagement.launchTranslation(componentName);
+        assertNotNull(templateManagement.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationApex() throws IOException, UnknownComponentException {
+        TemplateManagement templateManagement =
+                new TemplateManagement(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/defaultToscaTypes.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
+        assertNull(templateManagement.getParseToJson());
+        String componentName = "onap.policies.controlloop.operational.common.Apex";
+        templateManagement.launchTranslation(componentName);
+        assertNotNull(templateManagement.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationDrools() throws IOException, UnknownComponentException {
+        TemplateManagement templateManagement =
+                new TemplateManagement(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.controlloop.operational.common.Drools/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/defaultToscaTypes.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
+        assertNull(templateManagement.getParseToJson());
+        String componentName = "onap.policies.controlloop.operational.common.Drools";
+        templateManagement.launchTranslation(componentName);
+        assertNotNull(templateManagement.getParseToJson());
+    }
+
     /**
      * Test the launch translation.
      *
@@ -41,6 +121,7 @@ public class TemplateManagementTest extends TestCase {
         TemplateManagement templateManagement =
                 new TemplateManagement(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                         ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         assertNull(templateManagement.getParseToJson());
         String componentName = "onap.policies.controlloop.operational.common.Drools";
@@ -57,6 +138,7 @@ public class TemplateManagementTest extends TestCase {
         TemplateManagement templateManagement =
                 new TemplateManagement(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                         ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         int count = templateManagement.getTemplates().size();
         ArrayList<String> templateFields =
@@ -74,6 +156,7 @@ public class TemplateManagementTest extends TestCase {
         TemplateManagement templateManagement =
                 new TemplateManagement(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                         ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         int count = templateManagement.getTemplates().size();
         templateManagement.removeTemplate("string");
@@ -89,6 +172,7 @@ public class TemplateManagementTest extends TestCase {
         TemplateManagement templateManagement =
                 new TemplateManagement(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                         ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         int count = templateManagement.getTemplates().get("integer").getFields().size();
         templateManagement.updateTemplate("integer", "type", false);
@@ -104,6 +188,7 @@ public class TemplateManagementTest extends TestCase {
         TemplateManagement templateManagement =
                 new TemplateManagement(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
                         ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
         boolean has = true;
         ArrayList<String> templateFieldsString =
diff --git a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
index 2cd301850..f08e86e8e 100644
--- a/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
@@ -69,11 +69,15 @@ public class PolicyEngineControllerTestItCase {
         assertThat(firstExecution).isNotNull();
         List<PolicyModel> policyModelsList = policyModelsRepository.findAll();
         assertThat(policyModelsList.size()).isGreaterThanOrEqualTo(5);
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.Drools", null, "1.0.0"));
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.Apex", null, "1.0.0"));
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.FrequencyLimiter", null, "1.0.0"));
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.Blacklist", null, "1.0.0"));
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.MinMax", null, "2.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.common.Drools",
+                null, "1.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.common.Apex",
+                null, "1.0.0"));
+        assertThat(policyModelsList)
+                .contains(new PolicyModel("onap.policies.controlloop.guard.common.FrequencyLimiter", null, "1.0.0"));
+        assertThat(policyModelsList)
+                .contains(new PolicyModel("onap.policies.controlloop.guard.common.Blacklist", null, "1.0.0"));
+        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.guard.common.MinMax", null, "2.0.0"));
 
         // Re-do it to check that there is no issue with duplicate key
         policyController.synchronizeAllPolicies();
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
index 4b27438cc..0cce9c3d9 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
@@ -1,34 +1,34 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-  - onap.policies.controlloop.operational.Drools:
+  - onap.policies.controlloop.operational.common.Drools:
       version: 1.0.0
       description: Operational Policy for Control Loops using the Drools PDP
       derived_from: onapy.policies.controlloop.Operational
       properties:
         # Omitted for brevity, see Section 1
 
-  - onap.policies.controlloop.operational.Apex:
+  - onap.policies.controlloop.operational.common.Apex:
       version: 1.0.0
       description: Operational Policy for Control Loops using the APEX PDP
       derived_from: onap.policies.controlloop.Operational
       properties:
         # Omitted for brevity, see Section 1
 
-  - onap.policies.controlloop.guard.FrequencyLimiter:
+  - onap.policies.controlloop.guard.common.FrequencyLimiter:
       version: 1.0.0
       description: Supports limiting the frequency of actions being taken by a Actor.
       derived_from: onap.policies.controlloop.Guard
       properties:
         # Omitted for brevity, see Section 1
 
-  - onap.policies.controlloop.guard.Blacklist:
+  - onap.policies.controlloop.guard.common.Blacklist:
       version: 1.0.0
       description: Supports blacklist of VNF's from performing control loop actions on.
       derived_from: onap.policies.controlloop.Guard
       properties:
         # Omitted for brevity, see Section 1
 
-  - onap.policies.controlloop.guard.MinMax:
+  - onap.policies.controlloop.guard.common.MinMax:
       version: 2.0.0
       description: Supports Min/Max number of VF Modules
       derived_from: onap.policies.controlloop.Guard
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index 91a825212..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,40 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-   onap.policies.controlloop.Guard:
-      derived_from: tosca.policies.Root
-      version: 1.0.0
-      description: Guard Policies for Control Loop Operational Policies
-   onap.policies.controlloop.guard.Blacklist:
-      derived_from: onap.policies.controlloop.Guard
-      version: 1.0.0
-      description: Supports blacklist of VNF's from performing control loop actions on.
-      properties:
-         blacklist_policy:
-            type: map
-            description: null
-            entry_schema:
-               type: onap.datatypes.guard.Blacklist
-data_types:
-   onap.datatypes.guard.Blacklist:
-      derived_from: tosca.datatypes.Root
-      properties:
-         actor:
-            type: string
-            description: Specifies the Actor
-            required: true
-         recipe:
-            type: string
-            description: Specified the Recipe
-            required: true
-         time_range:
-            type: tosca.datatypes.TimeInterval
-            description: An optional range of time during the day the blacklist is valid for.
-            required: false
-         controlLoopName:
-            type: string
-            description: An optional specific control loop to apply this guard to.
-            required: false
-         blacklist:
-            type: list
-            description: List of VNF's
-            required: true
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index 45e5471fc..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,50 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-   onap.policies.controlloop.Guard:
-      derived_from: tosca.policies.Root
-      version: 1.0.0
-      description: Guard Policies for Control Loop Operational Policies
-   onap.policies.controlloop.guard.FrequencyLimiter:
-      derived_from: onap.policies.controlloop.Guard
-      version: 1.0.0
-      description: Supports limiting the frequency of actions being taken by a Actor.
-      properties:
-         frequency_policy:
-            type: map
-            description: null
-            entry_schema:
-               type: onap.datatypes.guard.FrequencyLimiter
-data_types:
-   onap.datatypes.guard.FrequencyLimiter:
-      derived_from: tosca.datatypes.Root
-      properties:
-         actor:
-            type: string
-            description: Specifies the Actor
-            required: true
-         recipe:
-            type: string
-            description: Specified the Recipe
-            required: true
-         time_window:
-            type: scalar-unit.time
-            description: The time window to count the actions against.
-            required: true
-         limit:
-            type: integer
-            description: The limit
-            required: true
-            constraints:
-            -  greater_than: 0
-         time_range:
-            type: tosca.datatypes.TimeInterval
-            description: An optional range of time during the day the frequency is valid for.
-            required: false
-         controlLoopName:
-            type: string
-            description: An optional specific control loop to apply this guard to.
-            required: false
-         target:
-            type: string
-            description: An optional specific VNF to apply this guard to.
-            required: false
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
deleted file mode 100644
index 54c4204e2..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ /dev/null
@@ -1,44 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-   onap.policies.controlloop.Guard:
-      derived_from: tosca.policies.Root
-      version: 1.0.0
-      description: Guard Policies for Control Loop Operational Policies
-   onap.policies.controlloop.guard.MinMax:
-      derived_from: onap.policies.controlloop.Guard
-      version: 1.0.0
-      description: Supports Min/Max number of VF Modules
-      properties:
-         minmax_policy:
-            type: map
-            description: null
-            entry_schema:
-               type: onap.datatypes.guard.MinMax
-data_types:
-   onap.datatypes.guard.MinMax:
-      derived_from: tosca.datatypes.Root
-      properties:
-         actor:
-            type: string
-            description: Specifies the Actor
-            required: true
-         recipe:
-            type: string
-            description: Specified the Recipe
-            required: true
-         time_range:
-            type: tosca.datatypes.TimeInterval
-            description: An optional range of time during the day the Min/Max limit is valid for.
-            required: false
-         controlLoopName:
-            type: string
-            description: An optional specific control loop to apply this guard to.
-            required: false
-         min_vf_module_instances:
-            type: integer
-            required: true
-            description: The minimum instances of this VF-Module
-         max_vf_module_instances:
-            type: integer
-            required: false
-            description: The maximum instances of this VF-Module
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header
deleted file mode 100644
index 6a280d972..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
new file mode 100644
index 000000000..79e79f0fe
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -0,0 +1,38 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+policy_types:
+    onap.policies.controlloop.guard.Common:
+        derived_from: tosca.policies.Root
+        version: 1.0.0
+        description: |
+            This is the base Policy Type for Guard policies that guard the execution of Operational
+            Policies.
+        properties:
+            actor:
+                type: string
+                description: Specifies the Actor the guard applies to.
+                required: true
+            operation:
+                type: string
+                description: Specified the operation that the actor is performing the guard applies to.
+                required: true
+            timeRange:
+                type: tosca.datatypes.TimeInterval
+                description: |
+                    An optional range of time during the day the guard policy is valid for.
+                required: false
+            id:
+                type: string
+                description: The Control Loop id this applies to.
+                required: false
+    onap.policies.controlloop.guard.common.Blacklist:
+        derived_from: onap.policies.controlloop.guard.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Supports blacklist of entity id's from performing control loop actions on.
+        properties:
+            blacklist:
+                type: list
+                description: List of entity id's
+                required: true
+                entry_schema:
+                    type: string
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
new file mode 100644
index 000000000..6a280d972
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0&#63;connectionTimeToLive=5000/.header
@@ -0,0 +1 @@
+{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
new file mode 100644
index 000000000..163027e46
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -0,0 +1,47 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+policy_types:
+    onap.policies.controlloop.guard.Common:
+        derived_from: tosca.policies.Root
+        version: 1.0.0
+        description: |
+            This is the base Policy Type for Guard policies that guard the execution of Operational
+            Policies.
+        properties:
+            actor:
+                type: string
+                description: Specifies the Actor the guard applies to.
+                required: true
+            operation:
+                type: string
+                description: Specified the operation that the actor is performing the guard applies to.
+                required: true
+            timeRange:
+                type: tosca.datatypes.TimeInterval
+                description: |
+                    An optional range of time during the day the guard policy is valid for.
+                required: false
+            id:
+                type: string
+                description: The Control Loop id this applies to.
+                required: false
+    onap.policies.controlloop.guard.common.FrequencyLimiter:
+        derived_from: onap.policies.controlloop.guard.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Supports limiting the frequency of actions being taken by a Actor.
+        properties:
+            timeWindow:
+                type: integer
+                description: The time window to count the actions against.
+                required: true
+            timeUnits:
+                type: string
+                description: The units of time the window is counting.
+                constraints:
+                - valid_values: ["second", "minute", "hour", "day", "week", "month", "year"]
+            limit:
+                type: integer
+                description: The limit
+                required: true
+                constraints:
+                -   greater_than: 0
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
new file mode 100644
index 000000000..6a280d972
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;connectionTimeToLive=5000/.header
@@ -0,0 +1 @@
+{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.file
new file mode 100644
index 000000000..78bdde746
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.file
@@ -0,0 +1,40 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+policy_types:
+    onap.policies.controlloop.guard.Common:
+        derived_from: tosca.policies.Root
+        version: 1.0.0
+        description: |
+            This is the base Policy Type for Guard policies that guard the execution of Operational
+            Policies.
+        properties:
+            actor:
+                type: string
+                description: Specifies the Actor the guard applies to.
+                required: true
+            operation:
+                type: string
+                description: Specified the operation that the actor is performing the guard applies to.
+                required: true
+            timeRange:
+                type: tosca.datatypes.TimeInterval
+                description: |
+                    An optional range of time during the day the guard policy is valid for.
+                required: false
+            id:
+                type: string
+                description: The Control Loop id this applies to.
+                required: false
+    onap.policies.controlloop.guard.common.MinMax:
+        derived_from: onap.policies.controlloop.guard.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Supports Min/Max number of entity for scaling operations
+        properties:
+            min:
+                type: integer
+                required: true
+                description: The minimum instances of this entity
+            max:
+                type: integer
+                required: false
+                description: The maximum instances of this entity
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.header
new file mode 100644
index 000000000..6a280d972
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0&#63;connectionTimeToLive=5000/.header
@@ -0,0 +1 @@
+{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
new file mode 100644
index 000000000..44f55879e
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -0,0 +1,158 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+policy_types:
+    onap.policies.controlloop.operational.common.Apex:
+        derived_from: onap.policies.controlloop.operational.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Operational policies for Apex PDP
+        properties:
+            engineServiceParameters:
+                type: string
+                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.
+                required: true
+            eventInputParameters:
+                type: string
+                description: The event input parameters.
+                required: true
+            eventOutputParameters:
+                type: string
+                description: The event output parameters.
+                required: true
+            javaProperties:
+                type: string
+                description: Name/value pairs of properties to be set for APEX if needed.
+                required: false
+    onap.policies.controlloop.operational.Common:
+        derived_from: tosca.policies.Root
+        version: 1.0.0
+        description: |
+            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant
+            Policy Types. This does NOT support the legacy Policy YAML policy type.
+        properties:
+            id:
+                type: string
+                description: The unique control loop id.
+                required: true
+            timeout:
+                type: integer
+                description: |
+                    Overall timeout for executing all the operations. This timeout should equal or exceed the total
+                    timeout for each operation listed.
+                required: true
+            abatement:
+                type: boolean
+                description: Whether an abatement event message will be expected for the control loop from DCAE.
+                required: true
+                default: false
+            trigger:
+                type: string
+                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
+                required: true
+            operations:
+                type: list
+                description: List of operations to be performed when Control Loop is triggered.
+                required: true
+                entry_schema:
+                    type: onap.datatype.controlloop.Operation
+data_types:
+    onap.datatype.controlloop.Target:
+        derived_from: tosca.datatypes.Root
+        description: Definition for a entity in A&AI to perform a control loop operation on
+        properties:
+            targetType:
+                type: string
+                description: Category for the target type
+                required: true
+                constraints:
+                - valid_values: [VNF, VM, VFMODULE, PNF]
+            entityIds:
+                type: map
+                description: |
+                    Map of values that identify the resource. If none are provided, it is assumed that the
+                    entity that generated the ONSET event will be the target.
+                required: false
+                entry_schema:
+                    type: string
+
+    onap.datatype.controlloop.Actor:
+        derived_from: tosca.datatypes.Root
+        description: An actor/operation/target definition
+        properties:
+            actor:
+                type: string
+                description: The actor performing the operation.
+                required: true
+            operation:
+                type: string
+                description: The operation the actor is performing.
+                required: true
+            target:
+                type: onap.datatype.controlloop.Target
+                description: The resource the operation should be performed on.
+                required: true
+                metadata:
+                    clamp_possible_values: <string:see clamp project for syntax>
+            payload:
+                type: map
+                description: Name/value pairs of payload information passed by Policy to the actor
+                required: false
+                entry_schema:
+                    type: string
+
+    onap.datatype.controlloop.Operation:
+        derived_from: tosca.datatypes.Root
+        description: An operation supported by an actor
+        properties:
+            id:
+                type: string
+                description: Unique identifier for the operation
+                required: true
+            description:
+                type: string
+                description: A user-friendly description of the intent for the operation
+                required: false
+            operation:
+                type: onap.datatype.controlloop.Actor
+                description: The definition of the operation to be performed.
+                required: true
+                metadata:
+                    clamp_possible_values: <string:see clamp project for syntax>
+            timeout:
+                type: integer
+                description: The amount of time for the actor to perform the operation.
+                required: true
+            retries:
+                type: integer
+                description: The number of retries the actor should attempt to perform the operation.
+                required: true
+                default: 0
+            success:
+                type: string
+                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
+                required: false
+                default: final_success
+            failure:
+                type: string
+                description: Points to the operation to invoke on Actor operation failure.
+                required: false
+                default: final_failure
+            failure_timeout:
+                type: string
+                description: Points to the operation to invoke when the time out for the operation occurs.
+                required: false
+                default: final_failure_timeout
+            failure_retries:
+                type: string
+                description: Points to the operation to invoke when the current operation has exceeded its max retries.
+                required: false
+                default: final_failure_retries
+            failure_exception:
+                type: string
+                description: Points to the operation to invoke when the current operation causes an exception.
+                required: false
+                default: final_failure_exception
+            failure_guard:
+                type: string
+                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
+                required: false
+                default: final_failure_guard
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
new file mode 100644
index 000000000..6a280d972
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.header
@@ -0,0 +1 @@
+{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
new file mode 100644
index 000000000..72897be07
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -0,0 +1,146 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+policy_types:
+    onap.policies.controlloop.operational.common.Drools:
+        derived_from: onap.policies.controlloop.operational.Common
+        type_version: 1.0.0
+        version: 1.0.0
+        description: Operational policies for Drools PDP
+        properties:
+            controllerName:
+                type: string
+                description: Drools controller properties
+                required: false
+    onap.policies.controlloop.operational.Common:
+        derived_from: tosca.policies.Root
+        version: 1.0.0
+        description: |
+            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant
+            Policy Types. This does NOT support the legacy Policy YAML policy type.
+        properties:
+            id:
+                type: string
+                description: The unique control loop id.
+                required: true
+            timeout:
+                type: integer
+                description: |
+                    Overall timeout for executing all the operations. This timeout should equal or exceed the total
+                    timeout for each operation listed.
+                required: true
+            abatement:
+                type: boolean
+                description: Whether an abatement event message will be expected for the control loop from DCAE.
+                required: true
+                default: false
+            trigger:
+                type: string
+                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
+                required: true
+            operations:
+                type: list
+                description: List of operations to be performed when Control Loop is triggered.
+                required: true
+                entry_schema:
+                    type: onap.datatype.controlloop.Operation
+data_types:
+    onap.datatype.controlloop.Target:
+        derived_from: tosca.datatypes.Root
+        description: Definition for a entity in A&AI to perform a control loop operation on
+        properties:
+            targetType:
+                type: string
+                description: Category for the target type
+                required: true
+                constraints:
+                - valid_values: [VNF, VM, VFMODULE, PNF]
+            entityIds:
+                type: map
+                description: |
+                    Map of values that identify the resource. If none are provided, it is assumed that the
+                    entity that generated the ONSET event will be the target.
+                required: false
+                entry_schema:
+                    type: string
+
+    onap.datatype.controlloop.Actor:
+        derived_from: tosca.datatypes.Root
+        description: An actor/operation/target definition
+        properties:
+            actor:
+                type: string
+                description: The actor performing the operation.
+                required: true
+            operation:
+                type: string
+                description: The operation the actor is performing.
+                required: true
+            target:
+                type: onap.datatype.controlloop.Target
+                description: The resource the operation should be performed on.
+                required: true
+                metadata:
+                    clamp_possible_values: <string:see clamp project for syntax>
+            payload:
+                type: map
+                description: Name/value pairs of payload information passed by Policy to the actor
+                required: false
+                entry_schema:
+                    type: string
+
+    onap.datatype.controlloop.Operation:
+        derived_from: tosca.datatypes.Root
+        description: An operation supported by an actor
+        properties:
+            id:
+                type: string
+                description: Unique identifier for the operation
+                required: true
+            description:
+                type: string
+                description: A user-friendly description of the intent for the operation
+                required: false
+            operation:
+                type: onap.datatype.controlloop.Actor
+                description: The definition of the operation to be performed.
+                required: true
+                metadata:
+                    clamp_possible_values: <string:see clamp project for syntax>
+            timeout:
+                type: integer
+                description: The amount of time for the actor to perform the operation.
+                required: true
+            retries:
+                type: integer
+                description: The number of retries the actor should attempt to perform the operation.
+                required: true
+                default: 0
+            success:
+                type: string
+                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
+                required: false
+                default: final_success
+            failure:
+                type: string
+                description: Points to the operation to invoke on Actor operation failure.
+                required: false
+                default: final_failure
+            failure_timeout:
+                type: string
+                description: Points to the operation to invoke when the time out for the operation occurs.
+                required: false
+                default: final_failure_timeout
+            failure_retries:
+                type: string
+                description: Points to the operation to invoke when the current operation has exceeded its max retries.
+                required: false
+                default: final_failure_retries
+            failure_exception:
+                type: string
+                description: Points to the operation to invoke when the current operation causes an exception.
+                required: false
+                default: final_failure_exception
+            failure_guard:
+                type: string
+                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
+                required: false
+                default: final_failure_guard
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header
new file mode 100644
index 000000000..6a280d972
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.header
@@ -0,0 +1 @@
+{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index 5fa4308db..3c17c9004 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 policy_types:
    onap.policies.Monitoring:
       derived_from: tosca.policies.Root
@@ -9,10 +9,9 @@ policy_types:
       version: 1.0.0
       properties:
          tca_policy:
-            type: map
+            type: onap.datatypes.monitoring.tca_policy
             description: TCA Policy JSON
-            entry_schema:
-               type: onap.datatypes.monitoring.tca_policy
+            required: true
 data_types:
    onap.datatypes.monitoring.metricsPerEventName:
       derived_from: tosca.datatypes.Root
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.file
index 6b6b372cf..f16f4e899 100644
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/pap/v1/pdps&#63;connectionTimeToLive=5000/.file
@@ -27,6 +27,10 @@
                     "policies": [],
                     "properties": {},
                     "supportedPolicyTypes": [
+                        {
+                            "name": "onap.policies.controlloop.operational.common.*",
+                            "version": "1.0.0"
+                        },
                         {
                             "name": "onap.policies.controlloop.Operational",
                             "version": "1.0.0"
@@ -42,7 +46,7 @@
                     "properties": {},
                     "supportedPolicyTypes": [
                         {
-                            "name": "onap.policies.controlloop.Guard",
+                            "name": "onap.policies.controlloop.guard.common.*",
                             "version": "1.0.0"
                         }
                     ]
diff --git a/src/test/resources/tosca/new-converter/tca-schema.json b/src/test/resources/tosca/new-converter/tca-schema.json
new file mode 100644
index 000000000..3f444aa9e
--- /dev/null
+++ b/src/test/resources/tosca/new-converter/tca-schema.json
@@ -0,0 +1,175 @@
+{
+  "title": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+  "type": "object",
+  "required": [],
+  "properties": {
+    "tca_policy": {
+      "title": "onap.datatypes.monitoring.tca_policy",
+      "type": "object",
+      "required": [
+        "domain",
+        "metricsPerEventName"
+      ],
+      "properties": {
+        "domain": {
+          "type": "string",
+          "description": "Domain name to which TCA needs to be applied",
+          "default": "measurementsForVfScaling",
+          "const": "measurementsForVfScaling"
+        },
+        "metricsPerEventName": {
+          "type": "array",
+          "description": "Contains eventName and threshold details that need to be applied to given eventName",
+          "items": {
+            "title": "onap.datatypes.monitoring.metricsPerEventName",
+            "type": "object",
+            "required": [
+              "controlLoopSchemaType",
+              "eventName",
+              "policyName",
+              "policyScope",
+              "policyVersion",
+              "thresholds"
+            ],
+            "properties": {
+              "controlLoopSchemaType": {
+                "type": "string",
+                "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+                "enum": [
+                  "VM",
+                  "VNF"
+                ]
+              },
+              "eventName": {
+                "type": "string",
+                "description": "Event name to which thresholds need to be applied"
+              },
+              "policyName": {
+                "type": "string",
+                "description": "TCA Policy Scope Name"
+              },
+              "policyScope": {
+                "type": "string",
+                "description": "TCA Policy Scope"
+              },
+              "policyVersion": {
+                "type": "string",
+                "description": "TCA Policy Scope Version"
+              },
+              "thresholds": {
+                "type": "array",
+                "description": "Thresholds associated with eventName",
+                "items": {
+                  "title": "onap.datatypes.monitoring.thresholds",
+                  "type": "object",
+                  "required": [
+                    "closedLoopControlName",
+                    "closedLoopEventStatus",
+                    "direction",
+                    "fieldPath",
+                    "severity",
+                    "thresholdValue",
+                    "version"
+                  ],
+                  "properties": {
+                    "closedLoopControlName": {
+                      "type": "string",
+                      "description": "Closed Loop Control Name associated with the threshold"
+                    },
+                    "closedLoopEventStatus": {
+                      "type": "string",
+                      "description": "Closed Loop Event Status of the threshold",
+                      "enum": [
+                        "ONSET",
+                        "ABATED"
+                      ]
+                    },
+                    "direction": {
+                      "type": "string",
+                      "description": "Direction of the threshold",
+                      "enum": [
+                        "LESS",
+                        "LESS_OR_EQUAL",
+                        "GREATER",
+                        "GREATER_OR_EQUAL",
+                        "EQUAL"
+                      ]
+                    },
+                    "fieldPath": {
+                      "type": "string",
+                      "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
+                      "enum": [
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                        "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+                      ]
+                    },
+                    "severity": {
+                      "type": "string",
+                      "description": "Threshold Event Severity",
+                      "enum": [
+                        "CRITICAL",
+                        "MAJOR",
+                        "MINOR",
+                        "WARNING",
+                        "NORMAL"
+                      ]
+                    },
+                    "thresholdValue": {
+                      "type": "integer",
+                      "description": "Threshold value for the field Path inside CEF message"
+                    },
+                    "version": {
+                      "type": "string",
+                      "description": "Version number associated with the threshold"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/tosca/templates.properties b/src/test/resources/tosca/templates.properties
deleted file mode 100644
index 792238bd3..000000000
--- a/src/test/resources/tosca/templates.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-Integer=type,description,required
-Boolean=description,required
-String=type,description,required,metadata,constraints
-Number=description,required
-Map=type,description,required,entry_schema
-List=type,required,entry_schema
-onap.datatype.controlloop.Actor=type,description,required,metadata
\ No newline at end of file
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index c8ecca2ff..5eaa79a64 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -126,12 +126,14 @@ export default class LoopCache {
 		return null;
 	}
 
-	getOperationalPolicySupportedPdpgroup(name) {
+	getOperationalPolicySupportedPdpGroup(name) {
 		var opConfig=this.getOperationalPolicyForName(name);
 		if (opConfig !== null) {
-			return opConfig["policyModel"]["policyPdpGroup"]["supportedPdpGroups"];
+		    if (opConfig["policyModel"]["policyPdpGroup"] !== undefined && opConfig["policyModel"]["policyPdpGroup"]["supportedPdpGroups"] !== undefined) {
+			    return opConfig["policyModel"]["policyPdpGroup"]["supportedPdpGroups"];
+			}
 		}
-		return null;
+		return [];
 	}
 
 	getOperationalPolicyPdpGroup(name) {
@@ -150,12 +152,14 @@ export default class LoopCache {
 		return null;
 	}
 
-	getMicroServiceSupportedPdpgroup(name) {
+	getMicroServiceSupportedPdpGroup(name) {
 		var microService=this.getMicroServiceForName(name);
 		if (microService !== null) {
-			return microService["policyModel"]["policyPdpGroup"]["supportedPdpGroups"];
+		    if (microService["policyModel"]["policyPdpGroup"] !== undefined && microService["policyModel"]["policyPdpGroup"]["supportedPdpGroups"] !== undefined) {
+			    return microService["policyModel"]["policyPdpGroup"]["supportedPdpGroups"];
+			}
 		}
-		return null;
+		return [];
 	}
 
 	getMicroServicePdpGroup(name) {
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 3fa0c0ca2..da65ac9f1 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -85,19 +85,20 @@ export default class ConfigurationPolicyModal extends React.Component {
 		}
 		var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
 
-		JSONEditor.defaults.options.theme = 'bootstrap4';
-		//JSONEditor.defaults.options.iconlib = 'bootstrap2';
-		JSONEditor.defaults.options.object_layout = 'grid';
-		JSONEditor.defaults.options.disable_properties = true;
-		JSONEditor.defaults.options.disable_edit_json = false;
-		JSONEditor.defaults.options.disable_array_reorder = true;
-		JSONEditor.defaults.options.disable_array_delete_last_row = true;
-		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
-		JSONEditor.defaults.options.show_errors = 'always';
-
 		this.setState({
 			jsonEditor: new JSONEditor(document.getElementById("editor"),
-				{ schema: toscaModel.schema, startval: editorData })
+				{
+				    schema: toscaModel,
+				    startval: editorData,
+				    theme: 'bootstrap4',
+                    object_layout: 'grid',
+                    disable_properties: true,
+                    disable_edit_json: false,
+                    disable_array_reorder: true,
+                    disable_array_delete_last_row: true,
+                    disable_array_delete_all_rows: false,
+                    show_errors: 'always'
+				 })
 		})
 	}
 
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
index 4d527b71c..a19c18c96 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
@@ -25,7 +25,6 @@ import { mount } from 'enzyme';
 import ConfigurationPolicyModal from './ConfigurationPolicyModal';
 import LoopCache from '../../../api/LoopCache';
 
-
 describe('Verify ConfigurationPolicyModal', () => {
     beforeEach(() => {
         fetch.resetMocks();
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index dc7c0a489..7ed8ba6f1 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -94,20 +94,8 @@ export default class OperationalPolicyModal extends React.Component {
 				return liel;
 			}
 		});
-		JSONEditor.defaults.options.theme = 'myBootstrap4';
-		JSONEditor.defaults.options.object_layout = 'grid';
-		JSONEditor.defaults.options.disable_properties = true;
-		JSONEditor.defaults.options.disable_edit_json = false;
-		JSONEditor.defaults.options.disable_array_reorder = true;
-		JSONEditor.defaults.options.disable_array_delete_last_row = true;
-		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
-		JSONEditor.defaults.options.array_controls_top=true;
-		JSONEditor.defaults.options.show_errors = 'always';
-		JSONEditor.defaults.options.keep_oneof_values=false;
-		JSONEditor.defaults.options.collapsed=true;
-		//JSONEditor.defaults.options.template = 'default';
 	}
-	
+
 	renderJsonEditor() {
 		console.debug("Rendering OperationalPolicyModal");
 		var schema_json = this.state.loopCache.getOperationalPolicyJsonSchema();
@@ -120,7 +108,21 @@ export default class OperationalPolicyModal extends React.Component {
 
 		this.setState({
 				jsonEditor: new JSONEditor(document.getElementById("editor"),
-					{ schema: schema_json.schema, startval: operationalPoliciesData })
+					{
+					    schema: schema_json.schema,
+					    startval: operationalPoliciesData,
+					    theme: 'myBootstrap4',
+                        object_layout: 'grid',
+                        disable_properties: true,
+                        disable_edit_json: false,
+                        disable_array_reorder: true,
+                        disable_array_delete_last_row: true,
+                        disable_array_delete_all_rows: false,
+                        array_controls_top: true,
+                        show_errors: 'always',
+                        keep_oneof_values: false,
+                        collapsed:true
+					})
 			})
 	}
 
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index caae70ef0..634c5ac57 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -59,6 +59,7 @@ export default class PolicyModal extends React.Component {
 		this.renderJsonEditor = this.renderJsonEditor.bind(this);
 		this.handlePdpGroupChange = this.handlePdpGroupChange.bind(this);
 		this.handlePdpSubgroupChange = this.handlePdpSubgroupChange.bind(this);
+		this.createJsonEditor = this.createJsonEditor.bind(this);
 	}
 
 	handleSave() {
@@ -67,13 +68,12 @@ export default class PolicyModal extends React.Component {
 
 		if (errors.length !== 0) {
 			console.error("Errors detected during policy data validation ", errors);
-			this.setState({ show: false });
-			this.props.history.push('/');
+			return;
 		}
 		else {
 			console.info("NO validation errors found in policy data");
 			if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
-                this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
+                this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData);
                 this.state.loopCache.updateMicroServicePdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
                 LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
                     this.setState({ show: false });
@@ -81,7 +81,7 @@ export default class PolicyModal extends React.Component {
                     this.props.loadLoopFunction(this.state.loopCache.getLoopName());
                 });
 			} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
-				this.state.loopCache.updateOperationalPolicyProperties(this.state.policyName, editorData[0]);
+				this.state.loopCache.updateOperationalPolicyProperties(this.state.policyName, editorData);
 				this.state.loopCache.updateOperationalPolicyPdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
 				LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()).then(resp => {
 					this.setState({ show: false });
@@ -101,6 +101,26 @@ export default class PolicyModal extends React.Component {
 		this.renderJsonEditor();
 	}
 
+    createJsonEditor(toscaModel, editorData) {
+        return new JSONEditor(document.getElementById("editor"),
+        {   schema: toscaModel,
+              startval: editorData,
+              theme: 'bootstrap4',
+              object_layout: 'grid',
+              disable_properties: true,
+              disable_edit_json: false,
+              disable_array_reorder: true,
+              disable_array_delete_last_row: true,
+              disable_array_delete_all_rows: false,
+              no_additional_properties: true,
+              show_errors: 'always',
+              display_required_only: false,
+              show_opt_in: true,
+              prompt_before_delete: true,
+              required_by_default: true
+        })
+    }
+
 	renderJsonEditor() {
 		console.debug("Rendering PolicyModal ", this.state.policyName);
 		var toscaModel = {};
@@ -110,13 +130,13 @@ export default class PolicyModal extends React.Component {
 		if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
 			toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
 			editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
-			pdpGroupValues = this.state.loopCache.getMicroServiceSupportedPdpgroup(this.state.policyName);
+			pdpGroupValues = this.state.loopCache.getMicroServiceSupportedPdpGroup(this.state.policyName);
 			chosenPdpGroupValue = this.state.loopCache.getMicroServicePdpGroup(this.state.policyName);
 			chosenPdpSubgroupValue = this.state.loopCache.getMicroServicePdpSubgroup(this.state.policyName);
 		} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
 			toscaModel = this.state.loopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
 			editorData = this.state.loopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
-			pdpGroupValues = this.state.loopCache.getOperationalPolicySupportedPdpgroup(this.state.policyName);
+			pdpGroupValues = this.state.loopCache.getOperationalPolicySupportedPdpGroup(this.state.policyName);
 			chosenPdpGroupValue = this.state.loopCache.getOperationalPolicyPdpGroup(this.state.policyName);
 			chosenPdpSubgroupValue = this.state.loopCache.getOperationalPolicyPdpSubgroup(this.state.policyName);
 		}
@@ -125,49 +145,28 @@ export default class PolicyModal extends React.Component {
 			return;
 		}
 
-		JSONEditor.defaults.options.theme = 'bootstrap4';
-		//JSONEditor.defaults.options.iconlib = 'bootstrap2';
-		JSONEditor.defaults.options.object_layout = 'grid';
-		JSONEditor.defaults.options.disable_properties = true;
-		JSONEditor.defaults.options.disable_edit_json = false;
-		JSONEditor.defaults.options.disable_array_reorder = true;
-		JSONEditor.defaults.options.disable_array_delete_last_row = true;
-		JSONEditor.defaults.options.disable_array_delete_all_rows = false;
-		JSONEditor.defaults.options.show_errors = 'always';
-
-		var pdpGroupListValues = pdpGroupValues.map(entry => {
-				return { label: Object.keys(entry)[0], value: Object.keys(entry)[0] };
-		});
-
-		if (typeof(chosenPdpGroupValue) === "undefined") {
-			this.setState({
-				jsonEditor: new JSONEditor(document.getElementById("editor"),
-					{ schema: toscaModel.schema, startval: editorData }),
-				pdpGroup: pdpGroupValues,
-				pdpGroupList: pdpGroupListValues,
-				chosenPdpGroup: chosenPdpGroupValue,
-				chosenPdpSubgroup: chosenPdpSubgroupValue
-			})
-		} else {
+        var pdpSubgroupValues = [];
+		if (typeof(chosenPdpGroupValue) !== "undefined") {
 			var selectedPdpGroup =	pdpGroupValues.filter(entry => (Object.keys(entry)[0] === chosenPdpGroupValue));
-			const pdpSubgroupValues = selectedPdpGroup[0][chosenPdpGroupValue].map((pdpSubgroup) => { return { label: pdpSubgroup, value: pdpSubgroup } });
-			this.setState({
-				jsonEditor: new JSONEditor(document.getElementById("editor"),
-					{ schema: toscaModel.schema, startval: editorData }),
-				pdpGroup: pdpGroupValues,
-				pdpGroupList: pdpGroupListValues,
-				pdpSubgroupList: pdpSubgroupValues,
-				chosenPdpGroup: chosenPdpGroupValue,
-				chosenPdpSubgroup: chosenPdpSubgroupValue
-			})
+			pdpSubgroupValues = selectedPdpGroup[0][chosenPdpGroupValue].map((pdpSubgroup) => { return { label: pdpSubgroup, value: pdpSubgroup } });
 		}
+		this.setState({
+        				jsonEditor: this.createJsonEditor(toscaModel,editorData),
+        				pdpGroup: pdpGroupValues,
+        				pdpGroupList: pdpGroupValues.map(entry => {
+                                      				return { label: Object.keys(entry)[0], value: Object.keys(entry)[0] };
+                                      		}),
+        				pdpSubgroupList: pdpSubgroupValues,
+        				chosenPdpGroup: chosenPdpGroupValue,
+        				chosenPdpSubgroup: chosenPdpSubgroupValue
+        			})
 	}
 
 	handlePdpGroupChange(e) {
 		var selectedPdpGroup =	this.state.pdpGroup.filter(entry => (Object.keys(entry)[0] === e.value));
 		const pdpSubgroupValues = selectedPdpGroup[0][e.value].map((pdpSubgroup) => { return { label: pdpSubgroup, value: pdpSubgroup } });
 		if (this.state.chosenPdpGroup !== e.value) {
-			this.setState({ 
+			this.setState({
 				chosenPdpGroup: e.value,
 				chosenPdpSubgroup: '',
 				pdpSubgroupList: pdpSubgroupValues
@@ -183,7 +182,7 @@ export default class PolicyModal extends React.Component {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
-					<Modal.Title>Configuration policies</Modal.Title>
+					<Modal.Title>Edit the policy</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
 					<div id="editor" />
-- 
cgit 1.2.3-korg


From 8604d37f2f6bdd011de62ec474b6883413d30348 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 10 Mar 2020 02:44:53 -0700
Subject: Fix the tosca converter

Fix the new tosca converter to support metadata section

Issue-ID: CLAMP-580
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I9068bd9dc89851c630660a7f78fae1cb70bdc178
---
 docs/swagger/swagger.json                          | 122 ++++----
 docs/swagger/swagger.pdf                           |   6 +-
 extra/sql/dump/test-data.sql                       |  32 +-
 .../onap/clamp/clds/tosca/update/Component.java    | 121 --------
 .../onap/clamp/clds/tosca/update/Extractor.java    | 116 --------
 .../org/onap/clamp/clds/tosca/update/Field.java    | 147 ---------
 .../clamp/clds/tosca/update/MetadataParser.java    |  46 +++
 .../onap/clamp/clds/tosca/update/ParserToJson.java | 321 --------------------
 .../org/onap/clamp/clds/tosca/update/Template.java |  66 ++--
 .../clamp/clds/tosca/update/TemplateField.java     | 148 +++++++++
 .../clds/tosca/update/TemplateManagement.java      | 191 ------------
 .../clds/tosca/update/ToscaConverterManager.java   | 192 ++++++++++++
 .../clds/tosca/update/ToscaConverterToJson.java    | 331 +++++++++++++++++++++
 .../onap/clamp/clds/tosca/update/ToscaElement.java | 121 ++++++++
 .../clamp/clds/tosca/update/ToscaItemsParser.java  | 109 +++++++
 .../clamp/loop/service/CsarServiceInstaller.java   |   2 +-
 .../onap/clamp/loop/service/ServiceRepository.java |  32 --
 src/main/java/org/onap/clamp/policy/Policy.java    |   8 +-
 .../operational/OperationalPolicyService.java      |  21 +-
 src/main/resources/META-INF/resources/swagger.html |   2 +-
 src/main/resources/application-noaaf.properties    |   7 +-
 .../clds/tosca_update/default-tosca-types.yaml     |  87 ++++++
 .../clds/tosca_update/defaultToscaTypes.yaml       |  87 ------
 .../clds/tosca_update/templates.properties         |  15 -
 .../clamp/clds/tosca/update/ArrayFieldTest.java    |   8 +-
 .../clamp/clds/tosca/update/ComponentTest.java     |  50 ----
 .../clamp/clds/tosca/update/ConstraintTest.java    |  22 +-
 .../onap/clamp/clds/tosca/update/PropertyTest.java |  18 +-
 .../clds/tosca/update/TemplateManagementTest.java  | 205 -------------
 .../onap/clamp/clds/tosca/update/TemplateTest.java |   6 +-
 .../tosca/update/ToscaConverterManagerTest.java    | 205 +++++++++++++
 .../clamp/clds/tosca/update/ToscaElementTest.java  |  50 ++++
 .../org/onap/clamp/loop/CsarInstallerItCase.java   |   5 +-
 .../src/components/dialogs/Policy/PolicyModal.js   |   2 +-
 ui-react/src/components/menu/MenuBar.js            |  12 +-
 .../menu/__snapshots__/MenuBar.test.js.snap        |  21 +-
 36 files changed, 1473 insertions(+), 1461 deletions(-)
 delete mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/Component.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/Field.java
 create mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/MetadataParser.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
 create mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/TemplateField.java
 delete mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
 create mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterManager.java
 create mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterToJson.java
 create mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/ToscaElement.java
 create mode 100644 src/main/java/org/onap/clamp/clds/tosca/update/ToscaItemsParser.java
 delete mode 100644 src/main/java/org/onap/clamp/loop/service/ServiceRepository.java
 create mode 100644 src/main/resources/clds/tosca_update/default-tosca-types.yaml
 delete mode 100644 src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
 delete mode 100644 src/main/resources/clds/tosca_update/templates.properties
 delete mode 100644 src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java
 delete mode 100644 src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java
 create mode 100644 src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java
 create mode 100644 src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 3b34182c1..1ed4a4ba6 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -4,7 +4,7 @@
     "version" : "5.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
-  "host" : "localhost:39237",
+  "host" : "localhost:46347",
   "basePath" : "/restservices/clds/",
   "schemes" : [ "http" ],
   "paths" : {
@@ -827,13 +827,6 @@
         "asString" : {
           "type" : "string"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -841,6 +834,10 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -851,30 +848,33 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "string" : {
           "type" : "boolean"
         },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }
@@ -973,33 +973,23 @@
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1008,6 +998,13 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -1017,6 +1014,9 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         }
       },
       "x-className" : {
@@ -1174,33 +1174,23 @@
         "asString" : {
           "type" : "string"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
-        "asJsonNull" : {
-          "$ref" : "#/definitions/JsonNull"
-        },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
+        "jsonArray" : {
+          "type" : "boolean"
         },
         "asByte" : {
           "type" : "string",
@@ -1209,6 +1199,13 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asJsonNull" : {
+          "$ref" : "#/definitions/JsonNull"
+        },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -1218,6 +1215,9 @@
         "asShort" : {
           "type" : "integer",
           "format" : "int32"
+        },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
         }
       }
     },
@@ -1242,13 +1242,6 @@
         "asString" : {
           "type" : "string"
         },
-        "asNumber" : {
-          "$ref" : "#/definitions/Number"
-        },
-        "asFloat" : {
-          "type" : "number",
-          "format" : "float"
-        },
         "asByte" : {
           "type" : "string",
           "format" : "byte"
@@ -1256,6 +1249,10 @@
         "asCharacter" : {
           "type" : "string"
         },
+        "asFloat" : {
+          "type" : "number",
+          "format" : "float"
+        },
         "asBigDecimal" : {
           "type" : "number"
         },
@@ -1266,27 +1263,30 @@
           "type" : "integer",
           "format" : "int32"
         },
+        "asNumber" : {
+          "$ref" : "#/definitions/Number"
+        },
         "asJsonObject" : {
           "$ref" : "#/definitions/JsonObject"
         },
-        "asJsonArray" : {
-          "$ref" : "#/definitions/JsonArray"
-        },
         "jsonObject" : {
           "type" : "boolean"
         },
-        "jsonArray" : {
-          "type" : "boolean"
+        "asJsonArray" : {
+          "$ref" : "#/definitions/JsonArray"
         },
-        "jsonPrimitive" : {
+        "jsonNull" : {
           "type" : "boolean"
         },
-        "jsonNull" : {
+        "jsonPrimitive" : {
           "type" : "boolean"
         },
         "asJsonPrimitive" : {
           "$ref" : "#/definitions/JsonPrimitive"
         },
+        "jsonArray" : {
+          "type" : "boolean"
+        },
         "asJsonNull" : {
           "$ref" : "#/definitions/JsonNull"
         }
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index a1d7b18d8..1095ce710 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200309160816-07'00')
-/ModDate (D:20200309160816-07'00')
+/CreationDate (D:20200310073214-07'00')
+/ModDate (D:20200310073214-07'00')
 >>
 endobj
 2 0 obj
@@ -5910,7 +5910,7 @@ ET
 BT
 71.30850000000001 592.176 Td
 /F1.0 10.5 Tf
-<203a206c6f63616c686f73743a3339323337> Tj
+<203a206c6f63616c686f73743a3436333437> Tj
 ET
 
 0.000 0.000 0.000 SCN
diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index c4e1e0b71..6c8f9c196 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-09 15:32:37.733946','Not found','2020-03-09 15:32:38.968545',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-10 15:34:31.130357','Not found','2020-03-10 15:34:31.845293',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_knKBA_v1_0_ResourceInstanceName1_tca','Not found','2020-03-09 15:32:38.823195','Not found','2020-03-09 15:32:38.823195','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-63a27491-910c-4d4d-a730-557bb7214af1',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-0e33a2c7-13d4-4f39-8d3c-7b511ac8a4db\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-90105567-0b99-4a75-85f5-55581c4578ec\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-61d6b8a3-4b6c-4df6-8395-ec657f09b7af\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_knKBA_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-09 15:32:38.243680','Not found','2020-03-09 15:32:38.243680','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-d7f45a12-2175-467d-b6bc-430370ece032',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-cf1cccfc-eb01-44c3-88f0-4e061ad871f5\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-2ebb4017-210f-4653-885a-63bfead37ec4\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-03492e87-6bf6-48d7-a78d-383b76d758cb\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_knKBA_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-09 15:32:37.679097','Not found','2020-03-09 15:32:37.679097','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-8d3bfe7e-65e4-4990-9b55-c214c244cdfa',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-270b4397-39ba-4111-9ff8-c01f612bc8dd\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-4aba9863-6f23-4603-b98c-3a161f53dc6d\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-17b0ac5c-7c06-44b8-bb3d-097345750f29\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_MZ8ks_v1_0_ResourceInstanceName1_tca','Not found','2020-03-10 15:34:31.780435','Not found','2020-03-10 15:34:31.780435','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-28fa0ed8-0e43-44ae-82cc-68e7507dd9f1',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-41aff54a-fbdc-4244-85f8-a29d419e4581\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-c79f1caf-53ff-4a78-bebe-6303e5c8d434\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-17e03e12-7a99-48d6-920d-d02ddadf3676\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_MZ8ks_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-10 15:34:31.399393','Not found','2020-03-10 15:34:31.399393','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-bd15286f-cfff-4703-b4f2-accbe3e79ce9',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a9e61020-8bad-4d79-912f-c7471616fabc\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-c660abad-58ed-462c-a607-677a5a3d0e1e\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-6116c4f4-c1af-49c2-ab10-572c58d2609a\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_MZ8ks_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-10 15:34:31.109027','Not found','2020-03-10 15:34:31.109027','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-7c473cb9-c825-43ec-97ce-6017c7ff15a2',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-92626e56-47f1-4cb7-bf01-9268d18c5623\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-97676997-7d26-47de-ad5a-af03bbe59791\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-1e0c1618-c479-495d-8dfc-47501a2eb050\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_knKBA_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_knKBA_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_knKBA_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_MZ8ks_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_MZ8ks_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_MZ8ks_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,13 +152,13 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-03-09 15:32:42.528466','Not found','2020-03-09 15:32:43.229545','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-03-09 15:32:42.464419','Not found','2020-03-09 15:32:43.255365','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                - valid_values: [\"second\", \"minute\", \"hour\", \"day\", \"week\", \"month\", \"year\"]\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-03-09 15:32:42.424488','Not found','2020-03-09 15:32:42.424488','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-03-09 15:32:42.460317','Not found','2020-03-09 15:32:43.280860','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Apex:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Apex PDP\n        properties:\n            engineServiceParameters:\n                type: string\n                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.\n                required: true\n            eventInputParameters:\n                type: string\n                description: The event input parameters.\n                required: true\n            eventOutputParameters:\n                type: string\n                description: The event output parameters.\n                required: true\n            javaProperties:\n                type: string\n                description: Name/value pairs of properties to be set for APEX if needed.\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-03-09 15:32:42.385667','Not found','2020-03-09 15:32:43.309310','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-09 15:32:37.762082','Not found','2020-03-09 15:32:43.330702','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: onap.datatypes.monitoring.tca_policy\n            description: TCA Policy JSON\n            required: true\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-09 15:31:28.413120','Not found','2020-03-09 15:31:28.413120','OperationalPolicyLegacy','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-03-10 15:34:16.151282','Not found','2020-03-10 15:34:16.653893','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-03-10 15:34:16.022020','Not found','2020-03-10 15:34:16.698932','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                - valid_values: [\"second\", \"minute\", \"hour\", \"day\", \"week\", \"month\", \"year\"]\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-03-10 15:34:16.006652','Not found','2020-03-10 15:34:16.006652','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-03-10 15:34:16.007394','Not found','2020-03-10 15:34:16.743212','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Apex:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Apex PDP\n        properties:\n            engineServiceParameters:\n                type: string\n                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.\n                required: true\n            eventInputParameters:\n                type: string\n                description: The event input parameters.\n                required: true\n            eventOutputParameters:\n                type: string\n                description: The event output parameters.\n                required: true\n            javaProperties:\n                type: string\n                description: Name/value pairs of properties to be set for APEX if needed.\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-03-10 15:34:16.007394','Not found','2020-03-10 15:34:16.776393','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: <string:see clamp project for syntax>\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-10 15:34:31.141969','Not found','2020-03-10 15:34:31.141969','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: onap.datatypes.monitoring.tca_policy\n            description: TCA Policy JSON\n            required: true\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-10 15:34:09.817128','Not found','2020-03-10 15:34:09.817128','OperationalPolicyLegacy','',NULL);
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -168,7 +168,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `services` WRITE;
 /*!40000 ALTER TABLE `services` DISABLE KEYS */;
-INSERT INTO `services` VALUES ('63cac700-ab9a-4115-a74f-7eac85e3fce0','vLoadBalancerMS','{\n  \"CP\": {},\n  \"VL\": {},\n  \"VF\": {\n    \"vLoadBalancerMS 0\": {\n      \"resourceVendor\": \"Test\",\n      \"name\": \"vLoadBalancerMS\",\n      \"resourceVendorModelNumber\": \"\",\n      \"description\": \"vLBMS\",\n      \"invariantUUID\": \"1a31b9f2-e50d-43b7-89b3-a040250cf506\",\n      \"UUID\": \"b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6\",\n      \"type\": \"VF\",\n      \"category\": \"Application L4+\",\n      \"subcategory\": \"Load Balancer\",\n      \"version\": \"1.0\",\n      \"customizationUUID\": \"465246dc-7748-45f4-a013-308d92922552\",\n      \"resourceVendorRelease\": \"1.0\"\n    }\n  },\n  \"CR\": {},\n  \"VFC\": {},\n  \"PNF\": {},\n  \"Service\": {},\n  \"CVFC\": {},\n  \"Service Proxy\": {},\n  \"Configuration\": {},\n  \"AllottedResource\": {},\n  \"VFModule\": {\n    \"Vloadbalancerms..vpkg..module-1\": {\n      \"vfModuleModelInvariantUUID\": \"ca052563-eb92-4b5b-ad41-9111768ce043\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vpkg..module-1\",\n      \"vfModuleModelUUID\": \"1e725ccc-b823-4f67-82b9-4f4367070dbc\",\n      \"vfModuleModelCustomizationUUID\": \"1bffdc31-a37d-4dee-b65c-dde623a76e52\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vpkg\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vdns..module-3\": {\n      \"vfModuleModelInvariantUUID\": \"4c10ba9b-f88f-415e-9de3-5d33336047fa\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vdns..module-3\",\n      \"vfModuleModelUUID\": \"4fa73b49-8a6c-493e-816b-eb401567b720\",\n      \"vfModuleModelCustomizationUUID\": \"bafcdab0-801d-4d81-9ead-f464640a38b1\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vdns\",\n      \"max_vf_module_instances\": 50,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..base_template..module-0\": {\n      \"vfModuleModelInvariantUUID\": \"921f7c96-ebdd-42e6-81b9-1cfc0c9796f3\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..base_template..module-0\",\n      \"vfModuleModelUUID\": \"63734409-f745-4e4d-a38b-131638a0edce\",\n      \"vfModuleModelCustomizationUUID\": \"86baddea-c730-4fb8-9410-cd2e17fd7f27\",\n      \"min_vf_module_instances\": 1,\n      \"vf_module_label\": \"base_template\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Base\",\n      \"isBase\": true,\n      \"initial_count\": 1,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vlb..module-2\": {\n      \"vfModuleModelInvariantUUID\": \"a772a1f4-0064-412c-833d-4749b15828dd\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vlb..module-2\",\n      \"vfModuleModelUUID\": \"0f5c3f6a-650a-4303-abb6-fff3e573a07a\",\n      \"vfModuleModelCustomizationUUID\": \"96a78aad-4ffb-4ef0-9c4f-deb03bf1d806\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vlb\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    }\n  }\n}','{\n  \"serviceType\": \"\",\n  \"serviceRole\": \"\",\n  \"description\": \"vLBMS\",\n  \"type\": \"Service\",\n  \"instantiationType\": \"A-la-carte\",\n  \"namingPolicy\": \"\",\n  \"serviceEcompNaming\": \"true\",\n  \"environmentContext\": \"General_Revenue-Bearing\",\n  \"name\": \"vLoadBalancerMS\",\n  \"invariantUUID\": \"30ec5b59-4799-48d8-ac5f-1058a6b0e48f\",\n  \"ecompGeneratedNaming\": \"true\",\n  \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\",\n  \"category\": \"Network L4+\"\n}','1.0');
+INSERT INTO `services` VALUES ('63cac700-ab9a-4115-a74f-7eac85e3fce0','vLoadBalancerMS','{\n  \"CP\": {},\n  \"VL\": {},\n  \"VF\": {\n    \"vLoadBalancerMS 0\": {\n      \"resourceVendor\": \"Test\",\n      \"name\": \"vLoadBalancerMS\",\n      \"resourceVendorModelNumber\": \"\",\n      \"description\": \"vLBMS\",\n      \"invariantUUID\": \"1a31b9f2-e50d-43b7-89b3-a040250cf506\",\n      \"UUID\": \"b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6\",\n      \"type\": \"VF\",\n      \"category\": \"Application L4+\",\n      \"subcategory\": \"Load Balancer\",\n      \"version\": \"1.0\",\n      \"customizationUUID\": \"465246dc-7748-45f4-a013-308d92922552\",\n      \"resourceVendorRelease\": \"1.0\",\n      \"controllerProperties\": {\n        \"sdnc_model_name\": \"baseconfiguration\",\n        \"sdnc_model_version\": \"1.0.0\",\n        \"workflows\": {\n          \"resource-assignment\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": \"\",\n                \"service-instance-id\": \"\",\n                \"vnf-id\": \"\",\n                \"action-name\": \"\",\n                \"scope-type\": \"\",\n                \"hostname\": \"\",\n                \"vnf_name\": \"\"\n              }\n            }\n          },\n          \"activate\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": \"\",\n                \"service-instance-id\": \"\",\n                \"vnf-id\": \"\",\n                \"action-name\": \"\",\n                \"scope-type\": \"\",\n                \"hostname\": \"\",\n                \"vnf_name\": \"\"\n              }\n            }\n          },\n          \"activate-restconf\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": \"\",\n                \"service-instance-id\": \"\",\n                \"vnf-id\": \"\",\n                \"action-name\": \"\",\n                \"scope-type\": \"\",\n                \"hostname\": \"\",\n                \"vnf_name\": \"\"\n              }\n            }\n          },\n          \"activate-cli\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": \"\",\n                \"service-instance-id\": \"\",\n                \"vnf-id\": \"\",\n                \"action-name\": \"\",\n                \"scope-type\": \"\",\n                \"hostname\": \"\",\n                \"vnf_name\": \"\"\n              }\n            }\n          },\n          \"assign-activate\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": \"\",\n                \"service-instance-id\": \"\",\n                \"vnf-id\": \"\",\n                \"action-name\": \"\",\n                \"scope-type\": \"\",\n                \"hostname\": \"\",\n                \"vnf_name\": \"\"\n              }\n            }\n          },\n          \"imperative-test-wf\": {\n            \"inputs\": {\n              \"resource-assignment-properties\": {\n                \"request-id\": \"\",\n                \"service-instance-id\": \"\",\n                \"vnf-id\": \"\",\n                \"action-name\": \"\",\n                \"scope-type\": \"\",\n                \"hostname\": \"\",\n                \"vnf_name\": \"\"\n              }\n            }\n          }\n        }\n      }\n    }\n  },\n  \"CR\": {},\n  \"VFC\": {},\n  \"PNF\": {},\n  \"Service\": {},\n  \"CVFC\": {},\n  \"Service Proxy\": {},\n  \"Configuration\": {},\n  \"AllottedResource\": {},\n  \"VFModule\": {\n    \"Vloadbalancerms..vpkg..module-1\": {\n      \"vfModuleModelInvariantUUID\": \"ca052563-eb92-4b5b-ad41-9111768ce043\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vpkg..module-1\",\n      \"vfModuleModelUUID\": \"1e725ccc-b823-4f67-82b9-4f4367070dbc\",\n      \"vfModuleModelCustomizationUUID\": \"1bffdc31-a37d-4dee-b65c-dde623a76e52\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vpkg\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vdns..module-3\": {\n      \"vfModuleModelInvariantUUID\": \"4c10ba9b-f88f-415e-9de3-5d33336047fa\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vdns..module-3\",\n      \"vfModuleModelUUID\": \"4fa73b49-8a6c-493e-816b-eb401567b720\",\n      \"vfModuleModelCustomizationUUID\": \"bafcdab0-801d-4d81-9ead-f464640a38b1\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vdns\",\n      \"max_vf_module_instances\": 50,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..base_template..module-0\": {\n      \"vfModuleModelInvariantUUID\": \"921f7c96-ebdd-42e6-81b9-1cfc0c9796f3\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..base_template..module-0\",\n      \"vfModuleModelUUID\": \"63734409-f745-4e4d-a38b-131638a0edce\",\n      \"vfModuleModelCustomizationUUID\": \"86baddea-c730-4fb8-9410-cd2e17fd7f27\",\n      \"min_vf_module_instances\": 1,\n      \"vf_module_label\": \"base_template\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Base\",\n      \"isBase\": true,\n      \"initial_count\": 1,\n      \"volume_group\": false\n    },\n    \"Vloadbalancerms..vlb..module-2\": {\n      \"vfModuleModelInvariantUUID\": \"a772a1f4-0064-412c-833d-4749b15828dd\",\n      \"vfModuleModelVersion\": \"1\",\n      \"vfModuleModelName\": \"Vloadbalancerms..vlb..module-2\",\n      \"vfModuleModelUUID\": \"0f5c3f6a-650a-4303-abb6-fff3e573a07a\",\n      \"vfModuleModelCustomizationUUID\": \"96a78aad-4ffb-4ef0-9c4f-deb03bf1d806\",\n      \"min_vf_module_instances\": 0,\n      \"vf_module_label\": \"vlb\",\n      \"max_vf_module_instances\": 1,\n      \"vf_module_type\": \"Expansion\",\n      \"isBase\": false,\n      \"initial_count\": 0,\n      \"volume_group\": false\n    }\n  }\n}','{\n  \"serviceType\": \"\",\n  \"serviceRole\": \"\",\n  \"description\": \"vLBMS\",\n  \"type\": \"Service\",\n  \"instantiationType\": \"A-la-carte\",\n  \"namingPolicy\": \"\",\n  \"serviceEcompNaming\": \"true\",\n  \"environmentContext\": \"General_Revenue-Bearing\",\n  \"name\": \"vLoadBalancerMS\",\n  \"invariantUUID\": \"30ec5b59-4799-48d8-ac5f-1058a6b0e48f\",\n  \"ecompGeneratedNaming\": \"true\",\n  \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\",\n  \"category\": \"Network L4+\"\n}','1.0');
 /*!40000 ALTER TABLE `services` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -180,4 +180,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-03-09 22:34:15
+-- Dump completed on 2020-03-10 22:35:47
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Component.java b/src/main/java/org/onap/clamp/clds/tosca/update/Component.java
deleted file mode 100644
index 6db129d1a..000000000
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Component.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-public class Component {
-
-    /**
-     * name parameter is used as "key", in the LinkedHashMap of Components.
-     */
-    private String name;
-    private String derivedFrom;
-    private String version;
-    private String typeVersion;
-    private String description;
-    private LinkedHashMap<String, Property> properties;
-
-    public Component() {
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param name name
-     * @param derivedFrom derivedFrom
-     * @param description description
-     */
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public Component(String name, String derivedFrom, String description) {
-        super();
-        this.name = name;
-        this.derivedFrom = derivedFrom;
-        this.description = description;
-        this.properties = new LinkedHashMap();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDerivedFrom() {
-        return derivedFrom;
-    }
-
-    public void setDerivedFrom(String derivedFrom) {
-        this.derivedFrom = derivedFrom;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getTypeVersion() {
-        return typeVersion;
-    }
-
-    public void setTypeVersion(String typeVersion) {
-        this.typeVersion = typeVersion;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public LinkedHashMap<String, Property> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(LinkedHashMap<String, Property> properties) {
-        this.properties = properties;
-    }
-
-    public void addProperties(Property property) {
-        this.properties.put(property.getName(), property);
-    }
-
-    public ArrayList<String> propertiesNames() {
-        return new ArrayList<>(properties.keySet());
-    }
-
-    @Override
-    public String toString() {
-        return name + ": " + description + ", version: " + version + ", nb de properties: " + properties.size()
-                + System.getProperty("line.separator") + propertiesNames();
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java b/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
deleted file mode 100644
index c6eabcd34..000000000
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Extractor.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-import java.util.LinkedHashMap;
-import java.util.Map.Entry;
-import org.yaml.snakeyaml.Yaml;
-
-public class Extractor {
-    private LinkedHashMap<String, Component> allItems;
-    private String source;
-    private String nativeComponent;
-
-    /**
-     * Constructor.
-     *
-     * @param toParse Tosca to parse
-     * @param nativeComponent The policy type to scan
-     */
-    public Extractor(String toParse, String nativeComponent) {
-
-        this.source = toParse;
-        this.nativeComponent = nativeComponent;
-        allItems = new LinkedHashMap<String, Component>();
-        getAllAsMaps();
-    }
-
-    public LinkedHashMap<String, Component> getAllItems() {
-        return allItems;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Yaml Parse gets raw policies and datatypes, in different sections : necessary to extract
-     * all entities and put them at the same level.
-     *
-     * @return an object
-     */
-    @SuppressWarnings("unchecked")
-    public LinkedHashMap<String, Object> getAllAsMaps() {
-        Yaml yaml = new Yaml();
-        Object contentFile = yaml.load(source);
-        LinkedHashMap<String, LinkedHashMap<String, Object>> file =
-                (LinkedHashMap<String, LinkedHashMap<String, Object>>) contentFile;
-        // Get DataTypes
-        LinkedHashMap<String, Object> dataTypes = file.get("data_types");
-        dataTypes = (dataTypes == null) ? (new LinkedHashMap<>()) : dataTypes;
-        // Get Policies : first, get topology and after extract policies from it
-        LinkedHashMap<String, Object> policyTypes = file.get("policy_types");
-        // Put the policies and datatypes in the same collection
-        dataTypes.putAll(policyTypes);
-
-        Object contentNativeFile = yaml.load(nativeComponent);
-        LinkedHashMap<String, Object> dataTypesEmbedded =
-                ((LinkedHashMap<String, LinkedHashMap<String, Object>>) contentNativeFile).get("data_types");
-        dataTypes.putAll(dataTypesEmbedded);
-
-        parseInComponent(dataTypes);
-        return dataTypes;
-    }
-
-    /**
-     * With all the component, get as Map, Components and Components properties are created.
-     *
-     * @param allMaps maps
-     */
-    @SuppressWarnings("unchecked")
-    public void parseInComponent(LinkedHashMap<String, Object> allMaps) {
-        //Component creations, from the file maps
-        for (Entry<String, Object> itemToParse : allMaps.entrySet()) {
-            LinkedHashMap<String, Object> componentBody = (LinkedHashMap<String, Object>) itemToParse.getValue();
-            Component component = new Component(itemToParse.getKey(), (String) componentBody.get("derived_from"),
-                    (String) componentBody.get("description"));
-            //If policy, version and type_version :
-            if (componentBody.get("type_version") != null) {
-                component.setVersion((String) componentBody.get("type_version"));
-                component.setTypeVersion((String) componentBody.get("type_version"));
-            }
-            //Properties creation, from the map
-            if (componentBody.get("properties") != null) {
-                LinkedHashMap<String, Object> properties =
-                        (LinkedHashMap<String, Object>) componentBody.get("properties");
-                for (Entry<String, Object> itemToProperty : properties.entrySet()) {
-                    Property property = new Property(itemToProperty.getKey(),
-                            (LinkedHashMap<String, Object>) itemToProperty.getValue());
-                    component.addProperties(property);
-                }
-            }
-            this.allItems.put(component.getName(), component);
-        }
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Field.java b/src/main/java/org/onap/clamp/clds/tosca/update/Field.java
deleted file mode 100644
index e01f14c43..000000000
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Field.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-public class Field {
-    private String title;
-    private Object value;
-    private Boolean visible;
-    private Boolean staticValue;
-
-    public Field(String title) {
-        this.title = title;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param title       The title
-     * @param value       The value
-     * @param visible     visible or not
-     * @param staticValue The static value
-     */
-    public Field(String title, Object value, Boolean visible, Boolean staticValue) {
-        this.title = title;
-        this.value = value;
-        this.visible = visible;
-        this.staticValue = staticValue;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
-    public Boolean getVisible() {
-        return visible;
-    }
-
-    public void setVisible(Boolean visible) {
-        this.visible = visible;
-    }
-
-    public Boolean getStaticValue() {
-        return staticValue;
-    }
-
-    public void setStaticValue(Boolean staticValue) {
-        this.staticValue = staticValue;
-    }
-
-    public String toString() {
-        return title + " " + value + " " + visible + " " + staticValue;
-    }
-
-    /**
-     * This method compares two fields.
-     *
-     * @param otherField Compare the current object with the one specified
-     * @return true if they are totally equals, false otherwise
-     */
-    public boolean compareWithField(Object otherField) {
-        if (this == otherField) {
-            return true;
-        }
-        if (otherField == null || getClass() != otherField.getClass()) {
-            return false;
-        }
-
-        Field field = (Field) otherField;
-
-        if (title != null ? !title.equals(field.title) : field.title != null) {
-            return false;
-        }
-        if (value != null ? !value.equals(field.value) : field.value != null) {
-            return false;
-        }
-        if (visible != null ? !visible.equals(field.visible) : field.visible != null) {
-            return false;
-        }
-        return staticValue != null ? staticValue.equals(field.staticValue) : field.staticValue == null;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object == null || getClass() != object.getClass()) {
-            return false;
-        }
-
-        Field field = (Field) object;
-
-        return title != null ? title.equals(field.title) : field.title == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return title != null ? title.hashCode() : 0;
-    }
-
-    /**
-     * This method test the entire equality.
-     *
-     * @param field1 object one
-     * @param field2 object two
-     * @return true if they are totally equals (all attributes, false otherwise
-     */
-    public static boolean fieldsEquals(Field field1, Field field2) {
-        return (field2.getTitle().equals(field1.getTitle()) && field2.getValue().equals(field1.getValue())
-                && field2.getVisible().equals(field1.getVisible())
-                && field2.getStaticValue().equals(field1.getStaticValue()));
-    }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/MetadataParser.java b/src/main/java/org/onap/clamp/clds/tosca/update/MetadataParser.java
new file mode 100644
index 000000000..fb70231fb
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/MetadataParser.java
@@ -0,0 +1,46 @@
+
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import com.google.gson.JsonObject;
+import org.onap.clamp.tosca.DictionaryService;
+
+public class MetadataParser {
+
+    /**
+     * This method is used to start the processing of the metadata field.
+     *
+     * @param property          The property metadata as Json Object
+     * @param dictionaryService the Dictionary service, if null nothing will be done
+     * @return The jsonObject structure that must be added to the json schema
+     */
+    public static JsonObject processAllMetadataElement(Property property, DictionaryService dictionaryService) {
+        if (dictionaryService != null) {
+            return null;
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java b/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
deleted file mode 100644
index 3c5cf975b..000000000
--- a/src/main/java/org/onap/clamp/clds/tosca/update/ParserToJson.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map.Entry;
-
-public class ParserToJson {
-    private LinkedHashMap<String, Component> components;
-    private LinkedHashMap<String, Template> templates;
-
-    public ParserToJson(LinkedHashMap<String, Component> components, LinkedHashMap<String, Template> templates) {
-        this.components = components;
-        this.templates = templates;
-    }
-
-    /**
-     * For a given component, launch process to parse it in Json.
-     *
-     * @param nameComponent name components
-     * @return return
-     */
-    public JsonObject getJsonProcess(String nameComponent, String typeComponent) {
-        JsonObject glob = new JsonObject();
-
-        if (typeComponent.equals("object")) {
-            glob = this.getFieldAsObject(matchComponent(nameComponent));
-        }
-        else {
-            /*glob = this.getFieldAsArray(matchComponent(nameComponent));*/
-        }
-
-        return glob;
-    }
-
-    /**
-     * Return the classical/general fields of the component, & launch the properties deployment.
-     *
-     * @param component the compo
-     * @return a json object
-     */
-    public JsonObject getFieldAsObject(Component component) {
-
-        JsonObject globalFields = new JsonObject();
-        if (templates.get("object").hasFields("title")) {
-            globalFields.addProperty("title", component.getName());
-        }
-        if (templates.get("object").hasFields("type")) {
-            globalFields.addProperty("type", "object");
-        }
-        if (templates.get("object").hasFields("description")) {
-            if (component.getDescription() != null) {
-                globalFields.addProperty("description", component.getDescription());
-            }
-        }
-        if (templates.get("object").hasFields("required")) {
-            globalFields.add("required", this.getRequirements(component.getName()));
-        }
-        if (templates.get("object").hasFields("properties")) {
-            globalFields.add("properties", this.deploy(component.getName()));
-        }
-        return globalFields;
-    }
-
-    /**
-     * Get the required properties of the Component, including the parents properties requirements.
-     *
-     * @param nameComponent name component
-     * @return a json array
-     */
-    public JsonArray getRequirements(String nameComponent) {
-        JsonArray requirements = new JsonArray();
-        Component toParse = components.get(nameComponent);
-        //Check for a father component, and launch the same process
-        if (!toParse.getDerivedFrom().equals("tosca.datatypes.Root")
-                && !toParse.getDerivedFrom().equals("tosca.policies.Root")) {
-            requirements.addAll(getRequirements(toParse.getDerivedFrom()));
-        }
-        //Each property is checked, and add to the requirement array if it's required
-        Collection<Property> properties = toParse.getProperties().values();
-        for (Property property : properties) {
-            if (property.getItems().containsKey("required")
-                    && property.getItems().get("required").equals(true)) {
-                requirements.add(property.getName());
-            }
-        }
-        return requirements;
-    }
-
-    /**
-     * The beginning of the recursive process. Get the parents (or not) to launch the same process, and otherwise
-     * deploy and parse the properties.
-     *
-     * @param nameComponent name component
-     * @return a json object
-     */
-    public JsonObject deploy(String nameComponent) {
-        JsonObject jsonSchema = new JsonObject();
-        Component toParse = components.get(nameComponent);
-        //Check for a father component, and launch the same process
-        if (!toParse.getDerivedFrom().equals("tosca.datatypes.Root")
-                && !toParse.getDerivedFrom().equals("tosca.policies.Root")) {
-            jsonSchema = this.getParent(toParse.getDerivedFrom());
-        }
-        //For each component property, check if its a complex properties (a component) or not. In that case,
-        //launch the analyse of the property.
-        for (Entry<String, Property> property : toParse.getProperties().entrySet()) {
-            if (matchComponent((String) property.getValue().getItems().get("type")) != null) {
-                jsonSchema.add(property.getValue().getName(),
-                        this.getJsonProcess((String) property.getValue().getItems().get("type"), "object"));
-            }
-            else {
-                jsonSchema.add(property.getValue().getName(), this.complexParse(property.getValue()));
-            }
-        }
-        return jsonSchema;
-    }
-
-    /**
-     * If a component has a parent, it is deploy in the same way.
-     *
-     * @param nameComponent name component
-     * @return a json object
-     */
-    public JsonObject getParent(String nameComponent) {
-        return deploy(nameComponent);
-    }
-
-    /**
-     * to be done.
-     *
-     * @param property property
-     * @return a json object
-     */
-    @SuppressWarnings("unchecked")
-    public JsonObject complexParse(Property property) {
-        JsonObject propertiesInJson = new JsonObject();
-        Template currentPropertyTemplate;
-        String typeProperty = (String) property.getItems().get("type");
-        if (typeProperty.toLowerCase().equals("list") || typeProperty.toLowerCase().equals("map")) {
-            currentPropertyTemplate = templates.get("object");
-        }
-        else {
-            String propertyType = (String) property.getItems().get("type");
-            currentPropertyTemplate = templates.get(propertyType.toLowerCase());
-        }
-        //Each "special" field is analysed, and has a specific treatment
-        for (String propertyField : property.getItems().keySet()) {
-            switch (propertyField) {
-                case "type":
-                    if (currentPropertyTemplate.hasFields(propertyField)) {
-                        String fieldtype = (String) property.getItems().get(propertyField);
-                        switch (fieldtype.toLowerCase()) {
-                            case "list":
-                                propertiesInJson.addProperty("type", "array");
-                                break;
-                            case "map":
-                                propertiesInJson.addProperty("type", "object");
-                                break;
-                            case "scalar-unit.time":
-                            case "scalar-unit.frequency":
-                            case "scalar-unit.size":
-                                propertiesInJson.addProperty("type", "string");
-                                break;
-                            case "timestamp":
-                                propertiesInJson.addProperty("type", "string");
-                                propertiesInJson.addProperty("format", "date-time");
-                                break;
-                            case "float":
-                                propertiesInJson.addProperty("type", "number");
-                                break;
-                            case "range":
-                                propertiesInJson.addProperty("type", "integer");
-                                if (!checkConstraintPresence(property, "greater_than")
-                                        && currentPropertyTemplate.hasFields("exclusiveMinimum")) {
-                                    propertiesInJson.addProperty("exclusiveMinimum", false);
-                                }
-                                if (!checkConstraintPresence(property, "less_than")
-                                        && currentPropertyTemplate.hasFields("exclusiveMaximum")) {
-                                    propertiesInJson.addProperty("exclusiveMaximum", false);
-                                }
-                                break;
-                            default:
-                                propertiesInJson.addProperty("type", currentPropertyTemplate.getName());
-                                break;
-                        }
-                    }
-                    break;
-                case "metadata":
-                    break;
-                case "constraints":
-                    property.addConstraintsAsJson(propertiesInJson,
-                            (ArrayList<Object>) property.getItems().get("constraints"),
-                            currentPropertyTemplate);
-                    break;
-                case "entry_schema":
-                    //Here, a way to check if entry is a component (datatype) or a simple string
-                    if (matchComponent(this.extractSpecificFieldFromMap(property, "entry_schema")) != null) {
-                        String nameComponent = this.extractSpecificFieldFromMap(property, "entry_schema");
-                        ParserToJson child = new ParserToJson(components, templates);
-                        JsonObject propertiesContainer = new JsonObject();
-
-                        switch ((String) property.getItems().get("type")) {
-                            case "map": // Get it as an object
-                                JsonObject componentAsProperty = child.getJsonProcess(nameComponent, "object");
-                                propertiesContainer.add(nameComponent, componentAsProperty);
-                                if (currentPropertyTemplate.hasFields("properties")) {
-                                    propertiesInJson.add("properties", propertiesContainer);
-                                }
-                                break;
-                            default://list : get it as an Array
-                                JsonObject componentAsItem = child.getJsonProcess(nameComponent, "object");
-                                if (currentPropertyTemplate.hasFields("properties")) {
-                                    propertiesInJson.add("items", componentAsItem);
-                                }
-                                break;
-                        }
-
-                    }
-                    // Native cases
-                    else if (property.getItems().get("type").equals("list")) {
-                        JsonObject itemContainer = new JsonObject();
-                        String valueInEntrySchema = this.extractSpecificFieldFromMap(property, "entry_schema");
-                        itemContainer.addProperty("type", valueInEntrySchema);
-                        propertiesInJson.add("items", itemContainer);
-                    }
-                    // MAP Case, for now nothing
-
-                    break;
-                default:
-                    //Each classical field : type, description, default..
-                    if (currentPropertyTemplate.hasFields(propertyField) && !propertyField.equals("required")) {
-                        property.addFieldToJson(propertiesInJson, propertyField,
-                                property.getItems().get(propertyField));
-                    }
-                    break;
-            }
-        }
-        return propertiesInJson;
-    }
-
-    /**
-     * Look for a matching Component for the name paramater, in the components list.
-     *
-     * @param name the name
-     * @return a component
-     */
-    public Component matchComponent(String name) {
-        Component correspondingComponent = null;
-        if (components == null) {
-            return null;
-        }
-        for (Component component : components.values()) {
-            if (component.getName().equals(name)) {
-                correspondingComponent = component;
-            }
-        }
-        return correspondingComponent;
-    }
-
-    /**
-     * Simple method to extract quickly a type field from particular property item.
-     *
-     * @param property  the property
-     * @param fieldName the fieldname
-     * @return a string
-     */
-    @SuppressWarnings("unchecked")
-    public String extractSpecificFieldFromMap(Property property, String fieldName) {
-        LinkedHashMap<String, String> entrySchemaFields =
-                (LinkedHashMap<String, String>) property.getItems().get(fieldName);
-        return entrySchemaFields.get("type");
-    }
-
-    /**
-     * Check if a constraint, for a specific property, is there.
-     *
-     * @param property       property
-     * @param nameConstraint name constraint
-     * @return a flag boolean
-     */
-    public boolean checkConstraintPresence(Property property, String nameConstraint) {
-        boolean presentConstraint = false;
-        if (property.getItems().containsKey("constraints")) {
-            ArrayList<Object> constraints = (ArrayList) property.getItems().get("constraints");
-            for (Object constraint : constraints) {
-                if (constraint instanceof LinkedHashMap) {
-                    if (((LinkedHashMap) constraint).containsKey(nameConstraint)) {
-                        presentConstraint = true;
-                    }
-                }
-            }
-        }
-        return presentConstraint;
-    }
-}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/Template.java b/src/main/java/org/onap/clamp/clds/tosca/update/Template.java
index 4507e3d71..6a531aeea 100644
--- a/src/main/java/org/onap/clamp/clds/tosca/update/Template.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/Template.java
@@ -33,16 +33,16 @@ public class Template {
      * name parameter is used as "key", in the LinkedHashMap of Templates.
      */
     private String name;
-    private List<Field> fields;
+    private List<TemplateField> templateFields;
 
     public Template(String name) {
         this.name = name;
-        this.fields = new ArrayList<>();
+        this.templateFields = new ArrayList<>();
     }
 
-    public Template(String name, List<Field> fields) {
+    public Template(String name, List<TemplateField> templateFields) {
         this.name = name;
-        this.fields = fields;
+        this.templateFields = templateFields;
     }
 
     public String getName() {
@@ -53,12 +53,12 @@ public class Template {
         this.name = name;
     }
 
-    public List<Field> getFields() {
-        return fields;
+    public List<TemplateField> getTemplateFields() {
+        return templateFields;
     }
 
-    public void setFields(List<Field> fields) {
-        this.fields = fields;
+    public void setTemplateFields(List<TemplateField> templateFields) {
+        this.templateFields = templateFields;
     }
 
     /**
@@ -68,8 +68,8 @@ public class Template {
      * @return Ture if it exists, false otherwise
      */
     public boolean hasFields(String fieldName) {
-        for (Field field : this.getFields()) {
-            if (field.getTitle().equals(fieldName)) {
+        for (TemplateField templateField : this.getTemplateFields()) {
+            if (templateField.getTitle().equals(fieldName)) {
                 return true;
             }
         }
@@ -82,21 +82,21 @@ public class Template {
      * @param fieldName The field name
      * @return THe Field found
      */
-    public Field getSpecificField(String fieldName) {
-        for (Field field : this.getFields()) {
-            if (field.getTitle().equals(fieldName)) {
-                return field;
+    public TemplateField getSpecificField(String fieldName) {
+        for (TemplateField templateField : this.getTemplateFields()) {
+            if (templateField.getTitle().equals(fieldName)) {
+                return templateField;
             }
         }
         return null;
     }
 
-    public void addField(Field field) {
-        fields.add(field);
+    public void addField(TemplateField templateField) {
+        templateFields.add(templateField);
     }
 
-    public void removeField(Field field) {
-        fields.remove(field);
+    public void removeField(TemplateField templateField) {
+        templateFields.remove(templateField);
     }
 
     /**
@@ -106,9 +106,9 @@ public class Template {
      * @param state True or false
      */
     public void setVisibility(String nameField, boolean state) {
-        for (Field field : this.fields) {
-            if (field.getTitle().equals(nameField)) {
-                field.setVisible(state);
+        for (TemplateField templateField : this.templateFields) {
+            if (templateField.getTitle().equals(nameField)) {
+                templateField.setVisible(state);
             }
         }
     }
@@ -120,9 +120,9 @@ public class Template {
      * @param state true or false
      */
     public void setStatic(String nameField, boolean state) {
-        for (Field field : this.fields) {
-            if (field.getTitle().equals(nameField)) {
-                field.setStaticValue(state);
+        for (TemplateField templateField : this.templateFields) {
+            if (templateField.getTitle().equals(nameField)) {
+                templateField.setStaticValue(state);
             }
         }
     }
@@ -134,9 +134,9 @@ public class Template {
      * @param newValue The new value as Object
      */
     public void updateValueField(String nameField, Object newValue) {
-        for (Field field : this.fields) {
-            if (field.getTitle().equals(nameField)) {
-                field.setValue(newValue);
+        for (TemplateField templateField : this.templateFields) {
+            if (templateField.getTitle().equals(nameField)) {
+                templateField.setValue(newValue);
             }
         }
     }
@@ -149,18 +149,18 @@ public class Template {
      */
     public boolean checkFields(Template template) {
         boolean duplicateFields = false;
-        if (template.getFields().size() == this.getFields().size()) {
+        if (template.getTemplateFields().size() == this.getTemplateFields().size()) {
             int countMatchingFields = 0;
             //loop each component of first
-            for (Field templateFieldToCheck : template.getFields()) {
-                for (Field templateField : this.getFields()) {
+            for (TemplateField templateFieldToCheck : template.getTemplateFields()) {
+                for (TemplateField templateField : this.getTemplateFields()) {
                     if (templateFieldToCheck.compareWithField(templateField)) {
                         countMatchingFields++;
                     }
                 }
             }
 
-            if (template.getFields().size() == countMatchingFields) {
+            if (template.getTemplateFields().size() == countMatchingFields) {
                 duplicateFields = true;
             }
         }
@@ -212,13 +212,13 @@ public class Template {
      */
     public void injectStaticValue(JsonObject jsonSchema, String fieldName) {
         if (isVisible(fieldName)) {
-            Field toInject = this.getSpecificField(fieldName);
+            TemplateField toInject = this.getSpecificField(fieldName);
             jsonSchema.addProperty(fieldName, (String) toInject.getValue());
         }
     }
 
     @Override
     public String toString() {
-        return " fields : " + fields;
+        return " templateFields : " + templateFields;
     }
 }
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateField.java b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateField.java
new file mode 100644
index 000000000..34446436a
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateField.java
@@ -0,0 +1,148 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+public class TemplateField {
+    private String title;
+    private Object value;
+    private Boolean visible;
+    private Boolean staticValue;
+
+    public TemplateField(String title) {
+        this.title = title;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param title       The title
+     * @param value       The value
+     * @param visible     visible or not
+     * @param staticValue The static value
+     */
+    public TemplateField(String title, Object value, Boolean visible, Boolean staticValue) {
+        this.title = title;
+        this.value = value;
+        this.visible = visible;
+        this.staticValue = staticValue;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public Boolean getVisible() {
+        return visible;
+    }
+
+    public void setVisible(Boolean visible) {
+        this.visible = visible;
+    }
+
+    public Boolean getStaticValue() {
+        return staticValue;
+    }
+
+    public void setStaticValue(Boolean staticValue) {
+        this.staticValue = staticValue;
+    }
+
+    public String toString() {
+        return title + " " + value + " " + visible + " " + staticValue;
+    }
+
+    /**
+     * This method compares two fields.
+     *
+     * @param otherField Compare the current object with the one specified
+     * @return true if they are totally equals, false otherwise
+     */
+    public boolean compareWithField(Object otherField) {
+        if (this == otherField) {
+            return true;
+        }
+        if (otherField == null || getClass() != otherField.getClass()) {
+            return false;
+        }
+
+        TemplateField templateField = (TemplateField) otherField;
+
+        if (title != null ? !title.equals(templateField.title) : templateField.title != null) {
+            return false;
+        }
+        if (value != null ? !value.equals(templateField.value) : templateField.value != null) {
+            return false;
+        }
+        if (visible != null ? !visible.equals(templateField.visible) : templateField.visible != null) {
+            return false;
+        }
+        return staticValue != null ? staticValue.equals(templateField.staticValue) : templateField.staticValue == null;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object == null || getClass() != object.getClass()) {
+            return false;
+        }
+
+        TemplateField templateField = (TemplateField) object;
+
+        return title != null ? title.equals(templateField.title) : templateField.title == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return title != null ? title.hashCode() : 0;
+    }
+
+    /**
+     * This method test the entire equality.
+     *
+     * @param templateField1 object one
+     * @param templateField2 object two
+     * @return true if they are totally equals (all attributes, false otherwise
+     */
+    public static boolean fieldsEquals(TemplateField templateField1, TemplateField templateField2) {
+        return (templateField2.getTitle().equals(templateField1.getTitle())
+                && templateField2.getValue().equals(templateField1.getValue())
+                && templateField2.getVisible().equals(templateField1.getVisible())
+                && templateField2.getStaticValue().equals(templateField1.getStaticValue()));
+    }
+
+}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java b/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
deleted file mode 100644
index 743077151..000000000
--- a/src/main/java/org/onap/clamp/clds/tosca/update/TemplateManagement.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.onap.clamp.clds.util.JsonUtils;
-
-public class TemplateManagement {
-
-    private LinkedHashMap<String, Template> templates;
-    private LinkedHashMap<String, Component> components;
-    private ParserToJson parserToJson;
-    private Extractor extractor;
-
-    /**
-     * Constructor.
-     *
-     * @param yamlContent        Yaml content as string
-     * @param templateProperties template properties as string
-     * @throws IOException in case of failure
-     */
-    public TemplateManagement(String yamlContent, String nativeComponent, String templateProperties)
-            throws IOException {
-        if (yamlContent != null && !yamlContent.isEmpty()) {
-            this.extractor = new Extractor(yamlContent, nativeComponent);
-            this.components = extractor.getAllItems();
-            this.templates = initializeTemplates(templateProperties);
-        }
-        else {
-            components = null;
-        }
-    }
-
-    //GETTERS & SETTERS
-    public LinkedHashMap<String, Component> getComponents() {
-        return components;
-    }
-
-    public void setComponents(LinkedHashMap<String, Component> components) {
-        this.components = components;
-    }
-
-    public ParserToJson getParseToJson() {
-        return parserToJson;
-    }
-
-    public void setParseToJson(ParserToJson parserToJson) {
-        this.parserToJson = parserToJson;
-    }
-
-    public LinkedHashMap<String, Template> getTemplates() {
-        return templates;
-    }
-
-    public void setTemplates(LinkedHashMap<String, Template> templates) {
-        this.templates = templates;
-    }
-
-    public Extractor getExtractor() {
-        return extractor;
-    }
-
-    /**
-     * Add a template.
-     *
-     * @param name   name
-     * @param fields fields
-     */
-    public void addTemplate(String name, List<Field> fields) {
-        Template template = new Template(name, fields);
-        //If it is true, the operation does not have any interest :
-        // replace OR put two different object with the same body
-        if (!templates.containsKey(template.getName()) || !this.hasTemplate(template)) {
-            this.templates.put(template.getName(), template);
-        }
-    }
-
-    /**
-     * By name, find and remove a given template.
-     *
-     * @param nameTemplate name template
-     */
-    public void removeTemplate(String nameTemplate) {
-        this.templates.remove(nameTemplate);
-    }
-
-    /**
-     * Update Template : adding with true flag, removing with false.
-     *
-     * @param nameTemplate name template
-     * @param field        field name
-     * @param operation    operation
-     */
-    public void updateTemplate(String nameTemplate, Field field, Boolean operation) {
-        // Operation = true && field is not present => add Field
-        if (operation && !this.templates.get(nameTemplate).getFields().contains(field)) {
-            this.templates.get(nameTemplate).addField(field);
-        }
-        // Operation = false && field is present => remove Field
-        else if (!operation && this.templates.get(nameTemplate).getFields().contains(field)) {
-            this.templates.get(nameTemplate).removeField(field);
-        }
-    }
-
-    /**
-     * Check if the JSONTemplates have the same bodies.
-     *
-     * @param template template
-     * @return a boolean
-     */
-    public boolean hasTemplate(Template template) {
-        boolean duplicateTemplate = false;
-        Collection<String> templatesName = templates.keySet();
-        if (templatesName.contains(template.getName())) {
-            Template existingTemplate = templates.get(template.getName());
-            duplicateTemplate = existingTemplate.checkFields(template);
-        }
-        return duplicateTemplate;
-    }
-
-    /**
-     * For a given Component, get a corresponding JsonObject, through parseToJSON.
-     *
-     * @param componentName name
-     * @return an json object
-     */
-    public JsonObject launchTranslation(String componentName) throws UnknownComponentException {
-        this.parserToJson = new ParserToJson(components, templates);
-        if (parserToJson.matchComponent(componentName) == null) {
-            throw new UnknownComponentException(componentName);
-        }
-        return parserToJson.getJsonProcess(componentName, "object");
-    }
-
-    /**
-     * Create and complete several Templates from file.properties.
-     *
-     * @param jsonTemplates The template properties as String
-     * @return a map
-     */
-    @SuppressWarnings("unused")
-    private LinkedHashMap<String, Template> initializeTemplates(String jsonTemplates) {
-
-        LinkedHashMap<String, Template> generatedTemplates = new LinkedHashMap<>();
-        JsonObject templates = JsonUtils.GSON.fromJson(jsonTemplates, JsonObject.class);
-
-        for (Map.Entry<String, JsonElement> templateAsJson : templates.entrySet()) {
-            Template template = new Template(templateAsJson.getKey());
-            JsonObject templateBody = (JsonObject) templateAsJson.getValue();
-            for (Map.Entry<String, JsonElement> field : templateBody.entrySet()) {
-                String fieldName = field.getKey();
-                JsonObject bodyFieldAsJson = (JsonObject) field.getValue();
-                Object fieldValue = bodyFieldAsJson.get("defaultValue").getAsString();
-                Boolean fieldVisible = bodyFieldAsJson.get("visible").getAsBoolean();
-                Boolean fieldStatic = bodyFieldAsJson.get("static").getAsBoolean();
-                Field bodyField = new Field(fieldName, fieldValue, fieldVisible, fieldStatic);
-                template.getFields().add(bodyField);
-            }
-            generatedTemplates.put(template.getName(), template);
-        }
-        return generatedTemplates;
-    }
-
-}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterManager.java b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterManager.java
new file mode 100644
index 000000000..b3224b045
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterManager.java
@@ -0,0 +1,192 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.onap.clamp.clds.util.JsonUtils;
+
+public class ToscaConverterManager {
+
+    private LinkedHashMap<String, Template> templates;
+    private LinkedHashMap<String, ToscaElement> components;
+    private ToscaConverterToJson toscaConverterToJson;
+    private ToscaItemsParser toscaItemsParser;
+
+    /**
+     * Constructor.
+     *
+     * @param toscaYamlContent     Policy Tosca Yaml content as string
+     * @param nativeToscaDatatypes The tosca yaml with tosca native datatypes
+     * @param templateProperties   template properties as string
+     * @throws IOException in case of failure
+     */
+    public ToscaConverterManager(String toscaYamlContent, String nativeToscaDatatypes, String templateProperties)
+            throws IOException {
+        if (toscaYamlContent != null && !toscaYamlContent.isEmpty()) {
+            this.toscaItemsParser = new ToscaItemsParser(toscaYamlContent, nativeToscaDatatypes);
+            this.components = toscaItemsParser.getAllItemsFound();
+            this.templates = initializeTemplates(templateProperties);
+        }
+        else {
+            components = null;
+        }
+    }
+
+    //GETTERS & SETTERS
+    public LinkedHashMap<String, ToscaElement> getComponents() {
+        return components;
+    }
+
+    public void setComponents(LinkedHashMap<String, ToscaElement> components) {
+        this.components = components;
+    }
+
+    public ToscaConverterToJson getParseToJson() {
+        return toscaConverterToJson;
+    }
+
+    public void setParseToJson(ToscaConverterToJson toscaConverterToJson) {
+        this.toscaConverterToJson = toscaConverterToJson;
+    }
+
+    public LinkedHashMap<String, Template> getTemplates() {
+        return templates;
+    }
+
+    public void setTemplates(LinkedHashMap<String, Template> templates) {
+        this.templates = templates;
+    }
+
+    public ToscaItemsParser getToscaItemsParser() {
+        return toscaItemsParser;
+    }
+
+    /**
+     * Add a template.
+     *
+     * @param name           name
+     * @param templateFields fields
+     */
+    public void addTemplate(String name, List<TemplateField> templateFields) {
+        Template template = new Template(name, templateFields);
+        //If it is true, the operation does not have any interest :
+        // replace OR put two different object with the same body
+        if (!templates.containsKey(template.getName()) || !this.hasTemplate(template)) {
+            this.templates.put(template.getName(), template);
+        }
+    }
+
+    /**
+     * By name, find and remove a given template.
+     *
+     * @param nameTemplate name template
+     */
+    public void removeTemplate(String nameTemplate) {
+        this.templates.remove(nameTemplate);
+    }
+
+    /**
+     * Update Template : adding with true flag, removing with false.
+     *
+     * @param nameTemplate  name template
+     * @param templateField field name
+     * @param operation     operation
+     */
+    public void updateTemplate(String nameTemplate, TemplateField templateField, Boolean operation) {
+        // Operation = true && field is not present => add Field
+        if (operation && !this.templates.get(nameTemplate).getTemplateFields().contains(templateField)) {
+            this.templates.get(nameTemplate).addField(templateField);
+        }
+        // Operation = false && field is present => remove Field
+        else if (!operation && this.templates.get(nameTemplate).getTemplateFields().contains(templateField)) {
+            this.templates.get(nameTemplate).removeField(templateField);
+        }
+    }
+
+    /**
+     * Check if the JSONTemplates have the same bodies.
+     *
+     * @param template template
+     * @return a boolean
+     */
+    public boolean hasTemplate(Template template) {
+        boolean duplicateTemplate = false;
+        Collection<String> templatesName = templates.keySet();
+        if (templatesName.contains(template.getName())) {
+            Template existingTemplate = templates.get(template.getName());
+            duplicateTemplate = existingTemplate.checkFields(template);
+        }
+        return duplicateTemplate;
+    }
+
+    /**
+     * For a given Component, get a corresponding JsonObject, through parseToJSON.
+     *
+     * @param componentName name
+     * @return an json object
+     */
+    public JsonObject startConversionToJson(String componentName) throws UnknownComponentException {
+        this.toscaConverterToJson = new ToscaConverterToJson(components, templates);
+        if (toscaConverterToJson.matchComponent(componentName) == null) {
+            throw new UnknownComponentException(componentName);
+        }
+        return toscaConverterToJson.getJsonProcess(componentName, "object");
+    }
+
+    /**
+     * Create and complete several Templates from file.properties.
+     *
+     * @param jsonTemplates The template properties as String
+     * @return a map
+     */
+    @SuppressWarnings("unused")
+    private LinkedHashMap<String, Template> initializeTemplates(String jsonTemplates) {
+
+        LinkedHashMap<String, Template> generatedTemplates = new LinkedHashMap<>();
+        JsonObject templates = JsonUtils.GSON.fromJson(jsonTemplates, JsonObject.class);
+
+        for (Map.Entry<String, JsonElement> templateAsJson : templates.entrySet()) {
+            Template template = new Template(templateAsJson.getKey());
+            JsonObject templateBody = (JsonObject) templateAsJson.getValue();
+            for (Map.Entry<String, JsonElement> field : templateBody.entrySet()) {
+                String fieldName = field.getKey();
+                JsonObject bodyFieldAsJson = (JsonObject) field.getValue();
+                Object fieldValue = bodyFieldAsJson.get("defaultValue").getAsString();
+                Boolean fieldVisible = bodyFieldAsJson.get("visible").getAsBoolean();
+                Boolean fieldStatic = bodyFieldAsJson.get("static").getAsBoolean();
+                TemplateField bodyTemplateField = new TemplateField(fieldName, fieldValue, fieldVisible, fieldStatic);
+                template.getTemplateFields().add(bodyTemplateField);
+            }
+            generatedTemplates.put(template.getName(), template);
+        }
+        return generatedTemplates;
+    }
+
+}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterToJson.java b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterToJson.java
new file mode 100644
index 000000000..297d568be
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaConverterToJson.java
@@ -0,0 +1,331 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+import org.onap.clamp.tosca.DictionaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ToscaConverterToJson {
+    private LinkedHashMap<String, ToscaElement> components;
+    private LinkedHashMap<String, Template> templates;
+
+    // if this one is set, the dictionary mechanism is enabled
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    public ToscaConverterToJson(LinkedHashMap<String, ToscaElement> components, LinkedHashMap<String, Template> templates) {
+        this.components = components;
+        this.templates = templates;
+    }
+
+    /**
+     * For a given component, launch process to parse it in Json.
+     *
+     * @param nameComponent name components
+     * @return return
+     */
+    public JsonObject getJsonProcess(String nameComponent, String typeComponent) {
+        JsonObject glob = new JsonObject();
+
+        if (typeComponent.equals("object")) {
+            glob = this.getFieldAsObject(matchComponent(nameComponent));
+        }
+        else {
+            /*glob = this.getFieldAsArray(matchComponent(nameComponent));*/
+        }
+
+        return glob;
+    }
+
+    /**
+     * Return the classical/general fields of the component, & launch the properties deployment.
+     *
+     * @param toscaElement the compo
+     * @return a json object
+     */
+    public JsonObject getFieldAsObject(ToscaElement toscaElement) {
+
+        JsonObject globalFields = new JsonObject();
+        if (templates.get("object").hasFields("title")) {
+            globalFields.addProperty("title", toscaElement.getName());
+        }
+        if (templates.get("object").hasFields("type")) {
+            globalFields.addProperty("type", "object");
+        }
+        if (templates.get("object").hasFields("description")) {
+            if (toscaElement.getDescription() != null) {
+                globalFields.addProperty("description", toscaElement.getDescription());
+            }
+        }
+        if (templates.get("object").hasFields("required")) {
+            globalFields.add("required", this.getRequirements(toscaElement.getName()));
+        }
+        if (templates.get("object").hasFields("properties")) {
+            globalFields.add("properties", this.deploy(toscaElement.getName()));
+        }
+        return globalFields;
+    }
+
+    /**
+     * Get the required properties of the Component, including the parents properties requirements.
+     *
+     * @param nameComponent name component
+     * @return a json array
+     */
+    public JsonArray getRequirements(String nameComponent) {
+        JsonArray requirements = new JsonArray();
+        ToscaElement toParse = components.get(nameComponent);
+        //Check for a father component, and launch the same process
+        if (!toParse.getDerivedFrom().equals("tosca.datatypes.Root")
+                && !toParse.getDerivedFrom().equals("tosca.policies.Root")) {
+            requirements.addAll(getRequirements(toParse.getDerivedFrom()));
+        }
+        //Each property is checked, and add to the requirement array if it's required
+        Collection<Property> properties = toParse.getProperties().values();
+        for (Property property : properties) {
+            if (property.getItems().containsKey("required")
+                    && property.getItems().get("required").equals(true)) {
+                requirements.add(property.getName());
+            }
+        }
+        return requirements;
+    }
+
+    /**
+     * The beginning of the recursive process. Get the parents (or not) to launch the same process, and otherwise
+     * deploy and parse the properties.
+     *
+     * @param nameComponent name component
+     * @return a json object
+     */
+    public JsonObject deploy(String nameComponent) {
+        JsonObject jsonSchema = new JsonObject();
+        ToscaElement toParse = components.get(nameComponent);
+        //Check for a father component, and launch the same process
+        if (!toParse.getDerivedFrom().equals("tosca.datatypes.Root")
+                && !toParse.getDerivedFrom().equals("tosca.policies.Root")) {
+            jsonSchema = this.getParent(toParse.getDerivedFrom());
+        }
+        //For each component property, check if its a complex properties (a component) or not. In that case,
+        //launch the analyse of the property.
+        for (Entry<String, Property> property : toParse.getProperties().entrySet()) {
+            if (matchComponent((String) property.getValue().getItems().get("type")) != null) {
+                jsonSchema.add(property.getValue().getName(),
+                        this.getJsonProcess((String) property.getValue().getItems().get("type"), "object"));
+            }
+            else {
+                jsonSchema.add(property.getValue().getName(), this.complexParse(property.getValue()));
+            }
+        }
+        return jsonSchema;
+    }
+
+    /**
+     * If a component has a parent, it is deploy in the same way.
+     *
+     * @param nameComponent name component
+     * @return a json object
+     */
+    public JsonObject getParent(String nameComponent) {
+        return deploy(nameComponent);
+    }
+
+    /**
+     * to be done.
+     *
+     * @param property property
+     * @return a json object
+     */
+    @SuppressWarnings("unchecked")
+    public JsonObject complexParse(Property property) {
+        JsonObject propertiesInJson = new JsonObject();
+        Template currentPropertyTemplate;
+        String typeProperty = (String) property.getItems().get("type");
+        if (typeProperty.toLowerCase().equals("list") || typeProperty.toLowerCase().equals("map")) {
+            currentPropertyTemplate = templates.get("object");
+        }
+        else {
+            String propertyType = (String) property.getItems().get("type");
+            currentPropertyTemplate = templates.get(propertyType.toLowerCase());
+        }
+        //Each "special" field is analysed, and has a specific treatment
+        for (String propertyField : property.getItems().keySet()) {
+            switch (propertyField) {
+                case "type":
+                    if (currentPropertyTemplate.hasFields(propertyField)) {
+                        String fieldtype = (String) property.getItems().get(propertyField);
+                        switch (fieldtype.toLowerCase()) {
+                            case "list":
+                                propertiesInJson.addProperty("type", "array");
+                                break;
+                            case "map":
+                                propertiesInJson.addProperty("type", "object");
+                                break;
+                            case "scalar-unit.time":
+                            case "scalar-unit.frequency":
+                            case "scalar-unit.size":
+                                propertiesInJson.addProperty("type", "string");
+                                break;
+                            case "timestamp":
+                                propertiesInJson.addProperty("type", "string");
+                                propertiesInJson.addProperty("format", "date-time");
+                                break;
+                            case "float":
+                                propertiesInJson.addProperty("type", "number");
+                                break;
+                            case "range":
+                                propertiesInJson.addProperty("type", "integer");
+                                if (!checkConstraintPresence(property, "greater_than")
+                                        && currentPropertyTemplate.hasFields("exclusiveMinimum")) {
+                                    propertiesInJson.addProperty("exclusiveMinimum", false);
+                                }
+                                if (!checkConstraintPresence(property, "less_than")
+                                        && currentPropertyTemplate.hasFields("exclusiveMaximum")) {
+                                    propertiesInJson.addProperty("exclusiveMaximum", false);
+                                }
+                                break;
+                            default:
+                                propertiesInJson.addProperty("type", currentPropertyTemplate.getName());
+                                break;
+                        }
+                    }
+                    break;
+                case "metadata":
+                    propertiesInJson.add("enum", MetadataParser.processAllMetadataElement(property,
+                            dictionaryService));
+                    break;
+                case "constraints":
+                    property.addConstraintsAsJson(propertiesInJson,
+                            (ArrayList<Object>) property.getItems().get("constraints"),
+                            currentPropertyTemplate);
+                    break;
+                case "entry_schema":
+                    //Here, a way to check if entry is a component (datatype) or a simple string
+                    if (matchComponent(this.extractSpecificFieldFromMap(property, "entry_schema")) != null) {
+                        String nameComponent = this.extractSpecificFieldFromMap(property, "entry_schema");
+                        ToscaConverterToJson child = new ToscaConverterToJson(components, templates);
+                        JsonObject propertiesContainer = new JsonObject();
+
+                        switch ((String) property.getItems().get("type")) {
+                            case "map": // Get it as an object
+                                JsonObject componentAsProperty = child.getJsonProcess(nameComponent, "object");
+                                propertiesContainer.add(nameComponent, componentAsProperty);
+                                if (currentPropertyTemplate.hasFields("properties")) {
+                                    propertiesInJson.add("properties", propertiesContainer);
+                                }
+                                break;
+                            default://list : get it as an Array
+                                JsonObject componentAsItem = child.getJsonProcess(nameComponent, "object");
+                                if (currentPropertyTemplate.hasFields("properties")) {
+                                    propertiesInJson.add("items", componentAsItem);
+                                }
+                                break;
+                        }
+
+                    }
+                    // Native cases
+                    else if (property.getItems().get("type").equals("list")) {
+                        JsonObject itemContainer = new JsonObject();
+                        String valueInEntrySchema = this.extractSpecificFieldFromMap(property, "entry_schema");
+                        itemContainer.addProperty("type", valueInEntrySchema);
+                        propertiesInJson.add("items", itemContainer);
+                    }
+                    // MAP Case, for now nothing
+
+                    break;
+                default:
+                    //Each classical field : type, description, default..
+                    if (currentPropertyTemplate.hasFields(propertyField) && !propertyField.equals("required")) {
+                        property.addFieldToJson(propertiesInJson, propertyField,
+                                property.getItems().get(propertyField));
+                    }
+                    break;
+            }
+        }
+        return propertiesInJson;
+    }
+
+    /**
+     * Look for a matching Component for the name paramater, in the components list.
+     *
+     * @param name the name
+     * @return a component
+     */
+    public ToscaElement matchComponent(String name) {
+        ToscaElement correspondingToscaElement = null;
+        if (components == null) {
+            return null;
+        }
+        for (ToscaElement toscaElement : components.values()) {
+            if (toscaElement.getName().equals(name)) {
+                correspondingToscaElement = toscaElement;
+            }
+        }
+        return correspondingToscaElement;
+    }
+
+    /**
+     * Simple method to extract quickly a type field from particular property item.
+     *
+     * @param property  the property
+     * @param fieldName the fieldname
+     * @return a string
+     */
+    @SuppressWarnings("unchecked")
+    public String extractSpecificFieldFromMap(Property property, String fieldName) {
+        LinkedHashMap<String, String> entrySchemaFields =
+                (LinkedHashMap<String, String>) property.getItems().get(fieldName);
+        return entrySchemaFields.get("type");
+    }
+
+    /**
+     * Check if a constraint, for a specific property, is there.
+     *
+     * @param property       property
+     * @param nameConstraint name constraint
+     * @return a flag boolean
+     */
+    public boolean checkConstraintPresence(Property property, String nameConstraint) {
+        boolean presentConstraint = false;
+        if (property.getItems().containsKey("constraints")) {
+            ArrayList<Object> constraints = (ArrayList) property.getItems().get("constraints");
+            for (Object constraint : constraints) {
+                if (constraint instanceof LinkedHashMap) {
+                    if (((LinkedHashMap) constraint).containsKey(nameConstraint)) {
+                        presentConstraint = true;
+                    }
+                }
+            }
+        }
+        return presentConstraint;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaElement.java b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaElement.java
new file mode 100644
index 000000000..d702cda55
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaElement.java
@@ -0,0 +1,121 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+public class ToscaElement {
+
+    /**
+     * name parameter is used as "key", in the LinkedHashMap of Components.
+     */
+    private String name;
+    private String derivedFrom;
+    private String version;
+    private String typeVersion;
+    private String description;
+    private LinkedHashMap<String, Property> properties;
+
+    public ToscaElement() {
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param name name
+     * @param derivedFrom derivedFrom
+     * @param description description
+     */
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public ToscaElement(String name, String derivedFrom, String description) {
+        super();
+        this.name = name;
+        this.derivedFrom = derivedFrom;
+        this.description = description;
+        this.properties = new LinkedHashMap();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDerivedFrom() {
+        return derivedFrom;
+    }
+
+    public void setDerivedFrom(String derivedFrom) {
+        this.derivedFrom = derivedFrom;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getTypeVersion() {
+        return typeVersion;
+    }
+
+    public void setTypeVersion(String typeVersion) {
+        this.typeVersion = typeVersion;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public LinkedHashMap<String, Property> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(LinkedHashMap<String, Property> properties) {
+        this.properties = properties;
+    }
+
+    public void addProperties(Property property) {
+        this.properties.put(property.getName(), property);
+    }
+
+    public ArrayList<String> propertiesNames() {
+        return new ArrayList<>(properties.keySet());
+    }
+
+    @Override
+    public String toString() {
+        return name + ": " + description + ", version: " + version + ", nb de properties: " + properties.size()
+                + System.getProperty("line.separator") + propertiesNames();
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/tosca/update/ToscaItemsParser.java b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaItemsParser.java
new file mode 100644
index 000000000..443a4b0cd
--- /dev/null
+++ b/src/main/java/org/onap/clamp/clds/tosca/update/ToscaItemsParser.java
@@ -0,0 +1,109 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map.Entry;
+import org.yaml.snakeyaml.Yaml;
+
+public class ToscaItemsParser {
+    private LinkedHashMap<String, ToscaElement> allItemsFound;
+
+    /**
+     * Constructor.
+     *
+     * @param toscaYaml               The tosca to parse
+     * @param toscaNativeDataTypeYaml THe name of the policy type to search
+     */
+    public ToscaItemsParser(String toscaYaml, String toscaNativeDataTypeYaml) {
+        this.allItemsFound = searchAllToscaElements(toscaYaml, toscaNativeDataTypeYaml);
+    }
+
+    public LinkedHashMap<String, ToscaElement> getAllItemsFound() {
+        return allItemsFound;
+    }
+
+    private static LinkedHashMap<String, Object> searchAllDataTypesAndPolicyTypes(String toscaYaml) {
+        LinkedHashMap<String, LinkedHashMap<String, Object>> file =
+                (LinkedHashMap<String, LinkedHashMap<String, Object>>) new Yaml().load(toscaYaml);
+        // Get DataTypes
+        LinkedHashMap<String, Object> allItemsFound = file.get("data_types");
+        allItemsFound = (allItemsFound == null) ? (new LinkedHashMap<>()) : allItemsFound;
+        // Put the policies and datatypes in the same collection
+        allItemsFound.putAll(file.get("policy_types"));
+        return allItemsFound;
+    }
+
+    private static LinkedHashMap<String, Object> searchAllNativeToscaDataTypes(String toscaNativeYaml) {
+        return ((LinkedHashMap<String, LinkedHashMap<String, Object>>) new Yaml().load(toscaNativeYaml))
+                .get("data_types");
+    }
+
+    /**
+     * Yaml Parse gets raw policies and datatypes, in different sections : necessary to extract
+     * all entities and put them at the same level.
+     *
+     * @return a map
+     */
+    private static LinkedHashMap<String, ToscaElement> searchAllToscaElements(String toscaYaml,
+                                                                              String nativeToscaYaml) {
+        LinkedHashMap<String, Object> allItemsFound = searchAllDataTypesAndPolicyTypes(toscaYaml);
+        allItemsFound.putAll(searchAllNativeToscaDataTypes(nativeToscaYaml));
+        return parseAllItemsFound(allItemsFound);
+    }
+
+    /**
+     * With all the component, get as Map, Components and Components properties are created.
+     *
+     * @param allMaps maps
+     */
+    private static LinkedHashMap<String, ToscaElement> parseAllItemsFound(LinkedHashMap<String, Object> allMaps) {
+        LinkedHashMap<String, ToscaElement> allItemsFound = new LinkedHashMap<String, ToscaElement>();
+        //Component creations, from the file maps
+        for (Entry<String, Object> itemToParse : allMaps.entrySet()) {
+            LinkedHashMap<String, Object> componentBody = (LinkedHashMap<String, Object>) itemToParse.getValue();
+            ToscaElement toscaElement =
+                    new ToscaElement(itemToParse.getKey(), (String) componentBody.get("derived_from"),
+                            (String) componentBody.get("description"));
+            //If policy, version and type_version :
+            if (componentBody.get("type_version") != null) {
+                toscaElement.setVersion((String) componentBody.get("type_version"));
+                toscaElement.setTypeVersion((String) componentBody.get("type_version"));
+            }
+            //Properties creation, from the map
+            if (componentBody.get("properties") != null) {
+                LinkedHashMap<String, Object> properties =
+                        (LinkedHashMap<String, Object>) componentBody.get("properties");
+                for (Entry<String, Object> itemToProperty : properties.entrySet()) {
+                    Property property = new Property(itemToProperty.getKey(),
+                            (LinkedHashMap<String, Object>) itemToProperty.getValue());
+                    toscaElement.addProperties(property);
+                }
+            }
+            allItemsFound.put(toscaElement.getName(), toscaElement);
+        }
+        return allItemsFound;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java b/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java
index 889125fee..b7ed1de9a 100644
--- a/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java
+++ b/src/main/java/org/onap/clamp/loop/service/CsarServiceInstaller.java
@@ -54,7 +54,7 @@ public class CsarServiceInstaller {
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarServiceInstaller.class);
 
     @Autowired
-    ServiceRepository serviceRepository;
+    ServicesRepository serviceRepository;
 
     @Autowired
     CdsServices cdsServices;
diff --git a/src/main/java/org/onap/clamp/loop/service/ServiceRepository.java b/src/main/java/org/onap/clamp/loop/service/ServiceRepository.java
deleted file mode 100644
index a6c5ff187..000000000
--- a/src/main/java/org/onap/clamp/loop/service/ServiceRepository.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.loop.service;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ServiceRepository extends CrudRepository<Service, String> {
-
-}
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
index d52e418e3..c9055bf9d 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -44,7 +44,7 @@ import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.json.JSONObject;
-import org.onap.clamp.clds.tosca.update.TemplateManagement;
+import org.onap.clamp.clds.tosca.update.ToscaConverterManager;
 import org.onap.clamp.clds.tosca.update.UnknownComponentException;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
@@ -300,9 +300,9 @@ public abstract class Policy extends AuditEntity {
     public static JsonObject generateJsonRepresentationFromToscaModel(String policyToscaModel,
                                                                       String policyModelType)
             throws IOException, UnknownComponentException {
-        return new TemplateManagement(policyToscaModel,ResourceFileUtil.getResourceAsString(
-                "clds/tosca_update/defaultToscaTypes.yaml"),
+        return new ToscaConverterManager(policyToscaModel,ResourceFileUtil.getResourceAsString(
+                "clds/tosca_update/default-tosca-types.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"))
-                .launchTranslation(policyModelType);
+                .startConversionToJson(policyModelType);
     }
 }
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
index 357a96d21..ad6cbd941 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
@@ -23,11 +23,11 @@
 
 package org.onap.clamp.policy.operational;
 
-import com.google.gson.JsonObject;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.onap.clamp.loop.Loop;
+import org.onap.clamp.loop.template.PolicyModelsRepository;
 import org.onap.clamp.policy.PolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,9 +37,13 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
 
     private final OperationalPolicyRepository operationalPolicyRepository;
 
+    private final PolicyModelsRepository policyModelsRepository;
+
     @Autowired
-    public OperationalPolicyService(OperationalPolicyRepository repository) {
+    public OperationalPolicyService(OperationalPolicyRepository repository,
+                                    PolicyModelsRepository policyModelsRepository) {
         this.operationalPolicyRepository = repository;
+        this.policyModelsRepository = policyModelsRepository;
     }
 
     @Override
@@ -49,10 +53,8 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
                 .map(policy ->
                         operationalPolicyRepository
                                 .findById(policy.getName())
-                                .map(p -> setConfigurationJson(p, policy))
-                                .orElse(new OperationalPolicy(policy.getName(), loop,
-                                        policy.getConfigurationsJson(),
-                                        policy.getPolicyModel(), null, policy.getPdpGroup(), policy.getPdpSubgroup())))
+                                .map(p -> setConfiguration(p, policy))
+                                .orElse(initializeMissingFields(loop,policy)))
                 .collect(Collectors.toSet());
     }
 
@@ -61,7 +63,12 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
         return operationalPolicyRepository.existsById(policyName);
     }
 
-    private OperationalPolicy setConfigurationJson(OperationalPolicy policy, OperationalPolicy newPolicy) {
+    private OperationalPolicy initializeMissingFields(Loop loop, OperationalPolicy policy) {
+        policy.setLoop(loop);
+        return policy;
+    }
+
+    private OperationalPolicy setConfiguration(OperationalPolicy policy, OperationalPolicy newPolicy) {
         policy.setConfigurationsJson(newPolicy.getConfigurationsJson());
         policy.setPdpGroup(newPolicy.getPdpGroup());
         policy.setPdpSubgroup(newPolicy.getPdpSubgroup());
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 69e9c7c15..29082abf1 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -692,7 +692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:39237<br>
+<p><em>Host</em> : localhost:46347<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index 288511b3b..3ce033f64 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -176,4 +176,9 @@ clamp.config.security.permission.instance=dev
 clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
 
 ## Tosca converter
-clamp.config.tosca.converter.templates=classpath:/clds/tosca_updates/templates.json
\ No newline at end of file
+clamp.config.tosca.converter.templates=classpath:/clds/tosca_updates/templates.json
+
+# Configuration settings for CDS
+clamp.config.cds.url=http4://blueprints-processor-http:8080
+clamp.config.cds.userName=ccsdkapps
+clamp.config.cds.password=ccsdkapps
\ No newline at end of file
diff --git a/src/main/resources/clds/tosca_update/default-tosca-types.yaml b/src/main/resources/clds/tosca_update/default-tosca-types.yaml
new file mode 100644
index 000000000..a11a73698
--- /dev/null
+++ b/src/main/resources/clds/tosca_update/default-tosca-types.yaml
@@ -0,0 +1,87 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+data_types:
+  tosca.datatypes.Root:
+    description: The TOSCA root Data Type all other TOSCA base Data Types derive from
+  tosca.datatypes.Credential:
+    derived_from: tosca.datatypes.Root
+    properties:
+      protocol:
+        type: string
+        required: false
+      token_type:
+        type: string
+        default: password
+      token:
+        type: string
+      keys:
+        type: map
+        required: false
+        entry_schema:
+          type: string
+      user:
+        type: string
+        required: false
+  tosca.datatypes.TimeInterval:
+    derived_from: tosca.datatypes.Root
+    properties:
+      start_time:
+        type: timestamp
+        required: true
+      end_time:
+        type: timestamp
+        required: true
+  tosca.datatypes.network.NetworkInfo:
+    derived_from: tosca.datatypes.Root
+    properties:
+      network_name:
+        type: string
+      network_id:
+        type: string
+      addresses:
+        type: list
+        entry_schema:
+          type: string
+  tosca.datatypes.network.PortInfo:
+    derived_from: tosca.datatypes.Root
+    properties:
+      port_name:
+        type: string
+      port_id:
+        type: string
+      network_id:
+        type: string
+      mac_address:
+        type: string
+      addresses:
+        type: list
+      entry_schema:
+        type: string
+  # tosca.datatypes.network.PortDef:
+  #     derived_from: integer
+  #     constraints:
+  #     - in_range: [ 1, 65535 ]
+  # tosca.datatypes.network.PortSpec:
+  #     derived_from: tosca.datatypes.Root
+  #     properties:
+  #         protocol:
+  #             type: string
+  #             required: true
+  #             default: tcp
+  #             constraints:
+  #             - valid_values: [ udp, tcp, igmp ]
+  #         target:
+  #             type: PortDef
+  #             required: false
+  #         target_range:
+  #             type: range
+  #             required: false
+  #             constraints:
+  #             - in_range: [ 1, 65535 ]
+  #         source:
+  #             type: PortDef
+  #             required: false
+  #         source_range:
+  #             type: range
+  #             required: false
+  #             constraints:
+  #             - in_range: [ 1, 65535 ]
\ No newline at end of file
diff --git a/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml b/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
deleted file mode 100644
index a11a73698..000000000
--- a/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-data_types:
-  tosca.datatypes.Root:
-    description: The TOSCA root Data Type all other TOSCA base Data Types derive from
-  tosca.datatypes.Credential:
-    derived_from: tosca.datatypes.Root
-    properties:
-      protocol:
-        type: string
-        required: false
-      token_type:
-        type: string
-        default: password
-      token:
-        type: string
-      keys:
-        type: map
-        required: false
-        entry_schema:
-          type: string
-      user:
-        type: string
-        required: false
-  tosca.datatypes.TimeInterval:
-    derived_from: tosca.datatypes.Root
-    properties:
-      start_time:
-        type: timestamp
-        required: true
-      end_time:
-        type: timestamp
-        required: true
-  tosca.datatypes.network.NetworkInfo:
-    derived_from: tosca.datatypes.Root
-    properties:
-      network_name:
-        type: string
-      network_id:
-        type: string
-      addresses:
-        type: list
-        entry_schema:
-          type: string
-  tosca.datatypes.network.PortInfo:
-    derived_from: tosca.datatypes.Root
-    properties:
-      port_name:
-        type: string
-      port_id:
-        type: string
-      network_id:
-        type: string
-      mac_address:
-        type: string
-      addresses:
-        type: list
-      entry_schema:
-        type: string
-  # tosca.datatypes.network.PortDef:
-  #     derived_from: integer
-  #     constraints:
-  #     - in_range: [ 1, 65535 ]
-  # tosca.datatypes.network.PortSpec:
-  #     derived_from: tosca.datatypes.Root
-  #     properties:
-  #         protocol:
-  #             type: string
-  #             required: true
-  #             default: tcp
-  #             constraints:
-  #             - valid_values: [ udp, tcp, igmp ]
-  #         target:
-  #             type: PortDef
-  #             required: false
-  #         target_range:
-  #             type: range
-  #             required: false
-  #             constraints:
-  #             - in_range: [ 1, 65535 ]
-  #         source:
-  #             type: PortDef
-  #             required: false
-  #         source_range:
-  #             type: range
-  #             required: false
-  #             constraints:
-  #             - in_range: [ 1, 65535 ]
\ No newline at end of file
diff --git a/src/main/resources/clds/tosca_update/templates.properties b/src/main/resources/clds/tosca_update/templates.properties
deleted file mode 100644
index 5da239b1f..000000000
--- a/src/main/resources/clds/tosca_update/templates.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#Numeric types
-integer=type,description,title,deprecated,default,enum,const,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum
-number=type,description,title,deprecated,default,enum,const,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum
-range=type,description,title,deprecated,default,enum,const,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum
-#
-boolean=type,description,title,deprecated,default,enum,const,readOnly,writeOnly
-#String types
-string=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format
-timestamp=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format
-scalar-unit.time=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format
-scalar-unit.frequency=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format
-scalar-unit.size=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format
-#Complex types
-array=type,description,title,deprecated,default,enum,const,minItems,maxItems,uniqueItems,minContains,maxContains
-object=type,description,title,deprecated,default,enum,const,properties,minProperties,maxProperties,required,dependentRequired,dependencies,readOnly,writeOnly
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
index a99d4ab56..83c374e9d 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ArrayFieldTest.java
@@ -37,12 +37,12 @@ public class ArrayFieldTest extends TestCase {
      * @throws IOException in case of failure
      */
     public void testDeploy() throws IOException {
-        TemplateManagement templateManagement = new TemplateManagement(ResourceFileUtil.getResourceAsString(
+        ToscaConverterManager toscaConverterManager = new ToscaConverterManager(ResourceFileUtil.getResourceAsString(
                 "tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),ResourceFileUtil.getResourceAsString(
-                "clds/tosca_update/defaultToscaTypes.yaml"),
+                "clds/tosca_update/default-tosca-types.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
-        Property property = component.getProperties().get("actor");
+        ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.Actor");
+        Property property = toscaElement.getProperties().get("actor");
         ArrayField arrayParser = new ArrayField((ArrayList<Object>) property.getItems().get("default"));
         JsonArray toTest = arrayParser.deploy();
         String reference = "[1,\"String\",5.5,true]";
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java
deleted file mode 100644
index 565547e4b..000000000
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ComponentTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import junit.framework.TestCase;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-
-public class ComponentTest extends TestCase {
-
-    /**
-     * Test propertiesName.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testPropertiesNames() throws IOException {
-        ArrayList<String> reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload"));
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
-        assertEquals(reference, component.propertiesNames());
-    }
-
-}
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
index a4d329e29..a73fd6736 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ConstraintTest.java
@@ -31,12 +31,12 @@ import org.onap.clamp.clds.util.ResourceFileUtil;
 
 public class ConstraintTest extends TestCase {
 
-    TemplateManagement templateManagement = new TemplateManagement(
+    ToscaConverterManager toscaConverterManager = new ToscaConverterManager(
             ResourceFileUtil.getResourceAsString("tosca/new-converter/constraints.yaml"),
-            ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
+            ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
             ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
 
-    Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Operation");
+    ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.Operation");
 
     public ConstraintTest() throws IOException {
     }
@@ -45,15 +45,15 @@ public class ConstraintTest extends TestCase {
      * Test get value array.
      */
     public void testGetValuesArray() {
-        Property property = component.getProperties().get("timeout");
-        Template template = templateManagement.getTemplates().get("integer");
+        Property property = toscaElement.getProperties().get("timeout");
+        Template template = toscaConverterManager.getTemplates().get("integer");
         JsonObject resultProcess = new JsonObject();
         property.addConstraintsAsJson(resultProcess, (ArrayList<Object>) property.getItems().get("constraints"),
                 template);
         String reference = "{\"enum\":[3,4,5.5,6,10]}";
         assertEquals(reference, String.valueOf(resultProcess));
-        property = component.getProperties().get("success");
-        template = templateManagement.getTemplates().get("string");
+        property = toscaElement.getProperties().get("success");
+        template = toscaConverterManager.getTemplates().get("string");
         resultProcess = new JsonObject();
         property.addConstraintsAsJson(resultProcess, (ArrayList<Object>) property.getItems().get("constraints"),
                 template);
@@ -66,8 +66,8 @@ public class ConstraintTest extends TestCase {
      */
     public void testGetSpecificLength() {
         //Test for string type, same process for array
-        Property property = component.getProperties().get("id");
-        Template template = templateManagement.getTemplates().get("string");
+        Property property = toscaElement.getProperties().get("id");
+        Template template = toscaConverterManager.getTemplates().get("string");
         JsonObject resultProcess = new JsonObject();
         property.addConstraintsAsJson(resultProcess, (ArrayList<Object>) property.getItems().get("constraints"),
                 template);
@@ -83,8 +83,8 @@ public class ConstraintTest extends TestCase {
      */
     public void testGetLimitValue() {
         //Test for array type, same process for string
-        Property property = component.getProperties().get("description");
-        Template template = templateManagement.getTemplates().get("array");
+        Property property = toscaElement.getProperties().get("description");
+        Template template = toscaConverterManager.getTemplates().get("array");
         JsonObject resultProcess = new JsonObject();
         property.addConstraintsAsJson(resultProcess, (ArrayList<Object>) property.getItems().get("constraints"),
                 template);
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
index 62def32b8..bb1929f98 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
@@ -40,12 +40,12 @@ public class PropertyTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testParseArray() throws IOException {
-        TemplateManagement templateManagement = new TemplateManagement(
+        ToscaConverterManager toscaConverterManager = new ToscaConverterManager(
                 ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),
-                ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
-        Property property = component.getProperties().get("actor");
+        ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.Actor");
+        Property property = toscaElement.getProperties().get("actor");
         JsonArray toTest = property.parseArray((ArrayList<Object>) property.getItems().get("default"));
         assertNotNull(toTest);
     }
@@ -56,13 +56,13 @@ public class PropertyTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testAddConstraintsAsJson() throws IOException {
-        TemplateManagement templateManagement = new TemplateManagement(
+        ToscaConverterManager toscaConverterManager = new ToscaConverterManager(
                 ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
                 ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        Component component = templateManagement.getComponents().get("onap.datatype.controlloop.operation.Failure");
-        Property property = component.getProperties().get("category");
-        Template template = templateManagement.getTemplates().get("string");
+        ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.operation.Failure");
+        Property property = toscaElement.getProperties().get("category");
+        Template template = toscaConverterManager.getTemplates().get("string");
         JsonObject toTest = new JsonObject();
         property.addConstraintsAsJson(toTest, (ArrayList<Object>) property.getItems().get("constraints"), template);
         String test = "{\"enum\":[\"error\",\"timeout\",\"retries\",\"guard\",\"exception\"]}";
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java
deleted file mode 100644
index aaa549386..000000000
--- a/src/test/java/org/onap/clamp/clds/tosca/update/TemplateManagementTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.clamp.clds.tosca.update;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import junit.framework.TestCase;
-import org.onap.clamp.clds.util.ResourceFileUtil;
-
-public class TemplateManagementTest extends TestCase {
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationTca() throws IOException, UnknownComponentException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(templateManagement.getParseToJson());
-        String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
-        templateManagement.launchTranslation(componentName);
-        assertNotNull(templateManagement.getParseToJson());
-    }
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationFrequencyLimiter() throws IOException, UnknownComponentException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(templateManagement.getParseToJson());
-        String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
-        templateManagement.launchTranslation(componentName);
-        assertNotNull(templateManagement.getParseToJson());
-    }
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationApex() throws IOException, UnknownComponentException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(templateManagement.getParseToJson());
-        String componentName = "onap.policies.controlloop.operational.common.Apex";
-        templateManagement.launchTranslation(componentName);
-        assertNotNull(templateManagement.getParseToJson());
-    }
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationDrools() throws IOException, UnknownComponentException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Drools/versions/1.0.0&#63;"
-                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(templateManagement.getParseToJson());
-        String componentName = "onap.policies.controlloop.operational.common.Drools";
-        templateManagement.launchTranslation(componentName);
-        assertNotNull(templateManagement.getParseToJson());
-    }
-
-    /**
-     * Test the launch translation.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslation() throws IOException, UnknownComponentException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(templateManagement.getParseToJson());
-        String componentName = "onap.policies.controlloop.operational.common.Drools";
-        templateManagement.launchTranslation(componentName);
-        assertNotNull(templateManagement.getParseToJson());
-    }
-
-    /**
-     * Test addTemplate.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testAddTemplate() throws IOException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        int count = templateManagement.getTemplates().size();
-        List<Field> templateFields = new ArrayList<>(Arrays.asList(new Field("type"), new Field("description"),
-                new Field(
-                "required"),
-                new Field("metadata"), new Field("constraints")));
-        templateManagement.addTemplate("test", templateFields);
-        assertNotSame(count, templateManagement.getTemplates().size());
-    }
-
-    /**
-     * test Remove template.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testRemoveTemplate() throws IOException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        int count = templateManagement.getTemplates().size();
-        templateManagement.removeTemplate("string");
-        assertNotSame(count, templateManagement.getTemplates().size());
-    }
-
-    /**
-     * Test update template.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testUpdateTemplate() throws IOException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        int count = templateManagement.getTemplates().get("integer").getFields().size();
-        templateManagement.updateTemplate("integer", new Field("type"), false);
-        assertNotSame(count, templateManagement.getTemplates().get("integer").getFields().size());
-    }
-
-    /**
-     * Test has template.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testHasTemplate() throws IOException {
-        TemplateManagement templateManagement =
-                new TemplateManagement(
-                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/defaultToscaTypes.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        boolean has = true;
-        List<Field> templateFieldsString =
-                new ArrayList<>(Arrays.asList(new Field("type"), new Field("description"), new Field("required"),
-                        new Field("metadata"), new Field("constraints")));
-        Template templateTest = new Template("String", templateFieldsString);
-        has = templateManagement.hasTemplate(templateTest);
-        assertEquals(false, has);
-    }
-
-}
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/TemplateTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/TemplateTest.java
index 4ffb4e28e..02c5747b6 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/TemplateTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/TemplateTest.java
@@ -35,11 +35,11 @@ public class TemplateTest extends TestCase {
      */
     public void testCheckFields() {
         Template toTest = new Template("toTest");
-        List<Field> fields = new ArrayList<>(Arrays.asList(new Field("type"), new Field("description"),new Field(
+        List<TemplateField> templateFields = new ArrayList<>(Arrays.asList(new TemplateField("type"), new TemplateField("description"),new TemplateField(
                 "enum")));
-        toTest.setFields(fields);
+        toTest.setTemplateFields(templateFields);
         Template reference = new Template("toTest");
-        reference.setFields(fields);
+        reference.setTemplateFields(templateFields);
         assertTrue(toTest.checkFields(reference));
     }
 
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java
new file mode 100644
index 000000000..493841215
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java
@@ -0,0 +1,205 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import junit.framework.TestCase;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+
+public class ToscaConverterManagerTest extends TestCase {
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationTca() throws IOException, UnknownComponentException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        assertNull(toscaConverterManager.getParseToJson());
+        String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
+        toscaConverterManager.startConversionToJson(componentName);
+        assertNotNull(toscaConverterManager.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationFrequencyLimiter() throws IOException, UnknownComponentException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        assertNull(toscaConverterManager.getParseToJson());
+        String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
+        toscaConverterManager.startConversionToJson(componentName);
+        assertNotNull(toscaConverterManager.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationApex() throws IOException, UnknownComponentException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        assertNull(toscaConverterManager.getParseToJson());
+        String componentName = "onap.policies.controlloop.operational.common.Apex";
+        toscaConverterManager.startConversionToJson(componentName);
+        assertNotNull(toscaConverterManager.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation wit operational policies.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslationDrools() throws IOException, UnknownComponentException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
+                                + ".policies.controlloop.operational.common.Drools/versions/1.0.0&#63;"
+                                + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
+                        "clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        assertNull(toscaConverterManager.getParseToJson());
+        String componentName = "onap.policies.controlloop.operational.common.Drools";
+        toscaConverterManager.startConversionToJson(componentName);
+        assertNotNull(toscaConverterManager.getParseToJson());
+    }
+
+    /**
+     * Test the launch translation.
+     *
+     * @throws IOException               In case of failure
+     * @throws UnknownComponentException In case of failure
+     */
+    public void testLaunchTranslation() throws IOException, UnknownComponentException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        assertNull(toscaConverterManager.getParseToJson());
+        String componentName = "onap.policies.controlloop.operational.common.Drools";
+        toscaConverterManager.startConversionToJson(componentName);
+        assertNotNull(toscaConverterManager.getParseToJson());
+    }
+
+    /**
+     * Test addTemplate.
+     *
+     * @throws IOException In case of failure
+     */
+    public void testAddTemplate() throws IOException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        int count = toscaConverterManager.getTemplates().size();
+        List<TemplateField> templateFields = new ArrayList<>(Arrays.asList(new TemplateField("type"), new TemplateField("description"),
+                new TemplateField(
+                "required"),
+                new TemplateField("metadata"), new TemplateField("constraints")));
+        toscaConverterManager.addTemplate("test", templateFields);
+        assertNotSame(count, toscaConverterManager.getTemplates().size());
+    }
+
+    /**
+     * test Remove template.
+     *
+     * @throws IOException In case of failure
+     */
+    public void testRemoveTemplate() throws IOException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        int count = toscaConverterManager.getTemplates().size();
+        toscaConverterManager.removeTemplate("string");
+        assertNotSame(count, toscaConverterManager.getTemplates().size());
+    }
+
+    /**
+     * Test update template.
+     *
+     * @throws IOException In case of failure
+     */
+    public void testUpdateTemplate() throws IOException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        int count = toscaConverterManager.getTemplates().get("integer").getTemplateFields().size();
+        toscaConverterManager.updateTemplate("integer", new TemplateField("type"), false);
+        assertNotSame(count, toscaConverterManager.getTemplates().get("integer").getTemplateFields().size());
+    }
+
+    /**
+     * Test has template.
+     *
+     * @throws IOException In case of failure
+     */
+    public void testHasTemplate() throws IOException {
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        boolean has = true;
+        List<TemplateField> templateFieldsString =
+                new ArrayList<>(Arrays.asList(new TemplateField("type"), new TemplateField("description"), new TemplateField("required"),
+                        new TemplateField("metadata"), new TemplateField("constraints")));
+        Template templateTest = new Template("String", templateFieldsString);
+        has = toscaConverterManager.hasTemplate(templateTest);
+        assertEquals(false, has);
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java
new file mode 100644
index 000000000..7ffba4e00
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java
@@ -0,0 +1,50 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import junit.framework.TestCase;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+
+public class ToscaElementTest extends TestCase {
+
+    /**
+     * Test propertiesName.
+     *
+     * @throws IOException In case of failure
+     */
+    public void testPropertiesNames() throws IOException {
+        ArrayList<String> reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload"));
+        ToscaConverterManager toscaConverterManager =
+                new ToscaConverterManager(
+                        ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.Actor");
+        assertEquals(reference, toscaElement.propertiesNames());
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
index fd215dd39..a57a35ea4 100644
--- a/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
+++ b/src/test/java/org/onap/clamp/loop/CsarInstallerItCase.java
@@ -27,7 +27,6 @@
 package org.onap.clamp.loop;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,7 +49,7 @@ import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact;
 import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.clds.util.ResourceFileUtil;
-import org.onap.clamp.loop.service.ServiceRepository;
+import org.onap.clamp.loop.service.ServicesRepository;
 import org.onap.clamp.loop.template.LoopTemplate;
 import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;
 import org.onap.clamp.loop.template.LoopTemplatesRepository;
@@ -87,7 +86,7 @@ public class CsarInstallerItCase {
     private LoopTemplatesRepository loopTemplatesRepo;
 
     @Autowired
-    ServiceRepository serviceRepository;
+    ServicesRepository serviceRepository;
 
     @Autowired
     PolicyModelsRepository policyModelsRepository;
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 634c5ac57..08bc8e0de 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -117,7 +117,7 @@ export default class PolicyModal extends React.Component {
               display_required_only: false,
               show_opt_in: true,
               prompt_before_delete: true,
-              required_by_default: true
+              required_by_default: false
         })
     }
 
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 4eafaa448..7cf56570b 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -85,7 +85,6 @@ export default class MenuBar extends React.Component {
 
 	render () {
 		return (
-
 				<Navbar.Collapse>
 					<StyledNavDropdown title="Loop Templates">
 							<NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View All Templates</NavDropdown.Item>
@@ -93,16 +92,15 @@ export default class MenuBar extends React.Component {
 					<StyledNavDropdown title="Policy Models">
                     	    <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Model</NavDropdown.Item>
                     		<NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item>
-                    </StyledNavDropdown>
-                    <StyledNavDropdown title="Dictionaries">
-                            <NavDropdown.Item as={StyledLink} to="/ManageDictionaries">Manage Dictionaries</NavDropdown.Item>
+                            <NavDropdown.Item as={StyledLink} to="/ManageDictionaries">Manage Metadata Dictionaries</NavDropdown.Item>
                     </StyledNavDropdown>
 					<StyledNavDropdown title="Loop Instance">
 					        <NavDropdown.Item as={StyledLink} to="/createLoop">Create</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/openLoop">Open</NavDropdown.Item>
+					        <NavDropdown.Item as={StyledLink} to="/openLoop">Open</NavDropdown.Item>
+					        <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item>
+					        <NavDropdown.Item as={StyledLink} to="/modifyLoop" disabled={this.state.disabled}>Modify</NavDropdown.Item>
+						    <NavDropdown.Divider />
 							<NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/modifyLoop" disabled={this.state.disabled}>Modify</NavDropdown.Item>
 							<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
 					</StyledNavDropdown>
 					<StyledNavDropdown title="Loop Operations">
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 9070e87e9..92444ea3d 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -162,10 +162,6 @@ exports[`Verify MenuBar Test the render method 1`] = `
     >
       View Tosca Models
     </DropdownItem>
-  </Styled(NavDropdown)>
-  <Styled(NavDropdown)
-    title="Dictionaries"
-  >
     <DropdownItem
       as={
         Object {
@@ -215,7 +211,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
       disabled={false}
       to="/ManageDictionaries"
     >
-      Manage Dictionaries
+      Manage Metadata Dictionaries
     </DropdownItem>
   </Styled(NavDropdown)>
   <Styled(NavDropdown)
@@ -370,9 +366,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/loopProperties"
+      to="/closeLoop"
     >
-      Properties
+      Close
     </DropdownItem>
     <DropdownItem
       as={
@@ -421,10 +417,13 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/closeLoop"
+      to="/modifyLoop"
     >
-      Close
+      Modify
     </DropdownItem>
+    <DropdownDivider
+      role="separator"
+    />
     <DropdownItem
       as={
         Object {
@@ -472,9 +471,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
         }
       }
       disabled={true}
-      to="/modifyLoop"
+      to="/loopProperties"
     >
-      Modify
+      Properties
     </DropdownItem>
     <DropdownItem
       as={
-- 
cgit 1.2.3-korg


From fb4b25f6827accf6f975f9ca9a7aaee08d335c2f Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 11 Mar 2020 11:22:15 +0100
Subject: Add remove op policy option

Update the UI and backend code to be able to remove op policy for loop
instances.

Issue-ID: CLAMP-648
Change-Id: Ib3eab4977fe4f1b85e11f2373263197009bbc3e1
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 src/main/java/org/onap/clamp/loop/Loop.java        |  11 +++
 .../java/org/onap/clamp/loop/LoopController.java   |  12 +++
 src/main/java/org/onap/clamp/loop/LoopService.java |  26 ++++-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |  30 ++++++
 .../onap/clamp/loop/LoopControllerTestItCase.java  |  34 ++++++-
 ui-react/src/api/LoopService.js                    |  67 ++++++++-----
 .../src/components/dialogs/Loop/ModifyLoopModal.js |  98 +++++++++++++-----
 .../dialogs/Loop/ModifyLoopModal.test.js           | 109 +++++++++++++++++++++
 8 files changed, 336 insertions(+), 51 deletions(-)
 create mode 100644 ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index f185460cf..2bf3decd6 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -270,6 +270,17 @@ public class Loop extends AuditEntity implements Serializable {
         this.setSvgRepresentation(SvgLoopGenerator.getSvgImage(this));
     }
 
+    /**
+     * This method removes an operational policy to the loop.
+     * It re-computes the Svg as well.
+     *
+     * @param opPolicy the operationalPolicy to add
+     */
+    public void removeOperationalPolicy(OperationalPolicy opPolicy) {
+        operationalPolicies.remove(opPolicy);
+        this.setSvgRepresentation(SvgLoopGenerator.getSvgImage(this));
+    }
+
     /**
      * This method adds an micro service policy to the loop.
      * It re-computes the Svg as well.
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index 1a67455e8..1a4ae5997 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -109,6 +109,18 @@ public class LoopController {
         return loopService.addOperationalPolicy(loopName, policyType, policyVersion);
     }
 
+    /**
+     * This method remove an operational policy to a loop instance.
+     *
+     * @param loopName      The loop name
+     * @param policyType    The policy model type
+     * @param policyVersion The policy model  version
+     * @return The loop modified
+     */
+    public Loop removeOperationalPolicy(String loopName, String policyType, String policyVersion) {
+        return loopService.removeOperationalPolicy(loopName, policyType, policyVersion);
+    }
+
     /**
      * This method deletes the loop.
      *
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index 98a2fbddc..953a59471 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -120,7 +120,31 @@ public class LoopService {
                 new OperationalPolicy(Policy.generatePolicyName("OPERATIONAL", loop.getModelService().getName(),
                         loop.getModelService().getVersion(), RandomStringUtils.randomAlphanumeric(3),
                         RandomStringUtils.randomAlphanumeric(4)), loop, null, policyModel, null, null, null));
-        return loopsRepository.save(loop);
+        return loopsRepository.saveAndFlush(loop);
+    }
+
+    /**
+     * This method remove an operational policy to a loop instance.
+     *
+     * @param loopName The loop name
+     * @param policyType The policy model type
+     * @param policyVersion The policy model  version
+     * @return The loop modified
+     */
+    Loop removeOperationalPolicy(String loopName, String policyType, String policyVersion) {
+        Loop loop = getLoop(loopName);
+        PolicyModel policyModel = policyModelsService.getPolicyModel(policyType, policyVersion);
+        if (policyModel == null) {
+            return null;
+        }
+        for (OperationalPolicy opPolicy : loop.getOperationalPolicies()) {
+            if (opPolicy.getPolicyModel().getPolicyModelType().equals(policyType) &&
+                    opPolicy.getPolicyModel().getVersion().equals(policyVersion)) {
+                loop.removeOperationalPolicy(opPolicy);
+                break;
+            }
+        }
+        return loopsRepository.saveAndFlush(loop);
     }
 
     Loop updateAndSaveOperationalPolicies(String loopName, List<OperationalPolicy> newOperationalPolicies) {
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index fbf90712a..d1c191dc7 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -604,6 +604,36 @@
 				</doTry>
 			</route>
 		</put>
+		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
+				<doTry>
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+							uri="bean:org.onap.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
+					<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="REMOVE OperationalPolicy request failed for loop: ${header.loopName}" />
+						<to
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
 		<post
 				uri="/v2/loop/create/{loopName}?templateName={templateName}"
 				outType="org.onap.clamp.loop.Loop" consumes="application/json"
diff --git a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
index f017dd899..24a9037ad 100644
--- a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
@@ -36,14 +36,17 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.onap.clamp.clds.Application;
 import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.loop.service.Service;
 import org.onap.clamp.loop.template.LoopTemplate;
 import org.onap.clamp.loop.template.PolicyModel;
 import org.onap.clamp.loop.template.PolicyModelsService;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.microservice.MicroServicePolicyService;
 import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Commit;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
@@ -62,6 +65,9 @@ public class LoopControllerTestItCase {
     @Autowired
     MicroServicePolicyService microServicePolicyService;
 
+    @Autowired
+    OperationalPolicyService operationalPolicyService;
+
     @Autowired
     PolicyModelsService policyModelsService;
 
@@ -74,6 +80,8 @@ public class LoopControllerTestItCase {
         LoopTemplate template =  new LoopTemplate();
         template.setName("testTemplate");
         testLoop.setLoopTemplate(template);
+        Service modelService = new Service("{\"name\":\"serviceName\",\"UUID\":\"uuid\"}","{}");
+        testLoop.setModelService(modelService);
         loopService.saveOrUpdateLoop(testLoop);
     }
 
@@ -131,7 +139,7 @@ public class LoopControllerTestItCase {
     @Transactional
     public void testUpdateMicroservicePolicy() {
         saveTestLoopToDb();
-        PolicyModel policyModel = new PolicyModel("",
+        PolicyModel policyModel = new PolicyModel("testPolicyModel",
                 "tosca_definitions_version: tosca_simple_yaml_1_0_0","1.0.0");
         policyModelsService.saveOrUpdatePolicyModel(policyModel);
         MicroServicePolicy policy = new MicroServicePolicy("policyName", policyModel, false,
@@ -147,4 +155,28 @@ public class LoopControllerTestItCase {
         String svgRepresentation = loopController.getSvgRepresentation(EXAMPLE_LOOP_NAME);
         assertThat(svgRepresentation).isEqualTo("representation");
     }
+
+    @Test
+    @Transactional
+    public void testAddAndRemoveOperationalPolicies() {
+        saveTestLoopToDb();
+        PolicyModel policyModel = new PolicyModel("testPolicyModel",
+                "tosca_definitions_version: tosca_simple_yaml_1_0_0","1.0.0");
+        policyModelsService.saveOrUpdatePolicyModel(policyModel);
+
+        loopController.addOperationalPolicy(EXAMPLE_LOOP_NAME, "testPolicyModel", "1.0.0");
+
+        Loop newLoop = loopController.getLoop(EXAMPLE_LOOP_NAME);
+        Set<OperationalPolicy> opPolicyList = newLoop.getOperationalPolicies();
+        assertThat(opPolicyList.size()).isEqualTo(1);
+        for(OperationalPolicy policy : opPolicyList) {
+            assertThat(policy.getName().contains("OPERATIONAL_serviceName")).isTrue();
+            assertThat(policy.getPolicyModel().getPolicyModelType()).isEqualTo("testPolicyModel");
+            assertThat(policy.getPolicyModel().getVersion()).isEqualTo("1.0.0");
+        }
+
+        loopController.removeOperationalPolicy(EXAMPLE_LOOP_NAME, "testPolicyModel", "1.0.0");
+        Loop newLoop2 = loopController.getLoop(EXAMPLE_LOOP_NAME);
+        assertThat(newLoop2.getOperationalPolicies().size()).isEqualTo(0);
+    }
 }
\ No newline at end of file
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index d665f8148..2750763da 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -194,26 +194,49 @@ export default class LoopService {
 			});
 	}
 
-		static addOperationalPolicyType(loopName, policyType, policyVersion) {
-    		return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
-    			method: 'PUT',
-    			headers: {
-    				"Content-Type": "application/json"
-    			},
-    			credentials: 'same-origin'
-    		})
-                .then(function (response) {
-                    console.debug("Add Operational Policy response received: ", response.status);
-    				if (response.ok) {
-    					return response.json();
-    				} else {
-    					console.error("Add Operational Policy query failed");
-    					return {};
-    				}
-    			})
-    			.catch(function (error) {
-    				console.error("Add Operational Policy error received", error);
-    				return {};
-    			});
-    	}
+	static addOperationalPolicyType(loopName, policyType, policyVersion) {
+		return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+			method: 'PUT',
+			headers: {
+				"Content-Type": "application/json"
+			},
+			credentials: 'same-origin'
+		})
+				.then(function (response) {
+					console.debug("Add Operational Policy response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("Add Operational Policy query failed");
+					return {};
+				}
+			})
+			.catch(function (error) {
+				console.error("Add Operational Policy error received", error);
+				return {};
+			});
+	}
+
+	static removeOperationalPolicyType(loopName, policyType, policyVersion) {
+		return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+			method: 'PUT',
+			headers: {
+				"Content-Type": "application/json"
+			},
+			credentials: 'same-origin'
+		})
+				.then(function (response) {
+					console.debug("Remove Operational Policy response received: ", response.status);
+				if (response.ok) {
+					return response.json();
+				} else {
+					console.error("Remove Operational Policy query failed");
+					return {};
+				}
+			})
+			.catch(function (error) {
+				console.error("Remove Operational Policy error received", error);
+				return {};
+			});
+	}
 }
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 4cd21fdb5..7c16b7863 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -35,6 +35,8 @@ import FirstPage from '@material-ui/icons/FirstPage';
 import LastPage from '@material-ui/icons/LastPage';
 import Search from '@material-ui/icons/Search';
 import LoopService from '../../../api/LoopService';
+import Tabs from 'react-bootstrap/Tabs';
+import Tab from 'react-bootstrap/Tab';
 
 
 const ModalStyled = styled(Modal)`
@@ -61,6 +63,8 @@ export default class ModifyLoopModal extends React.Component {
 		content: 'Please select Tosca model to view the details',
 		selectedRowData: {},
 		toscaPolicyModelsData: [],
+		selectedPolicyModelsData: [],
+		key: 'add',
 		toscaColumns: [
 			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
 				cellStyle: cellStyle,
@@ -105,11 +109,12 @@ export default class ModifyLoopModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 		this.handleClose = this.handleClose.bind(this);
-		this.getPolicyToscaModels = this.getToscaPolicyModels.bind(this);
+		this.initializeToscaPolicyModelsInfo = this.initializeToscaPolicyModelsInfo.bind(this);
 		this.handleYamlContent = this.handleYamlContent.bind(this);
 		this.getToscaPolicyModelYaml = this.getToscaPolicyModelYaml.bind(this);
 		this.handleAdd = this.handleAdd.bind(this);
-		this.getToscaPolicyModels();
+		this.handleRemove = this.handleRemove.bind(this);
+		this.initializeToscaPolicyModelsInfo();
 	}
 
 	componentWillReceiveProps(newProps) {
@@ -119,9 +124,16 @@ export default class ModifyLoopModal extends React.Component {
 		});
 	}
 
-	getToscaPolicyModels() {
-	    PolicyToscaService.getToscaPolicyModels().then(allToscaModels => {
-			this.setState({ toscaPolicyModelsData: allToscaModels});
+	initializeToscaPolicyModelsInfo() {
+		var operationalPolicies = this.state.loopCache.getOperationalPolicies();
+		var selectedPolicyModels = [];
+		for (var policy in operationalPolicies) {
+			selectedPolicyModels.push(operationalPolicies[policy]["policyModel"]);
+		}
+
+		PolicyToscaService.getToscaPolicyModels().then(allToscaModels => {
+			this.setState({ toscaPolicyModelsData: allToscaModels,
+							selectedPolicyModelsData: selectedPolicyModels});
 		});
 	}
 
@@ -149,38 +161,70 @@ export default class ModifyLoopModal extends React.Component {
 	}
 
 	handleAdd() {
-        LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
-        this.handleClose();
-        this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+		LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
+		this.handleClose();
+		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+	}
+
+	handleRemove() {
+		LoopService.removeOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
+		this.handleClose();
+		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
 	}
 
 	render() {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
+					<Modal.Title>Modify Loop Operational Policies</Modal.Title>
 				</Modal.Header>
-				<Modal.Body>
-					<MaterialTable
-					title={"View Tosca Policy Models"}
-					data={this.state.toscaPolicyModelsData}
-					columns={this.state.toscaColumns}
-					icons={this.state.tableIcons}
-					onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType, rowData.version);this.setState({selectedRowData: rowData})}}
-					options={{
-						headerStyle: rowHeaderStyle,
-						rowStyle: rowData => ({
-							backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
-						})
-					}}
-					/>
-					<div>
-						<TextModal value={this.state.content} onChange={this.handleYamlContent}/>
-					</div>
-				</Modal.Body>
+				<Tabs id="controlled-tab-example" activeKey={this.state.key} onSelect={key => this.setState({ key, selectedRowData: {} })}>
+					<Tab eventKey="add" title="Add Operational Policies">
+						<Modal.Body>
+							<MaterialTable
+							title={"View Tosca Policy Models"}
+							data={this.state.toscaPolicyModelsData}
+							columns={this.state.toscaColumns}
+							icons={this.state.tableIcons}
+							onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType, rowData.version);this.setState({selectedRowData: rowData})}}
+							options={{
+								headerStyle: rowHeaderStyle,
+								rowStyle: rowData => ({
+									backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.tableData !== undefined
+									&& this.state.selectedRowData.tableData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
+								})
+							}}
+							/>
+							<div>
+								<TextModal value={this.state.content} onChange={this.handleYamlContent}/>
+							</div>
+						</Modal.Body>
+					</Tab>
+					<Tab eventKey="remove" title="Remove Operational Policies">
+						<Modal.Body>
+							<MaterialTable
+							title={"Already added Tosca Policy Models"}
+							data={this.state.selectedPolicyModelsData}
+							columns={this.state.toscaColumns}
+							icons={this.state.tableIcons}
+							onRowClick={(event, rowData) => {this.setState({selectedRowData: rowData})}}
+							options={{
+								headerStyle: rowHeaderStyle,
+								rowStyle: rowData => ({
+									backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.tableData !== undefined
+									&& this.state.selectedRowData.tableData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
+								})
+							}}
+							/>
+						</Modal.Body>
+					</Tab>
+				</Tabs>
 				<Modal.Footer>
 					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-					<Button variant="primary"  type="submit" onClick={this.handleAdd}>Add</Button>
+					<Button variant="primary" disabled={(this.state.key === "remove")} type="submit" onClick={this.handleAdd}>Add</Button>
+					<Button variant="primary" disabled={(this.state.key === "add")} type="submit" onClick={this.handleRemove}>Remove</Button>
 				</Modal.Footer>
+
 			</ModalStyled>
 		);
 	}
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js
new file mode 100644
index 000000000..055ad0e68
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.test.js
@@ -0,0 +1,109 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { mount } from 'enzyme';
+import ModifyLoopModal from './ModifyLoopModal';
+import LoopCache from '../../../api/LoopCache';
+import LoopService from '../../../api/LoopService';
+import PolicyToscaService from '../../../api/PolicyToscaService';
+
+describe('Verify ModifyLoopModal', () => {
+    beforeEach(() => {
+        PolicyToscaService.getToscaPolicyModels = jest.fn().mockImplementation(() => {
+            return Promise.resolve([{
+                "policyModelType":"test",
+                "policyAcronym":"test",
+                "version":"1.0.0",
+                "updatedBy":"",
+                "updatedDate":""
+            }]);
+        });
+        PolicyToscaService.getToscaPolicyModelYaml = jest.fn().mockImplementation(() => {
+            return Promise.resolve("OK");
+        });
+    })
+
+    const loopCache = new LoopCache({
+            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+            "microServicePolicies": [{
+                "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
+                "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                "properties": {"domain": "measurementsForVfScaling"},
+                "shared": false,
+                "jsonRepresentation": {"schema": {}}
+            }],
+            "globalPropertiesJson": {
+                "dcaeDeployParameters": {
+                    "testMs": {
+                    "location_id": "",
+                    "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
+                }
+            }
+        }
+    });
+    const historyMock = { push: jest.fn() };
+    const flushPromises = () => new Promise(setImmediate);
+
+    it('Test handleClose', () => {
+        const handleClose = jest.spyOn(ModifyLoopModal.prototype,'handleClose');
+        const component = mount(<ModifyLoopModal history={historyMock} loopCache={loopCache}/>)
+
+        component.find('[variant="secondary"]').get(0).props.onClick();
+
+        expect(handleClose).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(false);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    });
+
+    it('Test getToscaPolicyModelYaml',  async () => {
+        const flushPromises = () => new Promise(setImmediate);
+        const component = mount(<ModifyLoopModal history={historyMock} loopCache={loopCache}/>)
+        component.setState({ 
+                "selectedRowData": {"tableData":{"id":0}}
+        });
+        const instance = component.instance();
+
+        instance.getToscaPolicyModelYaml("","1.0.0");
+        expect(component.state('content')).toEqual("Please select Tosca model to view the details");
+
+        instance.getToscaPolicyModelYaml("test","1.0.0");
+        await flushPromises();
+        expect(component.state('content')).toEqual("OK");
+
+        PolicyToscaService.getToscaPolicyModelYaml = jest.fn().mockImplementation(() => {
+            return Promise.resolve("");
+        });
+        instance.getToscaPolicyModelYaml("test","1.0.0");
+        await flushPromises();
+        expect(component.state('content')).toEqual("No Tosca model Yaml available");
+    });
+
+    it('Test handleYamlContent',  async () => {
+        const component = mount(<ModifyLoopModal loopCache={loopCache}/>)
+        const instance = component.instance();
+
+        const event = {"target":{"value":"testValue"}}
+        instance.handleYamlContent(event);
+        expect(component.state('content')).toEqual("testValue");
+    });
+});
\ No newline at end of file
-- 
cgit 1.2.3-korg


From 49ab84a916e96fde4fc39258fa10f8b5ce775f48 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 13 Mar 2020 15:27:41 -0700
Subject: Fix the legacy policies

Fix the legacy policies not displayed in the UI properly due to the new PolicyModal dialog.

Issue-ID: CLAMP-779
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I8070d8c57e43c9a386e09475f0d377f91104aef1
---
 extra/sql/dump/test-data.sql                       |   30 +-
 .../policy/operational/OperationalPolicy.java      |    3 +-
 .../OperationalPolicyRepresentationBuilder.java    |    6 +-
 src/main/resources/META-INF/resources/swagger.html |  110 +-
 .../operational_policies/operational_policy.json   |  921 ++++++------
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |    8 +-
 .../1.0.0&#63;connectionTimeToLive=5000/.file      |    8 +-
 .../tosca/operational-policy-json-schema.json      | 1490 ++++++++++----------
 .../src/components/dialogs/Policy/PolicyModal.js   |    7 +-
 9 files changed, 1274 insertions(+), 1309 deletions(-)

(limited to 'ui-react/src')

diff --git a/extra/sql/dump/test-data.sql b/extra/sql/dump/test-data.sql
index 72d95194a..31e2bd67e 100644
--- a/extra/sql/dump/test-data.sql
+++ b/extra/sql/dump/test-data.sql
@@ -63,7 +63,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_element_models` WRITE;
 /*!40000 ALTER TABLE `loop_element_models` DISABLE KEYS */;
-INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-13 10:59:53.499891','Not found','2020-03-13 10:59:53.993136',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
+INSERT INTO `loop_element_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app',NULL,'2020-03-13 13:23:59.669635','Not found','2020-03-13 13:24:00.322860',NULL,NULL,'MICRO_SERVICE_TYPE',NULL);
 /*!40000 ALTER TABLE `loop_element_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -82,9 +82,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `loop_templates` WRITE;
 /*!40000 ALTER TABLE `loop_templates` DISABLE KEYS */;
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_mnekp_v1_0_ResourceInstanceName1_tca','Not found','2020-03-13 10:59:53.904486','Not found','2020-03-13 10:59:53.904486','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-fcbedab3-67dd-4ab0-8b2e-1a03e30b2546',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-22f819f5-a249-41ad-96f7-990d2a0128a2\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-deda05a4-79d0-46a2-af15-0659a2092727\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-84848a5f-83c7-41ca-b388-1d15603fdcd3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_mnekp_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-13 10:59:53.709176','Not found','2020-03-13 10:59:53.709176','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-cfed3dd8-522e-4919-bf6b-071c388837eb',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-0f0eebcc-1145-4fc8-b3e0-b34790c798bc\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-3f70168f-a385-452f-b4bd-8064a9eb6eea\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-08549ed5-2df9-44eb-88f2-0d85b980060c\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
-INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_mnekp_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-13 10:59:53.447108','Not found','2020-03-13 10:59:53.447108','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-b20eee50-b363-459d-9c40-972f6b0d8322',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-35843b4a-992d-490e-be97-ac5bf1190e85\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-ed43bd3f-8b85-4585-a129-90ffeaf83601\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-5c9574dc-f203-4c74-91e5-2e7d80fe34fa\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ykXZp_v1_0_ResourceInstanceName1_tca','Not found','2020-03-13 13:24:00.244179','Not found','2020-03-13 13:24:00.244179','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\nimports:\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\ninputs:\n  location_id:\n    type: string\n  service_id:\n    type: string\n  policy_id:\n    type: string\nnode_templates:\n  policy_0:\n    type: dcae.nodes.policy\n    properties:\n      policy_id: \n        get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n  cdap_host_host:\n    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\n    properties:\n      location_id:\n        get_input: location_id\n      scn_override: cdap_broker.solutioning-central.dcae.onap.org\n    interfaces:\n      cloudify.interfaces.lifecycle: {\n        }\n  tca_tca:\n    type: dcae.nodes.MicroService.cdap\n    properties:\n      app_config:\n        appDescription: DCAE Analytics Threshold Crossing Alert Application\n        appName: dcae-tca\n        tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n        tcaVESAlertsTableName: TCAVESAlertsTable\n        tcaVESAlertsTableTTLSeconds: \'1728000\'\n        tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n        tcaVESMessageStatusTableTTLSeconds: \'86400\'\n        thresholdCalculatorFlowletInstances: \'2\'\n      app_preferences:\n        publisherContentType: application/json\n        publisherHostName: mrlocal-mtnjftle01.onap.org\n        publisherHostPort: \'3905\'\n        publisherMaxBatchSize: \'10\'\n        publisherMaxRecoveryQueueSize: \'100000\'\n        publisherPollingInterval: \'20000\'\n        publisherProtocol: https\n        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\n        publisherUserName: test@tca.af.dcae.onap.org\n        publisherUserPassword: password\n        subscriberConsumerGroup: OpenDCAE-c12\n        subscriberConsumerId: c12\n        subscriberContentType: application/json\n        subscriberHostName: mrlocal-mtnjftle01.onap.org\n        subscriberHostPort: \'3905\'\n        subscriberMessageLimit: \'-1\'\n        subscriberPollingInterval: \'20000\'\n        subscriberProtocol: https\n        subscriberTimeoutMS: \'-1\'\n        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\n        subscriberUserName: test@tca.af.dcae.onap.org\n        subscriberUserPassword: password\n        tca_policy: null\n      artifact_name: dcae-analytics-tca\n      artifact_version: 1.0.0\n      connections:\n        streams_publishes: [\n          ]\n        streams_subscribes: [\n          ]\n      jar_url: http://somejar\n      location_id:\n        get_input: location_id\n      namespace: cdap_tca_hi_lo\n      programs:\n      - program_id: TCAVESCollectorFlow\n        program_type: flows\n      - program_id: TCADMaaPMRSubscriberWorker\n        program_type: workers\n      - program_id: TCADMaaPMRPublisherWorker\n        program_type: workers\n      service_component_type: cdap_app_tca\n      service_id:\n        get_input: service_id\n      streamname: TCASubscriberOutputStream\n    relationships:\n    - target: topic0\n      type: dcae.relationships.subscribe_to_events\n    - target: topic1\n      type: dcae.relationships.publish_events\n    - target: cdap_host_host\n      type: dcae.relationships.component_contained_in\n    - target: policy_0\n      type: dcae.relationships.depends_on\n  topic0:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n  topic1:\n    type: dcae.nodes.Topic\n    properties:\n      topic_name: \'\'\n      \n','typeId-8c5913fd-5534-422e-ad9d-14ae3c50e88e',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-2a25d4d9-36f8-4fdc-871a-6dd7f8e70358\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a614462d-e0b7-4e87-bcd9-5035e943ea60\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-0b6615a3-7b7e-4933-8e73-eba37fdfc505\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ykXZp_v1_0_ResourceInstanceName1_tca_3','Not found','2020-03-13 13:23:59.916444','Not found','2020-03-13 13:23:59.916444','CLOSED','tosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap.svc.cluster.local\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest\"\n  consul_host:\n    type: string\n    default: consul-server.onap.svc.cluster.local\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-service.dcae.svc.cluster.local\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"none\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-c12\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n                tca_policy: \'\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: dcae.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \n           get_input: policy_model_id\n','typeId-0f2c9b76-d66b-42cc-a7ed-518351f6b084',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-563786a4-5ac4-47be-8521-ed974ca0575e\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-8c29bbe1-76ed-473c-af01-bbca6d8165a0\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-10a81138-b8e3-4c09-b7f2-97f5006a1ac3\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
+INSERT INTO `loop_templates` VALUES ('LOOP_TEMPLATE_ykXZp_v1_0_ResourceInstanceName2_tca_2','Not found','2020-03-13 13:23:59.627560','Not found','2020-03-13 13:23:59.627560','CLOSED','#\n# ============LICENSE_START====================================================\n# =============================================================================\n# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.\n# =============================================================================\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n# ============LICENSE_END======================================================\n\ntosca_definitions_version: cloudify_dsl_1_3\n\ndescription: >\n  This blueprint deploys/manages the TCA module as a Docker container\n\nimports:\n  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml\n#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml\n  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml\ninputs:\n  aaiEnrichmentHost:\n    type: string\n    default: \"aai.onap.svc.cluster.local\"\n  aaiEnrichmentPort:\n    type: string\n    default: \"8443\"\n  enableAAIEnrichment:\n    type: string\n    default: true\n  dmaap_host:\n    type: string\n    default: message-router.onap\n  dmaap_port:\n    type: string\n    default: \"3904\"\n  enableRedisCaching:\n    type: string\n    default: false\n  redisHosts:\n    type: string\n    default: dcae-redis.onap.svc.cluster.local:6379\n  tag_version:\n    type: string\n    default: \"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1\"\n  consul_host:\n    type: string\n    default: consul-server.onap\n  consul_port:\n    type: string\n    default: \"8500\"\n  cbs_host:\n    type: string\n    default: \"config-binding-servicel\"\n  cbs_port:\n    type: string\n    default: \"10000\"\n  policy_id:\n    type: string\n    default: \"onap.restart.tca\"\n  external_port:\n    type: string\n    description: Kubernetes node port on which CDAPgui is exposed\n    default: \"32012\"\n  policy_model_id:\n    type: string\n    default: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\nnode_templates:\n  tca_k8s:\n    type: dcae.nodes.ContainerizedServiceComponent\n    relationships:\n      - target: tca_policy\n        type: cloudify.relationships.depends_on\n    properties:\n        service_component_type: \'dcaegen2-analytics-tca\'\n        application_config: {}\n        docker_config: {}\n        image:\n          get_input: tag_version\n        log_info:\n          log_directory: \"/opt/app/TCAnalytics/logs\"\n        application_config:\n            app_config:\n                appDescription: DCAE Analytics Threshold Crossing Alert Application\n                appName: dcae-tca\n                tcaAlertsAbatementTableName: TCAAlertsAbatementTable\n                tcaAlertsAbatementTableTTLSeconds: \'1728000\'\n                tcaSubscriberOutputStreamName: TCASubscriberOutputStream\n                tcaVESAlertsTableName: TCAVESAlertsTable\n                tcaVESAlertsTableTTLSeconds: \'1728000\'\n                tcaVESMessageStatusTableName: TCAVESMessageStatusTable\n                tcaVESMessageStatusTableTTLSeconds: \'86400\'\n                thresholdCalculatorFlowletInstances: \'2\'\n            app_preferences:\n                aaiEnrichmentHost:\n                    get_input: aaiEnrichmentHost\n                aaiEnrichmentIgnoreSSLCertificateErrors: \'true\'\n                aaiEnrichmentPortNumber: \'8443\'\n                aaiEnrichmentProtocol: https\n                aaiEnrichmentUserName: dcae@dcae.onap.org\n                aaiEnrichmentUserPassword: demo123456!\n                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query\n                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf\n                enableAAIEnrichment:\n                    get_input: enableAAIEnrichment\n                enableRedisCaching:\n                    get_input: enableRedisCaching\n                redisHosts:\n                    get_input: redisHosts\n                enableAlertCEFFormat: \'false\'\n                publisherContentType: application/json\n                publisherHostName:\n                    get_input: dmaap_host\n                publisherHostPort:\n                    get_input: dmaap_port\n                publisherMaxBatchSize: \'1\'\n                publisherMaxRecoveryQueueSize: \'100000\'\n                publisherPollingInterval: \'20000\'\n                publisherProtocol: http\n                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT\n                subscriberConsumerGroup: OpenDCAE-clamp\n                subscriberConsumerId: c12\n                subscriberContentType: application/json\n                subscriberHostName:\n                    get_input: dmaap_host\n                subscriberHostPort:\n                    get_input: dmaap_port\n                subscriberMessageLimit: \'-1\'\n                subscriberPollingInterval: \'30000\'\n                subscriberProtocol: http\n                subscriberTimeoutMS: \'-1\'\n                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT\n#                tca_policy: \'{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":700,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"thresholdValue\":300,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]},{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}\'\n        service_component_type: dcaegen2-analytics_tca\n    interfaces:\n      cloudify.interfaces.lifecycle:\n        start:\n          inputs:\n            envs:\n                DMAAPHOST:\n                    { get_input: dmaap_host }\n                DMAAPPORT:\n                    { get_input: dmaap_port }\n                DMAAPPUBTOPIC: \"unauthenticated.DCAE_CL_OUTPUT\"\n                DMAAPSUBTOPIC: \"unauthenticated.VES_MEASUREMENT_OUTPUT\"\n                AAIHOST:\n                    { get_input: aaiEnrichmentHost }\n                AAIPORT:\n                    { get_input: aaiEnrichmentPort }\n                CONSUL_HOST:\n                    { get_input: consul_host }\n                CONSUL_PORT:\n                    { get_input: consul_port }\n                CBS_HOST:\n                    { get_input: cbs_host }\n                CBS_PORT:\n                    { get_input: cbs_port }\n                CONFIG_BINDING_SERVICE: \"config_binding_service\"\n            ports:\n              - concat: [\"11011:\", { get_input: external_port }]\n  tca_policy:\n    type: clamp.nodes.policy\n    properties:\n      policy_id:\n           get_input: policy_id\n      policy_model_id: \"onap.policies.monitoring.cdap.tca.hi.lo.app\"\n','typeId-4b1f12aa-24aa-4716-8f72-d42f9d8d829b',0,'<svg xmlns=\"http://www.w3.org/2000/svg\"><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"start-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><circle fill=\"none\" r=\"17\" cx=\"18\" cy=\"41\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-840dd7bc-a316-4a4f-9bb1-3200a22512ec\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"35\" x2=\"123\" y1=\"41\"/><polygon fill=\"none\" points=\" 121 39 121 43 125 41\"/><polygon points=\" 121 39 121 43 125 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"VES\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"127\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"127\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"177.5\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">VES</text><line y2=\"83\" fill=\"none\" x1=\"147\" x2=\"147\" y1=\"1\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-32333ecb-29a1-4871-a27e-eac404f96725\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"250\" x2=\"338\" y1=\"41\"/><polygon fill=\"none\" points=\" 336 39 336 43 340 41\"/><polygon points=\" 336 39 336 43 340 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"onap.policies.monitoring.cdap.tca.hi.lo.app\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><rect fill=\"none\" x=\"342\" width=\"123\" y=\"1\" height=\"82\"/></g><g fill-opacity=\"0\" fill=\"rgb(0,0,0)\" text-rendering=\"optimizeQuality\" shape-rendering=\"geometricPrecision\" stroke=\"rgb(0,0,0)\" stroke-opacity=\"0\" stroke-width=\"2\"><rect x=\"342\" width=\"123\" y=\"1\" height=\"82\" stroke=\"none\"/></g><g text-rendering=\"optimizeQuality\" stroke-width=\"2\" shape-rendering=\"geometricPrecision\" font-family=\"sans-serif\"><text x=\"393\" xml:space=\"preserve\" y=\"46.5\" stroke=\"none\">app</text><line y2=\"61\" fill=\"none\" x1=\"342\" x2=\"465\" y1=\"61\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"Arrow-a96b7fe5-31fb-4a1e-a785-8d1122ddade7\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"2\"><line y2=\"41\" fill=\"none\" x1=\"465\" x2=\"553\" y1=\"41\"/><polygon fill=\"none\" points=\" 551 39 551 43 555 41\"/><polygon points=\" 551 39 551 43 555 41\" stroke=\"none\"/></g></g></g><g fill-opacity=\"1\" color-rendering=\"auto\" color-interpolation=\"auto\" text-rendering=\"auto\" stroke=\"black\" stroke-linecap=\"square\" stroke-miterlimit=\"10\" shape-rendering=\"auto\" stroke-opacity=\"1\" fill=\"black\" stroke-dasharray=\"none\" font-weight=\"normal\" stroke-width=\"1\" font-family=\"\'Dialog\'\" font-style=\"normal\" data-element-id=\"stop-circle\" stroke-linejoin=\"miter\" font-size=\"12px\" image-rendering=\"auto\" stroke-dashoffset=\"0\"><!--Generated by the Batik Graphics2D SVG Generator--><defs id=\"genericDefs\"/><g><g shape-rendering=\"geometricPrecision\" text-rendering=\"optimizeQuality\" stroke-width=\"4\"><circle fill=\"none\" r=\"17\" cx=\"574\" cy=\"41\"/></g></g></g></svg>',1,'63cac700-ab9a-4115-a74f-7eac85e3fce0');
 /*!40000 ALTER TABLE `loop_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -122,9 +122,9 @@ UNLOCK TABLES;
 
 LOCK TABLES `looptemplates_to_loopelementmodels` WRITE;
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` DISABLE KEYS */;
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_mnekp_v1_0_ResourceInstanceName1_tca',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_mnekp_v1_0_ResourceInstanceName1_tca_3',0);
-INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_mnekp_v1_0_ResourceInstanceName2_tca_2',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ykXZp_v1_0_ResourceInstanceName1_tca',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ykXZp_v1_0_ResourceInstanceName1_tca_3',0);
+INSERT INTO `looptemplates_to_loopelementmodels` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','LOOP_TEMPLATE_ykXZp_v1_0_ResourceInstanceName2_tca_2',0);
 /*!40000 ALTER TABLE `looptemplates_to_loopelementmodels` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -152,13 +152,13 @@ UNLOCK TABLES;
 
 LOCK TABLES `policy_models` WRITE;
 /*!40000 ALTER TABLE `policy_models` DISABLE KEYS */;
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-03-13 11:00:00.756848','Not found','2020-03-13 11:00:01.083764','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-03-13 11:00:00.565289','Not found','2020-03-13 11:00:01.126892','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                - valid_values: [\"second\", \"minute\", \"hour\", \"day\", \"week\", \"month\", \"year\"]\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-03-13 11:00:00.562857','Not found','2020-03-13 11:00:00.562857','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity',NULL);
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-03-13 11:00:00.560476','Not found','2020-03-13 11:00:01.159737','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Apex:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Apex PDP\n        properties:\n            engineServiceParameters:\n                type: string\n                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.\n                required: true\n            eventInputParameters:\n                type: string\n                description: The event input parameters.\n                required: true\n            eventOutputParameters:\n                type: string\n                description: The event output parameters.\n                required: true\n            javaProperties:\n                type: string\n                description: Name/value pairs of properties to be set for APEX if needed.\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-03-13 11:00:00.560585','Not found','2020-03-13 11:00:01.212654','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-13 10:59:53.506410','Not found','2020-03-13 11:00:01.250555','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: onap.datatypes.monitoring.tca_policy\n            description: TCA Policy JSON\n            required: true\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
-INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-13 10:58:57.288612','Not found','2020-03-13 10:58:57.288612','OperationalPolicyLegacy','',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.Blacklist','1.0.0','Not found','2020-03-13 13:24:07.091190','Not found','2020-03-13 13:24:07.620720','Blacklist','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.Blacklist:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports blacklist of entity id\'s from performing control loop actions on.\n        properties:\n            blacklist:\n                type: list\n                description: List of entity id\'s\n                required: true\n                entry_schema:\n                    type: string','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.FrequencyLimiter','1.0.0','Not found','2020-03-13 13:24:07.004259','Not found','2020-03-13 13:24:07.653588','FrequencyLimiter','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.FrequencyLimiter:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports limiting the frequency of actions being taken by a Actor.\n        properties:\n            timeWindow:\n                type: integer\n                description: The time window to count the actions against.\n                required: true\n            timeUnits:\n                type: string\n                description: The units of time the window is counting.\n                constraints:\n                - valid_values: [\"second\", \"minute\", \"hour\", \"day\", \"week\", \"month\", \"year\"]\n            limit:\n                type: integer\n                description: The limit\n                required: true\n                constraints:\n                -   greater_than: 0','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.guard.common.MinMax','2.0.0','Not found','2020-03-13 13:24:07.004022','Not found','2020-03-13 13:24:07.004022','MinMax','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.guard.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            This is the base Policy Type for Guard policies that guard the execution of Operational\n            Policies.\n        properties:\n            actor:\n                type: string\n                description: Specifies the Actor the guard applies to.\n                required: true\n            operation:\n                type: string\n                description: Specified the operation that the actor is performing the guard applies to.\n                required: true\n            timeRange:\n                type: tosca.datatypes.TimeInterval\n                description: |\n                    An optional range of time during the day the guard policy is valid for.\n                required: false\n            id:\n                type: string\n                description: The Control Loop id this applies to.\n                required: false\n    onap.policies.controlloop.guard.common.MinMax:\n        derived_from: onap.policies.controlloop.guard.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Supports Min/Max number of entity for scaling operations\n        properties:\n            min:\n                type: integer\n                required: true\n                description: The minimum instances of this entity\n            max:\n                type: integer\n                required: false\n                description: The maximum instances of this entity',NULL);
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Apex','1.0.0','Not found','2020-03-13 13:24:07.004010','Not found','2020-03-13 13:24:07.664075','Apex','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Apex:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Apex PDP\n        properties:\n            engineServiceParameters:\n                type: string\n                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.\n                required: true\n            eventInputParameters:\n                type: string\n                description: The event input parameters.\n                required: true\n            eventOutputParameters:\n                type: string\n                description: The event output parameters.\n                required: true\n            javaProperties:\n                type: string\n                description: Name/value pairs of properties to be set for APEX if needed.\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                metadata:\n                    clamp_possible_values: test\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.controlloop.operational.common.Drools','1.0.0','Not found','2020-03-13 13:24:07.025409','Not found','2020-03-13 13:24:07.683584','Drools','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n    onap.policies.controlloop.operational.common.Drools:\n        derived_from: onap.policies.controlloop.operational.Common\n        type_version: 1.0.0\n        version: 1.0.0\n        description: Operational policies for Drools PDP\n        properties:\n            controllerName:\n                type: string\n                description: Drools controller properties\n                required: false\n    onap.policies.controlloop.operational.Common:\n        derived_from: tosca.policies.Root\n        version: 1.0.0\n        description: |\n            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant\n            Policy Types. This does NOT support the legacy Policy YAML policy type.\n        properties:\n            id:\n                type: string\n                description: The unique control loop id.\n                required: true\n            timeout:\n                type: integer\n                description: |\n                    Overall timeout for executing all the operations. This timeout should equal or exceed the total\n                    timeout for each operation listed.\n                required: true\n            abatement:\n                type: boolean\n                description: Whether an abatement event message will be expected for the control loop from DCAE.\n                required: true\n                default: false\n            trigger:\n                type: string\n                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.\n                required: true\n            operations:\n                type: list\n                description: List of operations to be performed when Control Loop is triggered.\n                required: true\n                entry_schema:\n                    type: onap.datatype.controlloop.Operation\ndata_types:\n    onap.datatype.controlloop.Target:\n        derived_from: tosca.datatypes.Root\n        description: Definition for a entity in A&AI to perform a control loop operation on\n        properties:\n            targetType:\n                type: string\n                description: Category for the target type\n                required: true\n                constraints:\n                - valid_values: [VNF, VM, VFMODULE, PNF]\n            entityIds:\n                type: map\n                description: |\n                    Map of values that identify the resource. If none are provided, it is assumed that the\n                    entity that generated the ONSET event will be the target.\n                required: false\n                metadata:\n                    clamp_possible_values: test\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Actor:\n        derived_from: tosca.datatypes.Root\n        description: An actor/operation/target definition\n        properties:\n            actor:\n                type: string\n                description: The actor performing the operation.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            operation:\n                type: string\n                description: The operation the actor is performing.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            target:\n                type: onap.datatype.controlloop.Target\n                description: The resource the operation should be performed on.\n                required: true\n                metadata:\n                    clamp_possible_values: test\n            payload:\n                type: map\n                description: Name/value pairs of payload information passed by Policy to the actor\n                required: false\n                entry_schema:\n                    type: string\n\n    onap.datatype.controlloop.Operation:\n        derived_from: tosca.datatypes.Root\n        description: An operation supported by an actor\n        properties:\n            id:\n                type: string\n                description: Unique identifier for the operation\n                required: true\n            description:\n                type: string\n                description: A user-friendly description of the intent for the operation\n                required: false\n            operation:\n                type: onap.datatype.controlloop.Actor\n                description: The definition of the operation to be performed.\n                required: true\n            timeout:\n                type: integer\n                description: The amount of time for the actor to perform the operation.\n                required: true\n            retries:\n                type: integer\n                description: The number of retries the actor should attempt to perform the operation.\n                required: true\n                default: 0\n            success:\n                type: string\n                description: Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.\n                required: false\n                default: final_success\n            failure:\n                type: string\n                description: Points to the operation to invoke on Actor operation failure.\n                required: false\n                default: final_failure\n            failure_timeout:\n                type: string\n                description: Points to the operation to invoke when the time out for the operation occurs.\n                required: false\n                default: final_failure_timeout\n            failure_retries:\n                type: string\n                description: Points to the operation to invoke when the current operation has exceeded its max retries.\n                required: false\n                default: final_failure_retries\n            failure_exception:\n                type: string\n                description: Points to the operation to invoke when the current operation causes an exception.\n                required: false\n                default: final_failure_exception\n            failure_guard:\n                type: string\n                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.\n                required: false\n                default: final_failure_guard','{\n  \"supportedPdpGroups\": [\n    {\n      \"controlloop\": [\n        \"drools\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.monitoring.cdap.tca.hi.lo.app','1.0.0','Not found','2020-03-13 13:23:59.685094','Not found','2020-03-13 13:24:07.709071','app','tosca_definitions_version: tosca_simple_yaml_1_1_0\npolicy_types:\n   onap.policies.Monitoring:\n      derived_from: tosca.policies.Root\n      version: 1.0.0\n      description: a base policy type for all policies that govern monitoring provisioning\n   onap.policies.monitoring.cdap.tca.hi.lo.app:\n      derived_from: onap.policies.Monitoring\n      version: 1.0.0\n      properties:\n         tca_policy:\n            type: onap.datatypes.monitoring.tca_policy\n            description: TCA Policy JSON\n            required: true\ndata_types:\n   onap.datatypes.monitoring.metricsPerEventName:\n      derived_from: tosca.datatypes.Root\n      properties:\n         controlLoopSchemaType:\n            type: string\n            required: true\n            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM\n            constraints:\n            -  valid_values:\n               - VM\n               - VNF\n         eventName:\n            type: string\n            required: true\n            description: Event name to which thresholds need to be applied\n         policyName:\n            type: string\n            required: true\n            description: TCA Policy Scope Name\n         policyScope:\n            type: string\n            required: true\n            description: TCA Policy Scope\n         policyVersion:\n            type: string\n            required: true\n            description: TCA Policy Scope Version\n         thresholds:\n            type: list\n            required: true\n            description: Thresholds associated with eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.thresholds\n   onap.datatypes.monitoring.tca_policy:\n      derived_from: tosca.datatypes.Root\n      properties:\n         domain:\n            type: string\n            required: true\n            description: Domain name to which TCA needs to be applied\n            default: measurementsForVfScaling\n            constraints:\n            -  equal: measurementsForVfScaling\n         metricsPerEventName:\n            type: list\n            required: true\n            description: Contains eventName and threshold details that need to be applied to given eventName\n            entry_schema:\n               type: onap.datatypes.monitoring.metricsPerEventName\n   onap.datatypes.monitoring.thresholds:\n      derived_from: tosca.datatypes.Root\n      properties:\n         closedLoopControlName:\n            type: string\n            required: true\n            description: Closed Loop Control Name associated with the threshold\n         closedLoopEventStatus:\n            type: string\n            required: true\n            description: Closed Loop Event Status of the threshold\n            constraints:\n            -  valid_values:\n               - ONSET\n               - ABATED\n         direction:\n            type: string\n            required: true\n            description: Direction of the threshold\n            constraints:\n            -  valid_values:\n               - LESS\n               - LESS_OR_EQUAL\n               - GREATER\n               - GREATER_OR_EQUAL\n               - EQUAL\n         fieldPath:\n            type: string\n            required: true\n            description: Json field Path as per CEF message which needs to be analyzed for TCA\n            constraints:\n            -  valid_values:\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait\n               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage\n               - $.event.measurementsForVfScalingFields.meanRequestLatency\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree\n               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed\n               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\n         severity:\n            type: string\n            required: true\n            description: Threshold Event Severity\n            constraints:\n            -  valid_values:\n               - CRITICAL\n               - MAJOR\n               - MINOR\n               - WARNING\n               - NORMAL\n         thresholdValue:\n            type: integer\n            required: true\n            description: Threshold value for the field Path inside CEF message\n         version:\n            type: string\n            required: true\n            description: Version number associated with the threshold','{\n  \"supportedPdpGroups\": [\n    {\n      \"monitoring\": [\n        \"xacml\"\n      ]\n    }\n  ]\n}');
+INSERT INTO `policy_models` VALUES ('onap.policies.operational.legacy','1.0.0','Not found','2020-03-13 13:22:52.629787','Not found','2020-03-13 13:22:52.629787','OperationalPolicyLegacy','',NULL);
 /*!40000 ALTER TABLE `policy_models` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -180,4 +180,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-03-13 18:01:08
+-- Dump completed on 2020-03-13 20:25:40
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 355a889e0..528d695c3 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -152,6 +152,7 @@ public class OperationalPolicy extends Policy implements Serializable {
     /**
      * This method can generate a Json representation (json schema) for an operational policy.
      * This is mainly to support a legacy case and a generic case.
+     * For the legacy case the operational policy given is modified (configurationJson).
      *
      * @param operationalPolicy The operational policy
      * @param toscaConverter    The tosca converter
@@ -166,7 +167,7 @@ public class OperationalPolicy extends Policy implements Serializable {
         }
         if (operationalPolicy.isLegacy()) {
             // Op policy Legacy case
-            LegacyOperationalPolicy.preloadConfiguration(jsonReturned, operationalPolicy.loop);
+            LegacyOperationalPolicy.preloadConfiguration(operationalPolicy.getConfigurationsJson(), operationalPolicy.loop);
             jsonReturned = OperationalPolicyRepresentationBuilder
                     .generateOperationalPolicySchema(operationalPolicy.loop.getModelService());
         }
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 0298cfde7..c88c1b984 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -52,15 +52,13 @@ public class OperationalPolicyRepresentationBuilder {
         JsonObject jsonSchema = JsonUtils.GSON.fromJson(
                 ResourceFileUtil.getResourceAsString("clds/json-schema/operational_policies/operational_policy.json"),
                 JsonObject.class);
-        jsonSchema.get("schema").getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject()
-                .get("configurationsJson").getAsJsonObject().get("properties").getAsJsonObject()
+        jsonSchema.get("properties").getAsJsonObject()
                 .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
                 .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("target")
                 .getAsJsonObject().get("anyOf").getAsJsonArray().addAll(createAnyOfArray(modelJson));
 
         // update CDS recipe and payload information to schema
-        JsonArray actors = jsonSchema.get("schema").getAsJsonObject().get("items").getAsJsonObject().get("properties")
-                .getAsJsonObject().get("configurationsJson").getAsJsonObject().get("properties").getAsJsonObject()
+        JsonArray actors = jsonSchema.get("properties").getAsJsonObject()
                 .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
                 .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("actor")
                 .getAsJsonObject().get("anyOf").getAsJsonArray();
diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 0451f1e0d..61b9d26c0 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -444,31 +444,31 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </li>
 <li><a href="#_paths">2. Paths</a>
 <ul class="sectlevel2">
-<li><a href="#_route36">2.1. GET /v1/healthcheck</a>
+<li><a href="#_route110">2.1. GET /v1/healthcheck</a>
 <ul class="sectlevel3">
 <li><a href="#_responses">2.1.1. Responses</a></li>
 <li><a href="#_produces">2.1.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route37">2.2. GET /v1/user/getUser</a>
+<li><a href="#_route111">2.2. GET /v1/user/getUser</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_2">2.2.1. Responses</a></li>
 <li><a href="#_produces_2">2.2.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route35">2.3. GET /v2/clampInformation</a>
+<li><a href="#_route109">2.3. GET /v2/clampInformation</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_3">2.3.1. Responses</a></li>
 <li><a href="#_produces_3">2.3.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route21">2.4. GET /v2/dictionary</a>
+<li><a href="#_route95">2.4. GET /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_4">2.4.1. Responses</a></li>
 <li><a href="#_produces_4">2.4.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route23">2.5. PUT /v2/dictionary</a>
+<li><a href="#_route97">2.5. PUT /v2/dictionary</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters">2.5.1. Parameters</a></li>
 <li><a href="#_responses_5">2.5.2. Responses</a></li>
@@ -497,7 +497,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_8">2.8.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route25">2.9. DELETE /v2/dictionary/{name}</a>
+<li><a href="#_route99">2.9. DELETE /v2/dictionary/{name}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_4">2.9.1. Parameters</a></li>
 <li><a href="#_responses_9">2.9.2. Responses</a></li>
@@ -511,14 +511,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_10">2.10.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route16">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a>
+<li><a href="#_route90">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_6">2.11.1. Parameters</a></li>
 <li><a href="#_responses_11">2.11.2. Responses</a></li>
 <li><a href="#_produces_11">2.11.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route18">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a>
+<li><a href="#_route92">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_7">2.12.1. Parameters</a></li>
 <li><a href="#_responses_12">2.12.2. Responses</a></li>
@@ -526,82 +526,82 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_12">2.12.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route14">2.13. PUT /v2/loop/delete/{loopName}</a>
+<li><a href="#_route88">2.13. PUT /v2/loop/delete/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_8">2.13.1. Parameters</a></li>
 <li><a href="#_responses_13">2.13.2. Responses</a></li>
 </ul>
 </li>
-<li><a href="#_route8">2.14. PUT /v2/loop/deploy/{loopName}</a>
+<li><a href="#_route82">2.14. PUT /v2/loop/deploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_9">2.14.1. Parameters</a></li>
 <li><a href="#_responses_14">2.14.2. Responses</a></li>
 <li><a href="#_produces_13">2.14.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route2">2.15. GET /v2/loop/getAllNames</a>
+<li><a href="#_route76">2.15. GET /v2/loop/getAllNames</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_15">2.15.1. Responses</a></li>
 <li><a href="#_produces_14">2.15.2. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route15">2.16. GET /v2/loop/getstatus/{loopName}</a>
+<li><a href="#_route89">2.16. GET /v2/loop/getstatus/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_10">2.16.1. Parameters</a></li>
 <li><a href="#_responses_16">2.16.2. Responses</a></li>
 <li><a href="#_produces_15">2.16.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route9">2.17. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
+<li><a href="#_route83">2.17. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_11">2.17.1. Parameters</a></li>
 <li><a href="#_responses_17">2.17.2. Responses</a></li>
 <li><a href="#_produces_16">2.17.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route17">2.18. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a>
+<li><a href="#_route91">2.18. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_12">2.18.1. Parameters</a></li>
 <li><a href="#_responses_18">2.18.2. Responses</a></li>
 <li><a href="#_produces_17">2.18.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route12">2.19. PUT /v2/loop/restart/{loopName}</a>
+<li><a href="#_route86">2.19. PUT /v2/loop/restart/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_13">2.19.1. Parameters</a></li>
 <li><a href="#_responses_19">2.19.2. Responses</a></li>
 <li><a href="#_produces_18">2.19.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route11">2.20. PUT /v2/loop/stop/{loopName}</a>
+<li><a href="#_route85">2.20. PUT /v2/loop/stop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_14">2.20.1. Parameters</a></li>
 <li><a href="#_responses_20">2.20.2. Responses</a></li>
 <li><a href="#_produces_19">2.20.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route13">2.21. PUT /v2/loop/submit/{loopName}</a>
+<li><a href="#_route87">2.21. PUT /v2/loop/submit/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_15">2.21.1. Parameters</a></li>
 <li><a href="#_responses_21">2.21.2. Responses</a></li>
 <li><a href="#_produces_20">2.21.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route4">2.22. GET /v2/loop/svgRepresentation/{loopName}</a>
+<li><a href="#_route78">2.22. GET /v2/loop/svgRepresentation/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_16">2.22.1. Parameters</a></li>
 <li><a href="#_responses_22">2.22.2. Responses</a></li>
 <li><a href="#_produces_21">2.22.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route10">2.23. PUT /v2/loop/undeploy/{loopName}</a>
+<li><a href="#_route84">2.23. PUT /v2/loop/undeploy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_17">2.23.1. Parameters</a></li>
 <li><a href="#_responses_23">2.23.2. Responses</a></li>
 <li><a href="#_produces_22">2.23.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route5">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a>
+<li><a href="#_route79">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_18">2.24.1. Parameters</a></li>
 <li><a href="#_responses_24">2.24.2. Responses</a></li>
@@ -609,7 +609,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_23">2.24.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route7">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
+<li><a href="#_route81">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_19">2.25.1. Parameters</a></li>
 <li><a href="#_responses_25">2.25.2. Responses</a></li>
@@ -617,7 +617,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_24">2.25.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route6">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
+<li><a href="#_route80">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_20">2.26.1. Parameters</a></li>
 <li><a href="#_responses_26">2.26.2. Responses</a></li>
@@ -625,14 +625,14 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_25">2.26.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route3">2.27. GET /v2/loop/{loopName}</a>
+<li><a href="#_route77">2.27. GET /v2/loop/{loopName}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_21">2.27.1. Parameters</a></li>
 <li><a href="#_responses_27">2.27.2. Responses</a></li>
 <li><a href="#_produces_26">2.27.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route29">2.28. POST /v2/policyToscaModels</a>
+<li><a href="#_route103">2.28. POST /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_22">2.28.1. Parameters</a></li>
 <li><a href="#_responses_28">2.28.2. Responses</a></li>
@@ -640,7 +640,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_27">2.28.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route28">2.29. GET /v2/policyToscaModels</a>
+<li><a href="#_route102">2.29. GET /v2/policyToscaModels</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_29">2.29.1. Responses</a></li>
 <li><a href="#_produces_28">2.29.2. Produces</a></li>
@@ -660,7 +660,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_30">2.31.3. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route30">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a>
+<li><a href="#_route104">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a>
 <ul class="sectlevel3">
 <li><a href="#_parameters_25">2.32.1. Parameters</a></li>
 <li><a href="#_responses_32">2.32.2. Responses</a></li>
@@ -668,7 +668,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_produces_31">2.32.4. Produces</a></li>
 </ul>
 </li>
-<li><a href="#_route34">2.33. GET /v2/templates</a>
+<li><a href="#_route108">2.33. GET /v2/templates</a>
 <ul class="sectlevel3">
 <li><a href="#_responses_33">2.33.1. Responses</a></li>
 <li><a href="#_produces_32">2.33.2. Produces</a></li>
@@ -736,7 +736,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:41607<br>
+<p><em>Host</em> : localhost:46291<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
@@ -747,7 +747,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h2 id="_paths"><a class="anchor" href="#_paths"></a><a class="link" href="#_paths">2. Paths</a></h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_route36"><a class="anchor" href="#_route36"></a><a class="link" href="#_route36">2.1. GET /v1/healthcheck</a></h3>
+<h3 id="_route110"><a class="anchor" href="#_route110"></a><a class="link" href="#_route110">2.1. GET /v1/healthcheck</a></h3>
 <div class="sect3">
 <h4 id="_responses"><a class="anchor" href="#_responses"></a><a class="link" href="#_responses">2.1.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -784,7 +784,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route37"><a class="anchor" href="#_route37"></a><a class="link" href="#_route37">2.2. GET /v1/user/getUser</a></h3>
+<h3 id="_route111"><a class="anchor" href="#_route111"></a><a class="link" href="#_route111">2.2. GET /v1/user/getUser</a></h3>
 <div class="sect3">
 <h4 id="_responses_2"><a class="anchor" href="#_responses_2"></a><a class="link" href="#_responses_2">2.2.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -818,7 +818,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route35"><a class="anchor" href="#_route35"></a><a class="link" href="#_route35">2.3. GET /v2/clampInformation</a></h3>
+<h3 id="_route109"><a class="anchor" href="#_route109"></a><a class="link" href="#_route109">2.3. GET /v2/clampInformation</a></h3>
 <div class="sect3">
 <h4 id="_responses_3"><a class="anchor" href="#_responses_3"></a><a class="link" href="#_responses_3">2.3.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -855,7 +855,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route21"><a class="anchor" href="#_route21"></a><a class="link" href="#_route21">2.4. GET /v2/dictionary</a></h3>
+<h3 id="_route95"><a class="anchor" href="#_route95"></a><a class="link" href="#_route95">2.4. GET /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_responses_4"><a class="anchor" href="#_responses_4"></a><a class="link" href="#_responses_4">2.4.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -892,7 +892,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route23"><a class="anchor" href="#_route23"></a><a class="link" href="#_route23">2.5. PUT /v2/dictionary</a></h3>
+<h3 id="_route97"><a class="anchor" href="#_route97"></a><a class="link" href="#_route97">2.5. PUT /v2/dictionary</a></h3>
 <div class="sect3">
 <h4 id="_parameters"><a class="anchor" href="#_parameters"></a><a class="link" href="#_parameters">2.5.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1141,7 +1141,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route25"><a class="anchor" href="#_route25"></a><a class="link" href="#_route25">2.9. DELETE /v2/dictionary/{name}</a></h3>
+<h3 id="_route99"><a class="anchor" href="#_route99"></a><a class="link" href="#_route99">2.9. DELETE /v2/dictionary/{name}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_4"><a class="anchor" href="#_parameters_4"></a><a class="link" href="#_parameters_4">2.9.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1265,7 +1265,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route16"><a class="anchor" href="#_route16"></a><a class="link" href="#_route16">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a></h3>
+<h3 id="_route90"><a class="anchor" href="#_route90"></a><a class="link" href="#_route90">2.11. PUT /v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_6"><a class="anchor" href="#_parameters_6"></a><a class="link" href="#_parameters_6">2.11.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1339,7 +1339,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route18"><a class="anchor" href="#_route18"></a><a class="link" href="#_route18">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a></h3>
+<h3 id="_route92"><a class="anchor" href="#_route92"></a><a class="link" href="#_route92">2.12. POST /v2/loop/create/{loopName}?templateName={templateName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_7"><a class="anchor" href="#_parameters_7"></a><a class="link" href="#_parameters_7">2.12.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1411,7 +1411,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route14"><a class="anchor" href="#_route14"></a><a class="link" href="#_route14">2.13. PUT /v2/loop/delete/{loopName}</a></h3>
+<h3 id="_route88"><a class="anchor" href="#_route88"></a><a class="link" href="#_route88">2.13. PUT /v2/loop/delete/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_8"><a class="anchor" href="#_parameters_8"></a><a class="link" href="#_parameters_8">2.13.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1460,7 +1460,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route8"><a class="anchor" href="#_route8"></a><a class="link" href="#_route8">2.14. PUT /v2/loop/deploy/{loopName}</a></h3>
+<h3 id="_route82"><a class="anchor" href="#_route82"></a><a class="link" href="#_route82">2.14. PUT /v2/loop/deploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_9"><a class="anchor" href="#_parameters_9"></a><a class="link" href="#_parameters_9">2.14.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1522,7 +1522,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route2"><a class="anchor" href="#_route2"></a><a class="link" href="#_route2">2.15. GET /v2/loop/getAllNames</a></h3>
+<h3 id="_route76"><a class="anchor" href="#_route76"></a><a class="link" href="#_route76">2.15. GET /v2/loop/getAllNames</a></h3>
 <div class="sect3">
 <h4 id="_responses_15"><a class="anchor" href="#_responses_15"></a><a class="link" href="#_responses_15">2.15.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1559,7 +1559,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route15"><a class="anchor" href="#_route15"></a><a class="link" href="#_route15">2.16. GET /v2/loop/getstatus/{loopName}</a></h3>
+<h3 id="_route89"><a class="anchor" href="#_route89"></a><a class="link" href="#_route89">2.16. GET /v2/loop/getstatus/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_10"><a class="anchor" href="#_parameters_10"></a><a class="link" href="#_parameters_10">2.16.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1621,7 +1621,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route9"><a class="anchor" href="#_route9"></a><a class="link" href="#_route9">2.17. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
+<h3 id="_route83"><a class="anchor" href="#_route83"></a><a class="link" href="#_route83">2.17. PUT /v2/loop/refreshOpPolicyJsonSchema/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_11"><a class="anchor" href="#_parameters_11"></a><a class="link" href="#_parameters_11">2.17.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1683,7 +1683,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route17"><a class="anchor" href="#_route17"></a><a class="link" href="#_route17">2.18. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a></h3>
+<h3 id="_route91"><a class="anchor" href="#_route91"></a><a class="link" href="#_route91">2.18. PUT /v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_12"><a class="anchor" href="#_parameters_12"></a><a class="link" href="#_parameters_12">2.18.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1757,7 +1757,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route12"><a class="anchor" href="#_route12"></a><a class="link" href="#_route12">2.19. PUT /v2/loop/restart/{loopName}</a></h3>
+<h3 id="_route86"><a class="anchor" href="#_route86"></a><a class="link" href="#_route86">2.19. PUT /v2/loop/restart/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_13"><a class="anchor" href="#_parameters_13"></a><a class="link" href="#_parameters_13">2.19.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1819,7 +1819,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route11"><a class="anchor" href="#_route11"></a><a class="link" href="#_route11">2.20. PUT /v2/loop/stop/{loopName}</a></h3>
+<h3 id="_route85"><a class="anchor" href="#_route85"></a><a class="link" href="#_route85">2.20. PUT /v2/loop/stop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_14"><a class="anchor" href="#_parameters_14"></a><a class="link" href="#_parameters_14">2.20.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1881,7 +1881,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route13"><a class="anchor" href="#_route13"></a><a class="link" href="#_route13">2.21. PUT /v2/loop/submit/{loopName}</a></h3>
+<h3 id="_route87"><a class="anchor" href="#_route87"></a><a class="link" href="#_route87">2.21. PUT /v2/loop/submit/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_15"><a class="anchor" href="#_parameters_15"></a><a class="link" href="#_parameters_15">2.21.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -1943,7 +1943,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route4"><a class="anchor" href="#_route4"></a><a class="link" href="#_route4">2.22. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
+<h3 id="_route78"><a class="anchor" href="#_route78"></a><a class="link" href="#_route78">2.22. GET /v2/loop/svgRepresentation/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_16"><a class="anchor" href="#_parameters_16"></a><a class="link" href="#_parameters_16">2.22.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2005,7 +2005,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route10"><a class="anchor" href="#_route10"></a><a class="link" href="#_route10">2.23. PUT /v2/loop/undeploy/{loopName}</a></h3>
+<h3 id="_route84"><a class="anchor" href="#_route84"></a><a class="link" href="#_route84">2.23. PUT /v2/loop/undeploy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_17"><a class="anchor" href="#_parameters_17"></a><a class="link" href="#_parameters_17">2.23.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2067,7 +2067,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route5"><a class="anchor" href="#_route5"></a><a class="link" href="#_route5">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
+<h3 id="_route79"><a class="anchor" href="#_route79"></a><a class="link" href="#_route79">2.24. POST /v2/loop/updateGlobalProperties/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_18"><a class="anchor" href="#_parameters_18"></a><a class="link" href="#_parameters_18">2.24.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2145,7 +2145,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route7"><a class="anchor" href="#_route7"></a><a class="link" href="#_route7">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
+<h3 id="_route81"><a class="anchor" href="#_route81"></a><a class="link" href="#_route81">2.25. POST /v2/loop/updateMicroservicePolicy/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_19"><a class="anchor" href="#_parameters_19"></a><a class="link" href="#_parameters_19">2.25.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2223,7 +2223,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route6"><a class="anchor" href="#_route6"></a><a class="link" href="#_route6">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
+<h3 id="_route80"><a class="anchor" href="#_route80"></a><a class="link" href="#_route80">2.26. POST /v2/loop/updateOperationalPolicies/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_20"><a class="anchor" href="#_parameters_20"></a><a class="link" href="#_parameters_20">2.26.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2301,7 +2301,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route3"><a class="anchor" href="#_route3"></a><a class="link" href="#_route3">2.27. GET /v2/loop/{loopName}</a></h3>
+<h3 id="_route77"><a class="anchor" href="#_route77"></a><a class="link" href="#_route77">2.27. GET /v2/loop/{loopName}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_21"><a class="anchor" href="#_parameters_21"></a><a class="link" href="#_parameters_21">2.27.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2363,7 +2363,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route29"><a class="anchor" href="#_route29"></a><a class="link" href="#_route29">2.28. POST /v2/policyToscaModels</a></h3>
+<h3 id="_route103"><a class="anchor" href="#_route103"></a><a class="link" href="#_route103">2.28. POST /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_parameters_22"><a class="anchor" href="#_parameters_22"></a><a class="link" href="#_parameters_22">2.28.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2435,7 +2435,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route28"><a class="anchor" href="#_route28"></a><a class="link" href="#_route28">2.29. GET /v2/policyToscaModels</a></h3>
+<h3 id="_route102"><a class="anchor" href="#_route102"></a><a class="link" href="#_route102">2.29. GET /v2/policyToscaModels</a></h3>
 <div class="sect3">
 <h4 id="_responses_29"><a class="anchor" href="#_responses_29"></a><a class="link" href="#_responses_29">2.29.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2608,7 +2608,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route30"><a class="anchor" href="#_route30"></a><a class="link" href="#_route30">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a></h3>
+<h3 id="_route104"><a class="anchor" href="#_route104"></a><a class="link" href="#_route104">2.32. PUT /v2/policyToscaModels/{policyModelType}/{policyModelVersion}</a></h3>
 <div class="sect3">
 <h4 id="_parameters_25"><a class="anchor" href="#_parameters_25"></a><a class="link" href="#_parameters_25">2.32.1. Parameters</a></h4>
 <table class="tableblock frame-all grid-all stretch">
@@ -2692,7 +2692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 </div>
 </div>
 <div class="sect2">
-<h3 id="_route34"><a class="anchor" href="#_route34"></a><a class="link" href="#_route34">2.33. GET /v2/templates</a></h3>
+<h3 id="_route108"><a class="anchor" href="#_route108"></a><a class="link" href="#_route108">2.33. GET /v2/templates</a></h3>
 <div class="sect3">
 <h4 id="_responses_33"><a class="anchor" href="#_responses_33"></a><a class="link" href="#_responses_33">2.33.1. Responses</a></h4>
 <table class="tableblock frame-all grid-all stretch">
diff --git a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
index ef22e815d..49d7878a8 100644
--- a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
+++ b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
@@ -1,483 +1,464 @@
 {
-    "schema": {
-        "uniqueItems": "true",
-        "format": "tabs",
-        "type": "array",
-        "minItems": 1,
-        "maxItems": 1,
-        "title": "Operational policies",
-        "items": {
+  "type": "object",
+  "title": "Configuration",
+  "required": [
+    "operational_policy",
+    "guard_policies"
+  ],
+  "properties": {
+    "operational_policy": {
+      "type": "object",
+      "title": "Related Parameters",
+      "required": [
+        "controlLoop",
+        "policies"
+      ],
+      "properties": {
+        "controlLoop": {
+          "type": "object",
+          "title": "Control Loop details",
+          "required": [
+            "timeout",
+            "abatement",
+            "trigger_policy",
+            "controlLoopName"
+          ],
+          "properties": {
+            "timeout": {
+              "type": "string",
+              "title": "Overall Time Limit",
+              "default": "0",
+              "format": "number"
+            },
+            "abatement": {
+              "type": "string",
+              "title": "Abatement",
+              "enum": [
+                "True",
+                "False"
+              ]
+            },
+            "trigger_policy": {
+              "type": "string",
+              "title": "Policy Decision Entry"
+            },
+            "controlLoopName": {
+              "type": "string",
+              "title": "Control loop name",
+              "readOnly": "True"
+            }
+          }
+        },
+        "policies": {
+          "uniqueItems": "true",
+          "id": "policies_array",
+          "type": "array",
+          "title": "Policy Decision Tree",
+          "format": "tabs-top",
+          "items": {
+            "title": "Policy Decision",
             "type": "object",
-            "title": "Operational Policy Item",
-            "id": "operational_policy_item",
-            "headerTemplate": "{{self.name}}",
+            "id": "policy_item",
+            "headerTemplate": "{{self.id}} - {{self.recipe}}",
+            "format": "categories",
+            "basicCategoryTitle": "recipe",
             "required": [
-                "name",
-                "configurationsJson"
+              "id",
+              "retry",
+              "timeout",
+              "actor",
+              "success",
+              "failure",
+              "failure_timeout",
+              "failure_retries",
+              "failure_exception",
+              "failure_guard",
+              "target"
             ],
             "properties": {
-                "name": {
-                    "type": "string",
-                    "title": "Operational policy name",
-                    "readOnly": "True"
-                },
-                "configurationsJson": {
-                    "type": "object",
-                    "title": "Configuration",
-                    "required": [
-                        "operational_policy",
-                        "guard_policies"
-                    ],
+              "id": {
+                "default": "Policy 1",
+                "title": "Policy ID",
+                "type": "string"
+              },
+              "retry": {
+                "default": "0",
+                "title": "Number of Retry",
+                "type": "string",
+                "format": "number"
+              },
+              "timeout": {
+                "default": "0",
+                "title": "Timeout",
+                "type": "string",
+                "format": "number"
+              },
+              "actor": {
+                "type": "object",
+                "title": "Actor",
+                "anyOf": [
+                  {
+                    "title": "APPC",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "APPC",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "Restart",
+                          "Rebuild",
+                          "Migrate",
+                          "Health-Check",
+                          "ModifyConfig"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "SO",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "SO",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "VF Module Create",
+                          "VF Module Delete"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "SDNC",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "SDNC",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "Reroute",
+                          "BandwidthOnDemand"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "VFC",
                     "properties": {
-                        "operational_policy": {
-                            "type": "object",
-                            "title": "Related Parameters",
-                            "required": [
-                                "controlLoop",
-                                "policies"
-                            ],
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "VFC",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "required": [
+                          "payload"
+                        ],
+                        "default": "",
+                        "enum": [
+                          "ModifyConfig"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "CDS",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "CDS",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "object",
+                        "required": [
+                          "payload"
+                        ],
+                        "anyOf": [
+                          {
+                            "title": "user-defined",
                             "properties": {
-                                "controlLoop": {
-                                    "type": "object",
-                                    "title": "Control Loop details",
-                                    "required": [
-                                        "timeout",
-                                        "abatement",
-                                        "trigger_policy",
-                                        "controlLoopName"
-                                    ],
-                                    "properties": {
-                                        "timeout": {
-                                            "type": "string",
-                                            "title": "Overall Time Limit",
-                                            "default": "0",
-                                            "format": "number"
-                                        },
-                                        "abatement": {
-                                            "type": "string",
-                                            "title": "Abatement",
-                                            "enum": [
-                                                "True",
-                                                "False"
-                                            ]
-                                        },
-                                        "trigger_policy": {
-                                            "type": "string",
-                                            "title": "Policy Decision Entry"
-                                        },
-                                        "controlLoopName": {
-                                            "type": "string",
-                                            "title": "Control loop name",
-                                            "readOnly": "True"
-                                        }
-                                    }
-                                },
-                                "policies": {
-                                    "uniqueItems": "true",
-                                    "id": "policies_array",
-                                    "type": "array",
-                                    "title": "Policy Decision Tree",
-                                    "format": "tabs-top",
-                                    "items": {
-                                        "title": "Policy Decision",
-                                        "type": "object",
-                                        "id": "policy_item",
-                                        "headerTemplate": "{{self.id}} - {{self.recipe}}",
-                                        "format": "categories",
-                                        "basicCategoryTitle": "recipe",
-                                        "required": [
-                                            "id",
-                                            "retry",
-                                            "timeout",
-                                            "actor",
-                                            "success",
-                                            "failure",
-                                            "failure_timeout",
-                                            "failure_retries",
-                                            "failure_exception",
-                                            "failure_guard",
-                                            "target"
-                                        ],
-                                        "properties": {
-                                            "id": {
-                                                "default": "Policy 1",
-                                                "title": "Policy ID",
-                                                "type": "string"
-                                            },
-                                            "retry": {
-                                                "default": "0",
-                                                "title": "Number of Retry",
-                                                "type": "string",
-                                                "format": "number"
-                                            },
-                                            "timeout": {
-                                                "default": "0",
-                                                "title": "Timeout",
-                                                "type": "string",
-                                                "format": "number"
-                                            },
-                                            "actor": {
-                                                "type": "object",
-                                                "title": "Actor",
-                                                "anyOf": [
-                                                    {
-                                                        "title": "APPC",
-                                                        "properties": {
-                                                            "actor": {
-                                                                "title": "actor",
-                                                                "type": "string",
-                                                                "default": "APPC",
-                                                                "options": {
-                                                                    "hidden": true
-                                                                }
-                                                            },
-                                                            "type": {
-                                                                "title": "recipe",
-                                                                "type": "string",
-                                                                "default": "",
-                                                                "enum": [
-                                                                    "Restart",
-                                                                    "Rebuild",
-                                                                    "Migrate",
-                                                                    "Health-Check",
-                                                                    "ModifyConfig"
-                                                                ]
-                                                            },
-                                                            "payload": {
-                                                                "title": "Payload (YAML)",
-                                                                "type": "string",
-                                                                "format": "textarea"
-                                                            }
-                                                        }
-                                                    },
-                                                    {
-                                                        "title": "SO",
-                                                        "properties": {
-                                                            "actor": {
-                                                                "title": "actor",
-                                                                "type": "string",
-                                                                "default": "SO",
-                                                                "options": {
-                                                                    "hidden": true
-                                                                }
-                                                            },
-                                                            "type": {
-                                                                "title": "recipe",
-                                                                "type": "string",
-                                                                "default": "",
-                                                                "enum": [
-                                                                    "VF Module Create",
-                                                                    "VF Module Delete"
-                                                                ]
-                                                            },
-                                                            "payload": {
-                                                                "title": "Payload (YAML)",
-                                                                "type": "string",
-                                                                "format": "textarea"
-                                                            }
-                                                        }
-                                                    },
-                                                    {
-                                                        "title": "SDNC",
-                                                        "properties": {
-                                                            "actor": {
-                                                                "title": "actor",
-                                                                "type": "string",
-                                                                "default": "SDNC",
-                                                                "options": {
-                                                                    "hidden": true
-                                                                }
-                                                            },
-                                                            "type": {
-                                                                "title": "recipe",
-                                                                "type": "string",
-                                                                "default": "",
-                                                                "enum": [
-                                                                    "Reroute",
-                                                                    "BandwidthOnDemand"
-                                                                ]
-                                                            },
-                                                            "payload": {
-                                                                "title": "Payload (YAML)",
-                                                                "type": "string",
-                                                                "format": "textarea"
-                                                            }
-                                                        }
-                                                    },
-                                                    {
-                                                        "title": "VFC",
-                                                        "properties": {
-                                                            "actor": {
-                                                                "title": "actor",
-                                                                "type": "string",
-                                                                "default": "VFC",
-                                                                "options": {
-                                                                    "hidden": true
-                                                                }
-                                                            },
-                                                            "type": {
-                                                                "title": "recipe",
-                                                                "type": "string",
-                                                                "required": [
-                                                                    "payload"
-                                                                ],
-                                                                "default": "",
-                                                                "enum": [
-                                                                    "ModifyConfig"
-                                                                ]
-                                                            },
-                                                            "payload": {
-                                                                "title": "Payload (YAML)",
-                                                                "type": "string",
-                                                                "format": "textarea"
-                                                            }
-                                                        }
-                                                    },
-                                                    {
-                                                        "title": "CDS",
-                                                        "properties": {
-                                                            "actor": {
-                                                                "title": "actor",
-                                                                "type": "string",
-                                                                "default": "CDS",
-                                                                "options": {
-                                                                    "hidden": true
-                                                                }
-                                                            },
-                                                            "type": {
-                                                                "title": "recipe",
-                                                                "type": "object",
-                                                                "required": [
-                                                                    "payload"
-                                                                ],
-                                                                "anyOf": [
-                                                                    {
-                                                                        "title": "user-defined",
-                                                                        "properties": {
-                                                                            "type": {
-                                                                                "title": "Payload (YAML)",
-                                                                                "type": "string",
-                                                                                "default" : "",
-                                                                                "format" : "textarea"
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                ]
-                                                            }
-                                                        }
-                                                    }
-                                                ]
-                                            },
-                                            "success": {
-                                                "default": "final_success",
-                                                "title": "When Success",
-                                                "type": "string"
-                                            },
-                                            "failure": {
-                                                "default": "final_failure",
-                                                "title": "When Failure",
-                                                "type": "string"
-                                            },
-                                            "failure_timeout": {
-                                                "default": "final_failure_timeout",
-                                                "title": "When Failure Timeout",
-                                                "type": "string"
-                                            },
-                                            "failure_retries": {
-                                                "default": "final_failure_retries",
-                                                "title": "When Failure Retries",
-                                                "type": "string"
-                                            },
-                                            "failure_exception": {
-                                                "default": "final_failure_exception",
-                                                "title": "When Failure Exception",
-                                                "type": "string"
-                                            },
-                                            "failure_guard": {
-                                                "default": "final_failure_guard",
-                                                "title": "When Failure Guard",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "type": "object",
-                                                "required": [
-                                                    "type",
-                                                    "resourceID"
-                                                ],
-                                                "anyOf": [
-                                                    {
-                                                        "title": "User Defined",
-                                                        "additionalProperties": "True",
-                                                        "properties": {
-                                                            "type": {
-                                                                "title": "Target type",
-                                                                "type": "string",
-                                                                "default": "",
-                                                                "enum": [
-                                                                    "VNF",
-                                                                    "VFMODULE",
-                                                                    "VM"
-                                                                ]
-                                                            },
-                                                            "resourceID": {
-                                                                "title": "Target type",
-                                                                "type": "string",
-                                                                "default": ""
-                                                            }
-                                                        }
-                                                    }
-                                                ]
-                                            }
-                                        }
-                                    }
-                                }
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "",
+                                "format": "textarea"
+                              }
                             }
-                        },
-                        "guard_policies": {
-                            "type": "array",
-                            "format": "tabs-top",
-                            "title": "Associated Guard policies",
-                            "items": {
-                                "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
-                                "anyOf": [
-                                    {
-                                        "title": "Guard MinMax",
-                                        "type": "object",
-                                        "properties": {
-                                            "policy-id": {
-                                                "type": "string",
-                                                "default": "guard.minmax.new",
-                                                "pattern": "^(guard.minmax\\..*)$"
-                                            },
-                                            "content": {
-                                                "properties": {
-                                                    "actor": {
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "APPC",
-                                                            "SO",
-                                                            "VFC",
-                                                            "SDNC",
-                                                            "SDNR"
-                                                        ]
-                                                    },
-                                                    "recipe": {
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "Restart",
-                                                            "Rebuild",
-                                                            "Migrate",
-                                                            "Health-Check",
-                                                            "ModifyConfig",
-                                                            "VF Module Create",
-                                                            "VF Module Delete",
-                                                            "Reroute"
-                                                        ]
-                                                    },
-                                                    "targets": {
-                                                        "type": "string",
-                                                        "default": ".*"
-                                                    },
-                                                    "clname": {
-                                                        "type": "string",
-                                                        "template": "{{loopName}}",
-                                                        "watch": {
-                                                            "loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
-                                                        }
-                                                    },
-                                                    "guardActiveStart": {
-                                                        "type": "string",
-                                                        "default": "00:00:00Z"
-                                                    },
-                                                    "guardActiveEnd": {
-                                                        "type": "string",
-                                                        "default": "10:00:00Z"
-                                                    },
-                                                    "min": {
-                                                        "type": "string",
-                                                        "default": "0"
-                                                    },
-                                                    "max": {
-                                                        "type": "string",
-                                                        "default": "1"
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    },
-                                    {
-                                        "title": "Guard Frequency",
-                                        "type": "object",
-                                        "properties": {
-                                            "policy-id": {
-                                                "type": "string",
-                                                "default": "guard.frequency.new",
-                                                "pattern": "^(guard.frequency\\..*)$"
-                                            },
-                                            "content": {
-                                                "properties": {
-                                                    "actor": {
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "APPC",
-                                                            "SO",
-                                                            "VFC",
-                                                            "SDNC",
-                                                            "SDNR"
-                                                        ]
-                                                    },
-                                                    "recipe": {
-                                                        "type": "string",
-                                                        "enum": [
-                                                            "Restart",
-                                                            "Rebuild",
-                                                            "Migrate",
-                                                            "Health-Check",
-                                                            "ModifyConfig",
-                                                            "VF Module Create",
-                                                            "VF Module Delete",
-                                                            "Reroute"
-                                                        ]
-                                                    },
-                                                    "targets": {
-                                                        "type": "string",
-                                                        "default": ".*"
-                                                    },
-                                                    "clname": {
-                                                        "type": "string",
-                                                        "template": "{{loopName}}",
-                                                        "watch": {
-                                                            "loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
-                                                        }
-                                                    },
-                                                    "guardActiveStart": {
-                                                        "type": "string",
-                                                        "default": "00:00:00Z"
-                                                    },
-                                                    "guardActiveEnd": {
-                                                        "type": "string",
-                                                        "default": "10:00:00Z"
-                                                    },
-                                                    "limit": {
-                                                        "type": "string"
-                                                    },
-                                                    "timeWindow": {
-                                                        "type": "string"
-                                                    },
-                                                    "timeUnits": {
-                                                        "type": "string",
-                                                        "enum":["minute","hour","day","week","month","year"]
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                ]
-                            }
-                        }
+                          }
+                        ]
+                      }
                     }
-                }
+                  }
+                ]
+              },
+              "success": {
+                "default": "final_success",
+                "title": "When Success",
+                "type": "string"
+              },
+              "failure": {
+                "default": "final_failure",
+                "title": "When Failure",
+                "type": "string"
+              },
+              "failure_timeout": {
+                "default": "final_failure_timeout",
+                "title": "When Failure Timeout",
+                "type": "string"
+              },
+              "failure_retries": {
+                "default": "final_failure_retries",
+                "title": "When Failure Retries",
+                "type": "string"
+              },
+              "failure_exception": {
+                "default": "final_failure_exception",
+                "title": "When Failure Exception",
+                "type": "string"
+              },
+              "failure_guard": {
+                "default": "final_failure_guard",
+                "title": "When Failure Guard",
+                "type": "string"
+              },
+              "target": {
+                "type": "object",
+                "required": [
+                  "type",
+                  "resourceID"
+                ],
+                "anyOf": [
+                  {
+                    "title": "User Defined",
+                    "additionalProperties": "True",
+                    "properties": {
+                      "type": {
+                        "title": "Target type",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "VNF",
+                          "VFMODULE",
+                          "VM"
+                        ]
+                      },
+                      "resourceID": {
+                        "title": "Target type",
+                        "type": "string",
+                        "default": ""
+                      }
+                    }
+                  }
+                ]
+              }
             }
+          }
         }
+      }
+    },
+    "guard_policies": {
+      "type": "array",
+      "format": "tabs-top",
+      "title": "Associated Guard policies",
+      "items": {
+        "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
+        "anyOf": [
+          {
+            "title": "Guard MinMax",
+            "type": "object",
+            "properties": {
+              "policy-id": {
+                "type": "string",
+                "default": "guard.minmax.new",
+                "pattern": "^(guard.minmax\\..*)$"
+              },
+              "content": {
+                "properties": {
+                  "actor": {
+                    "type": "string",
+                    "enum": [
+                      "APPC",
+                      "SO",
+                      "VFC",
+                      "SDNC",
+                      "SDNR"
+                    ]
+                  },
+                  "recipe": {
+                    "type": "string",
+                    "enum": [
+                      "Restart",
+                      "Rebuild",
+                      "Migrate",
+                      "Health-Check",
+                      "ModifyConfig",
+                      "VF Module Create",
+                      "VF Module Delete",
+                      "Reroute"
+                    ]
+                  },
+                  "targets": {
+                    "type": "string",
+                    "default": ".*"
+                  },
+                  "clname": {
+                    "type": "string",
+                    "template": "{{loopName}}",
+                    "watch": {
+                      "loopName": "operational_policy.controlLoop.controlLoopName"
+                    }
+                  },
+                  "guardActiveStart": {
+                    "type": "string",
+                    "default": "00:00:00Z"
+                  },
+                  "guardActiveEnd": {
+                    "type": "string",
+                    "default": "10:00:00Z"
+                  },
+                  "min": {
+                    "type": "string",
+                    "default": "0"
+                  },
+                  "max": {
+                    "type": "string",
+                    "default": "1"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "title": "Guard Frequency",
+            "type": "object",
+            "properties": {
+              "policy-id": {
+                "type": "string",
+                "default": "guard.frequency.new",
+                "pattern": "^(guard.frequency\\..*)$"
+              },
+              "content": {
+                "properties": {
+                  "actor": {
+                    "type": "string",
+                    "enum": [
+                      "APPC",
+                      "SO",
+                      "VFC",
+                      "SDNC",
+                      "SDNR"
+                    ]
+                  },
+                  "recipe": {
+                    "type": "string",
+                    "enum": [
+                      "Restart",
+                      "Rebuild",
+                      "Migrate",
+                      "Health-Check",
+                      "ModifyConfig",
+                      "VF Module Create",
+                      "VF Module Delete",
+                      "Reroute"
+                    ]
+                  },
+                  "targets": {
+                    "type": "string",
+                    "default": ".*"
+                  },
+                  "clname": {
+                    "type": "string",
+                    "template": "{{loopName}}",
+                    "watch": {
+                      "loopName": "operational_policy.controlLoop.controlLoopName"
+                    }
+                  },
+                  "guardActiveStart": {
+                    "type": "string",
+                    "default": "00:00:00Z"
+                  },
+                  "guardActiveEnd": {
+                    "type": "string",
+                    "default": "10:00:00Z"
+                  },
+                  "limit": {
+                    "type": "string"
+                  },
+                  "timeWindow": {
+                    "type": "string"
+                  },
+                  "timeUnits": {
+                    "type": "string",
+                    "enum": [
+                      "minute",
+                      "hour",
+                      "day",
+                      "week",
+                      "month",
+                      "year"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        ]
+      }
     }
+  }
 }
+
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index 64ba559c1..7d694eb8b 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -71,6 +71,8 @@ data_types:
                     Map of values that identify the resource. If none are provided, it is assumed that the
                     entity that generated the ONSET event will be the target.
                 required: false
+                metadata:
+                    clamp_possible_values: test
                 entry_schema:
                     type: string
 
@@ -82,10 +84,14 @@ data_types:
                 type: string
                 description: The actor performing the operation.
                 required: true
+                metadata:
+                    clamp_possible_values: test
             operation:
                 type: string
                 description: The operation the actor is performing.
                 required: true
+                metadata:
+                    clamp_possible_values: test
             target:
                 type: onap.datatype.controlloop.Target
                 description: The resource the operation should be performed on.
@@ -115,8 +121,6 @@ data_types:
                 type: onap.datatype.controlloop.Actor
                 description: The definition of the operation to be performed.
                 required: true
-                metadata:
-                    clamp_possible_values: test
             timeout:
                 type: integer
                 description: The amount of time for the actor to perform the operation.
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
index 1c082b1ee..240009932 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -59,6 +59,8 @@ data_types:
                     Map of values that identify the resource. If none are provided, it is assumed that the
                     entity that generated the ONSET event will be the target.
                 required: false
+                metadata:
+                    clamp_possible_values: test
                 entry_schema:
                     type: string
 
@@ -70,10 +72,14 @@ data_types:
                 type: string
                 description: The actor performing the operation.
                 required: true
+                metadata:
+                    clamp_possible_values: test
             operation:
                 type: string
                 description: The operation the actor is performing.
                 required: true
+                metadata:
+                    clamp_possible_values: test
             target:
                 type: onap.datatype.controlloop.Target
                 description: The resource the operation should be performed on.
@@ -103,8 +109,6 @@ data_types:
                 type: onap.datatype.controlloop.Actor
                 description: The definition of the operation to be performed.
                 required: true
-                metadata:
-                    clamp_possible_values: test
             timeout:
                 type: integer
                 description: The amount of time for the actor to perform the operation.
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
index b43f6f9d4..6ab84a8cf 100644
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ b/src/test/resources/tosca/operational-policy-json-schema.json
@@ -1,760 +1,734 @@
 {
-	"schema": {
-		"uniqueItems": "true",
-		"format": "tabs",
-		"type": "array",
-		"minItems": 1,
-		"maxItems": 1,
-		"title": "Operational policies",
-		"items": {
-			"type": "object",
-			"title": "Operational Policy Item",
-			"id": "operational_policy_item",
-			"headerTemplate": "{{self.name}}",
-			"required": [
-				"name",
-				"configurationsJson"
-			],
-			"properties": {
-				"name": {
-					"type": "string",
-					"title": "Operational policy name",
-					"readOnly": "True"
-				},
-				"configurationsJson": {
-					"type": "object",
-					"title": "Configuration",
-					"required": [
-						"operational_policy",
-						"guard_policies"
-					],
-					"properties": {
-						"operational_policy": {
-							"type": "object",
-							"title": "Related Parameters",
-							"required": [
-								"controlLoop",
-								"policies"
-							],
-							"properties": {
-								"controlLoop": {
-									"type": "object",
-									"title": "Control Loop details",
-									"required": [
-										"timeout",
-										"abatement",
-										"trigger_policy",
-										"controlLoopName"
-									],
-									"properties": {
-										"timeout": {
-											"type": "string",
-											"title": "Overall Time Limit",
-											"default": "0",
-											"format": "number"
-										},
-										"abatement": {
-											"type": "string",
-											"title": "Abatement",
-											"enum": [
-												"True",
-												"False"
-											]
-										},
-										"trigger_policy": {
-											"type": "string",
-											"title": "Policy Decision Entry"
-										},
-										"controlLoopName": {
-											"type": "string",
-											"title": "Control loop name",
-											"readOnly": "True"
-										}
-									}
-								},
-								"policies": {
-									"uniqueItems": "true",
-									"id": "policies_array",
-									"type": "array",
-									"title": "Policy Decision Tree",
-									"format": "tabs-top",
-									"items": {
-										"title": "Policy Decision",
-										"type": "object",
-										"id": "policy_item",
-										"headerTemplate": "{{self.id}} - {{self.recipe}}",
-										"format": "categories",
-										"basicCategoryTitle": "recipe",
-										"required": [
-											"id",
-											"retry",
-											"timeout",
-											"actor",
-											"success",
-											"failure",
-											"failure_timeout",
-											"failure_retries",
-											"failure_exception",
-											"failure_guard",
-											"target"
-										],
-										"properties": {
-											"id": {
-												"default": "Policy 1",
-												"title": "Policy ID",
-												"type": "string"
-											},
-											"retry": {
-												"default": "0",
-												"title": "Number of Retry",
-												"type": "string",
-												"format": "number"
-											},
-											"timeout": {
-												"default": "0",
-												"title": "Timeout",
-												"type": "string",
-												"format": "number"
-											},
-											"actor": {
-												"type": "object",
-												"title": "Actor",
-												"anyOf": [
-													{
-														"title": "APPC",
-														"properties": {
-															"actor": {
-																"title": "actor",
-																"type": "string",
-																"default": "APPC",
-																"options": {
-																	"hidden": true
-																}
-															},
-															"type": {
-																"title": "recipe",
-																"type": "string",
-																"default": "",
-																"enum": [
-																	"Restart",
-																	"Rebuild",
-																	"Migrate",
-																	"Health-Check",
-																	"ModifyConfig"
-																]
-															},
-															"payload": {
-																"title": "Payload (YAML)",
-																"type": "string",
-																"format": "textarea"
-															}
-														}
-													},
-													{
-														"title": "SO",
-														"properties": {
-															"actor": {
-																"title": "actor",
-																"type": "string",
-																"default": "SO",
-																"options": {
-																	"hidden": true
-																}
-															},
-															"type": {
-																"title": "recipe",
-																"type": "string",
-																"default": "",
-																"enum": [
-																	"VF Module Create",
-																	"VF Module Delete"
-																]
-															},
-															"payload": {
-																"title": "Payload (YAML)",
-																"type": "string",
-																"format": "textarea"
-															}
-														}
-													},
-													{
-														"title": "SDNC",
-														"properties": {
-															"actor": {
-																"title": "actor",
-																"type": "string",
-																"default": "SDNC",
-																"options": {
-																	"hidden": true
-																}
-															},
-															"type": {
-																"title": "recipe",
-																"type": "string",
-																"default": "",
-																"enum": [
-																	"Reroute",
-																	"BandwidthOnDemand"
-																]
-															},
-															"payload": {
-																"title": "Payload (YAML)",
-																"type": "string",
-																"format": "textarea"
-															}
-														}
-													},
-													{
-														"title": "VFC",
-														"properties": {
-															"actor": {
-																"title": "actor",
-																"type": "string",
-																"default": "VFC",
-																"options": {
-																	"hidden": true
-																}
-															},
-															"type": {
-																"title": "recipe",
-																"type": "string",
-																"required": [
-																	"payload"
-																],
-																"default": "",
-																"enum": [
-																	"ModifyConfig"
-																]
-															},
-															"payload": {
-																"title": "Payload (YAML)",
-																"type": "string",
-																"format": "textarea"
-															}
-														}
-													},
-													{
-														"title": "CDS",
-														"properties": {
-															"actor": {
-																"title": "actor",
-																"type": "string",
-																"default": "CDS",
-																"options": {
-																	"hidden": true
-																}
-															},
-															"type": {
-																"title": "recipe",
-																"type": "object",
-																"required": [
-																	"payload"
-																],
-																"anyOf": [
-																	{
-																		"title": "user-defined",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"format": "textarea"
-																			}
-																		}
-																	},
-																	{
-																		"title": "resource-assignment",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"default": "'artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : '\\'{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\''",
-																				"format": "textarea"
-																			}
-																		}
-																	},
-																	{
-																		"title": "activate",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"default": "'artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : '\\'{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\''",
-																				"format": "textarea"
-																			}
-																		}
-																	},
-																	{
-																		"title": "activate-restconf",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"default": "'artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : '\\'{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\''",
-																				"format": "textarea"
-																			}
-																		}
-																	},
-																	{
-																		"title": "activate-cli",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"default": "'artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : '\\'{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\''",
-																				"format": "textarea"
-																			}
-																		}
-																	},
-																	{
-																		"title": "assign-activate",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"default": "'artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : '\\'{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\''",
-																				"format": "textarea"
-																			}
-																		}
-																	},
-																	{
-																		"title": "imperative-test-wf",
-																		"properties": {
-																			"type": {
-																				"title": "Payload (YAML)",
-																				"type": "string",
-																				"default": "'artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : '\\'{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\''",
-																				"format": "textarea"
-																			}
-																		}
-																	}
-																]
-															}
-														}
-													}
-												]
-											},
-											"success": {
-												"default": "final_success",
-												"title": "When Success",
-												"type": "string"
-											},
-											"failure": {
-												"default": "final_failure",
-												"title": "When Failure",
-												"type": "string"
-											},
-											"failure_timeout": {
-												"default": "final_failure_timeout",
-												"title": "When Failure Timeout",
-												"type": "string"
-											},
-											"failure_retries": {
-												"default": "final_failure_retries",
-												"title": "When Failure Retries",
-												"type": "string"
-											},
-											"failure_exception": {
-												"default": "final_failure_exception",
-												"title": "When Failure Exception",
-												"type": "string"
-											},
-											"failure_guard": {
-												"default": "final_failure_guard",
-												"title": "When Failure Guard",
-												"type": "string"
-											},
-											"target": {
-												"type": "object",
-												"required": [
-													"type",
-													"resourceID"
-												],
-												"anyOf": [
-													{
-														"title": "User Defined",
-														"additionalProperties": "True",
-														"properties": {
-															"type": {
-																"title": "Target type",
-																"type": "string",
-																"default": "",
-																"enum": [
-																	"VNF",
-																	"VFMODULE",
-																	"VM"
-																]
-															},
-															"resourceID": {
-																"title": "Target type",
-																"type": "string",
-																"default": ""
-															}
-														}
-													},
-													{
-														"title": "VNF-vLoadBalancerMS 0",
-														"properties": {
-															"type": {
-																"title": "Type",
-																"type": "string",
-																"default": "VNF",
-																"readOnly": "True"
-															},
-															"resourceID": {
-																"title": "Resource ID",
-																"type": "string",
-																"default": "vLoadBalancerMS",
-																"readOnly": "True"
-															}
-														}
-													},
-													{
-														"title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-														"properties": {
-															"type": {
-																"title": "Type",
-																"type": "string",
-																"default": "VFMODULE",
-																"readOnly": "True"
-															},
-															"resourceID": {
-																"title": "Resource ID",
-																"type": "string",
-																"default": "Vloadbalancerms..vpkg..module-1",
-																"readOnly": "True"
-															},
-															"modelInvariantId": {
-																"title": "Model Invariant Id (ModelInvariantUUID)",
-																"type": "string",
-																"default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-																"readOnly": "True"
-															},
-															"modelVersionId": {
-																"title": "Model Version Id (ModelUUID)",
-																"type": "string",
-																"default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-																"readOnly": "True"
-															},
-															"modelName": {
-																"title": "Model Name",
-																"type": "string",
-																"default": "Vloadbalancerms..vpkg..module-1",
-																"readOnly": "True"
-															},
-															"modelVersion": {
-																"title": "Model Version",
-																"type": "string",
-																"default": "1",
-																"readOnly": "True"
-															},
-															"modelCustomizationId": {
-																"title": "Customization ID",
-																"type": "string",
-																"default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-																"readOnly": "True"
-															}
-														}
-													},
-													{
-														"title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-														"properties": {
-															"type": {
-																"title": "Type",
-																"type": "string",
-																"default": "VFMODULE",
-																"readOnly": "True"
-															},
-															"resourceID": {
-																"title": "Resource ID",
-																"type": "string",
-																"default": "Vloadbalancerms..vdns..module-3",
-																"readOnly": "True"
-															},
-															"modelInvariantId": {
-																"title": "Model Invariant Id (ModelInvariantUUID)",
-																"type": "string",
-																"default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-																"readOnly": "True"
-															},
-															"modelVersionId": {
-																"title": "Model Version Id (ModelUUID)",
-																"type": "string",
-																"default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-																"readOnly": "True"
-															},
-															"modelName": {
-																"title": "Model Name",
-																"type": "string",
-																"default": "Vloadbalancerms..vdns..module-3",
-																"readOnly": "True"
-															},
-															"modelVersion": {
-																"title": "Model Version",
-																"type": "string",
-																"default": "1",
-																"readOnly": "True"
-															},
-															"modelCustomizationId": {
-																"title": "Customization ID",
-																"type": "string",
-																"default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-																"readOnly": "True"
-															}
-														}
-													},
-													{
-														"title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-														"properties": {
-															"type": {
-																"title": "Type",
-																"type": "string",
-																"default": "VFMODULE",
-																"readOnly": "True"
-															},
-															"resourceID": {
-																"title": "Resource ID",
-																"type": "string",
-																"default": "Vloadbalancerms..base_template..module-0",
-																"readOnly": "True"
-															},
-															"modelInvariantId": {
-																"title": "Model Invariant Id (ModelInvariantUUID)",
-																"type": "string",
-																"default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-																"readOnly": "True"
-															},
-															"modelVersionId": {
-																"title": "Model Version Id (ModelUUID)",
-																"type": "string",
-																"default": "63734409-f745-4e4d-a38b-131638a0edce",
-																"readOnly": "True"
-															},
-															"modelName": {
-																"title": "Model Name",
-																"type": "string",
-																"default": "Vloadbalancerms..base_template..module-0",
-																"readOnly": "True"
-															},
-															"modelVersion": {
-																"title": "Model Version",
-																"type": "string",
-																"default": "1",
-																"readOnly": "True"
-															},
-															"modelCustomizationId": {
-																"title": "Customization ID",
-																"type": "string",
-																"default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-																"readOnly": "True"
-															}
-														}
-													},
-													{
-														"title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-														"properties": {
-															"type": {
-																"title": "Type",
-																"type": "string",
-																"default": "VFMODULE",
-																"readOnly": "True"
-															},
-															"resourceID": {
-																"title": "Resource ID",
-																"type": "string",
-																"default": "Vloadbalancerms..vlb..module-2",
-																"readOnly": "True"
-															},
-															"modelInvariantId": {
-																"title": "Model Invariant Id (ModelInvariantUUID)",
-																"type": "string",
-																"default": "a772a1f4-0064-412c-833d-4749b15828dd",
-																"readOnly": "True"
-															},
-															"modelVersionId": {
-																"title": "Model Version Id (ModelUUID)",
-																"type": "string",
-																"default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-																"readOnly": "True"
-															},
-															"modelName": {
-																"title": "Model Name",
-																"type": "string",
-																"default": "Vloadbalancerms..vlb..module-2",
-																"readOnly": "True"
-															},
-															"modelVersion": {
-																"title": "Model Version",
-																"type": "string",
-																"default": "1",
-																"readOnly": "True"
-															},
-															"modelCustomizationId": {
-																"title": "Customization ID",
-																"type": "string",
-																"default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-																"readOnly": "True"
-															}
-														}
-													}
-												]
-											}
-										}
-									}
-								}
-							}
-						},
-						"guard_policies": {
-							"type": "array",
-							"format": "tabs-top",
-							"title": "Associated Guard policies",
-							"items": {
-								"headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
-								"anyOf": [
-									{
-										"title": "Guard MinMax",
-										"type": "object",
-										"properties": {
-											"policy-id": {
-												"type": "string",
-												"default": "guard.minmax.new",
-												"pattern": "^(guard.minmax\\..*)$"
-											},
-											"content": {
-												"properties": {
-													"actor": {
-														"type": "string",
-														"enum": [
-															"APPC",
-															"SO",
-															"VFC",
-															"SDNC",
-															"SDNR"
-														]
-													},
-													"recipe": {
-														"type": "string",
-														"enum": [
-															"Restart",
-															"Rebuild",
-															"Migrate",
-															"Health-Check",
-															"ModifyConfig",
-															"VF Module Create",
-															"VF Module Delete",
-															"Reroute"
-														]
-													},
-													"targets": {
-														"type": "string",
-														"default": ".*"
-													},
-													"clname": {
-														"type": "string",
-														"template": "{{loopName}}",
-														"watch": {
-															"loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
-														}
-													},
-													"guardActiveStart": {
-														"type": "string",
-														"default": "00:00:00Z"
-													},
-													"guardActiveEnd": {
-														"type": "string",
-														"default": "10:00:00Z"
-													},
-													"min": {
-														"type": "string",
-														"default": "0"
-													},
-													"max": {
-														"type": "string",
-														"default": "1"
-													}
-												}
-											}
-										}
-									},
-									{
-										"title": "Guard Frequency",
-										"type": "object",
-										"properties": {
-											"policy-id": {
-												"type": "string",
-												"default": "guard.frequency.new",
-												"pattern": "^(guard.frequency\\..*)$"
-											},
-											"content": {
-												"properties": {
-													"actor": {
-														"type": "string",
-														"enum": [
-															"APPC",
-															"SO",
-															"VFC",
-															"SDNC",
-															"SDNR"
-														]
-													},
-													"recipe": {
-														"type": "string",
-														"enum": [
-															"Restart",
-															"Rebuild",
-															"Migrate",
-															"Health-Check",
-															"ModifyConfig",
-															"VF Module Create",
-															"VF Module Delete",
-															"Reroute"
-														]
-													},
-													"targets": {
-														"type": "string",
-														"default": ".*"
-													},
-													"clname": {
-														"type": "string",
-														"template": "{{loopName}}",
-														"watch": {
-															"loopName": "operational_policy_item.configurationsJson.operational_policy.controlLoop.controlLoopName"
-														}
-													},
-													"guardActiveStart": {
-														"type": "string",
-														"default": "00:00:00Z"
-													},
-													"guardActiveEnd": {
-														"type": "string",
-														"default": "10:00:00Z"
-													},
-													"limit": {
-														"type": "string"
-													},
-													"timeWindow": {
-														"type": "string"
-													},
-													"timeUnits": {
-														"type": "string",
-														"enum": [
-															"minute",
-															"hour",
-															"day",
-															"week",
-															"month",
-															"year"
-														]
-													}
-												}
-											}
-										}
-									}
-								]
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+  "type": "object",
+  "title": "Configuration",
+  "required": [
+    "operational_policy",
+    "guard_policies"
+  ],
+  "properties": {
+    "operational_policy": {
+      "type": "object",
+      "title": "Related Parameters",
+      "required": [
+        "controlLoop",
+        "policies"
+      ],
+      "properties": {
+        "controlLoop": {
+          "type": "object",
+          "title": "Control Loop details",
+          "required": [
+            "timeout",
+            "abatement",
+            "trigger_policy",
+            "controlLoopName"
+          ],
+          "properties": {
+            "timeout": {
+              "type": "string",
+              "title": "Overall Time Limit",
+              "default": "0",
+              "format": "number"
+            },
+            "abatement": {
+              "type": "string",
+              "title": "Abatement",
+              "enum": [
+                "True",
+                "False"
+              ]
+            },
+            "trigger_policy": {
+              "type": "string",
+              "title": "Policy Decision Entry"
+            },
+            "controlLoopName": {
+              "type": "string",
+              "title": "Control loop name",
+              "readOnly": "True"
+            }
+          }
+        },
+        "policies": {
+          "uniqueItems": "true",
+          "id": "policies_array",
+          "type": "array",
+          "title": "Policy Decision Tree",
+          "format": "tabs-top",
+          "items": {
+            "title": "Policy Decision",
+            "type": "object",
+            "id": "policy_item",
+            "headerTemplate": "{{self.id}} - {{self.recipe}}",
+            "format": "categories",
+            "basicCategoryTitle": "recipe",
+            "required": [
+              "id",
+              "retry",
+              "timeout",
+              "actor",
+              "success",
+              "failure",
+              "failure_timeout",
+              "failure_retries",
+              "failure_exception",
+              "failure_guard",
+              "target"
+            ],
+            "properties": {
+              "id": {
+                "default": "Policy 1",
+                "title": "Policy ID",
+                "type": "string"
+              },
+              "retry": {
+                "default": "0",
+                "title": "Number of Retry",
+                "type": "string",
+                "format": "number"
+              },
+              "timeout": {
+                "default": "0",
+                "title": "Timeout",
+                "type": "string",
+                "format": "number"
+              },
+              "actor": {
+                "type": "object",
+                "title": "Actor",
+                "anyOf": [
+                  {
+                    "title": "APPC",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "APPC",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "Restart",
+                          "Rebuild",
+                          "Migrate",
+                          "Health-Check",
+                          "ModifyConfig"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "SO",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "SO",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "VF Module Create",
+                          "VF Module Delete"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "SDNC",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "SDNC",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "Reroute",
+                          "BandwidthOnDemand"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "VFC",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "VFC",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "string",
+                        "required": [
+                          "payload"
+                        ],
+                        "default": "",
+                        "enum": [
+                          "ModifyConfig"
+                        ]
+                      },
+                      "payload": {
+                        "title": "Payload (YAML)",
+                        "type": "string",
+                        "format": "textarea"
+                      }
+                    }
+                  },
+                  {
+                    "title": "CDS",
+                    "properties": {
+                      "actor": {
+                        "title": "actor",
+                        "type": "string",
+                        "default": "CDS",
+                        "options": {
+                          "hidden": true
+                        }
+                      },
+                      "type": {
+                        "title": "recipe",
+                        "type": "object",
+                        "required": [
+                          "payload"
+                        ],
+                        "anyOf": [
+                          {
+                            "title": "user-defined",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "",
+                                "format": "textarea"
+                              }
+                            }
+                          },
+                          {
+                            "title": "resource-assignment",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "\u0027artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : \u0027\\\u0027{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\\u0027\u0027",
+                                "format": "textarea"
+                              }
+                            }
+                          },
+                          {
+                            "title": "activate",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "\u0027artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : \u0027\\\u0027{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\\u0027\u0027",
+                                "format": "textarea"
+                              }
+                            }
+                          },
+                          {
+                            "title": "activate-restconf",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "\u0027artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : \u0027\\\u0027{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\\u0027\u0027",
+                                "format": "textarea"
+                              }
+                            }
+                          },
+                          {
+                            "title": "activate-cli",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "\u0027artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : \u0027\\\u0027{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\\u0027\u0027",
+                                "format": "textarea"
+                              }
+                            }
+                          },
+                          {
+                            "title": "assign-activate",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "\u0027artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : \u0027\\\u0027{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\\u0027\u0027",
+                                "format": "textarea"
+                              }
+                            }
+                          },
+                          {
+                            "title": "imperative-test-wf",
+                            "properties": {
+                              "type": {
+                                "title": "Payload (YAML)",
+                                "type": "string",
+                                "default": "\u0027artifact_name : \"baseconfiguration\"\nartifact_version : \"1.0.0\"\nmode : async\ndata : \u0027\\\u0027{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"vnf-id\":\"\",\"action-name\":\"\",\"scope-type\":\"\",\"hostname\":\"\",\"vnf_name\":\"\"}}\\\u0027\u0027",
+                                "format": "textarea"
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ]
+              },
+              "success": {
+                "default": "final_success",
+                "title": "When Success",
+                "type": "string"
+              },
+              "failure": {
+                "default": "final_failure",
+                "title": "When Failure",
+                "type": "string"
+              },
+              "failure_timeout": {
+                "default": "final_failure_timeout",
+                "title": "When Failure Timeout",
+                "type": "string"
+              },
+              "failure_retries": {
+                "default": "final_failure_retries",
+                "title": "When Failure Retries",
+                "type": "string"
+              },
+              "failure_exception": {
+                "default": "final_failure_exception",
+                "title": "When Failure Exception",
+                "type": "string"
+              },
+              "failure_guard": {
+                "default": "final_failure_guard",
+                "title": "When Failure Guard",
+                "type": "string"
+              },
+              "target": {
+                "type": "object",
+                "required": [
+                  "type",
+                  "resourceID"
+                ],
+                "anyOf": [
+                  {
+                    "title": "User Defined",
+                    "additionalProperties": "True",
+                    "properties": {
+                      "type": {
+                        "title": "Target type",
+                        "type": "string",
+                        "default": "",
+                        "enum": [
+                          "VNF",
+                          "VFMODULE",
+                          "VM"
+                        ]
+                      },
+                      "resourceID": {
+                        "title": "Target type",
+                        "type": "string",
+                        "default": ""
+                      }
+                    }
+                  },
+                  {
+                    "title": "VNF-vLoadBalancerMS 0",
+                    "properties": {
+                      "type": {
+                        "title": "Type",
+                        "type": "string",
+                        "default": "VNF",
+                        "readOnly": "True"
+                      },
+                      "resourceID": {
+                        "title": "Resource ID",
+                        "type": "string",
+                        "default": "vLoadBalancerMS",
+                        "readOnly": "True"
+                      }
+                    }
+                  },
+                  {
+                    "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
+                    "properties": {
+                      "type": {
+                        "title": "Type",
+                        "type": "string",
+                        "default": "VFMODULE",
+                        "readOnly": "True"
+                      },
+                      "resourceID": {
+                        "title": "Resource ID",
+                        "type": "string",
+                        "default": "Vloadbalancerms..vpkg..module-1",
+                        "readOnly": "True"
+                      },
+                      "modelInvariantId": {
+                        "title": "Model Invariant Id (ModelInvariantUUID)",
+                        "type": "string",
+                        "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
+                        "readOnly": "True"
+                      },
+                      "modelVersionId": {
+                        "title": "Model Version Id (ModelUUID)",
+                        "type": "string",
+                        "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
+                        "readOnly": "True"
+                      },
+                      "modelName": {
+                        "title": "Model Name",
+                        "type": "string",
+                        "default": "Vloadbalancerms..vpkg..module-1",
+                        "readOnly": "True"
+                      },
+                      "modelVersion": {
+                        "title": "Model Version",
+                        "type": "string",
+                        "default": "1",
+                        "readOnly": "True"
+                      },
+                      "modelCustomizationId": {
+                        "title": "Customization ID",
+                        "type": "string",
+                        "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
+                        "readOnly": "True"
+                      }
+                    }
+                  },
+                  {
+                    "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
+                    "properties": {
+                      "type": {
+                        "title": "Type",
+                        "type": "string",
+                        "default": "VFMODULE",
+                        "readOnly": "True"
+                      },
+                      "resourceID": {
+                        "title": "Resource ID",
+                        "type": "string",
+                        "default": "Vloadbalancerms..vdns..module-3",
+                        "readOnly": "True"
+                      },
+                      "modelInvariantId": {
+                        "title": "Model Invariant Id (ModelInvariantUUID)",
+                        "type": "string",
+                        "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
+                        "readOnly": "True"
+                      },
+                      "modelVersionId": {
+                        "title": "Model Version Id (ModelUUID)",
+                        "type": "string",
+                        "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
+                        "readOnly": "True"
+                      },
+                      "modelName": {
+                        "title": "Model Name",
+                        "type": "string",
+                        "default": "Vloadbalancerms..vdns..module-3",
+                        "readOnly": "True"
+                      },
+                      "modelVersion": {
+                        "title": "Model Version",
+                        "type": "string",
+                        "default": "1",
+                        "readOnly": "True"
+                      },
+                      "modelCustomizationId": {
+                        "title": "Customization ID",
+                        "type": "string",
+                        "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
+                        "readOnly": "True"
+                      }
+                    }
+                  },
+                  {
+                    "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
+                    "properties": {
+                      "type": {
+                        "title": "Type",
+                        "type": "string",
+                        "default": "VFMODULE",
+                        "readOnly": "True"
+                      },
+                      "resourceID": {
+                        "title": "Resource ID",
+                        "type": "string",
+                        "default": "Vloadbalancerms..base_template..module-0",
+                        "readOnly": "True"
+                      },
+                      "modelInvariantId": {
+                        "title": "Model Invariant Id (ModelInvariantUUID)",
+                        "type": "string",
+                        "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
+                        "readOnly": "True"
+                      },
+                      "modelVersionId": {
+                        "title": "Model Version Id (ModelUUID)",
+                        "type": "string",
+                        "default": "63734409-f745-4e4d-a38b-131638a0edce",
+                        "readOnly": "True"
+                      },
+                      "modelName": {
+                        "title": "Model Name",
+                        "type": "string",
+                        "default": "Vloadbalancerms..base_template..module-0",
+                        "readOnly": "True"
+                      },
+                      "modelVersion": {
+                        "title": "Model Version",
+                        "type": "string",
+                        "default": "1",
+                        "readOnly": "True"
+                      },
+                      "modelCustomizationId": {
+                        "title": "Customization ID",
+                        "type": "string",
+                        "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
+                        "readOnly": "True"
+                      }
+                    }
+                  },
+                  {
+                    "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
+                    "properties": {
+                      "type": {
+                        "title": "Type",
+                        "type": "string",
+                        "default": "VFMODULE",
+                        "readOnly": "True"
+                      },
+                      "resourceID": {
+                        "title": "Resource ID",
+                        "type": "string",
+                        "default": "Vloadbalancerms..vlb..module-2",
+                        "readOnly": "True"
+                      },
+                      "modelInvariantId": {
+                        "title": "Model Invariant Id (ModelInvariantUUID)",
+                        "type": "string",
+                        "default": "a772a1f4-0064-412c-833d-4749b15828dd",
+                        "readOnly": "True"
+                      },
+                      "modelVersionId": {
+                        "title": "Model Version Id (ModelUUID)",
+                        "type": "string",
+                        "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
+                        "readOnly": "True"
+                      },
+                      "modelName": {
+                        "title": "Model Name",
+                        "type": "string",
+                        "default": "Vloadbalancerms..vlb..module-2",
+                        "readOnly": "True"
+                      },
+                      "modelVersion": {
+                        "title": "Model Version",
+                        "type": "string",
+                        "default": "1",
+                        "readOnly": "True"
+                      },
+                      "modelCustomizationId": {
+                        "title": "Customization ID",
+                        "type": "string",
+                        "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
+                        "readOnly": "True"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "guard_policies": {
+      "type": "array",
+      "format": "tabs-top",
+      "title": "Associated Guard policies",
+      "items": {
+        "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
+        "anyOf": [
+          {
+            "title": "Guard MinMax",
+            "type": "object",
+            "properties": {
+              "policy-id": {
+                "type": "string",
+                "default": "guard.minmax.new",
+                "pattern": "^(guard.minmax\\..*)$"
+              },
+              "content": {
+                "properties": {
+                  "actor": {
+                    "type": "string",
+                    "enum": [
+                      "APPC",
+                      "SO",
+                      "VFC",
+                      "SDNC",
+                      "SDNR"
+                    ]
+                  },
+                  "recipe": {
+                    "type": "string",
+                    "enum": [
+                      "Restart",
+                      "Rebuild",
+                      "Migrate",
+                      "Health-Check",
+                      "ModifyConfig",
+                      "VF Module Create",
+                      "VF Module Delete",
+                      "Reroute"
+                    ]
+                  },
+                  "targets": {
+                    "type": "string",
+                    "default": ".*"
+                  },
+                  "clname": {
+                    "type": "string",
+                    "template": "{{loopName}}",
+                    "watch": {
+                      "loopName": "operational_policy.controlLoop.controlLoopName"
+                    }
+                  },
+                  "guardActiveStart": {
+                    "type": "string",
+                    "default": "00:00:00Z"
+                  },
+                  "guardActiveEnd": {
+                    "type": "string",
+                    "default": "10:00:00Z"
+                  },
+                  "min": {
+                    "type": "string",
+                    "default": "0"
+                  },
+                  "max": {
+                    "type": "string",
+                    "default": "1"
+                  }
+                }
+              }
+            }
+          },
+          {
+            "title": "Guard Frequency",
+            "type": "object",
+            "properties": {
+              "policy-id": {
+                "type": "string",
+                "default": "guard.frequency.new",
+                "pattern": "^(guard.frequency\\..*)$"
+              },
+              "content": {
+                "properties": {
+                  "actor": {
+                    "type": "string",
+                    "enum": [
+                      "APPC",
+                      "SO",
+                      "VFC",
+                      "SDNC",
+                      "SDNR"
+                    ]
+                  },
+                  "recipe": {
+                    "type": "string",
+                    "enum": [
+                      "Restart",
+                      "Rebuild",
+                      "Migrate",
+                      "Health-Check",
+                      "ModifyConfig",
+                      "VF Module Create",
+                      "VF Module Delete",
+                      "Reroute"
+                    ]
+                  },
+                  "targets": {
+                    "type": "string",
+                    "default": ".*"
+                  },
+                  "clname": {
+                    "type": "string",
+                    "template": "{{loopName}}",
+                    "watch": {
+                      "loopName": "operational_policy.controlLoop.controlLoopName"
+                    }
+                  },
+                  "guardActiveStart": {
+                    "type": "string",
+                    "default": "00:00:00Z"
+                  },
+                  "guardActiveEnd": {
+                    "type": "string",
+                    "default": "10:00:00Z"
+                  },
+                  "limit": {
+                    "type": "string"
+                  },
+                  "timeWindow": {
+                    "type": "string"
+                  },
+                  "timeUnits": {
+                    "type": "string",
+                    "enum": [
+                      "minute",
+                      "hour",
+                      "day",
+                      "week",
+                      "month",
+                      "year"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 08bc8e0de..7151725c3 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -112,12 +112,15 @@ export default class PolicyModal extends React.Component {
               disable_array_reorder: true,
               disable_array_delete_last_row: true,
               disable_array_delete_all_rows: false,
-              no_additional_properties: true,
+              array_controls_top: true,
+              keep_oneof_values: false,
+              collapsed:true,
               show_errors: 'always',
               display_required_only: false,
               show_opt_in: true,
               prompt_before_delete: true,
-              required_by_default: false
+              required_by_default: false,
+              array_controls_top: true
         })
     }
 
-- 
cgit 1.2.3-korg


From 82775724cf35060294388f84d2e7d2b0671ee838 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 16 Mar 2020 07:07:18 -0700
Subject: Fix the legacy Guard UI

Fix the legacy policies UI because guard content can't be set in PolicyModal component.
It was due to Jsoneditor bugged parameter

Issue-ID: CLAMP-780
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I8070d8c57e48c9a386e19475f1d377f91104aef1
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../ManageDictionaries/ManageDictionaries.js       |  1 -
 .../src/components/dialogs/Policy/PolicyModal.js   | 22 ++++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 189523765..d8065ede6 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -236,7 +236,6 @@ export default class ManageDictionaries extends React.Component {
         TemplateMenuService.getDictionary().then(dictionaryNames => {
             this.setState({ dictionaryNames: dictionaryNames })
         });
-        var dictNamesingetDict = this.state.dictionaryNames;
     }
 
     getDictionaryElements(dictionaryName) {
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 7151725c3..0f41beb09 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -102,10 +102,25 @@ export default class PolicyModal extends React.Component {
 	}
 
     createJsonEditor(toscaModel, editorData) {
+        JSONEditor.defaults.themes.myBootstrap4 = JSONEditor.defaults.themes.bootstrap4.extend({
+    			getTab: function(text,tabId) {
+    				var liel = document.createElement('li');
+    				liel.classList.add('nav-item');
+    				var ael = document.createElement("a");
+    				ael.classList.add("nav-link");
+    				ael.setAttribute("style",'padding:10px;max-width:160px;');
+    				ael.setAttribute("href", "#" + tabId);
+    				ael.setAttribute('data-toggle', 'tab');
+    				text.setAttribute("style",'word-wrap:break-word;');
+    				ael.appendChild(text);
+    				liel.appendChild(ael);
+    				return liel;
+    			}
+    		});
         return new JSONEditor(document.getElementById("editor"),
         {   schema: toscaModel,
               startval: editorData,
-              theme: 'bootstrap4',
+              theme: 'myBootstrap4',
               object_layout: 'grid',
               disable_properties: true,
               disable_edit_json: false,
@@ -117,10 +132,9 @@ export default class PolicyModal extends React.Component {
               collapsed:true,
               show_errors: 'always',
               display_required_only: false,
-              show_opt_in: true,
+              show_opt_in: false,
               prompt_before_delete: true,
-              required_by_default: false,
-              array_controls_top: true
+              required_by_default: false
         })
     }
 
-- 
cgit 1.2.3-korg


From e916ac28ba46ff7cad64f1a3150b128ba4772c70 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 16 Mar 2020 11:04:34 -0700
Subject: Rework the policy refresh

Rework the policy refresh for the new unique dialog policyModel

Issue-ID: CLAMP-578
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ie8c91223e92c1e344d7ead5784ffea33d4f6a00f
---
 src/main/java/org/onap/clamp/loop/Loop.java        | 24 ++-----
 .../java/org/onap/clamp/loop/LoopController.java   | 64 ++++++++++++++++--
 src/main/java/org/onap/clamp/loop/LoopService.java | 27 ++------
 .../onap/clamp/loop/template/LoopElementModel.java |  8 +--
 src/main/java/org/onap/clamp/policy/Policy.java    |  8 +++
 .../policy/microservice/MicroServicePolicy.java    | 23 ++++---
 .../microservice/MicroServicePolicyService.java    | 30 +++++++--
 .../policy/operational/OperationalPolicy.java      | 75 ++++++++--------------
 .../OperationalPolicyRepresentationBuilder.java    | 60 +++++++++--------
 .../operational/OperationalPolicyService.java      | 19 +++++-
 .../resources/clds/camel/rest/clamp-api-v2.xml     | 53 ++++++++++++---
 ...OperationalPolicyRepresentationBuilderTest.java |  2 -
 ui-react/src/api/LoopCache.js                      |  4 --
 ui-react/src/api/LoopCache.test.js                 | 11 ----
 ui-react/src/api/LoopService.js                    | 27 +++++++-
 .../OperationalPolicy/OperationalPolicyModal.js    |  2 +-
 16 files changed, 259 insertions(+), 178 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index dd6fbf051..605e42fd1 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -23,11 +23,8 @@
 
 package org.onap.clamp.loop;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -77,9 +74,6 @@ public class Loop extends AuditEntity implements Serializable {
      */
     private static final long serialVersionUID = -286522707701388642L;
 
-    @Transient
-    private static final EELFLogger logger = EELFManager.getInstance().getLogger(Loop.class);
-
     @Id
     @Expose
     @Column(nullable = false, name = "name", unique = true)
@@ -170,23 +164,13 @@ public class Loop extends AuditEntity implements Serializable {
         this.setModelService(loopTemplate.getModelService());
         loopTemplate.getLoopElementModelsUsed().forEach(element -> {
             if (LoopElementModel.MICRO_SERVICE_TYPE.equals(element.getLoopElementModel().getLoopElementType())) {
-                try {
-                    this.addMicroServicePolicy((MicroServicePolicy) element.getLoopElementModel()
-                            .createPolicyInstance(this, toscaConverter));
-                } catch (IOException e) {
-                    logger.error("Exception caught when creating the microservice policy instance of the loop "
-                            + "instance", e);
-                }
+                this.addMicroServicePolicy((MicroServicePolicy) element.getLoopElementModel()
+                        .createPolicyInstance(this, toscaConverter));
             }
             else if (LoopElementModel.OPERATIONAL_POLICY_TYPE
                     .equals(element.getLoopElementModel().getLoopElementType())) {
-                try {
-                    this.addOperationalPolicy((OperationalPolicy) element.getLoopElementModel()
-                            .createPolicyInstance(this, toscaConverter));
-                } catch (IOException e) {
-                    logger.error("Exception caught when creating the operational policy instance of the loop instance",
-                            e);
-                }
+                this.addOperationalPolicy((OperationalPolicy) element.getLoopElementModel()
+                        .createPolicyInstance(this, toscaConverter));
             }
         });
     }
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index d230eb976..9c2c71f5f 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -29,9 +29,12 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.List;
+import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
 import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.clamp.policy.microservice.MicroServicePolicyService;
 import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.onap.clamp.policy.operational.OperationalPolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
@@ -39,13 +42,36 @@ import org.springframework.stereotype.Controller;
 public class LoopController {
 
     private final LoopService loopService;
-    private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {}.getType();
 
-    private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {}.getType();
+    private final ToscaConverterWithDictionarySupport toscaConverter;
 
+    private final OperationalPolicyService operationalPolicyService;
+
+    private final MicroServicePolicyService microServicePolicyService;
+
+    private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {
+    }.getType();
+
+    private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {
+    }.getType();
+
+
+    /**
+     * Constructor.
+     *
+     * @param loopService               loopService
+     * @param operationalPolicyService  operationalPolicyService
+     * @param microServicePolicyService microServicePolicyService
+     * @param toscaConverter            toscaConverter
+     */
     @Autowired
-    public LoopController(LoopService loopService) {
+    public LoopController(LoopService loopService, OperationalPolicyService operationalPolicyService,
+                          MicroServicePolicyService microServicePolicyService,
+                          ToscaConverterWithDictionarySupport toscaConverter) {
         this.loopService = loopService;
+        this.toscaConverter = toscaConverter;
+        this.operationalPolicyService = operationalPolicyService;
+        this.microServicePolicyService = microServicePolicyService;
     }
 
     public Loop createLoop(String loopName, String templateName) {
@@ -156,10 +182,34 @@ public class LoopController {
     /**
      * Refresh the Operational Policy Json representation of the loop.
      *
-     * @param loopName The loop name
-     * @return The refreshed Loop
+     * @param loop                  The loop
+     * @param operationalPolicyName The operational policy name that needs a refresh
+     * @return The loop object
+     */
+    public Loop refreshOperationalPolicyJsonRepresentation(Loop loop, String operationalPolicyName) {
+        for (OperationalPolicy operationalPolicy : loop.getOperationalPolicies()) {
+            if (operationalPolicy.getName().equals(operationalPolicyName)) {
+                this.operationalPolicyService
+                        .refreshOperationalPolicyJsonRepresentation(operationalPolicy, toscaConverter);
+            }
+        }
+        return loop;
+    }
+
+    /**
+     * Refresh the Config Policy Json representation of the loop.
+     *
+     * @param loop                   The loop
+     * @param microServicePolicyName The microservice policy name that needs a refresh
+     * @return The loop object
      */
-    public Loop refreshOpPolicyJsonRepresentation(String loopName) {
-        return loopService.refreshOpPolicyJsonRepresentation(loopName);
+    public Loop refreshMicroServicePolicyJsonRepresentation(Loop loop, String microServicePolicyName) {
+        for (MicroServicePolicy microServicePolicy : loop.getMicroServicePolicies()) {
+            if (microServicePolicy.getName().equals(microServicePolicyName)) {
+                this.microServicePolicyService
+                        .refreshMicroServicePolicyJsonRepresentation(microServicePolicy, toscaConverter);
+            }
+        }
+        return loop;
     }
 }
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index acd125b78..af1f58ba7 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -122,15 +122,15 @@ public class LoopService {
             return null;
         }
         loop.addOperationalPolicy(
-                new OperationalPolicy(loop,loop.getModelService(), policyModel, toscaConverter));
+                new OperationalPolicy(loop, loop.getModelService(), policyModel, toscaConverter));
         return loopsRepository.saveAndFlush(loop);
     }
 
     /**
      * This method remove an operational policy to a loop instance.
      *
-     * @param loopName The loop name
-     * @param policyType The policy model type
+     * @param loopName      The loop name
+     * @param policyType    The policy model type
      * @param policyVersion The policy model  version
      * @return The loop modified
      */
@@ -141,8 +141,8 @@ public class LoopService {
             return null;
         }
         for (OperationalPolicy opPolicy : loop.getOperationalPolicies()) {
-            if (opPolicy.getPolicyModel().getPolicyModelType().equals(policyType) &&
-                    opPolicy.getPolicyModel().getVersion().equals(policyVersion)) {
+            if (opPolicy.getPolicyModel().getPolicyModelType().equals(policyType)
+                    && opPolicy.getPolicyModel().getVersion().equals(policyVersion)) {
                 loop.removeOperationalPolicy(opPolicy);
                 break;
             }
@@ -179,20 +179,5 @@ public class LoopService {
         return loopsRepository.findById(loopName)
                 .orElseThrow(() -> new EntityNotFoundException("Couldn't find closed loop named: " + loopName));
     }
-
-    /**
-     * Api to refresh the Operational Policy UI window.
-     *
-     * @param loopName The loop Name
-     * @return The refreshed loop object
-     */
-    public Loop refreshOpPolicyJsonRepresentation(String loopName) {
-        Loop loop = findClosedLoopByName(loopName);
-        Set<OperationalPolicy> policyList = loop.getOperationalPolicies();
-        for (OperationalPolicy policy : policyList) {
-            policy.updateJsonRepresentation();
-        }
-        loop.setOperationalPolicies(policyList);
-        return loopsRepository.save(loop);
-    }
 }
+
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
index dfdfc42b3..4a46a9544 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
@@ -24,7 +24,6 @@
 package org.onap.clamp.loop.template;
 
 import com.google.gson.annotations.Expose;
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
@@ -251,16 +250,15 @@ public class LoopElementModel extends AuditEntity implements Serializable {
      * Create a policy instance from the current loop element model.
      *
      * @return A Policy object.
-     * @throws IOException in case of failure when creating an operational policy
      */
-    public Policy createPolicyInstance(Loop loop, ToscaConverterWithDictionarySupport toscaConverter)
-            throws IOException {
+    public Policy createPolicyInstance(Loop loop, ToscaConverterWithDictionarySupport toscaConverter) {
         if (LoopElementModel.MICRO_SERVICE_TYPE.equals(this.getLoopElementType())) {
             return new MicroServicePolicy(loop, loop.getModelService(), this, toscaConverter);
         }
         else if (LoopElementModel.OPERATIONAL_POLICY_TYPE.equals(this.getLoopElementType())) {
             return new OperationalPolicy(loop, loop.getModelService(), this, toscaConverter);
-        } else {
+        }
+        else {
             return null;
         }
     }
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
index 3b2206461..87d36f3d2 100644
--- a/src/main/java/org/onap/clamp/policy/Policy.java
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -43,6 +43,7 @@ import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.json.JSONObject;
+import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
 import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
 import org.onap.clamp.loop.common.AuditEntity;
 import org.onap.clamp.loop.template.LoopElementModel;
@@ -175,6 +176,13 @@ public abstract class Policy extends AuditEntity {
         this.jsonRepresentation = jsonRepresentation;
     }
 
+    /**
+     * Regenerate the Policy Json Representation.
+     *
+     * @param toscaConverter The tosca converter required to regenerate the json schema
+     */
+    public abstract void updateJsonRepresentation(ToscaConverterWithDictionarySupport toscaConverter);
+
     /**
      * policyModel getter.
      *
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index 321c12f6a..47b3a4ff2 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -23,8 +23,6 @@
 
 package org.onap.clamp.policy.microservice;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
@@ -36,7 +34,6 @@ import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
@@ -57,9 +54,6 @@ public class MicroServicePolicy extends Policy implements Serializable {
      */
     private static final long serialVersionUID = 6271238288583332616L;
 
-    @Transient
-    private static final EELFLogger logger = EELFManager.getInstance().getLogger(MicroServicePolicy.class);
-
     @Expose
     @Id
     @Column(nullable = false, name = "name", unique = true)
@@ -126,20 +120,19 @@ public class MicroServicePolicy extends Policy implements Serializable {
     /**
      * Constructor with tosca converter.
      *
-     * @param loop The loop instance
-     * @param service The service model object
+     * @param loop             The loop instance
+     * @param service          The service model object
      * @param loopElementModel The loop element model from which this microservice instance is created
-     * @param toscaConverter The tosca converter that will used to convert the tosca policy model
+     * @param toscaConverter   The tosca converter that will used to convert the tosca policy model
      */
     public MicroServicePolicy(Loop loop, Service service, LoopElementModel loopElementModel,
                               ToscaConverterWithDictionarySupport toscaConverter) {
         this(Policy.generatePolicyName("MICROSERVICE", service.getName(), service.getVersion(),
                 RandomStringUtils.randomAlphanumeric(3), RandomStringUtils.randomAlphanumeric(3)),
                 loopElementModel.getPolicyModels().first(), false,
-                toscaConverter.convertToscaToJsonSchemaObject(
-                        loopElementModel.getPolicyModels().first().getPolicyModelTosca(),
-                        loopElementModel.getPolicyModels().first().getPolicyModelType()),
+                new JsonObject(),
                 loopElementModel, null, null);
+        this.updateJsonRepresentation(toscaConverter);
     }
 
     @Override
@@ -157,6 +150,12 @@ public class MicroServicePolicy extends Policy implements Serializable {
         this.name = name;
     }
 
+    @Override
+    public void updateJsonRepresentation(ToscaConverterWithDictionarySupport toscaConverter) {
+        toscaConverter.convertToscaToJsonSchemaObject(this.getPolicyModel().getPolicyModelTosca(),
+                this.getPolicyModel().getPolicyModelType());
+    }
+
     public Boolean getShared() {
         return shared;
     }
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
index 9bc641c6d..0631380f5 100644
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyService.java
@@ -26,6 +26,7 @@ package org.onap.clamp.policy.microservice;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.policy.PolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,11 +35,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class MicroServicePolicyService implements PolicyService<MicroServicePolicy> {
 
-    private final MicroServicePolicyRepository repository;
+    private final MicroServicePolicyRepository microServiceRepository;
 
     @Autowired
-    public MicroServicePolicyService(MicroServicePolicyRepository repository) {
-        this.repository = repository;
+    public MicroServicePolicyService(MicroServicePolicyRepository microServiceRepository) {
+        this.microServiceRepository = microServiceRepository;
     }
 
     @Override
@@ -49,7 +50,7 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
 
     @Override
     public boolean isExisting(String policyName) {
-        return repository.existsById(policyName);
+        return microServiceRepository.existsById(policyName);
     }
 
     /**
@@ -60,8 +61,9 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
      * @return The updated MicroService policy
      */
     public MicroServicePolicy getAndUpdateMicroServicePolicy(Loop loop, MicroServicePolicy policy) {
-        return repository.save(
-                repository.findById(policy.getName()).map(p -> updateMicroservicePolicyProperties(p, policy, loop))
+        return microServiceRepository.save(
+                microServiceRepository
+                        .findById(policy.getName()).map(p -> updateMicroservicePolicyProperties(p, policy, loop))
                         .orElse(new MicroServicePolicy(policy.getName(), policy.getPolicyModel(),
                                 policy.getShared(), policy.getJsonRepresentation(), null, policy.getPdpGroup(),
                                 policy.getPdpSubgroup())));
@@ -89,6 +91,20 @@ public class MicroServicePolicyService implements PolicyService<MicroServicePoli
                                            String deploymentUrl) {
         microServicePolicy.setDcaeDeploymentId(deploymentId);
         microServicePolicy.setDcaeDeploymentStatusUrl(deploymentUrl);
-        repository.save(microServicePolicy);
+        microServiceRepository.save(microServicePolicy);
+    }
+
+
+    /**
+     * Api to refresh the MicroService Policy UI window.
+     *
+     * @param microServicePolicy The micro Service policy object
+     * @param toscaConverter     the tosca converter required to convert the tosca model to json schema
+     */
+    public void refreshMicroServicePolicyJsonRepresentation(MicroServicePolicy microServicePolicy,
+                                                            ToscaConverterWithDictionarySupport toscaConverter) {
+        microServicePolicy.updateJsonRepresentation(toscaConverter);
+        this.microServiceRepository.saveAndFlush(microServicePolicy);
+
     }
 }
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 528d695c3..492c9b9ef 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -31,7 +31,6 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.Expose;
 import java.io.IOException;
 import java.io.Serializable;
@@ -120,15 +119,14 @@ public class OperationalPolicy extends Policy implements Serializable {
      * @param service          The loop service
      * @param loopElementModel The loop element model
      * @param toscaConverter   The tosca converter that must be used to create the Json representation
-     * @throws IOException In case of issues with the legacy files (generated from resource files
      */
     public OperationalPolicy(Loop loop, Service service, LoopElementModel loopElementModel,
-                             ToscaConverterWithDictionarySupport toscaConverter) throws IOException {
+                             ToscaConverterWithDictionarySupport toscaConverter) {
         this(Policy.generatePolicyName("OPERATIONAL", service.getName(), service.getVersion(),
                 RandomStringUtils.randomAlphanumeric(3), RandomStringUtils.randomAlphanumeric(3)), new JsonObject(),
                 new JsonObject(), loopElementModel.getPolicyModels().first(), loopElementModel, null, null);
         this.setLoop(loop);
-        this.setJsonRepresentation(generateJsonRepresentation(this, toscaConverter));
+        this.updateJsonRepresentation(toscaConverter);
     }
 
     /**
@@ -146,39 +144,7 @@ public class OperationalPolicy extends Policy implements Serializable {
                 RandomStringUtils.randomAlphanumeric(3), RandomStringUtils.randomAlphanumeric(3)), new JsonObject(),
                 new JsonObject(), policyModel, null, null, null);
         this.setLoop(loop);
-        this.setJsonRepresentation(generateJsonRepresentation(this, toscaConverter));
-    }
-
-    /**
-     * This method can generate a Json representation (json schema) for an operational policy.
-     * This is mainly to support a legacy case and a generic case.
-     * For the legacy case the operational policy given is modified (configurationJson).
-     *
-     * @param operationalPolicy The operational policy
-     * @param toscaConverter    The tosca converter
-     * @return The Json Object with Json schema
-     */
-    public static JsonObject generateJsonRepresentation(OperationalPolicy operationalPolicy,
-                                                        ToscaConverterWithDictionarySupport toscaConverter)
-            throws IOException {
-        JsonObject jsonReturned = new JsonObject();
-        if (operationalPolicy.getPolicyModel() == null) {
-            return new JsonObject();
-        }
-        if (operationalPolicy.isLegacy()) {
-            // Op policy Legacy case
-            LegacyOperationalPolicy.preloadConfiguration(operationalPolicy.getConfigurationsJson(), operationalPolicy.loop);
-            jsonReturned = OperationalPolicyRepresentationBuilder
-                    .generateOperationalPolicySchema(operationalPolicy.loop.getModelService());
-        }
-        else {
-            // Generic Case
-            jsonReturned = toscaConverter.convertToscaToJsonSchemaObject(
-                    operationalPolicy.getPolicyModel().getPolicyModelTosca(),
-                    operationalPolicy.getPolicyModel().getPolicyModelType());
-        }
-
-        return jsonReturned;
+        this.updateJsonRepresentation(toscaConverter);
     }
 
     public void setLoop(Loop loopName) {
@@ -204,6 +170,28 @@ public class OperationalPolicy extends Policy implements Serializable {
         this.name = name;
     }
 
+    @Override
+    public void updateJsonRepresentation(ToscaConverterWithDictionarySupport toscaConverter) {
+        {
+            this.setJsonRepresentation(new JsonObject());
+            if (this.getPolicyModel() == null) {
+                return;
+            }
+            if (this.isLegacy()) {
+                // Op policy Legacy case
+                LegacyOperationalPolicy.preloadConfiguration(this.getConfigurationsJson(), this.loop);
+                this.setJsonRepresentation(OperationalPolicyRepresentationBuilder
+                        .generateOperationalPolicySchema(this.loop.getModelService()));
+            }
+            else {
+                // Generic Case
+                this.setJsonRepresentation(toscaConverter.convertToscaToJsonSchemaObject(
+                        this.getPolicyModel().getPolicyModelTosca(),
+                        this.getPolicyModel().getPolicyModelType()));
+            }
+        }
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -320,17 +308,4 @@ public class OperationalPolicy extends Policy implements Serializable {
         logger.info("Guard policy payload: " + result);
         return result;
     }
-
-    /**
-     * Regenerate the Operational Policy Json Representation.
-     */
-    public void updateJsonRepresentation() {
-        try {
-            this.setJsonRepresentation(
-                    OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(loop.getModelService()));
-        } catch (JsonSyntaxException | IOException | NullPointerException e) {
-            logger.error("Unable to generate the operational policy Schema ... ", e);
-            this.setJsonRepresentation(new JsonObject());
-        }
-    }
 }
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index c88c1b984..755985191 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -24,10 +24,11 @@
 
 package org.onap.clamp.policy.operational;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
 import java.io.IOException;
 import java.util.Map.Entry;
 import org.onap.clamp.clds.util.JsonUtils;
@@ -36,6 +37,9 @@ import org.onap.clamp.loop.service.Service;
 
 public class OperationalPolicyRepresentationBuilder {
 
+    private static final EELFLogger logger =
+            EELFManager.getInstance().getLogger(OperationalPolicyRepresentationBuilder.class);
+
     /**
      * This method generates the operational policy json representation that will be
      * used by ui for rendering. It uses the model (VF and VFModule) defined in the
@@ -44,34 +48,38 @@ public class OperationalPolicyRepresentationBuilder {
      *
      * @param modelJson The loop model json
      * @return The json representation
-     * @throws JsonSyntaxException If the schema template cannot be parsed
-     * @throws IOException         In case of issue when opening the schema template
      */
-    public static JsonObject generateOperationalPolicySchema(Service modelJson)
-            throws JsonSyntaxException, IOException {
-        JsonObject jsonSchema = JsonUtils.GSON.fromJson(
-                ResourceFileUtil.getResourceAsString("clds/json-schema/operational_policies/operational_policy.json"),
-                JsonObject.class);
-        jsonSchema.get("properties").getAsJsonObject()
-                .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
-                .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("target")
-                .getAsJsonObject().get("anyOf").getAsJsonArray().addAll(createAnyOfArray(modelJson));
-
-        // update CDS recipe and payload information to schema
-        JsonArray actors = jsonSchema.get("properties").getAsJsonObject()
-                .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
-                .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("actor")
-                .getAsJsonObject().get("anyOf").getAsJsonArray();
-
-        for (JsonElement actor : actors) {
-            if ("CDS".equalsIgnoreCase(actor.getAsJsonObject().get("title").getAsString())) {
-                actor.getAsJsonObject().get("properties").getAsJsonObject().get("type").getAsJsonObject()
-                        .get("anyOf").getAsJsonArray()
-                        .addAll(createAnyOfArrayForCdsRecipe(modelJson.getResourceDetails()));
+    public static JsonObject generateOperationalPolicySchema(Service modelJson) {
+
+        JsonObject jsonSchema = null;
+        try {
+            jsonSchema = JsonUtils.GSON.fromJson(
+                    ResourceFileUtil
+                            .getResourceAsString("clds/json-schema/operational_policies/operational_policy.json"),
+                    JsonObject.class);
+            jsonSchema.get("properties").getAsJsonObject()
+                    .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
+                    .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("target")
+                    .getAsJsonObject().get("anyOf").getAsJsonArray().addAll(createAnyOfArray(modelJson));
+
+            // update CDS recipe and payload information to schema
+            JsonArray actors = jsonSchema.get("properties").getAsJsonObject()
+                    .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
+                    .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("actor")
+                    .getAsJsonObject().get("anyOf").getAsJsonArray();
+
+            for (JsonElement actor : actors) {
+                if ("CDS".equalsIgnoreCase(actor.getAsJsonObject().get("title").getAsString())) {
+                    actor.getAsJsonObject().get("properties").getAsJsonObject().get("type").getAsJsonObject()
+                            .get("anyOf").getAsJsonArray()
+                            .addAll(createAnyOfArrayForCdsRecipe(modelJson.getResourceDetails()));
+                }
             }
+            return jsonSchema;
+        } catch (IOException e) {
+            logger.error("Unable to generate the json schema because of an exception",e);
+            return new JsonObject();
         }
-
-        return jsonSchema;
     }
 
     private static JsonObject createSchemaProperty(String title, String type, String defaultValue, String readOnlyFlag,
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
index ad6cbd941..9c0cbe99c 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
@@ -23,9 +23,12 @@
 
 package org.onap.clamp.policy.operational;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.onap.clamp.clds.tosca.update.ToscaConverterWithDictionarySupport;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.loop.template.PolicyModelsRepository;
 import org.onap.clamp.policy.PolicyService;
@@ -39,6 +42,8 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
 
     private final PolicyModelsRepository policyModelsRepository;
 
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(OperationalPolicyService.class);
+
     @Autowired
     public OperationalPolicyService(OperationalPolicyRepository repository,
                                     PolicyModelsRepository policyModelsRepository) {
@@ -54,7 +59,7 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
                         operationalPolicyRepository
                                 .findById(policy.getName())
                                 .map(p -> setConfiguration(p, policy))
-                                .orElse(initializeMissingFields(loop,policy)))
+                                .orElse(initializeMissingFields(loop, policy)))
                 .collect(Collectors.toSet());
     }
 
@@ -74,4 +79,16 @@ public class OperationalPolicyService implements PolicyService<OperationalPolicy
         policy.setPdpSubgroup(newPolicy.getPdpSubgroup());
         return policy;
     }
+
+    /**
+     * Api to refresh the Operational Policy UI window.
+     *
+     * @param operationalPolicy The operational policy object
+     * @param toscaConverter    the tosca converter required to convert the tosca model to json schema
+     */
+    public void refreshOperationalPolicyJsonRepresentation(OperationalPolicy operationalPolicy,
+                                                           ToscaConverterWithDictionarySupport toscaConverter) {
+        operationalPolicy.updateJsonRepresentation(toscaConverter);
+        this.operationalPolicyRepository.saveAndFlush(operationalPolicy);
+    }
 }
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index d1c191dc7..d81c164a5 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -207,24 +207,59 @@
 				</doTry>
 			</route>
 		</put>
-		<put uri="/v2/loop/refreshOpPolicyJsonSchema/{loopName}"
+		<put uri="/v2/loop/refreshMicroServicePolicyJsonSchema/{loopName}/{microServicePolicyName}"
+			 outType="org.onap.clamp.loop.Loop" produces="application/json">
+			<route>
+				<removeHeaders pattern="*" excludePattern="loopName|microServicePolicyName" />
+				<doTry>
+					<log loggingLevel="INFO"
+						 message="Refresh Micro Service Policy UI for loop: ${header.loopName} and ${header.microServicePolicyName}" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Micro Service Policy UI request')" />
+					<to
+							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
+					<to uri="direct:load-loop" />
+					<to
+							uri="bean:org.onap.clamp.loop.LoopController?method=refreshMicroServicePolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.microServicePolicyName}})" />
+					<log loggingLevel="INFO"
+						 message="REFRESH Micro Service policy request successfully executed for loop: ${header.loopName}" />
+					<to
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+					<to
+							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
+					<doCatch>
+						<exception>java.lang.Exception</exception>
+						<handled>
+							<constant>false</constant>
+						</handled>
+						<to
+								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
+						<log loggingLevel="ERROR"
+							 message="REFRESH Micro Service policy request failed for loop: ${header.loopName}" />
+						<to
+								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH Micro Service policy request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+					</doCatch>
+				</doTry>
+			</route>
+		</put>
+		<put uri="/v2/loop/refreshOperationalPolicyJsonSchema/{loopName}/{operationalPolicyName}"
 			outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders pattern="*" excludePattern="loopName" />
+				<removeHeaders pattern="*" excludePattern="loopName|operationalPolicyName" />
 				<doTry>
 					<log loggingLevel="INFO"
-						message="Refresh Operational Policy UI for loop: ${header.loopName}" />
+						message="Refresh Operational Policy UI for loop: ${header.loopName} and ${header.operationalPolicyName}" />
 					<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH OP Policy UI request')" />
+						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REFRESH Operational Policy UI request')" />
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=refreshOpPolicyJsonRepresentation(${header.loopName})" />
+						uri="bean:org.onap.clamp.loop.LoopController?method=refreshOperationalPolicyJsonRepresentation(${exchangeProperty[loopObject]},${header.operationalPolicyName}})" />
 					<log loggingLevel="INFO"
-						message="REFRESH request successfully executed for loop: ${header.loopName}" />
+						message="REFRESH operational policy request successfully executed for loop: ${header.loopName}" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH request successfully executed','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
@@ -235,9 +270,9 @@
 						<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=errorLog()" />
 						<log loggingLevel="ERROR"
-							message="REFRESH request failed for loop: ${header.loopName}" />
+							message="REFRESH operational policy request failed for loop: ${header.loopName}" />
 						<to
-							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
+							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('REFRESH operational policy request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 					</doCatch>
 				</doTry>
 			</route>
diff --git a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
index 12ddbaa71..4e9b56206 100644
--- a/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
+++ b/src/test/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
@@ -27,9 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-
 import java.io.IOException;
-
 import org.junit.Test;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.onap.clamp.loop.service.Service;
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 5eaa79a64..c54337f2f 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -70,10 +70,6 @@ export default class LoopCache {
 		return this.loopJsonCache["name"];
 	}
 
-	getOperationalPolicyConfigurationJson() {
-		return this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"];
-	}
-
 	getOperationalPolicyJsonSchema() {
 		return this.loopJsonCache["operationalPolicies"]["0"]["jsonRepresentation"];
 	}
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index fc7568148..4642ff52f 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -30,17 +30,6 @@ describe('Verify LoopCache functions', () => {
       expect(loopCache.getLoopName()).toBe("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
 		});
 
-    it('getOperationalPolicyConfigurationJson', () => {
-      const opPolicyConfig = {
-          "guard_policies": {},
-          "operational_policy": {
-            "controlLoop": {},
-            "policies": []
-          }
-      };
-      expect(loopCache.getOperationalPolicyConfigurationJson()).toStrictEqual(opPolicyConfig);
-    });
-
     it('getOperationalPolicies', () => {
       const opPolicy = [{
         "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 2750763da..698ee28c2 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -171,8 +171,8 @@ export default class LoopService {
 			});
 	}
 
-	static refreshOpPolicyJson(loopName) {
-		return fetch('/restservices/clds/v2/loop/refreshOpPolicyJsonSchema/' + loopName, {
+	static refreshOperationalPolicyJson(loopName,operationalPolicyName) {
+		return fetch('/restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
@@ -194,6 +194,29 @@ export default class LoopService {
 			});
 	}
 
+		static refreshMicroServicePolicyJson(loopName,microServicePolicyName) {
+    		return fetch('/restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, {
+    			method: 'PUT',
+    			headers: {
+    				"Content-Type": "application/json"
+    			},
+    			credentials: 'same-origin'
+    		})
+    			.then(function (response) {
+    				console.debug("Refresh Operational Policy Json Schema response received: ", response.status);
+    				if (response.ok) {
+    					return response.json();
+    				} else {
+    					console.error("Refresh Operational Policy Json Schema query failed");
+    					return {};
+    				}
+    			})
+    			.catch(function (error) {
+    				console.error("Refresh Operational Policy Json Schema error received", error);
+    				return {};
+    			});
+    }
+
 	static addOperationalPolicyType(loopName, policyType, policyVersion) {
 		return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
 			method: 'PUT',
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 7ed8ba6f1..89e70795e 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -127,7 +127,7 @@ export default class OperationalPolicyModal extends React.Component {
 	}
 
 	handleRefresh() {
-		LoopService.refreshOpPolicyJson(this.state.loopCache.getLoopName()).then(data => {
+		LoopService.refreshOperationalPolicyJson(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()[0]).then(data => {
 			var newLoopCache =  new LoopCache(data);
 			var schema_json = newLoopCache.getOperationalPolicyJsonSchema();
 			var operationalPoliciesData = newLoopCache.getOperationalPoliciesNoJsonSchema();
-- 
cgit 1.2.3-korg


From e18ed70c2c2475e7cb7eba74bbb3e74c47740960 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 17 Mar 2020 10:46:39 +0100
Subject: Update policy model UI

Update the PolicyModal UI, adding refresh button to update policy josn
representation.

Issue-ID: CLAMP-578
Change-Id: I8dc85fa1908fa735352b3877a845113d4995c3ec
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../src/components/dialogs/Policy/PolicyModal.js   |  66 ++++++++++-
 .../components/dialogs/Policy/PolicyModal.test.js  | 128 +++++++++++++++++++++
 2 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 ui-react/src/components/dialogs/Policy/PolicyModal.test.js

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 0f41beb09..d78cd6d60 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -30,7 +30,9 @@ import Select from 'react-select';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
 import LoopService from '../../../api/LoopService';
+import LoopCache from '../../../api/LoopCache';
 import JSONEditor from '@json-editor/json-editor';
+import Alert from 'react-bootstrap/Alert';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -49,7 +51,9 @@ export default class PolicyModal extends React.Component {
 		pdpGroupList: [],
 		pdpSubgroupList: [],
 		chosenPdpGroup: '',
-		chosenPdpSubgroup: ''
+		chosenPdpSubgroup: '',
+		showSucAlert: false,
+		showFailAlert: false
 	};
 
 	constructor(props, context) {
@@ -60,6 +64,8 @@ export default class PolicyModal extends React.Component {
 		this.handlePdpGroupChange = this.handlePdpGroupChange.bind(this);
 		this.handlePdpSubgroupChange = this.handlePdpSubgroupChange.bind(this);
 		this.createJsonEditor = this.createJsonEditor.bind(this);
+		this.handleRefresh = this.handleRefresh.bind(this);
+		this.disableAlert =  this.disableAlert.bind(this);
 	}
 
 	handleSave() {
@@ -195,12 +201,67 @@ export default class PolicyModal extends React.Component {
 		this.setState({ chosenPdpSubgroup: e.value });
 	}
 
+	handleRefresh() {
+		var newLoopCache, toscaModel, editorData;
+		if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
+			LoopService.refreshMicroServicePolicyJson(this.state.loopCache.getLoopName(),this.state.policyName).then(data => {
+				newLoopCache =  new LoopCache(data);
+				toscaModel = newLoopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
+				editorData = newLoopCache.getMicroServicePropertiesForName(this.state.policyName);
+				document.getElementById("editor").innerHTML = "";
+				this.setState({
+					loopCache: newLoopCache,
+					jsonEditor: this.createJsonEditor(toscaModel,editorData),
+					showSucAlert: true,
+					showMessage: "Successfully refreshed"
+				});
+			})
+			.catch(error => {
+				console.error("Error while refreshing the Operational Policy Json Representation");
+				this.setState({
+					showFailAlert: true,
+					showMessage: "Refreshing of UI failed"
+				});
+			});
+		} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
+			LoopService.refreshOperationalPolicyJson(this.state.loopCache.getLoopName(),this.state.policyName).then(data => {
+				var newLoopCache =  new LoopCache(data);
+				toscaModel = newLoopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
+				editorData = newLoopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
+				document.getElementById("editor").innerHTML = "";
+				this.setState({
+					loopCache: newLoopCache,
+					jsonEditor: this.createJsonEditor(toscaModel,editorData),
+					showSucAlert: true,
+					showMessage: "Successfully refreshed"
+				});
+			})
+			.catch(error => {
+				console.error("Error while refreshing the Operational Policy Json Representation");
+				this.setState({
+					showFailAlert: true,
+					showMessage: "Refreshing of UI failed"
+				});
+			});
+		}
+	}
+
+	disableAlert() {
+		this.setState ({ showSucAlert: false, showFailAlert: false });
+	}
+
 	render() {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>Edit the policy</Modal.Title>
 				</Modal.Header>
+				<Alert variant="success" show={this.state.showSucAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
+				<Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
 				<Modal.Body>
 					<div id="editor" />
 					<Form.Group as={Row} controlId="formPlaintextEmail">
@@ -220,6 +281,9 @@ export default class PolicyModal extends React.Component {
 					<Button variant="primary" onClick={this.handleSave}>
 						Save Changes
 					</Button>
+					<Button variant="primary" onClick={this.handleRefresh}>
+						Refresh
+					</Button>
 				</Modal.Footer>
 			</ModalStyled>
 
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
new file mode 100644
index 000000000..bf0b91096
--- /dev/null
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
@@ -0,0 +1,128 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { mount } from 'enzyme';
+import PolicyModal from './PolicyModal';
+import LoopCache from '../../../api/LoopCache';
+import LoopService from '../../../api/LoopService';
+
+describe('Verify PolicyModal', () => {
+    beforeEach(() => {
+        fetch.resetMocks();
+        fetch.mockImplementation(() => {
+            return Promise.resolve({
+                ok: true,
+                status: 200,
+                text: () => "OK"
+            });
+        });
+    })
+    const loopCacheStr = {
+            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
+            "operationalPolicies": [{
+                "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+                "configurationsJson": {
+                    "guard_policies": {},
+                    "operational_policy": {
+                        "controlLoop": {},
+                        "policies": []
+                    }
+                },
+                "policyModel": {"policyPdpGroup": {"supportedPdpGroups":[{"monitoring": ["xacml"]}]}},
+                "jsonRepresentation" : {"schema": {}}
+             }]
+    };
+    const loopCache = new LoopCache(loopCacheStr);
+    const historyMock = { push: jest.fn() };
+    const flushPromises = () => new Promise(setImmediate);
+    const match = {params: {policyName:"OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", policyInstanceType: "OPERATIONAL-POLICY"}}
+        
+    it('Test handleClose', () => {
+      const handleClose = jest.spyOn(PolicyModal.prototype,'handleClose');
+      const component = mount(<PolicyModal history={historyMock} match={match} loopCache={loopCache}/>)
+
+      component.find('[variant="secondary"]').prop('onClick')();
+
+      expect(handleClose).toHaveBeenCalledTimes(1);
+      expect(component.state('show')).toEqual(false);
+      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    });
+
+    it('Test handleSave', async () => {
+        const loadLoopFunction = jest.fn();
+        const handleSave = jest.spyOn(PolicyModal.prototype,'handleSave');
+        const component = mount(<PolicyModal history={historyMock} 
+                          loopCache={loopCache} match={match} loadLoopFunction={loadLoopFunction} />)
+
+        component.find('[variant="primary"]').get(0).props.onClick();
+        await flushPromises();
+        component.update();
+
+        expect(handleSave).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(false);
+        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    });
+
+    it('Test handleRefresh', async () => {
+        LoopService.refreshOperationalPolicyJson = jest.fn().mockImplementation(() => {
+            return Promise.resolve(loopCacheStr);
+        });
+        const updateLoopFunction = jest.fn();
+        const handleRefresh = jest.spyOn(PolicyModal.prototype,'handleRefresh');
+        const component = mount(<PolicyModal loopCache={loopCache} match={match} updateLoopFunction={updateLoopFunction} />)
+
+        component.find('[variant="primary"]').get(1).props.onClick();
+        await flushPromises();
+        component.update();
+
+        expect(handleRefresh).toHaveBeenCalledTimes(1);
+        expect(component.state('show')).toEqual(true);
+        expect(component.state('showSucAlert')).toEqual(true);
+        expect(component.state('showMessage')).toEqual("Successfully refreshed");
+    });
+
+    it('Test handlePdpGroupChange', () => {
+        const component = mount(<PolicyModal loopCache={loopCache} match={match} />)
+        component.setState({ 
+                "pdpGroup": [{"option1":["subPdp1","subPdp2"]}],
+                "chosenPdpGroup": "option2"
+        });
+        expect(component.state('chosenPdpGroup')).toEqual("option2");
+
+        const instance = component.instance();
+        const event = {label:"option1", value:"option1"}
+        instance.handlePdpGroupChange(event);
+        expect(component.state('chosenPdpGroup')).toEqual("option1");
+        expect(component.state('chosenPdpSubgroup')).toEqual("");
+        expect(component.state('pdpSubgroupList')).toEqual([{label:"subPdp1", value:"subPdp1"}, {label:"subPdp2", value:"subPdp2"}]);
+    });
+
+    it('Test handlePdpSubgroupChange', () => {
+        const component = mount(<PolicyModal loopCache={loopCache} match={match} />)
+
+        const instance = component.instance();
+        const event = {label:"option1", value:"option1"}
+        instance.handlePdpSubgroupChange(event);
+        expect(component.state('chosenPdpSubgroup')).toEqual("option1");
+    });
+});
\ No newline at end of file
-- 
cgit 1.2.3-korg


From 1b4f20dfda1c5dad80640571e13de53772f2cce1 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 17 Mar 2020 07:47:03 -0700
Subject: Fix the policy synchro

Fix the periodic policy synchro issue due to wrong format expected.

Issue-ID: CLAMP-784
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Iaa815e92bb5c7d93f9db9c75f98e144b8d0f6b44
---
 .../clamp/clds/client/PolicyEngineServices.java    |  2 +-
 .../.file                                          |  7 ++
 .../1.0.0&#63;connectionTimeToLive=5000/.file      | 80 ++++++++++++++++++++++
 .../1.0.0&#63;connectionTimeToLive=5000/.header    |  1 +
 .../src/components/dialogs/Policy/PolicyModal.js   |  2 +-
 5 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
 create mode 100644 src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java b/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
index 23586712a..5e6d9d98d 100644
--- a/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/PolicyEngineServices.java
@@ -118,7 +118,7 @@ public class PolicyEngineServices {
 
         LinkedHashMap<String, Object> policyTypesMap = (LinkedHashMap<String, Object>) loadedYaml
                 .get("policy_types");
-        policyTypesMap.entrySet().parallelStream().forEach(entryPolicyType -> {
+        policyTypesMap.entrySet().stream().forEach(entryPolicyType -> {
             policyModelsService.createPolicyInDbIfNeeded(
                     createPolicyModelFromPolicyEngine(entryPolicyType.getKey(),
                             ((String) ((LinkedHashMap<String, Object>) entryPolicyType.getValue()).get("version"))));
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
index 6f24f3ca6..7f5b897bf 100644
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes&#63;connectionTimeToLive=5000/.file
@@ -28,6 +28,13 @@ policy_types:
       properties:
         # Omitted for brevity, see Section 1
 
+  onap.policies.controlloop.guard.common.MinMax:
+      version: 1.0.0
+      description: Supports Min/Max number of VF Modules
+      derived_from: onap.policies.controlloop.Guard
+      properties:
+        # Omitted for brevity, see Section 1
+
   onap.policies.controlloop.guard.common.MinMax:
       version: 2.0.0
       description: Supports Min/Max number of VF Modules
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
new file mode 100644
index 000000000..778efae9e
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.file
@@ -0,0 +1,80 @@
+{
+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+  "policy_types": {
+    "onap.policies.controlloop.guard.Common": {
+      "properties": {
+        "id": {
+          "name": "id",
+          "type": "string",
+          "typeVersion": "0.0.0",
+          "description": "The Control Loop id this applies to.",
+          "required": false,
+          "constraints": [],
+          "metadata": {}
+        },
+        "actor": {
+          "name": "actor",
+          "type": "string",
+          "typeVersion": "0.0.0",
+          "description": "Specifies the Actor the guard applies to.",
+          "required": true,
+          "constraints": [],
+          "metadata": {}
+        },
+        "operation": {
+          "name": "operation",
+          "type": "string",
+          "typeVersion": "0.0.0",
+          "description": "Specified the operation that the actor is performing the guard applies to.",
+          "required": true,
+          "constraints": [],
+          "metadata": {}
+        },
+        "timeRange": {
+          "name": "timeRange",
+          "type": "tosca.datatypes.TimeInterval",
+          "typeVersion": "0.0.0",
+          "description": "An optional range of time during the day the guard policy is valid for.\n",
+          "required": false,
+          "constraints": [],
+          "metadata": {}
+        }
+      },
+      "name": "onap.policies.controlloop.guard.Common",
+      "version": "1.0.0",
+      "derived_from": "tosca.policies.Root",
+      "metadata": {},
+      "description": "This is the base Policy Type for Guard policies that guard the execution of Operational\nPolicies.\n"
+    },
+    "onap.policies.controlloop.guard.common.MinMax": {
+      "properties": {
+        "min": {
+          "name": "min",
+          "type": "integer",
+          "typeVersion": "0.0.0",
+          "description": "The minimum instances of this entity",
+          "required": true,
+          "constraints": [],
+          "metadata": {}
+        },
+        "max": {
+          "name": "max",
+          "type": "integer",
+          "typeVersion": "0.0.0",
+          "description": "The maximum instances of this entity",
+          "required": false,
+          "constraints": [],
+          "metadata": {}
+        }
+      },
+      "name": "onap.policies.controlloop.guard.common.MinMax",
+      "version": "1.0.0",
+      "derived_from": "onap.policies.controlloop.guard.Common",
+      "metadata": {},
+      "description": "Supports Min/Max number of entity for scaling operations"
+    }
+  },
+  "name": "ToscaServiceTemplateSimple",
+  "version": "1.0.0",
+  "metadata": {}
+}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header
new file mode 100644
index 000000000..6a280d972
--- /dev/null
+++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0&#63;connectionTimeToLive=5000/.header
@@ -0,0 +1 @@
+{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 0f41beb09..428e443cf 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -122,7 +122,7 @@ export default class PolicyModal extends React.Component {
               startval: editorData,
               theme: 'myBootstrap4',
               object_layout: 'grid',
-              disable_properties: true,
+              disable_properties: false,
               disable_edit_json: false,
               disable_array_reorder: true,
               disable_array_delete_last_row: true,
-- 
cgit 1.2.3-korg


From a2625fe6c6819fc41a6f4f5a9625cd9ba753bc72 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 18 Mar 2020 12:55:22 +0100
Subject: Fix modify model UI bug

Fix the modify model UI bug, update the loopCache before closing the
window.

Issue-ID: CLAMP-783
Change-Id: Ide103f66b103ca2f51e8b7bbeda883db6626d027
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/components/dialogs/Loop/ModifyLoopModal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 7c16b7863..42c03daca 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -162,14 +162,14 @@ export default class ModifyLoopModal extends React.Component {
 
 	handleAdd() {
 		LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
-		this.handleClose();
 		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+		this.handleClose();
 	}
 
 	handleRemove() {
 		LoopService.removeOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
-		this.handleClose();
 		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+		this.handleClose();
 	}
 
 	render() {
-- 
cgit 1.2.3-korg


From be9a2a5b46a96ef97810a3893512f7e42591c640 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 24 Mar 2020 16:38:01 +0100
Subject: Fix the loop deploy issue

Fix deploy UI issue and update the deployment payload.

Issue-ID: CLAMP-791
Change-Id: I2e652bc321e27be7c21ae12c66e98880e2eed4b5
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../org/onap/clamp/loop/components/external/DcaeComponent.java    | 3 ++-
 src/test/java/org/onap/clamp/loop/DcaeComponentTest.java          | 2 +-
 src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java       | 3 ++-
 ui-react/src/components/dialogs/Loop/DeployLoopModal.js           | 8 ++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java b/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java
index 89332bbd0..8fce5cafd 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java
+++ b/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java
@@ -47,6 +47,7 @@ public class DcaeComponent extends ExternalComponent {
     private static final String DEPLOYMENT_PARAMETER = "dcaeDeployParameters";
     private static final String DCAE_SERVICETYPE_ID = "serviceTypeId";
     private static final String DCAE_INPUTS = "inputs";
+    private static final String SINGLE_BLUEPRINT_POLICYID = "loop template blueprint";
 
     private String name;
 
@@ -131,7 +132,7 @@ public class DcaeComponent extends ExternalComponent {
      */
     public static String getDeployPayload(Loop loop) {
         JsonObject globalProp = loop.getGlobalPropertiesJson();
-        JsonObject deploymentProp = globalProp.getAsJsonObject(DEPLOYMENT_PARAMETER);
+        JsonObject deploymentProp = globalProp.getAsJsonObject(DEPLOYMENT_PARAMETER).getAsJsonObject(SINGLE_BLUEPRINT_POLICYID);
 
         String serviceTypeId = loop.getLoopTemplate().getDcaeBlueprintId();
 
diff --git a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
index fc7e1c90a..b42ba987e 100644
--- a/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/DcaeComponentTest.java
@@ -47,7 +47,7 @@ public class DcaeComponentTest {
     private Loop createTestLoop() {
         Loop loopTest = new Loop("ControlLoopTest", "<xml></xml>");
         loopTest.setGlobalPropertiesJson(
-                new Gson().fromJson("{\"dcaeDeployParameters\":" + "{\"policy_id\": \"name\"}}", JsonObject.class));
+                new Gson().fromJson("{\"dcaeDeployParameters\":{\"loop template blueprint\": {\"policy_id\": \"name\"}}}", JsonObject.class));
         loopTest.setLastComputedState(LoopState.DESIGN);
         loopTest.setDcaeDeploymentId("123456789");
         loopTest.setDcaeDeploymentStatusUrl("http4://localhost:8085");
diff --git a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
index f1d299226..98134e828 100644
--- a/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/DeployFlowTestItCase.java
@@ -71,7 +71,8 @@ public class DeployFlowTestItCase {
     @Test
     @Transactional
     public void deployWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "<xml></xml>", "yamlcontent", "{\"testname\":\"testvalue\"}",
+        Loop loopTest = createLoop("ControlLoopTest", "<xml></xml>", "yamlcontent",
+                "{\"dcaeDeployParameters\":{\"loop template blueprint\": {\"policy_id\": \"name\"}}}",
                 "UUID-blueprint");
         LoopTemplate template = new LoopTemplate();
         template.setName("templateName");
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 6468e9f9e..d034ee5d7 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -75,14 +75,14 @@ export default class DeployLoopModal extends React.Component {
 	}
 
 	handleClose(){
+		this.setState({ show: false });
 		this.props.history.push('/');
 	}
+
 	handleSave() {
 		const loopName = this.props.loopCache.getLoopName();
 		// save the global propserties
 		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
-			this.setState({ show: false });
-
 			LoopActionService.performAction(loopName, "deploy").then(pars => {
 				this.props.showAlert("Action deploy successfully performed");
 				// refresh status and update loop logs
@@ -94,16 +94,16 @@ export default class DeployLoopModal extends React.Component {
 				this.refreshStatus(loopName);
 			});
 		});
+		this.setState({ show: false });
+		this.props.history.push('/');
 	}
 
 	refreshStatus(loopName) {
 		LoopActionService.refreshStatus(loopName).then(data => {
 			this.props.updateLoopFunction(data);
-			this.props.history.push('/');
 		})
 		.catch(error => {
 			this.props.showAlert("Refresh status failed");
-			this.props.history.push('/');
 		});
 	}
 	handleChange(event) {
-- 
cgit 1.2.3-korg


From 3173d554371bae1eefafc69b2bc9da5543510dd5 Mon Sep 17 00:00:00 2001
From: jingjincs <jinjingcs@gmail.com>
Date: Wed, 4 Mar 2020 09:11:10 +0100
Subject: Update template menu UI

Modify View Templates Menu to adopt changes from get template CL API

Issue-ID: CLAMP-589
Change-Id: I54d059620e91d0da70e85c62dbb932ee58dd99ab
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/api/TemplateService.js                | 17 +++++
 .../src/components/dialogs/Loop/CreateLoopModal.js | 32 ++++++--
 .../src/components/dialogs/Loop/OpenLoopModal.js   | 29 +++++++-
 .../components/dialogs/Loop/OpenLoopModal.test.js  |  6 +-
 .../Loop/__snapshots__/OpenLoopModal.test.js.snap  | 14 +++-
 .../dialogs/Tosca/ViewLoopTemplatesModal.js        | 87 +++++++++++++---------
 .../dialogs/Tosca/ViewLoopTemplatesModal.test.js   | 26 +------
 .../ViewLoopTemplatesModal.test.js.snap            | 12 ++-
 8 files changed, 143 insertions(+), 80 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index 124d29c27..615a87e96 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -54,6 +54,23 @@ export default class TemplateService {
 	            return {};
 	        });
 	    }
+
+	static getBlueprintMicroServiceTemplate(templateName) {
+	  	return fetch('/restservices/clds/v2/templates/' + templateName + ' /svgRepresentation', { method: 'GET', credentials: 'same-origin', })
+			.then(function (response) {
+			console.debug("getBlueprintMicroServiceTemplate response received: ", response.status);
+			if (response.ok) {
+				return response.text();
+			} else {
+				console.error("getBlueprintMicroServiceTemplates query failed");
+				return {};
+			}
+		})
+		.catch(function (error) {
+			console.error("getBlueprintMicroServiceTemplate error received", error);
+			return {};
+		});
+	}
 	
 	static getDictionary() {
 	    return fetch('restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', })
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index d6c5e3579..e38207792 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -34,6 +34,14 @@ import TemplateService from '../../../api/TemplateService';
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
+const LoopViewSvgDivStyled = styled.div`
+	overflow: hidden;
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	margin-left: auto;
+	margin-right:auto;
+	text-align: center;
+`
 
 export default class CreateLoopModal extends React.Component {
 	constructor(props, context) {
@@ -46,6 +54,7 @@ export default class CreateLoopModal extends React.Component {
 		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
 		this.state = {
 			show: true,
+			content: '',
 			chosenTemplateName: '',
 			modelName: '',
 			templateNames: []
@@ -63,6 +72,13 @@ export default class CreateLoopModal extends React.Component {
 
 	handleDropdownListChange(e) {
 		this.setState({ chosenTemplateName: e.value });
+		TemplateService.getBlueprintMicroServiceTemplates(e.value).then(svgXml => {
+			if (svgXml.length !== 0) {
+				this.setState({ content: svgXml })
+			} else {
+				this.setState({ content: 'Error1' })
+			}
+		})
 	}
 
 	getTemplateNames() {
@@ -77,7 +93,7 @@ export default class CreateLoopModal extends React.Component {
 			alert("A model name is required");
 			return;
 		}
-		console.info("Create Model " + this.state.modelName + ", Template " + this.state.chosenTemplateName + " is chosen");
+		console.debug("Create Model " + this.state.modelName + ", Template " + this.state.chosenTemplateName + " is chosen");
 		this.setState({ show: false });
 		LoopService.createLoop("LOOP_" + this.state.modelName, this.state.chosenTemplateName).then(text => {
 			console.debug("CreateLoop response received: ", text);
@@ -92,18 +108,17 @@ export default class CreateLoopModal extends React.Component {
 		.catch(error => {
 			console.debug("Create Loop failed");
 		});
-
 	}
 
 	handleModelName = event => {
-    	this.setState({
-      		modelName: event.target.value
-    	})
+		this.setState({
+			modelName: event.target.value
+		})
 	}
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>Create Model</Modal.Title>
 				</Modal.Header>
@@ -114,6 +129,10 @@ export default class CreateLoopModal extends React.Component {
 							<Select onChange={this.handleDropdownListChange} options={this.state.templateNames} />
 						</Col>
 					</Form.Group>
+					<Form.Group controlId="formPlaintextEmail">
+						<LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }} value={this.state.content} >
+						</LoopViewSvgDivStyled>
+					</Form.Group>
 					<Form.Group controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Model Name:</Form.Label>
 						<input type="text" style={{width: '50%'}}
@@ -127,7 +146,6 @@ export default class CreateLoopModal extends React.Component {
 					<Button variant="primary" type="submit" onClick={this.handleCreate}>Create</Button>
 				</Modal.Footer>
 			</ModalStyled>
-
 		);
 	}
 }
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index 4e8d97820..7c98fab4d 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -37,6 +37,14 @@ const ModalStyled = styled(Modal)`
 const CheckBoxStyled = styled(FormCheck.Input)`
 	margin-left:3rem;
 `
+const LoopViewSvgDivStyled = styled.div`
+	overflow: hidden;
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	margin-left: auto;
+	margin-right:auto;
+	text-align: center;
+`
 
 export default class OpenLoopModal extends React.Component {
 	constructor(props, context) {
@@ -49,7 +57,8 @@ export default class OpenLoopModal extends React.Component {
 		this.state = {
 			show: true,
 			chosenLoopName: '',
-			loopNames: []
+			loopNames: [],
+			content:''
 		};
 	}
 
@@ -64,6 +73,13 @@ export default class OpenLoopModal extends React.Component {
 
 	handleDropdownListChange(e) {
 		this.setState({ chosenLoopName: e.value });
+		LoopService.getSvg(e.value).then(svgXml => {
+			if (svgXml.length !== 0) {
+				this.setState({ content: svgXml })
+			} else {
+				this.setState({ content: 'Error1' })
+			}
+		});
 	}
 
 	getLoopNames() {
@@ -71,7 +87,9 @@ export default class OpenLoopModal extends React.Component {
 		    if (Object.entries(loopNames).length !== 0) {
 		        const loopOptions = loopNames.filter(loopName => loopName!=='undefined').map((loopName) => { return { label: loopName, value: loopName } });
             	this.setState({ loopNames: loopOptions })
+
 		    }
+
 		});
 	}
 
@@ -83,7 +101,7 @@ export default class OpenLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
 					<Modal.Title>Open Model</Modal.Title>
 				</Modal.Header>
@@ -91,9 +109,14 @@ export default class OpenLoopModal extends React.Component {
 					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Model Name</Form.Label>
 						<Col sm="10">
-							<Select onChange={this.handleDropdownListChange} options={this.state.loopNames} />
+							<Select onChange={this.handleDropdownListChange}
+							options={this.state.loopNames} />
 						</Col>
 					</Form.Group>
+					<Form.Group controlId="formPlaintextEmail">
+                         <LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }}   value={this.state.content} >
+                         </LoopViewSvgDivStyled>
+                    </Form.Group>
 					<Form.Group controlId="formBasicChecbox">
 						<Form.Check>
 							<FormCheck.Label>Read Only</FormCheck.Label>
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
index 208c947c3..f362cfaa6 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
@@ -28,12 +28,12 @@ describe('Verify OpenLoopModal', () => {
 
   beforeEach(() => {
       fetch.resetMocks();
-          fetch.mockResponseOnce(JSON.stringify([
+      fetch.mockResponse(JSON.stringify([
         "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca",
         "LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3",
         "LOOP_gmtAS_v1_0_ResourceInstanceName2_tca_2"
       ]));
-  })
+  });
 
     it('Test the render method', () => {
 
@@ -44,12 +44,12 @@ describe('Verify OpenLoopModal', () => {
   it('Onchange event', () => {
     const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'};
     const component = shallow(<OpenLoopModal/>);
-
     component.find('StateManager').simulate('change', event);
     component.update();
     expect(component.state('chosenLoopName')).toEqual("LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3");
   });
 
+
   it('Test handleClose', () => {
     const historyMock = { push: jest.fn() }; 
     const handleClose = jest.spyOn(OpenLoopModal.prototype,'handleClose');
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
index 9e7222415..1aa0b5ae9 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
@@ -4,7 +4,7 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
   onHide={[Function]}
   show={true}
-  size="lg"
+  size="xl"
 >
   <ModalHeader
     closeButton={true}
@@ -46,6 +46,18 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
         />
       </Col>
     </FormGroup>
+    <FormGroup
+      controlId="formPlaintextEmail"
+    >
+      <styled.div
+        dangerouslySetInnerHTML={
+          Object {
+            "__html": "",
+          }
+        }
+        value=""
+      />
+    </FormGroup>
     <FormGroup
       controlId="formBasicChecbox"
     >
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index 89e5697c9..18c444046 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -38,22 +38,26 @@ import MaterialTable from "material-table";
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-const TextModal = styled.textarea`
-margin-top: 20px;
-white-space:pre;
-background-color: ${props => props.theme.toscaTextareaBackgroundColor};;
-text-align: justify;
-font-size: ${props => props.theme.toscaTextareaFontSize};;
-width: 100%;
-height: 300px;
+const LoopViewSvgDivStyled = styled.div`
+	overflow: hidden;
+	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
+	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	margin-left: auto;
+	margin-right:auto;
+	text-align: center;
+	margin-top: 20px;
 `
+const SvgContainerDivStyled = styled.div`
+	border: 1px solid;
+`
+
 const cellStyle = { border: '1px solid black' };
 const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
 const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
 
 export default class ViewLoopTemplatesModal extends React.Component {
   state = {
-    show: true,
+        show: true,
 		content: 'Please select a loop template to display it',
 		selectedRow: -1,
 		loopTemplateData: [],
@@ -97,8 +101,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 		this.handleClose = this.handleClose.bind(this);
-		this.getBlueprintMicroServiceTemplates = this.getBlueprintMicroServiceTemplates.bind(this);
-		this.handleYamlContent = this.handleYamlContent.bind(this);
+		this.getBlueprintMicroServiceTemplate = this.getBlueprintMicroServiceTemplate.bind(this);
 		this.getBlueprintMicroServiceTemplates();
 	}
 
@@ -108,11 +111,20 @@ export default class ViewLoopTemplatesModal extends React.Component {
 		});
 	}
 
-	handleYamlContent = event => {
-		this.setState({
-			content: event.target.value
-		});
-	}
+	getBlueprintMicroServiceTemplate(templateName) {
+	    if (typeof templateName !== "undefined") {
+		    TemplateService.getBlueprintMicroServiceTemplate(templateName).then(svgXml => {
+				if (svgXml.length !== 0) {
+					this.setState({ content: svgXml })
+				} else {
+					this.setState({ content: 'Please select a loop template to view the details' })
+
+				}
+			});
+		} else {
+          	this.setState({ content: 'Please select a loop template to view the details' })
+          	}
+    }
 
 	handleClose() {
 		this.setState({ show: false });
@@ -121,30 +133,31 @@ export default class ViewLoopTemplatesModal extends React.Component {
 
 	render() {
     return (
-      <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
-        <Modal.Header closeButton>
-				</Modal.Header>
-				<Modal.Body>
-          <MaterialTable
-            title={"View Blueprint MicroService Templates"}
-            data={this.state.loopTemplateData}
+    		<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+    			<Modal.Header closeButton>
+    			</Modal.Header>
+    			<Modal.Body>
+    			   <MaterialTable
+    				  title={"View Blueprint MicroService Templates"}
+    				  data={this.state.loopTemplateData}
 					  columns={this.state.loopTemplateColumnsDefinition}
 					  icons={this.state.tableIcons}
-					  onRowClick={(event, rowData) => {this.setState({content: rowData.name, selectedRow: rowData.tableData.id})}}
+    			      onRowClick={(event, rowData) => {this.getBlueprintMicroServiceTemplate(rowData.name);this.setState({selectedRow: rowData.tableData.id})}}
 					  options={{
-					  headerStyle:rowHeaderStyle,
-					  rowStyle: rowData => ({
-					  backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
-            })
-          }}
-          />
-          <div>
-            <TextModal value={this.state.content} onChange={this.handleYamlContent} />
-          </div>
-        </Modal.Body>
-        <Modal.Footer>
-          <Button variant="secondary" onClick={this.handleClose}>Close</Button>
-        </Modal.Footer>
+					      headerStyle:rowHeaderStyle,
+					      rowStyle: rowData => ({
+					      backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
+                          })
+                      }}
+                  />
+	              <SvgContainerDivStyled>
+		            <LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }} value={this.state.content} >
+					</LoopViewSvgDivStyled>
+	              </SvgContainerDivStyled>
+                </Modal.Body>
+                <Modal.Footer>
+                	<Button variant="secondary" onClick={this.handleClose}>Close</Button>
+               </Modal.Footer>
       </ModalStyled>
       );
     }
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
index 94d4acdc8..ddfb2a70c 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
@@ -28,8 +28,7 @@ import { mount } from 'enzyme';
 describe('Verify ViewLoopTemplatesModal', () => {
 	beforeEach(() => {
 		fetch.resetMocks();
-		}
-	);
+	});
 
 	it('Test API Successful', () => {
 		fetch.mockImplementationOnce(() => {
@@ -133,29 +132,6 @@ describe('Verify ViewLoopTemplatesModal', () => {
 			const component = mount(<ViewLoopTemplatesModal/>);
 			expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
 		});
-
-		it('Test handleYamlContent', () => {
-			fetch.mockImplementationOnce(() => {
-				return Promise.resolve({
-					ok: true,
-					status: 200,
-					json: () => {
-						return Promise.resolve({
-						"index": "1",
-						"name": "MTCA version 1",
-						"modelService.serviceDetails.name": "MTCA",
-						"allowedLoopType" : "CLOSED",
-						"maximumInstancesAllowed":1,
-						"updatedDate":"2019-09-06 19:09:42"
-						});
-					}
-				});
-			});
-			const yamlContent = 'MTCA version 1';
-			const component = shallow(<ViewLoopTemplatesModal/>);
-			component.find('[value="Please select a loop template to display it"]').prop('onChange')({ target: { value: yamlContent }});
-			expect(component.state('content')).toEqual(yamlContent);
-		});
 		
 		it('Test handleClose', () => {
 			fetch.mockImplementationOnce(() => {
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
index efec96e94..253820f86 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
@@ -140,12 +140,16 @@ exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1
       }
       title="View Blueprint MicroService Templates"
     />
-    <div>
-      <styled.textarea
-        onChange={[Function]}
+    <styled.div>
+      <styled.div
+        dangerouslySetInnerHTML={
+          Object {
+            "__html": "Please select a loop template to display it",
+          }
+        }
         value="Please select a loop template to display it"
       />
-    </div>
+    </styled.div>
   </ModalBody>
   <ModalFooter>
     <Button
-- 
cgit 1.2.3-korg


From 9e82c5a3d192c9557c7549becf172e1f37e2dec9 Mon Sep 17 00:00:00 2001
From: JulienBe <jb379x@att.com>
Date: Wed, 1 Apr 2020 17:40:42 +0200
Subject: Remove unused objects

reported by Sonar

Issue-ID: CLAMP-806
Signed-off-by: JulienBe <jb379x@att.com>
Change-Id: Ia3d6939e1f946280551583a777032efe63e12e01
---
 .../src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js | 1 -
 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js     | 1 -
 ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js       | 1 -
 3 files changed, 3 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
index 4363da923..3a45153e9 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
@@ -78,7 +78,6 @@ describe('Verify ManageDictionaries', () => {
 		}),
 		100
 		);
-		new Promise(resolve => setTimeout(resolve, 200));
 		const component = shallow(<ManageDictionaries />);
 		expect(myMockFunc.mock.calls.length).toBe(1);
 	});
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
index ddfb2a70c..e11d86f53 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
@@ -77,7 +77,6 @@ describe('Verify ViewLoopTemplatesModal', () => {
 		}),
 		100
 		);
-		new Promise(resolve => setTimeout(resolve, 200));
 		const component = shallow(<ViewLoopTemplatesModal/>);
 		expect(myMockFunc.mock.calls.length).toBe(1);
 	});
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
index 952e88867..29127ed55 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
@@ -82,7 +82,6 @@ describe('Verify ViewToscaPolicyModal', () => {
       }),
     100
   );
-	new Promise(resolve => setTimeout(resolve, 200));
 	const component = shallow(<ViewToscaPolicyModal/>);
 	expect(myMockFunc.mock.calls.length).toBe(1);
 	});
-- 
cgit 1.2.3-korg


From 84242153b1d2ae1cd55be003b4a45730a3f68a04 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 2 Apr 2020 15:31:34 +0200
Subject: Fix bug in Create loop UI

Fix the missing SVG representing the loop template in the Create loop dialog

Issue-ID: CLAMP-811
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Id74855e2935130337bc852df79b3a9fed0d444ac
---
 ui-react/src/api/TemplateService.js                             | 8 ++++----
 ui-react/src/components/dialogs/Loop/CreateLoopModal.js         | 2 +-
 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index 615a87e96..eddd58dff 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -55,19 +55,19 @@ export default class TemplateService {
 	        });
 	    }
 
-	static getBlueprintMicroServiceTemplate(templateName) {
+	static getBlueprintMicroServiceTemplateSvg(templateName) {
 	  	return fetch('/restservices/clds/v2/templates/' + templateName + ' /svgRepresentation', { method: 'GET', credentials: 'same-origin', })
 			.then(function (response) {
-			console.debug("getBlueprintMicroServiceTemplate response received: ", response.status);
+			console.debug("getBlueprintMicroServiceTemplateSvg response received: ", response.status);
 			if (response.ok) {
 				return response.text();
 			} else {
-				console.error("getBlueprintMicroServiceTemplates query failed");
+				console.error("getBlueprintMicroServiceTemplateSvg query failed");
 				return {};
 			}
 		})
 		.catch(function (error) {
-			console.error("getBlueprintMicroServiceTemplate error received", error);
+			console.error("getBlueprintMicroServiceTemplateSvg error received", error);
 			return {};
 		});
 	}
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index e38207792..c5762a8d4 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -72,7 +72,7 @@ export default class CreateLoopModal extends React.Component {
 
 	handleDropdownListChange(e) {
 		this.setState({ chosenTemplateName: e.value });
-		TemplateService.getBlueprintMicroServiceTemplates(e.value).then(svgXml => {
+		TemplateService.getBlueprintMicroServiceTemplateSvg(e.value).then(svgXml => {
 			if (svgXml.length !== 0) {
 				this.setState({ content: svgXml })
 			} else {
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index 18c444046..cec6722d0 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -113,7 +113,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
 
 	getBlueprintMicroServiceTemplate(templateName) {
 	    if (typeof templateName !== "undefined") {
-		    TemplateService.getBlueprintMicroServiceTemplate(templateName).then(svgXml => {
+		    TemplateService.getBlueprintMicroServiceTemplateSvg(templateName).then(svgXml => {
 				if (svgXml.length !== 0) {
 					this.setState({ content: svgXml })
 				} else {
-- 
cgit 1.2.3-korg


From 0cde2b5f4b7d769dec74667d963138e858588ef3 Mon Sep 17 00:00:00 2001
From: JulienBe <jb379x@att.com>
Date: Fri, 3 Apr 2020 13:21:13 +0200
Subject: Move to console.info in tests

to please Sonar

Issue-ID: CLAMP-806
Signed-off-by: JulienBe <jb379x@att.com>
Change-Id: Ia09874acfa7237f0a920f0327e6e2d76eb61fb2a
---
 .../components/dialogs/ManageDictionaries/ManageDictionaries.test.js  | 2 +-
 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js  | 4 ++--
 ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
index 3a45153e9..13a6035a3 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
@@ -74,7 +74,7 @@ describe('Verify ManageDictionaries', () => {
 	it('Test API Rejection', () => {
 		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
 		setTimeout( () => myMockFunc().catch(e => {
-			console.log(e);
+			console.info(e);
 		}),
 		100
 		);
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
index e11d86f53..1a6cc1959 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
@@ -73,7 +73,7 @@ describe('Verify ViewLoopTemplatesModal', () => {
 	it('Test API Rejection', () => {
 		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
 		setTimeout( () => myMockFunc().catch(e => {
-			console.log(e);
+			console.info(e);
 		}),
 		100
 		);
@@ -158,4 +158,4 @@ describe('Verify ViewLoopTemplatesModal', () => {
 			expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
 			handleClose.mockClear();
 		});
-	});
\ No newline at end of file
+	});
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
index 29127ed55..a599cec04 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.test.js
@@ -78,7 +78,7 @@ describe('Verify ViewToscaPolicyModal', () => {
 		setTimeout(
     () =>
       myMockFunc().catch(e => {
-        console.log(e);
+        console.info(e);
       }),
     100
   );
@@ -192,4 +192,4 @@ describe('Verify ViewToscaPolicyModal', () => {
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
 		handleClose.mockClear();
 	});
-});
\ No newline at end of file
+});
-- 
cgit 1.2.3-korg


From cc5fe51690dc1f780c6b7cd1168e59dedc3b245f Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 6 Apr 2020 13:13:52 +0200
Subject: Update suc alert color

Update the back groud color for succesful alert messages.

Issue-ID: CLAMP-815
Change-Id: I97a621e31f2eb850eae30da3754afd3cd4ddb34a
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 ui-react/src/LoopUI.js                             | 39 +++++++++-----
 ui-react/src/LoopUI.test.js                        | 18 +++++--
 ui-react/src/__snapshots__/LoopUI.test.js.snap     | 63 +++++++++++++++-------
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  | 63 +++++++++++++++-------
 .../src/components/dialogs/Loop/DeployLoopModal.js |  6 +--
 .../dialogs/Loop/DeployLoopModal.test.js           |  5 +-
 .../OperationalPolicy/OperationalPolicyModal.js    |  2 +-
 ui-react/src/components/dialogs/PerformActions.js  |  4 +-
 .../src/components/dialogs/PerformActions.test.js  | 10 ++--
 ui-react/src/components/dialogs/RefreshStatus.js   |  4 +-
 .../src/components/dialogs/RefreshStatus.test.js   | 10 ++--
 11 files changed, 147 insertions(+), 77 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index bc3f2355e..5e2da79c6 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -109,7 +109,8 @@ export default class LoopUI extends React.Component {
 		userName: null,
 		loopName: OnapConstants.defaultLoopName,
 		loopCache: new LoopCache({}),
-		showAlert: false
+		showSucAlert: false,
+		showFailAlert: false
 	};
 
 	constructor() {
@@ -119,7 +120,8 @@ export default class LoopUI extends React.Component {
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
 		this.closeLoop = this.closeLoop.bind(this);
-		this.showAlert =  this.showAlert.bind(this);
+		this.showSucAlert =  this.showSucAlert.bind(this);
+		this.showFailAlert =  this.showFailAlert.bind(this);
 		this.disableAlert =  this.disableAlert.bind(this);
 	}
 
@@ -168,9 +170,14 @@ export default class LoopUI extends React.Component {
 
 	renderAlertBar() {
 		return (
-				<Alert variant="danger" show={this.state.showAlert} onClose={this.disableAlert} dismissible>
+			<div>
+				<Alert variant="success" show={this.state.showSucAlert} onClose={this.disableAlert} dismissible>
 					{this.state.showMessage}
 				</Alert>
+				<Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
+			</div>
 		);
 	}
 
@@ -223,12 +230,16 @@ export default class LoopUI extends React.Component {
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
 
-	showAlert(message) {
-		this.setState ({ showAlert: true, showMessage:message });
+	showSucAlert(message) {
+		this.setState ({ showSucAlert: true, showMessage:message });
 	}
 
+	showFailAlert(message) {
+		this.setState ({ showFailAlert: true, showMessage:message });
+	}
+ 
 	disableAlert() {
-		this.setState ({ showAlert: false });
+		this.setState ({ showSucAlert: false, showFailAlert: false });
 	}
 
 	loadLoop(loopName) {
@@ -258,7 +269,7 @@ export default class LoopUI extends React.Component {
 				<Route path="/ViewLoopTemplatesModal" render={(routeProps) => (<ViewLoopTemplatesModal {...routeProps} />)} />
 				<Route path="/ManageDictionaries" render={(routeProps) => (<ManageDictionaries {...routeProps} />)} />
 				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/configurationPolicyModal/:policyName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/createLoop" render={(routeProps) => (<CreateLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
@@ -268,13 +279,13 @@ export default class LoopUI extends React.Component {
 
 				<Route path="/userInfo" render={(routeProps) => (<UserInfoModal {...routeProps} />)} />
 				<Route path="/closeLoop" render={this.closeLoop} />
-				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
-				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
+				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
+				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
+				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
+				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
+				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
+				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/logout" render={this.logout} />
 				<GlobalClampStyle />
 					{this.renderAlertBar()}
diff --git a/ui-react/src/LoopUI.test.js b/ui-react/src/LoopUI.test.js
index d1b76aa9a..6885e7932 100644
--- a/ui-react/src/LoopUI.test.js
+++ b/ui-react/src/LoopUI.test.js
@@ -66,7 +66,8 @@ describe('Verify LoopUI', () => {
 		const component = shallow(<LoopUI />)
 		component.setState({
 			loopName: "testLoopName",
-			showAlert: false 
+			showSucAlert: false,
+			showFailAlert: false 
 		});
 		await flushPromises();
 		expect(component).toMatchSnapshot();
@@ -158,15 +159,22 @@ describe('Verify LoopUI', () => {
 
 	test('Test alert methods', () => {
 		const component = shallow(<LoopUI />)
-		expect(component.state('showAlert')).toEqual(false);
+		expect(component.state('showSucAlert')).toEqual(false);
 
 		const instance = component.instance();
-		instance.showAlert("testAlert");
-		expect(component.state('showAlert')).toEqual(true);
+		instance.showSucAlert("testAlert");
+		expect(component.state('showSucAlert')).toEqual(true);
+		expect(component.state('showFailAlert')).toEqual(false);
 		expect(component.state('showMessage')).toEqual("testAlert");
 
 		instance.disableAlert();
 			
-		expect(component.state('showAlert')).toEqual(false);
+		expect(component.state('showSucAlert')).toEqual(false);
+		expect(component.state('showFailAlert')).toEqual(false);
+
+		instance.showFailAlert("testAlert2");
+		expect(component.state('showSucAlert')).toEqual(false);
+		expect(component.state('showFailAlert')).toEqual(true);
+		expect(component.state('showMessage')).toEqual("testAlert2");
 	})
 });
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 9de232dd6..e523de948 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -89,27 +89,50 @@ exports[`Verify LoopUI Test the render method 1`] = `
     render={[Function]}
   />
   <GlobalStyleComponent />
-  <Alert
-    closeLabel="Close alert"
-    dismissible={true}
-    onClose={[Function]}
-    show={false}
-    transition={
-      Object {
-        "$$typeof": Symbol(react.forward_ref),
-        "defaultProps": Object {
-          "appear": false,
-          "in": false,
-          "mountOnEnter": false,
-          "timeout": 300,
-          "unmountOnExit": false,
-        },
-        "displayName": "Fade",
-        "render": [Function],
+  <div>
+    <Alert
+      closeLabel="Close alert"
+      dismissible={true}
+      onClose={[Function]}
+      show={false}
+      transition={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "appear": false,
+            "in": false,
+            "mountOnEnter": false,
+            "timeout": 300,
+            "unmountOnExit": false,
+          },
+          "displayName": "Fade",
+          "render": [Function],
+        }
       }
-    }
-    variant="danger"
-  />
+      variant="success"
+    />
+    <Alert
+      closeLabel="Close alert"
+      dismissible={true}
+      onClose={[Function]}
+      show={false}
+      transition={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "appear": false,
+            "in": false,
+            "mountOnEnter": false,
+            "timeout": 300,
+            "unmountOnExit": false,
+          },
+          "displayName": "Fade",
+          "render": [Function],
+        }
+      }
+      variant="danger"
+    />
+  </div>
   <Navbar
     collapseOnSelect={false}
     expand={true}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 91812b7c5..235185321 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -114,27 +114,50 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       render={[Function]}
     />
     <GlobalStyleComponent />
-    <Alert
-      closeLabel="Close alert"
-      dismissible={true}
-      onClose={[Function]}
-      show={false}
-      transition={
-        Object {
-          "$$typeof": Symbol(react.forward_ref),
-          "defaultProps": Object {
-            "appear": false,
-            "in": false,
-            "mountOnEnter": false,
-            "timeout": 300,
-            "unmountOnExit": false,
-          },
-          "displayName": "Fade",
-          "render": [Function],
+    <div>
+      <Alert
+        closeLabel="Close alert"
+        dismissible={true}
+        onClose={[Function]}
+        show={false}
+        transition={
+          Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "defaultProps": Object {
+              "appear": false,
+              "in": false,
+              "mountOnEnter": false,
+              "timeout": 300,
+              "unmountOnExit": false,
+            },
+            "displayName": "Fade",
+            "render": [Function],
+          }
         }
-      }
-      variant="danger"
-    />
+        variant="success"
+      />
+      <Alert
+        closeLabel="Close alert"
+        dismissible={true}
+        onClose={[Function]}
+        show={false}
+        transition={
+          Object {
+            "$$typeof": Symbol(react.forward_ref),
+            "defaultProps": Object {
+              "appear": false,
+              "in": false,
+              "mountOnEnter": false,
+              "timeout": 300,
+              "unmountOnExit": false,
+            },
+            "displayName": "Fade",
+            "render": [Function],
+          }
+        }
+        variant="danger"
+      />
+    </div>
     <Navbar
       collapseOnSelect={false}
       expand={true}
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index d034ee5d7..5dacad13b 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -84,12 +84,12 @@ export default class DeployLoopModal extends React.Component {
 		// save the global propserties
 		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
 			LoopActionService.performAction(loopName, "deploy").then(pars => {
-				this.props.showAlert("Action deploy successfully performed");
+				this.props.showSucAlert("Action deploy successfully performed");
 				// refresh status and update loop logs
 				this.refreshStatus(loopName);
 			})
 			.catch(error => {
-				this.props.showAlert("Action deploy failed");
+				this.props.showFailAlert("Action deploy failed");
 				// refresh status and update loop logs
 				this.refreshStatus(loopName);
 			});
@@ -103,7 +103,7 @@ export default class DeployLoopModal extends React.Component {
 			this.props.updateLoopFunction(data);
 		})
 		.catch(error => {
-			this.props.showAlert("Refresh status failed");
+			this.props.showFailAlert("Refresh status failed");
 		});
 	}
 	handleChange(event) {
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
index 5f1dcd5fc..84dbfd1f6 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.test.js
@@ -63,7 +63,8 @@ describe('Verify DeployLoopModal', () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
-		const showAlert = jest.fn();
+		const showSucAlert = jest.fn();
+		const showFailAlert = jest.fn();
 		const handleSave = jest.spyOn(DeployLoopModal.prototype,'handleSave');
 		LoopService.updateGlobalProperties = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -88,7 +89,7 @@ describe('Verify DeployLoopModal', () => {
 		});
 
 		const component = shallow(<DeployLoopModal history={historyMock} 
-						loopCache={loopCache} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
+						loopCache={loopCache} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
 
 		component.find('[variant="primary"]').prop('onClick')();
 		await flushPromises();
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 89e70795e..149639cbc 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -56,7 +56,7 @@ export default class OperationalPolicyModal extends React.Component {
 
 		if (errors.length !== 0) {
 			console.error("Errors detected during config policy data validation ", errors);
-			this.props.showAlert(errors);
+			this.props.showFailAlert(errors);
 		}
 		else {
 			console.info("NO validation errors found in config policy data");
diff --git a/ui-react/src/components/dialogs/PerformActions.js b/ui-react/src/components/dialogs/PerformActions.js
index 66b192863..cf5a3c20e 100644
--- a/ui-react/src/components/dialogs/PerformActions.js
+++ b/ui-react/src/components/dialogs/PerformActions.js
@@ -52,12 +52,12 @@ export default class PerformActions extends React.Component {
 		const loopName = this.state.loopName;
 
 		LoopActionService.performAction(loopName, action).then(pars => {
-			this.props.showAlert("Action " + action + " successfully performed");
+			this.props.showSucAlert("Action " + action + " successfully performed");
 			// refresh status and update loop logs
 			this.refreshStatus(loopName);
 		})
 		.catch(error => {
-			this.props.showAlert("Action " + action + " failed");
+			this.props.showFailAlert("Action " + action + " failed");
 			// refresh status and update loop logs
 			this.refreshStatus(loopName);
 		});
diff --git a/ui-react/src/components/dialogs/PerformActions.test.js b/ui-react/src/components/dialogs/PerformActions.test.js
index 0b0786290..b833a929d 100644
--- a/ui-react/src/components/dialogs/PerformActions.test.js
+++ b/ui-react/src/components/dialogs/PerformActions.test.js
@@ -36,7 +36,8 @@ describe('Verify PerformActions', () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
-		const showAlert = jest.fn();
+		const showSucAlert = jest.fn();
+		const showFailAlert = jest.fn();
 		
 		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -46,7 +47,7 @@ describe('Verify PerformActions', () => {
 			});
 		});
 		const component = shallow(<PerformActions loopCache={loopCache} 
-					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
+					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
 		await flushPromises();
 		component.update();
 
@@ -57,7 +58,8 @@ describe('Verify PerformActions', () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
-		const showAlert = jest.fn();
+		const showSucAlert = jest.fn();
+		const showFailAlert = jest.fn();
 
 		LoopActionService.performAction = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -74,7 +76,7 @@ describe('Verify PerformActions', () => {
 			});
 		});
 		const component = shallow(<PerformActions loopCache={loopCache} 
-						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
 		await flushPromises();
 		component.update();
 
diff --git a/ui-react/src/components/dialogs/RefreshStatus.js b/ui-react/src/components/dialogs/RefreshStatus.js
index 64b35d99b..bb0939152 100644
--- a/ui-react/src/components/dialogs/RefreshStatus.js
+++ b/ui-react/src/components/dialogs/RefreshStatus.js
@@ -44,12 +44,12 @@ export default class RefreshStatus extends React.Component {
 	componentDidMount() {
 		// refresh status and update loop logs
 		LoopActionService.refreshStatus(this.state.loopName).then(data => {
-			this.props.showAlert("Status successfully refreshed");
+			this.props.showSucAlert("Status successfully refreshed");
 			this.props.updateLoopFunction(data);
 			this.props.history.push('/');
 		})
 		.catch(error => {
-			this.props.showAlert("Status refreshing failed");
+			this.props.showFailAlert("Status refreshing failed");
 			this.props.history.push('/');
 		});
 	}
diff --git a/ui-react/src/components/dialogs/RefreshStatus.test.js b/ui-react/src/components/dialogs/RefreshStatus.test.js
index 3038eb321..e08c50d2e 100644
--- a/ui-react/src/components/dialogs/RefreshStatus.test.js
+++ b/ui-react/src/components/dialogs/RefreshStatus.test.js
@@ -35,9 +35,10 @@ describe('Verify RefreshStatus', () => {
 	it('Test refresh status failed', async () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
-		const showAlert = jest.fn();
+		const showSucAlert = jest.fn();
+		const showFailAlert = jest.fn();
 
-		const component = shallow(<RefreshStatus loopCache={loopCache} history={historyMock} showAlert={showAlert} />)
+		const component = shallow(<RefreshStatus loopCache={loopCache} history={historyMock} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
 		await flushPromises();
 		component.update();
 
@@ -48,7 +49,8 @@ describe('Verify RefreshStatus', () => {
 		const flushPromises = () => new Promise(setImmediate);
 		const historyMock = { push: jest.fn() };
 		const updateLoopFunction = jest.fn();
-		const showAlert = jest.fn();
+		const showSucAlert = jest.fn();
+		const showFailAlert = jest.fn();
 
 		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -59,7 +61,7 @@ describe('Verify RefreshStatus', () => {
 		});
 
 		const component = shallow(<RefreshStatus loopCache={loopCache} 
-						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showAlert={showAlert} />)
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
 		await flushPromises();
 		component.update();
 
-- 
cgit 1.2.3-korg


From ed70037caff4471e05de0604f985c2003ed13f28 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 8 Apr 2020 08:46:25 +0200
Subject: Add spinner for Deploy action

Add the spinning symbol while loop is deploying.

Issue-ID: CLAMP-814
Change-Id: Id041622c300e18643e6fb725b3b5bd4ad8e9911e
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../src/components/dialogs/Loop/DeployLoopModal.js | 29 ++++++++++++++++++++--
 .../__snapshots__/DeployLoopModal.test.js.snap     |  1 +
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 5dacad13b..6e7437038 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -29,6 +29,12 @@ import Form from 'react-bootstrap/Form';
 import Tabs from 'react-bootstrap/Tabs';
 import Tab from 'react-bootstrap/Tab';
 import styled from 'styled-components';
+import Spinner from 'react-bootstrap/Spinner'
+
+const StyledSpinnerDiv = styled.div`
+	justify-content: center !important;
+	display: flex !important;
+`;
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -48,6 +54,7 @@ export default class DeployLoopModal extends React.Component {
 		this.handleChange = this.handleChange.bind(this);
 		this.refreshStatus = this.refreshStatus.bind(this);
 		this.renderDeployParam = this.renderDeployParam.bind(this);
+		this.renderSpinner = this.renderSpinner.bind(this);
 
 		const propertiesJson = JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties()));
 		this.state = {
@@ -79,9 +86,24 @@ export default class DeployLoopModal extends React.Component {
 		this.props.history.push('/');
 	}
 
+	renderSpinner() {
+		if (this.state.deploying) {
+			return (
+				<StyledSpinnerDiv>
+					<Spinner animation="border" role="status">
+						<span className="sr-only">Loading...</span>
+					</Spinner>
+				</StyledSpinnerDiv>
+			);
+		} else {
+			return (<div></div>);
+		}
+	}
+
 	handleSave() {
 		const loopName = this.props.loopCache.getLoopName();
 		// save the global propserties
+		this.setState({ deploying: true });
 		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
 			LoopActionService.performAction(loopName, "deploy").then(pars => {
 				this.props.showSucAlert("Action deploy successfully performed");
@@ -94,16 +116,18 @@ export default class DeployLoopModal extends React.Component {
 				this.refreshStatus(loopName);
 			});
 		});
-		this.setState({ show: false });
-		this.props.history.push('/');
 	}
 
 	refreshStatus(loopName) {
 		LoopActionService.refreshStatus(loopName).then(data => {
 			this.props.updateLoopFunction(data);
+			this.setState({ show: false, deploying: false });
+			this.props.history.push('/');
 		})
 		.catch(error => {
 			this.props.showFailAlert("Refresh status failed");
+			this.setState({ show: false, deploying: false  });
+			this.props.history.push('/');
 		});
 	}
 	handleChange(event) {
@@ -144,6 +168,7 @@ export default class DeployLoopModal extends React.Component {
 						<Tabs id="controlled-tab-example" activeKey={this.state.key} onSelect={key => this.setState({ key })}>
 						{this.renderDeployParamTabs()}
 						</Tabs>
+						{this.renderSpinner()}
 						<Modal.Footer>
 							<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
 							<Button variant="primary" type="submit" onClick={this.handleSave}>Deploy</Button>
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
index 0f86aa340..d7beecd02 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
@@ -56,6 +56,7 @@ exports[`Verify DeployLoopModal Test the render method 1`] = `
       </Styled(FormGroup)>
     </Tab>
   </Tabs>
+  <div />
   <ModalFooter>
     <Button
       active={false}
-- 
cgit 1.2.3-korg


From edaf4f9e6d0f8e1b95115cc39492c84d730ba1a2 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 16 Apr 2020 00:43:48 +0200
Subject: Add template name to UI

Add template name to the UI loop viewer + change color of logs panel

Issue-ID: CLAMP-826
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I6776729cefc0597067ae8ef722f7d6e488a12cad
---
 ui-react/src/LoopUI.js                                             | 2 +-
 ui-react/src/__snapshots__/LoopUI.test.js.snap                     | 2 ++
 ui-react/src/__snapshots__/OnapClamp.test.js.snap                  | 4 ++++
 ui-react/src/api/LoopCache.js                                      | 7 +++++++
 ui-react/src/components/dialogs/Loop/CreateLoopModal.js            | 2 +-
 ui-react/src/components/dialogs/Loop/DeployLoopModal.js            | 2 +-
 ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js        | 2 +-
 ui-react/src/components/dialogs/Loop/ModifyLoopModal.js            | 2 +-
 ui-react/src/components/dialogs/Loop/OpenLoopModal.js              | 2 +-
 .../dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap        | 1 +
 .../dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap    | 1 +
 .../dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap          | 1 +
 .../components/dialogs/ManageDictionaries/ManageDictionaries.js    | 2 +-
 .../__snapshots__/ManageDictionaries.test.js.snap                  | 1 +
 ui-react/src/components/dialogs/Policy/PolicyModal.js              | 2 +-
 ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js    | 2 +-
 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js    | 2 +-
 ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js      | 2 +-
 .../Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap        | 1 +
 .../dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap  | 1 +
 ui-react/src/components/loop_viewer/logs/LoopLogs.js               | 4 ++--
 ui-react/src/theme/globalStyle.js                                  | 3 +++
 22 files changed, 35 insertions(+), 13 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 5e2da79c6..efd02b41f 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -195,7 +195,7 @@ export default class LoopUI extends React.Component {
 	renderLoopViewHeader() {
 		return (
 			<LoopViewHeaderDivStyled>
-				Loop Viewer - {this.state.loopName}
+				Loop Viewer - {this.state.loopName} - ({this.state.loopCache.getTemplateName()})
 			</LoopViewHeaderDivStyled>
 		);
 	}
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index e523de948..ff08f7afb 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -176,6 +176,8 @@ exports[`Verify LoopUI Test the render method 1`] = `
     <styled.div>
       Loop Viewer - 
       testLoopName
+       - (
+      )
     </styled.div>
     <styled.div>
       <withRouter(LoopViewSvg)
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 235185321..93dc44286 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -13,6 +13,8 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       "fontNormal": "black",
       "fontSize": "16px",
       "fontWarning": "#eb238e",
+      "loopLogsHeaderBackgroundColor": "white",
+      "loopLogsHeaderFontColor": "black",
       "loopViewerBackgroundColor": "white",
       "loopViewerFontColor": "yellow",
       "loopViewerHeaderBackgroundColor": "#337ab7",
@@ -199,6 +201,8 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       <styled.div>
         Loop Viewer - 
         Empty (NO loop loaded yet)
+         - (
+        )
       </styled.div>
       <styled.div>
         <withRouter(LoopViewSvg)
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index c54337f2f..4f22dc2bb 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -219,4 +219,11 @@ export default class LoopCache {
 	getComponentStates() {
 		return this.loopJsonCache.components;
 	}
+
+	getTemplateName() {
+	    if (this.loopJsonCache["loopTemplate"] !== undefined) {
+        			return this.loopJsonCache["loopTemplate"].name;
+        }
+	    return null;
+	}
 }
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index c5762a8d4..321304a6a 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -118,7 +118,7 @@ export default class CreateLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
 				<Modal.Header closeButton>
 					<Modal.Title>Create Model</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 6e7437038..853df1c89 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -161,7 +161,7 @@ export default class DeployLoopModal extends React.Component {
 	}
 	render() {
 		return (
-					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
+					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static">
 						<Modal.Header closeButton>
 							<Modal.Title>Deployment parameters</Modal.Title>
 						</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
index 73946f45d..97b782246 100644
--- a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
+++ b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
@@ -102,7 +102,7 @@ export default class LoopPropertiesModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static">
 				<Modal.Header closeButton>
 					<Modal.Title>Model Properties</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 42c03daca..1802e43de 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -174,7 +174,7 @@ export default class ModifyLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
 				<Modal.Header closeButton>
 					<Modal.Title>Modify Loop Operational Policies</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index 7c98fab4d..15a718885 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -101,7 +101,7 @@ export default class OpenLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
 				<Modal.Header closeButton>
 					<Modal.Title>Open Model</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
index d7beecd02..c9acb9e12 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`Verify DeployLoopModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
+  backdrop="static"
   onHide={[Function]}
   show={true}
   size="lg"
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
index fe9aee2ab..0fde7a564 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`Verify LoopPropertiesModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
+  backdrop="static"
   onHide={[Function]}
   show={true}
   size="lg"
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
index 1aa0b5ae9..1c98195b3 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`Verify OpenLoopModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
+  backdrop="static"
   onHide={[Function]}
   show={true}
   size="xl"
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index d8065ede6..d43503647 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -376,7 +376,7 @@ export default class ManageDictionaries extends React.Component {
     
     render() {
         return (
-            <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+            <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
                 <Modal.Header closeButton>
                     <Modal.Title>Manage Dictionaries</Modal.Title>
                 </Modal.Header>
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
index e78292216..a73513e47 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
+++ b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`Verify ManageDictionaries Test API Successful 1`] = `
 <Styled(Bootstrap(Modal))
+  backdrop="static"
   onHide={[Function]}
   show={true}
   size="xl"
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 8b49d9150..05db8e14d 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -252,7 +252,7 @@ export default class PolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose } backdrop="static">
 				<Modal.Header closeButton>
 					<Modal.Title>Edit the policy</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
index 1937485b0..ec080589f 100644
--- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
@@ -86,7 +86,7 @@ export default class UploadToscaPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static">
 				<Modal.Header closeButton>
 					<Modal.Title>Upload Tosca Model</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index cec6722d0..c5a91ea26 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -133,7 +133,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
 
 	render() {
     return (
-    		<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+    		<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
     			<Modal.Header closeButton>
     			</Modal.Header>
     			<Modal.Body>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
index 650080520..71f371a6d 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
@@ -139,7 +139,7 @@ export default class ViewToscalPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
 				<Modal.Header closeButton>
 				</Modal.Header>
 				<Modal.Body>
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
index 253820f86..2926e066e 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1`] = `
 <Styled(Bootstrap(Modal))
+  backdrop="static"
   onHide={[Function]}
   show={true}
   size="xl"
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
index fc5eef024..babe59749 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
@@ -2,6 +2,7 @@
 
 exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`] = `
 <Styled(Bootstrap(Modal))
+  backdrop="static"
   onHide={[Function]}
   show={true}
   size="xl"
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
index 6abdc4b4f..b3f052626 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.js
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.js
@@ -26,9 +26,9 @@ import LoopCache from '../../../api/LoopCache';
 import styled from 'styled-components';
 
 const LoopLogsHeaderDivStyled = styled.div`
-	background-color: ${props => props.theme.loopViewerHeaderBackgroundColor};
+	background-color: ${props => props.theme.loopLogsHeaderBackgroundColor};
 	padding: 10px 10px;
-	color: ${props => props.theme.loopViewerHeaderFontColor};
+	color: ${props => props.theme.loopLogsHeaderFontColor};
 `
 const TableStyled = styled(Table)`
     
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index 3656f9e98..64fd7c5d9 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -87,6 +87,9 @@ export const DefaultClampTheme = {
 	loopViewerHeaderBackgroundColor: '#337ab7',
 	loopViewerHeaderFontColor: 'white',
 
+    loopLogsHeaderBackgroundColor:  'white',
+    loopLogsHeaderFontColor: 'black',
+
 	menuBackgroundColor: 'white',
 	menuFontColor: 'black',
 	menuHighlightedBackgroundColor: '#337ab7',
-- 
cgit 1.2.3-korg


From ab3eab60a0883ffa22eb12e2b8680088c9ad25a1 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 16 Apr 2020 12:09:24 +0200
Subject: Remove policy from PEF when removing op policy

The operational policy must be removed from the PEF when the user remove an operational policy (at least attempt to purge the PEF)

Issue-ID: CLAMP-824
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I442c0890c391d43e8fcbdb89189d6ad2581db3af
---
 src/main/java/org/onap/clamp/loop/Loop.java        |   30 +
 .../java/org/onap/clamp/loop/LoopController.java   |    4 +-
 src/main/java/org/onap/clamp/loop/LoopService.java |    2 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |   18 +-
 .../resources/clds/camel/routes/policy-flows.xml   | 1076 +++++++++++---------
 ui-react/src/api/LoopService.js                    |    4 +-
 .../src/components/dialogs/Loop/ModifyLoopModal.js |   14 +-
 7 files changed, 628 insertions(+), 520 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index 19a17dbb0..081331337 100644
--- a/src/main/java/org/onap/clamp/loop/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -330,6 +330,36 @@ public class Loop extends AuditEntity implements Serializable {
         }
     }
 
+    /**
+     * Return the operationalPolicy object with the opPolicyName.
+     *
+     * @param opPolicyName The operationalPolicy name
+     * @return The OperationalPolicy object found in loop object
+     */
+    public OperationalPolicy getOperationalPolicy(String opPolicyName) {
+        for (OperationalPolicy operationalPolicy : this.getOperationalPolicies()) {
+            if (operationalPolicy.getName().equals(opPolicyName)) {
+                return operationalPolicy;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Return the microServicePolicy object with the msPolicyName.
+     *
+     * @param msPolicyName The microServicePolicy name
+     * @return The MicroServicePolicy object found in loop object
+     */
+    public MicroServicePolicy getMicroServicePolicy(String msPolicyName) {
+        for (MicroServicePolicy microServicePolicy : this.getMicroServicePolicies()) {
+            if (microServicePolicy.getName().equals(msPolicyName)) {
+                return microServicePolicy;
+            }
+        }
+        return null;
+    }
+
     /**
      * Generate the loop name.
      *
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
index a2a44631b..fad93bc7d 100644
--- a/src/main/java/org/onap/clamp/loop/LoopController.java
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -137,11 +137,11 @@ public class LoopController {
     }
 
     /**
-     * This method remove an operational policy to a loop instance.
+     * This method removes an operational policy from a loop instance.
      *
      * @param loopName      The loop name
      * @param policyType    The policy model type
-     * @param policyVersion The policy model  version
+     * @param policyVersion The policy model version
      * @return The loop modified
      */
     public Loop removeOperationalPolicy(String loopName, String policyType, String policyVersion) {
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index 6658c5a30..ca3681b62 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -131,7 +131,7 @@ public class LoopService {
      *
      * @param loopName      The loop name
      * @param policyType    The policy model type
-     * @param policyVersion The policy model  version
+     * @param policyVersion The policy model version
      * @return The loop modified
      */
     Loop removeOperationalPolicy(String loopName, String policyType, String policyVersion) {
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 770626755..fc7dbd492 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -770,15 +770,29 @@
 				</doTry>
 			</route>
 		</put>
-		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
+		<put uri="/v2/loop/removeOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}/{policyName}" outType="org.onap.clamp.loop.Loop" produces="application/json">
 			<route>
-				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
+				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion|policyName" />
 				<doTry>
 					<to
 							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'REMOVE operational Policy')" />
 					<to
 							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
 					<to uri="direct:load-loop" />
+					<setProperty propertyName="policyName">
+						<simple>${header.policyName}</simple>
+					</setProperty>
+					<setProperty propertyName="policy">
+						<simple>${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)}</simple>
+					</setProperty>
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">false</simple>
+					</setProperty>
+					<to uri="direct:remove-one-policy-from-active-pdp-group" />
+					<setProperty propertyName="raiseHttpExceptionFlag">
+						<simple resultType="java.lang.Boolean">false</simple>
+					</setProperty>
+					<to uri="direct:delete-policy" />
 					<to
 							uri="bean:org.onap.clamp.loop.LoopController?method=removeOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 					<to
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
index ef68a5483..59772c253 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/src/main/resources/clds/camel/routes/policy-flows.xml
@@ -1,521 +1,579 @@
-
 <routes xmlns="http://camel.apache.org/schema/spring">
-		<route id="verify-one-policy">
-				<from uri="direct:verify-one-policy"/>
-				<setProperty propertyName="raiseHttpExceptionFlag">
-						<simple resultType="java.lang.Boolean">false</simple>
-				</setProperty>
-				<to uri="direct:get-policy"/>
-				<when>
-						<simple> ${header.CamelHttpResponseCode} != 200 </simple>
-						<setProperty propertyName="policyFound">
-								<simple resultType="java.lang.Boolean">false</simple>
-						</setProperty>
-						<log loggingLevel="WARN"
-								message="At least one policy has not been found on policy engine: ${exchangeProperty[policyName]}"/>
-				</when>
-				<setProperty propertyName="raiseHttpExceptionFlag">
-						<simple resultType="java.lang.Boolean">false</simple>
-				</setProperty>
-				<to uri="direct:get-deployment-policy"/>
-				<when>
-						<simple> ${header.CamelHttpResponseCode} != 200 </simple>
-						<setProperty propertyName="policyDeployed">
-								<simple resultType="java.lang.Boolean">false</simple>
-						</setProperty>
-						<log loggingLevel="WARN"
-								message="At least one policy has not been deployed on policy engine: ${exchangeProperty[policyName]}"/>
-				</when>
-				<setProperty propertyName="newPolicyState">
-						<simple>${exchangeProperty[policyComponent].computeState(*)}</simple>
-				</setProperty>
-		</route>
+    <route id="verify-one-policy">
+        <from uri="direct:verify-one-policy"/>
+        <setProperty propertyName="raiseHttpExceptionFlag">
+            <simple resultType="java.lang.Boolean">false</simple>
+        </setProperty>
+        <to uri="direct:get-policy"/>
+        <when>
+            <simple>${header.CamelHttpResponseCode} != 200</simple>
+            <setProperty propertyName="policyFound">
+                <simple resultType="java.lang.Boolean">false</simple>
+            </setProperty>
+            <log loggingLevel="WARN"
+                 message="At least one policy has not been found on policy engine: ${exchangeProperty[policyName]}"/>
+        </when>
+        <setProperty propertyName="raiseHttpExceptionFlag">
+            <simple resultType="java.lang.Boolean">false</simple>
+        </setProperty>
+        <to uri="direct:get-deployment-policy"/>
+        <when>
+            <simple>${header.CamelHttpResponseCode} != 200</simple>
+            <setProperty propertyName="policyDeployed">
+                <simple resultType="java.lang.Boolean">false</simple>
+            </setProperty>
+            <log loggingLevel="WARN"
+                 message="At least one policy has not been deployed on policy engine: ${exchangeProperty[policyName]}"/>
+        </when>
+        <setProperty propertyName="newPolicyState">
+            <simple>${exchangeProperty[policyComponent].computeState(*)}</simple>
+        </setProperty>
+    </route>
 
-		<route id="get-policy">
-				<from uri="direct:get-policy"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Getting Policy: ${exchangeProperty[policyName]}"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>GET</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
-						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-								<setProperty propertyName="logMessage">
-										<simple>${exchangeProperty[policyName]} GET
-												Policy status
-										</simple>
-								</setProperty>
-								<setProperty propertyName="logComponent">
-										<simple>POLICY</simple>
-								</setProperty>
-								<to uri="direct:dump-loop-log-http-response"/>
-						</doFinally>
-				</doTry>
-		</route>
+    <route id="get-policy">
+        <from uri="direct:get-policy"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Getting Policy: ${exchangeProperty[policyName]}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>${exchangeProperty[policyName]} GET
+                        Policy status
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
 
-		<route id="get-deployment-policy">
-				<from uri="direct:get-deployment-policy"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>GET</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0"></log>
-						<toD
-								uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-								<setProperty propertyName="logMessage">
-										<simple>${exchangeProperty[policyName]} GET Policy deployment
-												status
-										</simple>
-								</setProperty>
-								<setProperty propertyName="logComponent">
-										<simple>POLICY</simple>
-								</setProperty>
-								<to uri="direct:dump-loop-log-http-response"/>
-						</doFinally>
-				</doTry>
-		</route>
-		<route id="get-all-policy-models">
-				<from uri="direct:get-all-policy-models"/>
-				<doTry>
-						<log loggingLevel="INFO" message="Getting all the policy models"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>GET</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to get all policy models: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
-						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-						<convertBodyTo type="java.lang.String"/>		
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-						</doFinally>
-				</doTry>
-		</route>
-		<route id="get-policy-model">
-				<from uri="direct:get-policy-model"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Getting the policy model: ${exchangeProperty[policyModelName]}/${exchangeProperty[policyModelVersion]}"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>GET</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to get policy model: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}"></log>
-						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-						<convertBodyTo type="java.lang.String"/>
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-						</doFinally>
-				</doTry>
-		</route>
-		<route id="create-policy">
-			<from uri="direct:create-policy"/>
-			<doTry>
-				<log loggingLevel="INFO"
-					 message="Creating Policy: ${exchangeProperty[policy].getName()}"/>
-				<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
-				<setBody>
-					<simple>${exchangeProperty[policy].createPolicyPayload()}
-					</simple>
-				</setBody>
-				<setHeader headerName="CamelHttpMethod">
-					<constant>POST</constant>
-				</setHeader>
-				<setHeader headerName="Content-Type">
-					<constant>application/json</constant>
-				</setHeader>
-				<setHeader headerName="X-ONAP-RequestID">
-					<simple>${exchangeProperty[X-ONAP-RequestID]}
-					</simple>
-				</setHeader>
-				<setHeader headerName="X-ONAP-InvocationID">
-					<simple>${exchangeProperty[X-ONAP-InvocationID]}
-					</simple>
-				</setHeader>
-				<setHeader headerName="X-ONAP-PartnerName">
-					<simple>${exchangeProperty[X-ONAP-PartnerName]}
-					</simple>
-				</setHeader>
-				<log loggingLevel="INFO"
-					 message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies"></log>
-				<toD
-						uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-				<doFinally>
-					<to uri="direct:reset-raise-http-exception-flag"/>
-					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-					<setProperty propertyName="logMessage">
-						<simple>${exchangeProperty[policy].getName()} creation
-							status
-						</simple>
-					</setProperty>
-					<setProperty propertyName="logComponent">
-						<simple>POLICY</simple>
-					</setProperty>
-					<to uri="direct:dump-loop-log-http-response"/>
-				</doFinally>
-			</doTry>
-		</route>
+    <route id="get-deployment-policy">
+        <from uri="direct:get-deployment-policy"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0"></log>
+            <toD
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/deployed/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>${exchangeProperty[policyName]} GET Policy deployment
+                        status
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="get-all-policy-models">
+        <from uri="direct:get-all-policy-models"/>
+        <doTry>
+            <log loggingLevel="INFO" message="Getting all the policy models"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to get all policy models: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <convertBodyTo type="java.lang.String"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="get-policy-model">
+        <from uri="direct:get-policy-model"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Getting the policy model: ${exchangeProperty[policyModelName]}/${exchangeProperty[policyModelVersion]}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to get policy model: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelName]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <convertBodyTo type="java.lang.String"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="create-policy">
+        <from uri="direct:create-policy"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Creating Policy: ${exchangeProperty[policy].getName()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
+            <setBody>
+                <simple>${exchangeProperty[policy].createPolicyPayload()}
+                </simple>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+                <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>${exchangeProperty[policy].getName()} creation
+                        status
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
 
-		<route id="delete-policy">
-			<from uri="direct:delete-policy"/>
-			<doTry>
-				<log loggingLevel="INFO"
-					 message="Deleting Policy: ${exchangeProperty[policy].getName()}"/>
-				<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy')"/>
-				<setBody>
-					<constant>null</constant>
-				</setBody>
-				<setHeader headerName="CamelHttpMethod">
-					<constant>DELETE</constant>
-				</setHeader>
-				<setHeader headerName="X-ONAP-RequestID">
-					<simple>${exchangeProperty[X-ONAP-RequestID]}
-					</simple>
-				</setHeader>
-				<setHeader headerName="X-ONAP-InvocationID">
-					<simple>${exchangeProperty[X-ONAP-InvocationID]}
-					</simple>
-				</setHeader>
-				<setHeader headerName="X-ONAP-PartnerName">
-					<simple>${exchangeProperty[X-ONAP-PartnerName]}
-					</simple>
-				</setHeader>
-				<choice>
-					<when>
-						<simple>${exchangeProperty[policy].isLegacy()} == true</simple>
-						<setProperty propertyName="policyVersion">
-							<simple>1</simple>
-						</setProperty>
-					</when>
-					<otherwise>
-						<setProperty propertyName="policyVersion">
-							<simple>1.0.0</simple>
-						</setProperty>
-					</otherwise>
-				</choice>
-				<log loggingLevel="INFO"
-					 message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}"></log>
-				<toD
-						uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+    <route id="delete-policy">
+        <from uri="direct:delete-policy"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Deleting Policy: ${exchangeProperty[policy].getName()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy')"/>
+            <setBody>
+                <constant>null</constant>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>DELETE</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <choice>
+                <when>
+                    <simple>${exchangeProperty[policy].isLegacy()} == true</simple>
+                    <setProperty propertyName="policyVersion">
+                        <simple>1</simple>
+                    </setProperty>
+                </when>
+                <otherwise>
+                    <setProperty propertyName="policyVersion">
+                        <simple>1.0.0</simple>
+                    </setProperty>
+                </otherwise>
+            </choice>
+            <log loggingLevel="INFO"
+                 message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}/versions/${exchangeProperty[policy].getPolicyModel().getVersion()}/policies/${exchangeProperty[policy].getName()}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
-				<doFinally>
-					<to uri="direct:reset-raise-http-exception-flag"/>
-					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-					<setProperty propertyName="logMessage">
-						<simple>${exchangeProperty[policy].getName()} removal
-							status
-						</simple>
-					</setProperty>
-					<setProperty propertyName="logComponent">
-						<simple>POLICY</simple>
-					</setProperty>
-					<to uri="direct:dump-loop-log-http-response"/>
-				</doFinally>
-			</doTry>
-		</route>
-		<route id="create-guard-policy">
-				<from uri="direct:create-guard-policy"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Creating Guard Policy: ${exchangeProperty[guardPolicy].getKey()}"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Guard Policy')"/>
-						<setBody>
-								<simple>${exchangeProperty[guardPolicy].getValue()}
-								</simple>
-						</setBody>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>POST</constant>
-						</setHeader>
-						<setHeader headerName="Content-Type">
-								<constant>application/json</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to create guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies"></log>
-						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-								<setProperty propertyName="logMessage">
-										<simple>${exchangeProperty[guardPolicy].getKey()} creation status
-										</simple>
-								</setProperty>
-								<setProperty propertyName="logComponent">
-										<simple>POLICY</simple>
-								</setProperty>
-								<to uri="direct:dump-loop-log-http-response"/>
-						</doFinally>
-				</doTry>
-		</route>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>${exchangeProperty[policy].getName()} removal
+                        status
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="create-guard-policy">
+        <from uri="direct:create-guard-policy"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Creating Guard Policy: ${exchangeProperty[guardPolicy].getKey()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Guard Policy')"/>
+            <setBody>
+                <simple>${exchangeProperty[guardPolicy].getValue()}
+                </simple>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+                <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to create guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>${exchangeProperty[guardPolicy].getKey()} creation status
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
 
-		<route id="delete-guard-policy">
-				<from uri="direct:delete-guard-policy"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Deleting Guard Policy: ${exchangeProperty[guardPolicy].getKey()}"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Guard Policy')"/>
-						<setBody>
-								<constant>null</constant>
-						</setBody>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>DELETE</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to delete guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1"></log>
-						<toD
-								uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+    <route id="delete-guard-policy">
+        <from uri="direct:delete-guard-policy"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Deleting Guard Policy: ${exchangeProperty[guardPolicy].getKey()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Guard Policy')"/>
+            <setBody>
+                <constant>null</constant>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>DELETE</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to delete guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1"></log>
+            <toD
+                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-								<setProperty propertyName="logMessage">
-										<simple>${exchangeProperty[guardPolicy].getKey()} removal status
-										</simple>
-								</setProperty>
-								<setProperty propertyName="logComponent">
-										<simple>POLICY</simple>
-								</setProperty>
-								<to uri="direct:dump-loop-log-http-response"/>
-						</doFinally>
-				</doTry>
-		</route>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>${exchangeProperty[guardPolicy].getKey()} removal status
+                    </simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
 
-		<route id="add-all-to-active-pdp-group">
-				<from uri="direct:add-all-to-active-pdp-group"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Adding loop policies to PDP Group: ${exchangeProperty[loopObject].getName()}"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
-						<setBody>
-								<simple>${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")}
-								</simple>
-						</setBody>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>POST</constant>
-						</setHeader>
-						<setHeader headerName="Content-Type">
-								<constant>application/json</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to add policies to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
-						<toD
-								uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+    <route id="add-all-to-active-pdp-group">
+        <from uri="direct:add-all-to-active-pdp-group"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Adding loop policies to PDP Group: ${exchangeProperty[loopObject].getName()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
+            <setBody>
+                <simple>
+                    ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")}
+                </simple>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+                <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to add policies to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
+            <toD
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-								<setProperty propertyName="logMessage">
-										<simple>PDP Group push ALL status</simple>
-								</setProperty>
-								<setProperty propertyName="logComponent">
-										<simple>POLICY</simple>
-								</setProperty>
-								<to uri="direct:dump-loop-log-http-response"/>
-						</doFinally>
-				</doTry>
-		</route>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>PDP Group push ALL status</simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
 
-		<route id="remove-all-policy-from-active-pdp-group">
-				<from uri="direct:remove-all-policy-from-active-pdp-group"/>
-			<doTry>
-				<log loggingLevel="INFO"
-					 message="Removing loop policies from PDP Group: ${exchangeProperty[loopObject].getName()}"/>
-				<to
-						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Remove policies from PDP group')"/>
-				<setBody>
-					<simple>${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")}
-					</simple>
-				</setBody>
-				<setHeader headerName="CamelHttpMethod">
-					<constant>POST</constant>
-				</setHeader>
-				<setHeader headerName="Content-Type">
-					<constant>application/json</constant>
-				</setHeader>
-				<setHeader headerName="X-ONAP-RequestID">
-					<simple>${exchangeProperty[X-ONAP-RequestID]}
-					</simple>
-				</setHeader>
-				<setHeader headerName="X-ONAP-InvocationID">
-					<simple>${exchangeProperty[X-ONAP-InvocationID]}
-					</simple>
-				</setHeader>
-				<setHeader headerName="X-ONAP-PartnerName">
-					<simple>${exchangeProperty[X-ONAP-PartnerName]}
-					</simple>
-				</setHeader>
-				<log loggingLevel="INFO"
-					 message="Endpoint to remove policies from PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
-				<toD
-						uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+    <route id="remove-all-policy-from-active-pdp-group">
+        <from uri="direct:remove-all-policy-from-active-pdp-group"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Removing loop policies from PDP Group: ${exchangeProperty[loopObject].getName()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Remove policies from PDP group')"/>
+            <setBody>
+                <simple>
+                    ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")}
+                </simple>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+                <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to remove policies from PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
+            <toD
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;useSystemProperties=true&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
 
-				<doFinally>
-					<to uri="direct:reset-raise-http-exception-flag"/>
-					<to
-							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-					<setProperty propertyName="logMessage">
-						<simple>PDP Group remove ALL status</simple>
-					</setProperty>
-					<setProperty propertyName="logComponent">
-						<simple>POLICY</simple>
-					</setProperty>
-					<to uri="direct:dump-loop-log-http-response"/>
-				</doFinally>
-			</doTry>
-		</route>
-		<route id="get-all-pdp-groups">
-				<from uri="direct:get-all-pdp-groups"/>
-				<doTry>
-						<log loggingLevel="INFO"
-								message="Getting the list of PDP Groups"/>
-						<to
-								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
-						<setHeader headerName="CamelHttpMethod">
-								<constant>GET</constant>
-						</setHeader>
-						<setHeader headerName="X-ONAP-RequestID">
-								<simple>${exchangeProperty[X-ONAP-RequestID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-InvocationID">
-								<simple>${exchangeProperty[X-ONAP-InvocationID]}
-								</simple>
-						</setHeader>
-						<setHeader headerName="X-ONAP-PartnerName">
-								<simple>${exchangeProperty[X-ONAP-PartnerName]}
-								</simple>
-						</setHeader>
-						<log loggingLevel="INFO"
-								message="Endpoint to get policy model: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps"></log>
-						<toD
-								uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-						<convertBodyTo type="java.lang.String" />
-						<doFinally>
-								<to uri="direct:reset-raise-http-exception-flag"/>
-								<to
-										uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-						</doFinally>
-				</doTry>
-		</route>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+                <setProperty propertyName="logMessage">
+                    <simple>PDP Group remove ALL status</simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="get-all-pdp-groups">
+        <from uri="direct:get-all-pdp-groups"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Getting the list of PDP Groups"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>GET</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to get policy model: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps"></log>
+            <toD
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <convertBodyTo type="java.lang.String"/>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
+    <route id="remove-one-policy-from-active-pdp-group">
+        <from uri="direct:remove-one-policy-from-active-pdp-group"/>
+        <doTry>
+            <log loggingLevel="INFO"
+                 message="Removing policy from active PDP group for loop: ${exchangeProperty[loopObject].getName()}"/>
+            <to
+                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing one policy PDP group')"/>
+            <setBody>
+                <constant>null</constant>
+            </setBody>
+            <setHeader headerName="CamelHttpMethod">
+                <constant>DELETE</constant>
+            </setHeader>
+            <setHeader headerName="X-ONAP-RequestID">
+                <simple>${exchangeProperty[X-ONAP-RequestID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-InvocationID">
+                <simple>${exchangeProperty[X-ONAP-InvocationID]}
+                </simple>
+            </setHeader>
+            <setHeader headerName="X-ONAP-PartnerName">
+                <simple>${exchangeProperty[X-ONAP-PartnerName]}
+                </simple>
+            </setHeader>
+            <log loggingLevel="INFO"
+                 message="Endpoint to delete policy from PDP Group: {{clamp.config.policy.pap.url}}/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0"></log>
+            <toD
+                    uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.pap.userName}}&amp;authPassword={{clamp.config.policy.pap.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
+            <setProperty propertyName="logMessage">
+                <simple>${exchangeProperty[policyName]} PDP Group removal status
+                </simple>
+            </setProperty>
+            <setProperty propertyName="logComponent">
+                <simple>POLICY</simple>
+            </setProperty>
+            <to uri="direct:dump-loop-log-http-response"/>
+            <doCatch>
+                <exception>java.lang.Exception</exception>
+                <handled>
+                    <constant>false</constant>
+                </handled>
+                <setProperty propertyName="logMessage">
+                    <simple>PDP Group removal, Error reported: ${exception}</simple>
+                </setProperty>
+                <setProperty propertyName="logComponent">
+                    <simple>POLICY</simple>
+                </setProperty>
+                <to uri="direct:dump-loop-log-http-response"/>
+            </doCatch>
+            <doFinally>
+                <to uri="direct:reset-raise-http-exception-flag"/>
+                <to
+                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
+            </doFinally>
+        </doTry>
+    </route>
 </routes>
\ No newline at end of file
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 698ee28c2..f10d187cb 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -240,8 +240,8 @@ export default class LoopService {
 			});
 	}
 
-	static removeOperationalPolicyType(loopName, policyType, policyVersion) {
-		return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+	static removeOperationalPolicyType(loopName, policyType, policyVersion, policyName) {
+		return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 1802e43de..11e935338 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -78,6 +78,10 @@ export default class ModifyLoopModal extends React.Component {
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
+			{ title: "Policy Name", field: "policyName",
+             	cellStyle: cellStyle,
+                headerStyle: headerStyle
+            },
 			{ title: "Version", field: "version",
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
@@ -90,7 +94,7 @@ export default class ModifyLoopModal extends React.Component {
 				cellStyle: cellStyle,
 				headerStyle: headerStyle
 			},
-             { title: "Add", field: "updatedDate", editable: 'never',
+             { title: "Created Date", field: "createdDate", editable: 'never',
              	cellStyle: cellStyle,
              	headerStyle: headerStyle
              }
@@ -128,7 +132,9 @@ export default class ModifyLoopModal extends React.Component {
 		var operationalPolicies = this.state.loopCache.getOperationalPolicies();
 		var selectedPolicyModels = [];
 		for (var policy in operationalPolicies) {
-			selectedPolicyModels.push(operationalPolicies[policy]["policyModel"]);
+		    var newRow = operationalPolicies[policy]["policyModel"];
+		    newRow.add("policyName", operationalPolicies[policy].name);
+			selectedPolicyModels.push(newRow);
 		}
 
 		PolicyToscaService.getToscaPolicyModels().then(allToscaModels => {
@@ -167,7 +173,7 @@ export default class ModifyLoopModal extends React.Component {
 	}
 
 	handleRemove() {
-		LoopService.removeOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
+		LoopService.removeOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version,this.state.selectedRowData.policyName);
 		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
 		this.handleClose();
 	}
@@ -203,7 +209,7 @@ export default class ModifyLoopModal extends React.Component {
 					<Tab eventKey="remove" title="Remove Operational Policies">
 						<Modal.Body>
 							<MaterialTable
-							title={"Already added Tosca Policy Models"}
+							title={"Tosca Policy Models already added"}
 							data={this.state.selectedPolicyModelsData}
 							columns={this.state.toscaColumns}
 							icons={this.state.tableIcons}
-- 
cgit 1.2.3-korg


From 6e7d04895c9133f772f3d781e84dbfc7b32f2874 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 16 Apr 2020 16:14:45 +0200
Subject: Remove policy from PEF when removing op policy

The operational policy must be removed from the PEF when the user remove an operational policy (at least attempt to purge the PEF)

Issue-ID: CLAMP-824
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I793212adcfb36675c3aae9edbc077f29b14b262e
---
 ui-react/src/components/dialogs/Loop/ModifyLoopModal.js | 2 +-
 ui-react/src/components/dialogs/Policy/PolicyModal.js   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 11e935338..8886dbfdf 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -133,7 +133,7 @@ export default class ModifyLoopModal extends React.Component {
 		var selectedPolicyModels = [];
 		for (var policy in operationalPolicies) {
 		    var newRow = operationalPolicies[policy]["policyModel"];
-		    newRow.add("policyName", operationalPolicies[policy].name);
+		    newRow["policyName"] = operationalPolicies[policy].name;
 			selectedPolicyModels.push(newRow);
 		}
 
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 05db8e14d..5930386c2 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -74,6 +74,10 @@ export default class PolicyModal extends React.Component {
 
 		if (errors.length !== 0) {
 			console.error("Errors detected during policy data validation ", errors);
+			this.setState({
+            		showFailAlert: true,
+            		showMessage: "Errors detected during policy data validation " + errors
+            });
 			return;
 		}
 		else {
-- 
cgit 1.2.3-korg


From df68db271f23561671a59b1678c39b8ee54cd8e4 Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Thu, 16 Apr 2020 17:36:17 +0000
Subject: Minor UI fixes for dialogues and Tosca upload feature

Issue-ID: CLAMP-587
Change-Id: I683b62fbd0b15ab5db18c7e1e941ff8cb58cb0f3
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 ui-react-lib/libIndex.js                           |  6 +++
 .../ConfigurationPolicyModal.js                    |  2 +-
 .../src/components/dialogs/Loop/CreateLoopModal.js | 33 ++++++++----
 .../src/components/dialogs/Loop/DeployLoopModal.js |  2 +-
 .../components/dialogs/Loop/LoopPropertiesModal.js |  2 +-
 .../src/components/dialogs/Loop/ModifyLoopModal.js |  2 +-
 .../src/components/dialogs/Loop/OpenLoopModal.js   | 40 ++++++++++-----
 .../__snapshots__/DeployLoopModal.test.js.snap     |  1 +
 .../__snapshots__/LoopPropertiesModal.test.js.snap |  1 +
 .../Loop/__snapshots__/OpenLoopModal.test.js.snap  | 60 ++++++++++++++++++----
 .../ManageDictionaries/ManageDictionaries.js       |  2 +-
 .../__snapshots__/ManageDictionaries.test.js.snap  |  1 +
 .../OperationalPolicy/OperationalPolicyModal.js    |  2 +-
 .../dialogs/Tosca/UploadToscaPolicyModal.js        |  4 +-
 .../dialogs/Tosca/ViewLoopTemplatesModal.js        | 18 +++++--
 .../dialogs/Tosca/ViewToscaPolicyModal.js          |  2 +-
 .../ViewLoopTemplatesModal.test.js.snap            |  3 +-
 .../ViewToscaPolicyModal.test.js.snap              |  1 +
 ui-react/src/components/loop_viewer/svg/LoopSvg.js | 14 +++--
 .../svg/__snapshots__/LoopSvg.test.js.snap         |  6 +--
 20 files changed, 146 insertions(+), 56 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react-lib/libIndex.js b/ui-react-lib/libIndex.js
index fae47e7fd..da98df43c 100755
--- a/ui-react-lib/libIndex.js
+++ b/ui-react-lib/libIndex.js
@@ -33,13 +33,19 @@ export { default as LoopService } from './src/api/LoopService';
 export { default as LoopStatus } from './src/components/loop_viewer/status/LoopStatus';
 export { default as LoopSvg } from './src/components/loop_viewer/svg/LoopSvg';
 export { default as LoopUI } from './src/LoopUI';
+export { default as ManageDictionaries } from './src/components/dialogs/ManageDictionaries/ManageDictionaries';
 export { default as MenuBar } from './src/components/menu/MenuBar';
+export { default as ModifyLoopModal } from './src/components/dialogs/Loop/ModifyLoopModal';
 export { default as NotFound } from './src/NotFound';
 export { default as OpenLoopModal } from './src/components/dialogs/Loop/OpenLoopModal';
 export { default as CreateLoopModal } from './src/components/dialogs/Loop/CreateLoopModal';
 export { default as OperationalPolicyModal } from './src/components/dialogs/OperationalPolicy/OperationalPolicyModal';
 export { default as PerformActions } from './src/components/dialogs/PerformActions';
+export { default as PolicyToscaService } from './src/api/PolicyToscaService';
 export { default as RefreshStatus } from './src/components/dialogs/RefreshStatus';
+export { default as TemplateService } from './src/api/TemplateService';
 export { default as UserInfoModal } from './src/components/dialogs/UserInfoModal';
 export { default as UserService } from './src/api/UserService';
+export { default as UploadToscaPolicyModal } from './src/components/dialogs/Tosca/UploadToscaPolicyModal';
+export { default as ViewLoopTemplatesModal } from './src/components/dialogs/Tosca/ViewLoopTemplatesModal';
 export { default as ViewToscaPolicyModal } from './src/components/dialogs/Tosca/ViewToscaPolicyModal';
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index da65ac9f1..3ff1ebec7 100644
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -104,7 +104,7 @@ export default class ConfigurationPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Configuration policies</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index 321304a6a..e98b59566 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -34,13 +34,20 @@ import TemplateService from '../../../api/TemplateService';
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-const LoopViewSvgDivStyled = styled.div`
-	overflow: hidden;
+const LoopViewSvgDivStyled = styled.svg`
+	display: flex;
+	flex-direction: row;
+	overflow-x: scroll;
 	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	margin-top: 3em;
 	margin-left: auto;
 	margin-right:auto;
+	margin-bottom: -1em;
 	text-align: center;
+	align-items: center;
+	height: 100%;
+	width: 100%;
 `
 
 export default class CreateLoopModal extends React.Component {
@@ -118,24 +125,28 @@ export default class CreateLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Create Model</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
 					<Form.Group as={Row} controlId="formPlaintextEmail">
-						<Form.Label column sm="2">Template Name</Form.Label>
+						<Form.Label column sm="2">Template Name:</Form.Label>
 						<Col sm="10">
 							<Select onChange={this.handleDropdownListChange} options={this.state.templateNames} />
 						</Col>
 					</Form.Group>
-					<Form.Group controlId="formPlaintextEmail">
-						<LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }} value={this.state.content} >
-						</LoopViewSvgDivStyled>
-					</Form.Group>
-					<Form.Group controlId="formPlaintextEmail">
+                                        <Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
+                                                <Form.Label column sm="2">Model Preview:</Form.Label>
+                                                <Col sm="10">
+                                                        <LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }}
+                                                                value={this.state.content} >
+                                                        </LoopViewSvgDivStyled>
+                                                </Col>
+                                        </Form.Group>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Model Name:</Form.Label>
-						<input type="text" style={{width: '50%'}}
+						<input type="text" style={{width: '50%', marginLeft: '1em' }}
 							value={this.state.modelName}
 							onChange={this.handleModelName}
 						/>
@@ -148,4 +159,4 @@ export default class CreateLoopModal extends React.Component {
 			</ModalStyled>
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
index 853df1c89..2155977f6 100644
--- a/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/DeployLoopModal.js
@@ -161,7 +161,7 @@ export default class DeployLoopModal extends React.Component {
 	}
 	render() {
 		return (
-					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static">
+					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 						<Modal.Header closeButton>
 							<Modal.Title>Deployment parameters</Modal.Title>
 						</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
index 97b782246..c0a2084f5 100644
--- a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
+++ b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
@@ -102,7 +102,7 @@ export default class LoopPropertiesModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static">
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Model Properties</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 8886dbfdf..8c6740564 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -180,7 +180,7 @@ export default class ModifyLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Modify Loop Operational Policies</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index 15a718885..c04883443 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -37,13 +37,20 @@ const ModalStyled = styled(Modal)`
 const CheckBoxStyled = styled(FormCheck.Input)`
 	margin-left:3rem;
 `
-const LoopViewSvgDivStyled = styled.div`
-	overflow: hidden;
+const LoopViewSvgDivStyled = styled.svg`
+	overflow-x: scroll;
+	display: flex;
+	flex-direction: row;
 	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	margin-top: 2em;
 	margin-left: auto;
 	margin-right:auto;
+	margin-bottom: -3em;
 	text-align: center;
+	align-items: center;
+	height: 100%;
+	width: 100%;
 `
 
 export default class OpenLoopModal extends React.Component {
@@ -54,6 +61,7 @@ export default class OpenLoopModal extends React.Component {
 		this.handleOpen = this.handleOpen.bind(this);
 		this.handleClose = this.handleClose.bind(this);
 		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.showReadOnly = props.showReadOnly ? props.showReadOnly : true;
 		this.state = {
 			show: true,
 			chosenLoopName: '',
@@ -101,28 +109,34 @@ export default class OpenLoopModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Open Model</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
 					<Form.Group as={Row} controlId="formPlaintextEmail">
-						<Form.Label column sm="2">Model Name</Form.Label>
+						<Form.Label column sm="2">Model Name:</Form.Label>
 						<Col sm="10">
 							<Select onChange={this.handleDropdownListChange}
 							options={this.state.loopNames} />
 						</Col>
 					</Form.Group>
-					<Form.Group controlId="formPlaintextEmail">
-                         <LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }}   value={this.state.content} >
-                         </LoopViewSvgDivStyled>
-                    </Form.Group>
-					<Form.Group controlId="formBasicChecbox">
-						<Form.Check>
-							<FormCheck.Label>Read Only</FormCheck.Label>
-							<CheckBoxStyled type="checkbox" />
-						</Form.Check>
+					<Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
+						<Form.Label column sm="2">Model Preview:</Form.Label>
+						<Col sm="10">
+                         				<LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }}
+								value={this.state.content} >
+							</LoopViewSvgDivStyled>
+						</Col>
 					</Form.Group>
+					{this.showReadOnly === true ?
+						<Form.Group as={Row} controlId="formBasicChecbox">
+							<Form.Check>
+								<FormCheck.Label>Read Only Mode:</FormCheck.Label>
+								<CheckBoxStyled style={{marginLeft: '3.5em'}} type="checkbox" />
+							</Form.Check>
+						</Form.Group>
+					: null}
 				</Modal.Body>
 				<Modal.Footer>
 					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
index c9acb9e12..8d0faa5f7 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/DeployLoopModal.test.js.snap
@@ -3,6 +3,7 @@
 exports[`Verify DeployLoopModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
   backdrop="static"
+  keyboard={false}
   onHide={[Function]}
   show={true}
   size="lg"
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
index 0fde7a564..233c560ab 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/LoopPropertiesModal.test.js.snap
@@ -3,6 +3,7 @@
 exports[`Verify LoopPropertiesModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
   backdrop="static"
+  keyboard={false}
   onHide={[Function]}
   show={true}
   size="lg"
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
index 1c98195b3..196854446 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
@@ -3,6 +3,7 @@
 exports[`Verify OpenLoopModal Test the render method 1`] = `
 <Styled(Bootstrap(Modal))
   backdrop="static"
+  keyboard={false}
   onHide={[Function]}
   show={true}
   size="xl"
@@ -33,7 +34,7 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
         sm="2"
         srOnly={false}
       >
-        Model Name
+        Model Name:
       </FormLabel>
       <Col
         sm="10"
@@ -48,18 +49,52 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
       </Col>
     </FormGroup>
     <FormGroup
-      controlId="formPlaintextEmail"
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formSvgPreview"
+      style={
+        Object {
+          "alignItems": "center",
+        }
+      }
     >
-      <styled.div
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "",
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+        Model Preview:
+      </FormLabel>
+      <Col
+        sm="10"
+      >
+        <styled.svg
+          dangerouslySetInnerHTML={
+            Object {
+              "__html": "",
+            }
           }
-        }
-        value=""
-      />
+          value=""
+        />
+      </Col>
     </FormGroup>
     <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
       controlId="formBasicChecbox"
     >
       <FormCheck
@@ -71,9 +106,14 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
         type="checkbox"
       >
         <FormCheckLabel>
-          Read Only
+          Read Only Mode:
         </FormCheckLabel>
         <Styled(FormCheckInput)
+          style={
+            Object {
+              "marginLeft": "3.5em",
+            }
+          }
           type="checkbox"
         />
       </FormCheck>
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index d43503647..2af1b7ce4 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -376,7 +376,7 @@ export default class ManageDictionaries extends React.Component {
     
     render() {
         return (
-            <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
+            <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
                 <Modal.Header closeButton>
                     <Modal.Title>Manage Dictionaries</Modal.Title>
                 </Modal.Header>
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
index a73513e47..71cc393b8 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
+++ b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
@@ -3,6 +3,7 @@
 exports[`Verify ManageDictionaries Test API Successful 1`] = `
 <Styled(Bootstrap(Modal))
   backdrop="static"
+  keyboard={false}
   onHide={[Function]}
   show={true}
   size="xl"
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 149639cbc..77dce1656 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -147,7 +147,7 @@ export default class OperationalPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Operational policies</Modal.Title>
 				</Modal.Header>
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
index ec080589f..fa95ca977 100644
--- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
@@ -86,14 +86,14 @@ export default class UploadToscaPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static">
+			<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} backdrop="static"  keyboard={false} >
 				<Modal.Header closeButton>
 					<Modal.Title>Upload Tosca Model</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
 					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Col sm="10">
-						<input style={{display: 'none'}} type="file" name="file" accept=".yaml" onChange={this.fileSelectedHandler}
+						<input style={{display: 'none'}} type="file" name="file" accept=".yaml,.yml" onChange={this.fileSelectedHandler}
 							ref={fileInput => this.fileInput = fileInput}/>
 						<button onClick={() => this.fileInput.click()}>Pick Tosca File</button>
 							<Alert variant="secondary">
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index c5a91ea26..7cf02f711 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -38,16 +38,24 @@ import MaterialTable from "material-table";
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-const LoopViewSvgDivStyled = styled.div`
-	overflow: hidden;
+const LoopViewSvgDivStyled = styled.svg`
+	overflow-x: scroll;
 	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-	margin-left: auto;
+	margin-top: 3em;
+	margin-left: 2em;
 	margin-right:auto;
 	text-align: center;
-	margin-top: 20px;
+	height: 100%;
+	width: 100%;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	
 `
 const SvgContainerDivStyled = styled.div`
+	display: flex;
+	align-items: center;
 	border: 1px solid;
 `
 
@@ -133,7 +141,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
 
 	render() {
     return (
-    		<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
+    		<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static"  keyboard={false}>
     			<Modal.Header closeButton>
     			</Modal.Header>
     			<Modal.Body>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
index 71f371a6d..d49232f2d 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
@@ -139,7 +139,7 @@ export default class ViewToscalPolicyModal extends React.Component {
 
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static">
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false}>
 				<Modal.Header closeButton>
 				</Modal.Header>
 				<Modal.Body>
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
index 2926e066e..3f6dc9482 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
@@ -3,6 +3,7 @@
 exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1`] = `
 <Styled(Bootstrap(Modal))
   backdrop="static"
+  keyboard={false}
   onHide={[Function]}
   show={true}
   size="xl"
@@ -142,7 +143,7 @@ exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1
       title="View Blueprint MicroService Templates"
     />
     <styled.div>
-      <styled.div
+      <styled.svg
         dangerouslySetInnerHTML={
           Object {
             "__html": "Please select a loop template to display it",
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
index babe59749..5f19a9b7d 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewToscaPolicyModal.test.js.snap
@@ -3,6 +3,7 @@
 exports[`Verify ViewToscaPolicyModal Test the tosca model view render method 1`] = `
 <Styled(Bootstrap(Modal))
   backdrop="static"
+  keyboard={false}
   onHide={[Function]}
   show={true}
   size="xl"
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 4bbf608df..048f63044 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -27,14 +27,20 @@ import { withRouter } from "react-router-dom";
 import LoopService from '../../../api/LoopService';
 import LoopComponentConverter from './LoopComponentConverter';
 
-const LoopViewSvgDivStyled = styled.div`
-	overflow: hidden;
+const LoopViewSvgDivStyled = styled.svg`
+	display: flex;
+	flex-direction: row;
+	overflow-x: scroll;
 	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
 	border: 1px solid;
 	border-color: ${props => (props.theme.loopViewerHeaderColor)};
+	margin-top: 1em;
 	margin-left: auto;
 	margin-right:auto;
-	text-align: center;
+	margin-bottom: -3em;
+	align-items: center;
+	height: 100%;
+	width: 100%;
 
 `
 
@@ -101,4 +107,4 @@ class LoopViewSvg extends React.Component {
 	}
 }
 
-export default withRouter(LoopViewSvg);
\ No newline at end of file
+export default withRouter(LoopViewSvg);
diff --git a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
index cecfb425a..e05f1c794 100644
--- a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
+++ b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Verify LoopSvg Test the render method 1`] = `
-<styled.div
+<styled.svg
   dangerouslySetInnerHTML={
     Object {
       "__html": "<svg><text x=\\"20\\" y=\\"40\\">No LOOP (SVG)</text></svg>",
@@ -12,7 +12,7 @@ exports[`Verify LoopSvg Test the render method 1`] = `
 `;
 
 exports[`Verify LoopSvg Test the render method no loopName 1`] = `
-<styled.div
+<styled.svg
   dangerouslySetInnerHTML={
     Object {
       "__html": "<svg><text x=\\"20\\" y=\\"40\\">No LOOP (SVG)</text></svg>",
@@ -23,7 +23,7 @@ exports[`Verify LoopSvg Test the render method no loopName 1`] = `
 `;
 
 exports[`Verify LoopSvg Test the render method svg not empty 1`] = `
-<styled.div
+<styled.svg
   dangerouslySetInnerHTML={
     Object {
       "__html": "<svg><text test</text></svg>",
-- 
cgit 1.2.3-korg


From c65613938d30565d4dc913fbf2d48002390119d3 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 21 Apr 2020 13:39:50 +0200
Subject: Prevent adding same type of Op policy

Add the logic to prevent user adding the same type of Operational Policy


Issue-ID: CLAMP-828
Change-Id: Iec6774ec7a9494740f7aed0873165ba073d73e45
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 src/main/java/org/onap/clamp/loop/LoopService.java |  6 +++++
 ui-react/src/api/LoopService.js                    | 13 +++++------
 .../src/components/dialogs/Loop/ModifyLoopModal.js | 27 ++++++++++++++++++----
 3 files changed, 34 insertions(+), 12 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
index 6658c5a30..d14667ea7 100644
--- a/src/main/java/org/onap/clamp/loop/LoopService.java
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -118,6 +118,12 @@ public class LoopService {
     Loop addOperationalPolicy(String loopName, String policyType, String policyVersion) throws IOException {
         Loop loop = getLoop(loopName);
         PolicyModel policyModel = policyModelsService.getPolicyModel(policyType, policyVersion);
+        Set<OperationalPolicy> opPolicySet = loop.getOperationalPolicies();
+        for (OperationalPolicy opPolicy : opPolicySet) {
+        	if (opPolicy.getPolicyModel().equals(policyModel)) {
+        		throw new IllegalArgumentException("This type of Operational Policy is already added to the loop. Please choose another one.");
+        	}
+        }
         if (policyModel == null) {
             return null;
         }
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 698ee28c2..9d3b36983 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -226,18 +226,17 @@ export default class LoopService {
 			credentials: 'same-origin'
 		})
 				.then(function (response) {
-					console.debug("Add Operational Policy response received: ", response.status);
+				console.debug("Add Operational Policy response received: ", response.status);
 				if (response.ok) {
 					return response.json();
 				} else {
-					console.error("Add Operational Policy query failed");
-					return {};
+					return response.text();
 				}
 			})
-			.catch(function (error) {
-				console.error("Add Operational Policy error received", error);
-				return {};
-			});
+			.then(function (object) {
+				console.error("Add Operational Policy query failed");
+				throw new Error(object);
+			})
 	}
 
 	static removeOperationalPolicyType(loopName, policyType, policyVersion) {
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
index 42c03daca..4c6b6a729 100644
--- a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -37,7 +37,7 @@ import Search from '@material-ui/icons/Search';
 import LoopService from '../../../api/LoopService';
 import Tabs from 'react-bootstrap/Tabs';
 import Tab from 'react-bootstrap/Tab';
-
+import Alert from 'react-bootstrap/Alert';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -65,6 +65,7 @@ export default class ModifyLoopModal extends React.Component {
 		toscaPolicyModelsData: [],
 		selectedPolicyModelsData: [],
 		key: 'add',
+		showFailAlert: false,
 		toscaColumns: [
 			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
 				cellStyle: cellStyle,
@@ -160,10 +161,25 @@ export default class ModifyLoopModal extends React.Component {
 		this.props.history.push('/');
 	}
 
+	renderAlert() {
+		return (
+			<div>
+				<Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
+			</div>
+		);
+	}
+
 	handleAdd() {
-		LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
-		this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-		this.handleClose();
+		LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version)
+		.then(pars => {
+			this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+			this.handleClose();
+		})
+		.catch(error => {
+			this.setState({ showFailAlert: true, showMessage: "Adding failed with error: " + error.message});
+		});
 	}
 
 	handleRemove() {
@@ -192,13 +208,14 @@ export default class ModifyLoopModal extends React.Component {
 								rowStyle: rowData => ({
 									backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.tableData !== undefined
 									&& this.state.selectedRowData.tableData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
-								})
+									})
 							}}
 							/>
 							<div>
 								<TextModal value={this.state.content} onChange={this.handleYamlContent}/>
 							</div>
 						</Modal.Body>
+						{this.renderAlert()}
 					</Tab>
 					<Tab eventKey="remove" title="Remove Operational Policies">
 						<Modal.Body>
-- 
cgit 1.2.3-korg


From c4f54bf8f8520cb270ad3d7f8c91e12a951f138a Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Tue, 21 Apr 2020 18:05:44 +0200
Subject: Guard policy clean up

Remove guard policy related code, so that it will not be shown or
created in the legacy policy UI.

Issue-ID: CLAMP-825
Change-Id: I6c654fef9fd9df810fd48600c91ffef96db371cd
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../loop/components/external/PolicyComponent.java  |   9 +-
 .../policy/operational/OperationalPolicy.java      |  21 ---
 .../resources/clds/camel/rest/clamp-api-v2.xml     |  49 +------
 .../resources/clds/camel/routes/loop-flows.xml     |  26 +---
 .../resources/clds/camel/routes/policy-flows.xml   |  95 -------------
 .../operational_policies/operational_policy.json   | 152 +--------------------
 .../onap/clamp/loop/LoopControllerTestItCase.java  |   2 +-
 .../microservice/OperationalPolicyPayloadTest.java |  26 ----
 .../operational-policy-cds-payload-with-list.json  | 152 +--------------------
 .../tosca/operational-policy-json-schema.json      | 152 +--------------------
 .../tosca/operational-policy-properties.json       |  31 +----
 .../resources/tosca/pdp-group-policy-payload.json  |   4 -
 ui-react/src/api/LoopCache.test.js                 |   5 +-
 ui-react/src/api/LoopCache_mokeLoopJsonCache.json  |   3 +-
 .../OperationalPolicyModal.test.js                 |   1 -
 .../dialogs/OperationalPolicy/template.json        |  15 --
 .../components/dialogs/Policy/PolicyModal.test.js  |   1 -
 .../components/loop_viewer/logs/LoopLogs.test.js   |   6 +-
 .../logs/__snapshots__/LoopLogs.test.js.snap       |   2 +-
 .../src/components/loop_viewer/svg/LoopSvg.test.js |   1 -
 20 files changed, 16 insertions(+), 737 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
index 227f40a72..4ea5b7118 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
@@ -85,13 +85,6 @@ public class PolicyComponent extends ExternalComponent {
             updatePdpGroupMap(opPolicy.getPdpGroup(), opPolicy.getPdpSubgroup(),
                     opPolicy.getName(),
                     "1.0.0", pdpGroupMap);
-            if (opPolicy.isLegacy()) {
-                for (String guardName:opPolicy.createGuardPolicyPayloads().keySet()) {
-                    updatePdpGroupMap(opPolicy.getPdpGroup(), opPolicy.getPdpSubgroup(),
-                            guardName,
-                            "1.0.0", pdpGroupMap);
-                }
-            }
         }
 
         for (MicroServicePolicy msPolicy : loop.getMicroServicePolicies()) {
@@ -186,7 +179,7 @@ public class PolicyComponent extends ExternalComponent {
 
     /**
      * This is a method that expect the results of the queries getPolicy and
-     * getPolicyDeployed for a unique policy (op,guard, config, etc ...). It
+     * getPolicyDeployed for a unique policy (op, config, etc ...). It
      * re-computes the global policy state for each policy results given. Therefore
      * this method is called multiple times from the camel route and must be reset
      * for a new global policy state retrieval. The state to compute the global
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index 1e721ce24..b4020c18e 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -293,25 +293,4 @@ public class OperationalPolicy extends Policy implements Serializable {
             return super.createPolicyPayload();
         }
     }
-
-    /**
-     * Return a map containing all Guard policies indexed by Guard policy Name.
-     *
-     * @return The Guards map
-     */
-    public Map<String, String> createGuardPolicyPayloads() {
-        Map<String, String> result = new HashMap<>();
-
-        if (this.getConfigurationsJson() != null) {
-            JsonElement guardsList = this.getConfigurationsJson().get("guard_policies");
-            if (guardsList != null) {
-                for (JsonElement guardElem : guardsList.getAsJsonArray()) {
-                    result.put(guardElem.getAsJsonObject().get("policy-id").getAsString(),
-                            new GsonBuilder().create().toJson(guardElem));
-                }
-            }
-        }
-        logger.info("Guard policy payload: " + result);
-        return result;
-    }
 }
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 879c9b707..88d582605 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -157,7 +157,7 @@
 					<to
 						uri="bean:org.onap.clamp.loop.LoopController?method=updateOperationalPolicies(${header.loopName},${header.OperationalPoliciesArray})" />
 					<to
-						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational and Guard policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
+						uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Operational policies UPDATED','INFO',${exchangeProperty[loopObject]})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
@@ -532,29 +532,6 @@
 
 						<to uri="direct:delete-policy" />
 						<to uri="direct:create-policy" />
-						<choice>
-							<when>
-								<simple>${exchangeProperty['policy'].isLegacy()} == true
-								</simple>
-								<log loggingLevel="INFO"
-									message="Processing all GUARD policies (LEGACY) defined in loop ${exchangeProperty[loopObject].getName()}" />
-								<split>
-									<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-									</simple>
-									<setProperty propertyName="guardPolicy">
-										<simple>${body}</simple>
-									</setProperty>
-									<log loggingLevel="INFO"
-										message="Processing Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
-
-									<setProperty propertyName="raiseHttpExceptionFlag">
-										<simple resultType="java.lang.Boolean">false</simple>
-									</setProperty>
-									<to uri="direct:delete-guard-policy" />
-									<to uri="direct:create-guard-policy" />
-								</split>
-							</when>
-						</choice>
 					</split>
 
 					<delay>
@@ -634,27 +611,6 @@
 							<simple resultType="java.lang.Boolean">false</simple>
 						</setProperty>
 						<to uri="direct:delete-policy" />
-						<choice>
-							<when>
-								<simple>${exchangeProperty['policy'].isLegacy()} == true
-								</simple>
-								<log loggingLevel="INFO"
-									message="Deleting all GUARD policies (LEGACY) defined in loop ${exchangeProperty[loopObject].getName()}" />
-								<split>
-									<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-									</simple>
-									<setProperty propertyName="guardPolicy">
-										<simple>${body}</simple>
-									</setProperty>
-									<log loggingLevel="INFO"
-										message="Deleting Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" />
-									<setProperty propertyName="raiseHttpExceptionFlag">
-										<simple resultType="java.lang.Boolean">false</simple>
-									</setProperty>
-									<to uri="direct:delete-guard-policy" />
-								</split>
-							</when>
-						</choice>
 					</split>
 					<to
 						uri="bean:org.onap.clamp.loop.LoopController?method=deleteLoop(${header.loopName})" />
@@ -759,8 +715,9 @@
 							<constant>500</constant>
 						</setHeader>
 						<setBody>
-							<simple>ADD Operational policy request FAILED</simple>
+							<simple>ADD Operational policy request FAILED for loop: ${header.loopName}, ${exception.message}"</simple>
 						</setBody>
+						
 					</doCatch>
 				</doTry>
 			</route>
diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml
index 2f4d9c8cf..691656d81 100644
--- a/src/main/resources/clds/camel/routes/loop-flows.xml
+++ b/src/main/resources/clds/camel/routes/loop-flows.xml
@@ -87,32 +87,8 @@
 				<constant>null</constant>
 			</setBody>
 			<log loggingLevel="INFO"
-				message="Processing Micro Service Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
+				message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
 			<to uri="direct:verify-one-policy" />
-			<log loggingLevel="INFO"
-				message="Processing all GUARD policies defined in loop ${exchangeProperty[loopObject].getName()}" />
-			<split>
-				<simple>${exchangeProperty[operationalPolicy].createGuardPolicyPayloads().entrySet()}
-				</simple>
-				<setProperty propertyName="policyName">
-					<simple>${body.getKey()}</simple>
-				</setProperty>
-				<setProperty propertyName="policyType">
-					<simple>onap.policies.controlloop.Guard</simple>
-				</setProperty>
-				<setProperty propertyName="policyTypeVersion">
-					<simple>1.0.0</simple>
-				</setProperty>
-				<setProperty propertyName="policyVersion">
-					<simple>1</simple>
-				</setProperty>
-				<setBody>
-					<constant>null</constant>
-				</setBody>
-				<log loggingLevel="INFO"
-					message="Processing Guard Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
-				<to uri="direct:verify-one-policy" />
-			</split>
 		</split>
 		<setProperty propertyName="policyState">
 			<simple> ${exchangeProperty[policyComponent].getState()}
diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml
index 1731308ee..f597bdc08 100644
--- a/src/main/resources/clds/camel/routes/policy-flows.xml
+++ b/src/main/resources/clds/camel/routes/policy-flows.xml
@@ -313,101 +313,6 @@
             </doFinally>
         </doTry>
     </route>
-    <route id="create-guard-policy">
-        <from uri="direct:create-guard-policy"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Creating Guard Policy: ${exchangeProperty[guardPolicy].getKey()}"/>
-            <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Guard Policy')"/>
-            <setBody>
-                <simple>${exchangeProperty[guardPolicy].getValue()}
-                </simple>
-            </setBody>
-            <setHeader headerName="CamelHttpMethod">
-                <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-                <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader headerName="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader headerName="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to create guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies?bridgeEndpoint=true&amp;useSystemProperties=true&amp;mapHttpMessageHeaders=false&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty propertyName="logMessage">
-                    <simple>${exchangeProperty[guardPolicy].getKey()} creation status
-                    </simple>
-                </setProperty>
-                <setProperty propertyName="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
-    <route id="delete-guard-policy">
-        <from uri="direct:delete-guard-policy"/>
-        <doTry>
-            <log loggingLevel="INFO"
-                 message="Deleting Guard Policy: ${exchangeProperty[guardPolicy].getKey()}"/>
-            <to
-                    uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Guard Policy')"/>
-            <setBody>
-                <constant>null</constant>
-            </setBody>
-            <setHeader headerName="CamelHttpMethod">
-                <constant>DELETE</constant>
-            </setHeader>
-            <setHeader headerName="X-ONAP-RequestID">
-                <simple>${exchangeProperty[X-ONAP-RequestID]}
-                </simple>
-            </setHeader>
-            <setHeader headerName="X-ONAP-InvocationID">
-                <simple>${exchangeProperty[X-ONAP-InvocationID]}
-                </simple>
-            </setHeader>
-            <setHeader headerName="X-ONAP-PartnerName">
-                <simple>${exchangeProperty[X-ONAP-PartnerName]}
-                </simple>
-            </setHeader>
-            <log loggingLevel="INFO"
-                 message="Endpoint to delete guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1"></log>
-            <toD
-                    uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1?bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;deleteWithBody=false&amp;mapHttpMessageBody=false&amp;mapHttpMessageFormUrlEncodedBody=false&amp;authUsername={{clamp.config.policy.api.userName}}&amp;authPassword={{clamp.config.policy.api.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=20000&amp;authenticationPreemptive=true&amp;connectionClose=true"/>
-
-            <doFinally>
-                <to uri="direct:reset-raise-http-exception-flag"/>
-                <to
-                        uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
-                <setProperty propertyName="logMessage">
-                    <simple>${exchangeProperty[guardPolicy].getKey()} removal status
-                    </simple>
-                </setProperty>
-                <setProperty propertyName="logComponent">
-                    <simple>POLICY</simple>
-                </setProperty>
-                <to uri="direct:dump-loop-log-http-response"/>
-            </doFinally>
-        </doTry>
-    </route>
-
     <route id="add-all-to-active-pdp-group">
         <from uri="direct:add-all-to-active-pdp-group"/>
         <doTry>
diff --git a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
index 7214b022c..973028316 100644
--- a/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
+++ b/src/main/resources/clds/json-schema/operational_policies/operational_policy.json
@@ -2,8 +2,7 @@
   "type": "object",
   "title": "Configuration",
   "required": [
-    "operational_policy",
-    "guard_policies"
+    "operational_policy"
   ],
   "properties": {
     "operational_policy": {
@@ -315,155 +314,6 @@
           }
         }
       }
-    },
-    "guard_policies": {
-      "type": "array",
-      "format": "tabs-top",
-      "title": "Associated Guard policies",
-      "items": {
-        "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
-        "anyOf": [
-          {
-            "title": "Guard MinMax",
-            "type": "object",
-            "properties": {
-              "policy-id": {
-                "type": "string",
-                "default": "guard.minmax.new",
-                "pattern": "^(guard.minmax\\..*)$"
-              },
-              "content": {
-                "properties": {
-                  "actor": {
-                    "type": "string",
-                    "enum": [
-                      "APPC",
-                      "SO",
-                      "VFC",
-                      "SDNC",
-                      "SDNR"
-                    ]
-                  },
-                  "recipe": {
-                    "type": "string",
-                    "enum": [
-                      "Restart",
-                      "Rebuild",
-                      "Migrate",
-                      "Health-Check",
-                      "ModifyConfig",
-                      "VF Module Create",
-                      "VF Module Delete",
-                      "Reroute"
-                    ]
-                  },
-                  "targets": {
-                    "type": "string",
-                    "default": ".*"
-                  },
-                  "clname": {
-                    "type": "string",
-                    "template": "{{loopName}}",
-                    "watch": {
-                      "loopName": "operational_policy.controlLoop.controlLoopName"
-                    }
-                  },
-                  "guardActiveStart": {
-                    "type": "string",
-                    "default": "00:00:00Z"
-                  },
-                  "guardActiveEnd": {
-                    "type": "string",
-                    "default": "10:00:00Z"
-                  },
-                  "min": {
-                    "type": "string",
-                    "default": "0"
-                  },
-                  "max": {
-                    "type": "string",
-                    "default": "1"
-                  }
-                }
-              }
-            }
-          },
-          {
-            "title": "Guard Frequency",
-            "type": "object",
-            "properties": {
-              "policy-id": {
-                "type": "string",
-                "default": "guard.frequency.new",
-                "pattern": "^(guard.frequency\\..*)$"
-              },
-              "content": {
-                "properties": {
-                  "actor": {
-                    "type": "string",
-                    "enum": [
-                      "APPC",
-                      "SO",
-                      "VFC",
-                      "SDNC",
-                      "SDNR"
-                    ]
-                  },
-                  "recipe": {
-                    "type": "string",
-                    "enum": [
-                      "Restart",
-                      "Rebuild",
-                      "Migrate",
-                      "Health-Check",
-                      "ModifyConfig",
-                      "VF Module Create",
-                      "VF Module Delete",
-                      "Reroute"
-                    ]
-                  },
-                  "targets": {
-                    "type": "string",
-                    "default": ".*"
-                  },
-                  "clname": {
-                    "type": "string",
-                    "template": "{{loopName}}",
-                    "watch": {
-                      "loopName": "operational_policy.controlLoop.controlLoopName"
-                    }
-                  },
-                  "guardActiveStart": {
-                    "type": "string",
-                    "default": "00:00:00Z"
-                  },
-                  "guardActiveEnd": {
-                    "type": "string",
-                    "default": "10:00:00Z"
-                  },
-                  "limit": {
-                    "type": "string"
-                  },
-                  "timeWindow": {
-                    "type": "string"
-                  },
-                  "timeUnits": {
-                    "type": "string",
-                    "enum": [
-                      "minute",
-                      "hour",
-                      "day",
-                      "week",
-                      "month",
-                      "year"
-                    ]
-                  }
-                }
-              }
-            }
-          }
-        ]
-      }
     }
   }
 }
diff --git a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
index 4d51bb27c..26db6b013 100644
--- a/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopControllerTestItCase.java
@@ -94,7 +94,7 @@ public class LoopControllerTestItCase {
     public void testUpdateOperationalPolicies() {
         saveTestLoopToDb();
         String policy = "[{\"name\":\"OPERATIONAL_CLholmes31_v1_0_vFW_PG_T10_k8s-holmes-rules\","
-                + "\"configurationsJson\":{\"guard_policies\":{},"
+                + "\"configurationsJson\":{"
                 + "\"operational_policy\":{\"controlLoop\":{\"trigger_policy\":\"unique-policy-id-1-modifyConfig\","
                 + "\"timeout\":\"3600\",\"abatement\":\"false\","
                 + "\"controlLoopName\":\"LOOP_CLholmes31_v1_0_vFW_PG_T10_k8s-holmes-rules\"},"
diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
index 58a432d34..cef82e501 100644
--- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
+++ b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java
@@ -59,30 +59,4 @@ public class OperationalPolicyPayloadTest {
         assertThat(LegacyOperationalPolicy.createPolicyPayloadYamlLegacy(jsonConfig.get("operational_policy")))
                 .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload-legacy.yaml"));
     }
-
-    @Test
-    public void testGuardPolicyEmptyPayloadConstruction() throws IOException {
-        JsonObject jsonConfig = new GsonBuilder().create().fromJson(
-                ResourceFileUtil.getResourceAsString("tosca/operational-policy-no-guard-properties.json"),
-                JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", jsonConfig, null, null, null, null, null);
-        Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
-        assertThat(guardsMap).isEmpty();
-        assertThat(guardsMap.entrySet()).isEmpty();
-    }
-
-    @Test
-    public void testGuardPolicyPayloadConstruction() throws IOException {
-        JsonObject jsonConfig = new GsonBuilder().create().fromJson(
-                ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class);
-        OperationalPolicy policy = new OperationalPolicy("testPolicy", jsonConfig, null, null, null, null, null);
-
-        Map<String, String> guardsMap = policy.createGuardPolicyPayloads();
-
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/guard1-policy-payload.json"),
-                guardsMap.get("guard.minmax.new"), false);
-
-        JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/guard2-policy-payload.json"),
-                guardsMap.get("guard.frequency.new"), false);
-    }
 }
diff --git a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json b/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
index 13b468ea0..d9b5aee93 100644
--- a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
+++ b/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
@@ -2,8 +2,7 @@
   "type": "object",
   "title": "Configuration",
   "required": [
-    "operational_policy",
-    "guard_policies"
+    "operational_policy"
   ],
   "properties": {
     "operational_policy": {
@@ -582,155 +581,6 @@
           }
         }
       }
-    },
-    "guard_policies": {
-      "type": "array",
-      "format": "tabs-top",
-      "title": "Associated Guard policies",
-      "items": {
-        "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
-        "anyOf": [
-          {
-            "title": "Guard MinMax",
-            "type": "object",
-            "properties": {
-              "policy-id": {
-                "type": "string",
-                "default": "guard.minmax.new",
-                "pattern": "^(guard.minmax\\..*)$"
-              },
-              "content": {
-                "properties": {
-                  "actor": {
-                    "type": "string",
-                    "enum": [
-                      "APPC",
-                      "SO",
-                      "VFC",
-                      "SDNC",
-                      "SDNR"
-                    ]
-                  },
-                  "recipe": {
-                    "type": "string",
-                    "enum": [
-                      "Restart",
-                      "Rebuild",
-                      "Migrate",
-                      "Health-Check",
-                      "ModifyConfig",
-                      "VF Module Create",
-                      "VF Module Delete",
-                      "Reroute"
-                    ]
-                  },
-                  "targets": {
-                    "type": "string",
-                    "default": ".*"
-                  },
-                  "clname": {
-                    "type": "string",
-                    "template": "{{loopName}}",
-                    "watch": {
-                      "loopName": "operational_policy.controlLoop.controlLoopName"
-                    }
-                  },
-                  "guardActiveStart": {
-                    "type": "string",
-                    "default": "00:00:00Z"
-                  },
-                  "guardActiveEnd": {
-                    "type": "string",
-                    "default": "10:00:00Z"
-                  },
-                  "min": {
-                    "type": "string",
-                    "default": "0"
-                  },
-                  "max": {
-                    "type": "string",
-                    "default": "1"
-                  }
-                }
-              }
-            }
-          },
-          {
-            "title": "Guard Frequency",
-            "type": "object",
-            "properties": {
-              "policy-id": {
-                "type": "string",
-                "default": "guard.frequency.new",
-                "pattern": "^(guard.frequency\\..*)$"
-              },
-              "content": {
-                "properties": {
-                  "actor": {
-                    "type": "string",
-                    "enum": [
-                      "APPC",
-                      "SO",
-                      "VFC",
-                      "SDNC",
-                      "SDNR"
-                    ]
-                  },
-                  "recipe": {
-                    "type": "string",
-                    "enum": [
-                      "Restart",
-                      "Rebuild",
-                      "Migrate",
-                      "Health-Check",
-                      "ModifyConfig",
-                      "VF Module Create",
-                      "VF Module Delete",
-                      "Reroute"
-                    ]
-                  },
-                  "targets": {
-                    "type": "string",
-                    "default": ".*"
-                  },
-                  "clname": {
-                    "type": "string",
-                    "template": "{{loopName}}",
-                    "watch": {
-                      "loopName": "operational_policy.controlLoop.controlLoopName"
-                    }
-                  },
-                  "guardActiveStart": {
-                    "type": "string",
-                    "default": "00:00:00Z"
-                  },
-                  "guardActiveEnd": {
-                    "type": "string",
-                    "default": "10:00:00Z"
-                  },
-                  "limit": {
-                    "type": "string"
-                  },
-                  "timeWindow": {
-                    "type": "string"
-                  },
-                  "timeUnits": {
-                    "type": "string",
-                    "enum": [
-                      "minute",
-                      "hour",
-                      "day",
-                      "week",
-                      "month",
-                      "year"
-                    ]
-                  }
-                }
-              }
-            }
-          }
-        ]
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
index 9dee089e0..081e0f25a 100644
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ b/src/test/resources/tosca/operational-policy-json-schema.json
@@ -2,8 +2,7 @@
   "type": "object",
   "title": "Configuration",
   "required": [
-    "operational_policy",
-    "guard_policies"
+    "operational_policy"
   ],
   "properties": {
     "operational_policy": {
@@ -940,155 +939,6 @@
           }
         }
       }
-    },
-    "guard_policies": {
-      "type": "array",
-      "format": "tabs-top",
-      "title": "Associated Guard policies",
-      "items": {
-        "headerTemplate": "{{self.policy-id}} - {{self.content.recipe}}",
-        "anyOf": [
-          {
-            "title": "Guard MinMax",
-            "type": "object",
-            "properties": {
-              "policy-id": {
-                "type": "string",
-                "default": "guard.minmax.new",
-                "pattern": "^(guard.minmax\\..*)$"
-              },
-              "content": {
-                "properties": {
-                  "actor": {
-                    "type": "string",
-                    "enum": [
-                      "APPC",
-                      "SO",
-                      "VFC",
-                      "SDNC",
-                      "SDNR"
-                    ]
-                  },
-                  "recipe": {
-                    "type": "string",
-                    "enum": [
-                      "Restart",
-                      "Rebuild",
-                      "Migrate",
-                      "Health-Check",
-                      "ModifyConfig",
-                      "VF Module Create",
-                      "VF Module Delete",
-                      "Reroute"
-                    ]
-                  },
-                  "targets": {
-                    "type": "string",
-                    "default": ".*"
-                  },
-                  "clname": {
-                    "type": "string",
-                    "template": "{{loopName}}",
-                    "watch": {
-                      "loopName": "operational_policy.controlLoop.controlLoopName"
-                    }
-                  },
-                  "guardActiveStart": {
-                    "type": "string",
-                    "default": "00:00:00Z"
-                  },
-                  "guardActiveEnd": {
-                    "type": "string",
-                    "default": "10:00:00Z"
-                  },
-                  "min": {
-                    "type": "string",
-                    "default": "0"
-                  },
-                  "max": {
-                    "type": "string",
-                    "default": "1"
-                  }
-                }
-              }
-            }
-          },
-          {
-            "title": "Guard Frequency",
-            "type": "object",
-            "properties": {
-              "policy-id": {
-                "type": "string",
-                "default": "guard.frequency.new",
-                "pattern": "^(guard.frequency\\..*)$"
-              },
-              "content": {
-                "properties": {
-                  "actor": {
-                    "type": "string",
-                    "enum": [
-                      "APPC",
-                      "SO",
-                      "VFC",
-                      "SDNC",
-                      "SDNR"
-                    ]
-                  },
-                  "recipe": {
-                    "type": "string",
-                    "enum": [
-                      "Restart",
-                      "Rebuild",
-                      "Migrate",
-                      "Health-Check",
-                      "ModifyConfig",
-                      "VF Module Create",
-                      "VF Module Delete",
-                      "Reroute"
-                    ]
-                  },
-                  "targets": {
-                    "type": "string",
-                    "default": ".*"
-                  },
-                  "clname": {
-                    "type": "string",
-                    "template": "{{loopName}}",
-                    "watch": {
-                      "loopName": "operational_policy.controlLoop.controlLoopName"
-                    }
-                  },
-                  "guardActiveStart": {
-                    "type": "string",
-                    "default": "00:00:00Z"
-                  },
-                  "guardActiveEnd": {
-                    "type": "string",
-                    "default": "10:00:00Z"
-                  },
-                  "limit": {
-                    "type": "string"
-                  },
-                  "timeWindow": {
-                    "type": "string"
-                  },
-                  "timeUnits": {
-                    "type": "string",
-                    "enum": [
-                      "minute",
-                      "hour",
-                      "day",
-                      "week",
-                      "month",
-                      "year"
-                    ]
-                  }
-                }
-              }
-            }
-          }
-        ]
-      }
     }
   }
 }
diff --git a/src/test/resources/tosca/operational-policy-properties.json b/src/test/resources/tosca/operational-policy-properties.json
index aaf9dc378..a38334b55 100644
--- a/src/test/resources/tosca/operational-policy-properties.json
+++ b/src/test/resources/tosca/operational-policy-properties.json
@@ -128,34 +128,5 @@
         }
       }
     ]
-  },
-  "guard_policies": [
-    {
-      "policy-id": "guard.minmax.new",
-      "content": {
-        "actor": "APPC",
-        "recipe": "Restart",
-        "targets": ".*",
-        "clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
-        "guardActiveStart": "00:00:00Z",
-        "guardActiveEnd": "10:00:00Z",
-        "min": "0",
-        "max": "1"
-      }
-    },
-    {
-      "policy-id": "guard.frequency.new",
-      "content": {
-        "actor": "APPC",
-        "recipe": "Rebuild",
-        "targets": ".*",
-        "clname": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca",
-        "guardActiveStart": "00:00:00Z",
-        "guardActiveEnd": "10:00:00Z",
-        "limit": "1",
-        "timeWindow": "2",
-        "timeUnits": "minute"
-      }
-    }
-  ]
+  }
 }
diff --git a/src/test/resources/tosca/pdp-group-policy-payload.json b/src/test/resources/tosca/pdp-group-policy-payload.json
index dce740fcd..17535ecbb 100644
--- a/src/test/resources/tosca/pdp-group-policy-payload.json
+++ b/src/test/resources/tosca/pdp-group-policy-payload.json
@@ -26,10 +26,6 @@
               "name": "opLegacyPolicy",
               "version": "1.0.0"
             },
-            {
-              "name": "guard1",
-              "version": "1.0.0"
-            },
             {
               "name": "opPolicy",
               "version": "1.0.0"
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index 4642ff52f..b0eef755c 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -34,7 +34,6 @@ describe('Verify LoopCache functions', () => {
       const opPolicy = [{
         "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
         "configurationsJson": {
-          "guard_policies": {},
           "operational_policy": {
             "controlLoop": {},
             "policies": []
@@ -51,7 +50,6 @@ describe('Verify LoopCache functions', () => {
       const opPolicy = [{
         "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
         "configurationsJson": {
-          "guard_policies": {},
           "operational_policy": {
             "controlLoop": {},
             "policies": []
@@ -157,7 +155,7 @@ describe('Verify LoopCache functions', () => {
           "id": 1,
           "logType": "INFO",
           "logComponent": "CLAMP",
-          "message": "Operational and Guard policies UPDATED",
+          "message": "Operational policies UPDATED",
           "logInstant": "2019-07-08T09:44:37Z"
         }
       ];
@@ -196,7 +194,6 @@ describe('Verify LoopCache functions', () => {
 
     it('updateOperationalPolicyProperties', () => {
       const newOpPolicy = {
-          "guard_policies": {},
           "operational_policy": {
             "controlLoop": {},
             "policies": []
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index 23ea354ea..788306b8e 100644
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -88,7 +88,6 @@
     {
       "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
       "configurationsJson": {
-        "guard_policies": {},
         "operational_policy": {
           "controlLoop": {},
           "policies": []
@@ -113,7 +112,7 @@
       "id": 1,
       "logType": "INFO",
       "logComponent": "CLAMP",
-      "message": "Operational and Guard policies UPDATED",
+      "message": "Operational policies UPDATED",
       "logInstant": "2019-07-08T09:44:37Z"
     }
   ]
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
index c10c6ff0a..4c11ce535 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
@@ -41,7 +41,6 @@ describe('Verify OperationalPolicyModal', () => {
             "operationalPolicies": [{
                 "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
                 "configurationsJson": {
-                    "guard_policies": {},
                     "operational_policy": {
                         "controlLoop": {},
                         "policies": []
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/template.json b/ui-react/src/components/dialogs/OperationalPolicy/template.json
index 6b4477f88..7c9dc0cdd 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/template.json
+++ b/ui-react/src/components/dialogs/OperationalPolicy/template.json
@@ -3,21 +3,6 @@
 		{
 			"name": "OPERATIONAL_LOOP_NAME",
 			"configurationsJson": {
-				"guard_policies": {
-					"guard.minmax.new": {
-						"recipe": "",
-						"clname": "LOOP_NAME",
-						"actor": "",
-						"targets": "",
-						"min": "",
-						"max": "",
-						"limit": "",
-						"timeUnits": "",
-						"timeWindow": "",
-						"guardActiveStart": "00:00:00Z",
-						"guardActiveEnd": "00:00:01Z"
-					}
-				},
 				"operational_policy": {
 					"controlLoop": {
 						"trigger_policy": "new",
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
index bf0b91096..d4021c97c 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
@@ -42,7 +42,6 @@ describe('Verify PolicyModal', () => {
             "operationalPolicies": [{
                 "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
                 "configurationsJson": {
-                    "guard_policies": {},
                     "operational_policy": {
                         "controlLoop": {},
                         "policies": []
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
index 5c478f6a5..3b7fd413a 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
@@ -34,7 +34,7 @@ describe('Verify LoopLogs', () => {
 				"id": 1,
 				"logType": "INFO",
 				"logComponent": "CLAMP",
-				"message": "Operational and Guard policies UPDATED",
+				"message": "Operational policies UPDATED",
 				"logInstant": "2019-07-08T09:44:37Z"
 			}
 		]
@@ -51,14 +51,14 @@ describe('Verify LoopLogs', () => {
 				"id": 1,
 				"logType": "INFO",
 				"logComponent": "CLAMP",
-				"message": "Operational and Guard policies UPDATED",
+				"message": "Operational policies UPDATED",
 				"logInstant": "2019-07-08T09:44:37Z"
 			},
 			{
 				"id": 2,
 				"logType": "INFO",
 				"logComponent": "CLAMP",
-				"message": "Operational and Guard policies UPDATED",
+				"message": "Operational policies UPDATED",
 				"logInstant": "2019-07-08T09:44:50Z"
 			}
 			]
diff --git a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
index 174a3202b..25736d2e9 100644
--- a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
+++ b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
@@ -51,7 +51,7 @@ exports[`Verify LoopLogs Test the render method 1`] = `
             "logComponent": "CLAMP",
             "logInstant": "2019-07-08T09:44:37Z",
             "logType": "INFO",
-            "message": "Operational and Guard policies UPDATED",
+            "message": "Operational policies UPDATED",
           }
         }
       />
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
index 17f4b3563..e54b500f5 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
@@ -39,7 +39,6 @@ describe('Verify LoopSvg', () => {
         "operationalPolicies": [{
             "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
             "configurationsJson": {
-                "guard_policies": {},
                 "operational_policy": {
                     "controlLoop": {},
                     "policies": []
-- 
cgit 1.2.3-korg


From f1692af8bcc02c6a7335078160463025b85eba68 Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 22 Apr 2020 13:54:24 +0200
Subject: Remove bugs and vulnerabilities

Remove bugs and vulnerabilities based on the sonar report

Issue-ID: CLAMP-841
Change-Id: I49d0eeeedf69a0cbe3adf49cf115ab25aec7adfd
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../onap/clamp/loop/template/LoopElementModel.java |  4 +-
 .../OperationalPolicyRepresentationBuilder.java    | 98 ++++++++++++----------
 .../ManageDictionaries/ManageDictionaries.js       | 14 ++--
 3 files changed, 62 insertions(+), 54 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
index 4a46a9544..35fdf43cd 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
@@ -75,8 +75,8 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     @Column(columnDefinition = "MEDIUMTEXT", name = "blueprint_yaml")
     private String blueprint;
 
-    public static String MICRO_SERVICE_TYPE = "MICRO_SERVICE_TYPE";
-    public static String OPERATIONAL_POLICY_TYPE = "OPERATIONAL_POLICY_TYPE";
+    public static final String MICRO_SERVICE_TYPE = "MICRO_SERVICE_TYPE";
+    public static final String OPERATIONAL_POLICY_TYPE = "OPERATIONAL_POLICY_TYPE";
     /**
      * The type of element.
      */
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
index 57d13ef17..674db2295 100644
--- a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepresentationBuilder.java
@@ -45,9 +45,19 @@ public class OperationalPolicyRepresentationBuilder {
             EELFManager.getInstance().getLogger(OperationalPolicyRepresentationBuilder.class);
 
     public static final String PROPERTIES = "properties";
+    public static final String ITEMS = "items";
+    public static final String ANY_OF = "anyOf";
+    public static final String TITLE = "title";
+    public static final String RECIPE = "recipe";
+    public static final String DEFAULT = "default";
+    public static final String STRING = "string";
     public static final String TYPE = "type";
     public static final String TYPE_LIST = "list";
 
+    private OperationalPolicyRepresentationBuilder() {
+    	throw new IllegalStateException("This is Utility class, not supposed to be initiated.");
+    }
+
     /**
      * This method generates the operational policy json representation that will be
      * used by ui for rendering. It uses the model (VF and VFModule) defined in the
@@ -65,21 +75,21 @@ public class OperationalPolicyRepresentationBuilder {
                     ResourceFileUtil
                             .getResourceAsString("clds/json-schema/operational_policies/operational_policy.json"),
                     JsonObject.class);
-            jsonSchema.get("properties").getAsJsonObject()
-                    .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
-                    .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("target")
-                    .getAsJsonObject().get("anyOf").getAsJsonArray().addAll(createAnyOfArray(modelJson, true));
+            jsonSchema.get(PROPERTIES).getAsJsonObject()
+                    .get("operational_policy").getAsJsonObject().get(PROPERTIES).getAsJsonObject().get("policies")
+                    .getAsJsonObject().get(ITEMS).getAsJsonObject().get(PROPERTIES).getAsJsonObject().get("target")
+                    .getAsJsonObject().get(ANY_OF).getAsJsonArray().addAll(createAnyOfArray(modelJson, true));
 
             // update CDS recipe and payload information to schema
-            JsonArray actors = jsonSchema.get("properties").getAsJsonObject()
-                    .get("operational_policy").getAsJsonObject().get("properties").getAsJsonObject().get("policies")
-                    .getAsJsonObject().get("items").getAsJsonObject().get("properties").getAsJsonObject().get("actor")
-                    .getAsJsonObject().get("anyOf").getAsJsonArray();
+            JsonArray actors = jsonSchema.get(PROPERTIES).getAsJsonObject()
+                    .get("operational_policy").getAsJsonObject().get(PROPERTIES).getAsJsonObject().get("policies")
+                    .getAsJsonObject().get(ITEMS).getAsJsonObject().get(PROPERTIES).getAsJsonObject().get("actor")
+                    .getAsJsonObject().get(ANY_OF).getAsJsonArray();
 
             for (JsonElement actor : actors) {
-                if ("CDS".equalsIgnoreCase(actor.getAsJsonObject().get("title").getAsString())) {
-                    actor.getAsJsonObject().get("properties").getAsJsonObject().get("recipe").getAsJsonObject()
-                            .get("anyOf").getAsJsonArray()
+                if ("CDS".equalsIgnoreCase(actor.getAsJsonObject().get(TITLE).getAsString())) {
+                    actor.getAsJsonObject().get(PROPERTIES).getAsJsonObject().get(RECIPE).getAsJsonObject()
+                            .get(ANY_OF).getAsJsonArray()
                             .addAll(createAnyOfArrayForCdsRecipe(modelJson));
                 }
             }
@@ -93,9 +103,9 @@ public class OperationalPolicyRepresentationBuilder {
     private static JsonObject createSchemaProperty(String title, String type, String defaultValue, String readOnlyFlag,
                                                    String[] enumArray) {
         JsonObject property = new JsonObject();
-        property.addProperty("title", title);
-        property.addProperty("type", type);
-        property.addProperty("default", defaultValue);
+        property.addProperty(TITLE, title);
+        property.addProperty(TYPE, type);
+        property.addProperty(DEFAULT, defaultValue);
         property.addProperty("readOnly", readOnlyFlag);
 
         if (enumArray != null) {
@@ -114,15 +124,15 @@ public class OperationalPolicyRepresentationBuilder {
 
         for (Entry<String, JsonElement> entry : modelVnfs.entrySet()) {
             JsonObject vnfOneOfSchema = new JsonObject();
-            vnfOneOfSchema.addProperty("title", "VNF" + "-" + entry.getKey());
+            vnfOneOfSchema.addProperty(TITLE, "VNF" + "-" + entry.getKey());
             JsonObject properties = new JsonObject();
             if (generateType) {
-                properties.add("type", createSchemaProperty("Type", "string", "VNF", "True", null));
+                properties.add(TYPE, createSchemaProperty("Type", STRING, "VNF", "True", null));
             }
-            properties.add("resourceID", createSchemaProperty("Resource ID", "string",
+            properties.add("resourceID", createSchemaProperty("Resource ID", STRING,
                     modelVnfs.get(entry.getKey()).getAsJsonObject().get("name").getAsString(), "True", null));
 
-            vnfOneOfSchema.add("properties", properties);
+            vnfOneOfSchema.add(PROPERTIES, properties);
             vnfSchemaArray.add(vnfOneOfSchema);
         }
         return vnfSchemaArray;
@@ -134,39 +144,39 @@ public class OperationalPolicyRepresentationBuilder {
 
         for (Entry<String, JsonElement> entry : modelVfModules.entrySet()) {
             JsonObject vfModuleOneOfSchema = new JsonObject();
-            vfModuleOneOfSchema.addProperty("title", "VFMODULE" + "-" + entry.getKey());
+            vfModuleOneOfSchema.addProperty(TITLE, "VFMODULE" + "-" + entry.getKey());
             JsonObject properties = new JsonObject();
             if (generateType) {
-                properties.add("type", createSchemaProperty("Type", "string", "VFMODULE", "True", null));
+                properties.add(TYPE, createSchemaProperty("Type", STRING, "VFMODULE", "True", null));
             }
             properties.add("resourceID",
-                    createSchemaProperty("Resource ID", "string",
+                    createSchemaProperty("Resource ID", STRING,
                             modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelName").getAsString(),
                             "True", null));
             properties.add("modelInvariantId",
-                    createSchemaProperty("Model Invariant Id (ModelInvariantUUID)", "string",
+                    createSchemaProperty("Model Invariant Id (ModelInvariantUUID)", STRING,
                             modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelInvariantUUID")
                                     .getAsString(),
                             "True", null));
             properties.add("modelVersionId",
-                    createSchemaProperty("Model Version Id (ModelUUID)", "string",
+                    createSchemaProperty("Model Version Id (ModelUUID)", STRING,
                             modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelUUID").getAsString(),
                             "True", null));
             properties.add("modelName",
-                    createSchemaProperty("Model Name", "string",
+                    createSchemaProperty("Model Name", STRING,
                             modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelName").getAsString(),
                             "True", null));
-            properties.add("modelVersion", createSchemaProperty("Model Version", "string",
+            properties.add("modelVersion", createSchemaProperty("Model Version", STRING,
                     modelVfModules.get(entry.getKey()).getAsJsonObject().get("vfModuleModelVersion").getAsString(),
                     "True", null));
             properties
                     .add("modelCustomizationId",
-                            createSchemaProperty("Customization ID", "string",
+                            createSchemaProperty("Customization ID", STRING,
                                     modelVfModules.get(entry.getKey()).getAsJsonObject()
                                             .get("vfModuleModelCustomizationUUID").getAsString(), "True",
                                     null));
 
-            vfModuleOneOfSchema.add("properties", properties);
+            vfModuleOneOfSchema.add(PROPERTIES, properties);
             vfModuleOneOfSchemaArray.add(vfModuleOneOfSchema);
         }
         return vfModuleOneOfSchemaArray;
@@ -202,9 +212,9 @@ public class OperationalPolicyRepresentationBuilder {
                 JsonObject workflows = controllerProperties.getAsJsonObject("workflows");
                 for (Entry<String, JsonElement> workflowsEntry : workflows.entrySet()) {
                     JsonObject obj = new JsonObject();
-                    obj.addProperty("title", workflowsEntry.getKey());
-                    obj.addProperty("type", "object");
-                    obj.add("properties", createPayloadProperty(workflowsEntry.getValue().getAsJsonObject(),
+                    obj.addProperty(TITLE, workflowsEntry.getKey());
+                    obj.addProperty(TYPE, "object");
+                    obj.add(PROPERTIES, createPayloadProperty(workflowsEntry.getValue().getAsJsonObject(),
                             controllerProperties, workflowsEntry.getKey()));
                     schemaArray.add(obj);
                 }
@@ -217,21 +227,21 @@ public class OperationalPolicyRepresentationBuilder {
     private static JsonObject createPayloadProperty(JsonObject workFlow,
                                                     JsonObject controllerProperties, String workFlowName) {
         JsonObject payload = new JsonObject();
-        payload.addProperty("title", "Payload");
-        payload.addProperty("type", "object");
-        payload.add("properties", createInputPropertiesForPayload(workFlow,
+        payload.addProperty(TITLE, "Payload");
+        payload.addProperty(TYPE, "object");
+        payload.add(PROPERTIES, createInputPropertiesForPayload(workFlow,
                                                                   controllerProperties));
         JsonObject properties = new JsonObject();
-        properties.add("recipe", createRecipeForCdsWorkflow(workFlowName));
+        properties.add(RECIPE, createRecipeForCdsWorkflow(workFlowName));
         properties.add("payload", payload);
         return properties;
     }
 
     private static JsonObject createRecipeForCdsWorkflow(String workflow) {
         JsonObject recipe = new JsonObject();
-        recipe.addProperty("title", "recipe");
-        recipe.addProperty("type", "string");
-        recipe.addProperty("default", workflow);
+        recipe.addProperty(TITLE, RECIPE);
+        recipe.addProperty(TYPE, STRING);
+        recipe.addProperty(DEFAULT, workflow);
         JsonObject options = new JsonObject();
         options.addProperty("hidden", true);
         recipe.add("options", options);
@@ -253,18 +263,18 @@ public class OperationalPolicyRepresentationBuilder {
         JsonObject inputs = workFlow.getAsJsonObject("inputs");
         JsonObject jsonObject = new JsonObject();
         jsonObject.add("artifact_name", createSchemaProperty(
-                "artifact name", "string", artifactName, "True", null));
+                "artifact name", STRING, artifactName, "True", null));
         jsonObject.add("artifact_version", createSchemaProperty(
-                "artifact version", "string", artifactVersion, "True", null));
+                "artifact version", STRING, artifactVersion, "True", null));
         jsonObject.add("mode", createCdsInputProperty(
-                "mode", "string", "async" ,null));
+                "mode", STRING, "async" ,null));
         jsonObject.add("data", createDataProperty(inputs));
         return jsonObject;
     }
 
     private static JsonObject createDataProperty(JsonObject inputs) {
         JsonObject data = new JsonObject();
-        data.addProperty("title", "data");
+        data.addProperty(TITLE, "data");
         JsonObject dataObj = new JsonObject();
         addDataFields(inputs, dataObj);
         data.add(PROPERTIES, dataObj);
@@ -294,7 +304,7 @@ public class OperationalPolicyRepresentationBuilder {
                                                      String defaultValue,
                                                      JsonObject cdsProperty) {
         JsonObject property = new JsonObject();
-        property.addProperty("title", title);
+        property.addProperty(TITLE, title);
 
         if (TYPE_LIST.equalsIgnoreCase(type)) {
             property.addProperty(TYPE, "array");
@@ -304,14 +314,14 @@ public class OperationalPolicyRepresentationBuilder {
                               dataObject);
                 JsonObject listProperties = new JsonObject();
                 listProperties.add(PROPERTIES, dataObject);
-                property.add("items", listProperties);
+                property.add(ITEMS, listProperties);
             }
         } else {
             property.addProperty(TYPE, type);
         }
 
         if (defaultValue != null) {
-            property.addProperty("default", defaultValue);
+            property.addProperty(DEFAULT, defaultValue);
         }
         return property;
     }
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 2af1b7ce4..538688dac 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -21,7 +21,7 @@
  */
 
 
-import React from 'react';
+import React, { forwardRef } from 'react';
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
 import styled from 'styled-components';
@@ -30,7 +30,6 @@ import MaterialTable, {MTableToolbar} from "material-table";
 import IconButton from '@material-ui/core/IconButton';
 import Tooltip from '@material-ui/core/Tooltip';
 import Grid from '@material-ui/core/Grid';
-import { forwardRef }  from 'react';
 import AddBox from '@material-ui/icons/AddBox';
 import ArrowUpward from '@material-ui/icons/ArrowUpward';
 import Check from '@material-ui/icons/Check';
@@ -204,7 +203,7 @@ export default class ManageDictionaries extends React.Component {
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
 				 },
-				 {  
+				 {
 				    title: "Sub-Dictionary", field: "subDictionary",
 				      editComponent: props => (
 						 <div>
@@ -214,7 +213,7 @@ export default class ManageDictionaries extends React.Component {
 				    cellStyle: cellStyle,
 				    headerStyle: headerStyle
 				 },
-				{     
+				{   
 					title: "Updated By", field: "updatedBy", editable: 'never',
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
@@ -294,7 +293,7 @@ export default class ManageDictionaries extends React.Component {
         var dictionaryElements = [];
         if (event.target.files[0].type === 'text/csv' ) {
             if (event.target.files && event.target.files[0]) {
-                let reader = new FileReader();
+                const reader = new FileReader();
                 reader.onload = function(e) {
                     var dictElems = reader.result.split('\n');
                     var jsonObj = [];
@@ -312,7 +311,6 @@ export default class ManageDictionaries extends React.Component {
                     const mandatoryKeys = [ 'Element Short Name', 'Element Name', 'Element Type' ];
                     const validTypes = ['string','number','datetime','json','map'];
                     if (!dictElems){
-                        
                         text.setState({validData: false});
                     } else if (headers.length !== dictKeys.length){
                         text.setState({validImport: false});
@@ -373,7 +371,7 @@ export default class ManageDictionaries extends React.Component {
         }
 
     }
-    
+   
     render() {
         return (
             <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
@@ -440,7 +438,7 @@ export default class ManageDictionaries extends React.Component {
                 new Promise((resolve, reject) => {
                                 setTimeout(() => {
                                     {
-                                        let data = this.state.dictionaryNames;
+                                        const data = this.state.dictionaryNames;
                     const index = data.indexOf(oldData);
                     data.splice(index, 1);
                     this.setState({ data }, () => resolve());
-- 
cgit 1.2.3-korg


From 614956d2662db39e4daf99da1b8302001bd2d8c2 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 22 Apr 2020 23:10:54 +0200
Subject: Fix bug when adding op policy

The fix to prevent multiple op policy modle to be inserted introduced another bug, this pr fixes it

Issue-ID: CLAMP-828
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I90432688df48cbf2b456efae5e4191e2909077cc
---
 ui-react/src/api/LoopService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 3b9ed86fa..8f9805e33 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -233,9 +233,9 @@ export default class LoopService {
 					return response.text();
 				}
 			})
-			.then(function (object) {
+			.catch(function (error) {
 				console.error("Add Operational Policy query failed");
-				throw new Error(object);
+				throw new Error(error);
 			})
 	}
 
-- 
cgit 1.2.3-korg


From e7c9326c63077634c5aa68940f5c24677177c9d6 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Thu, 23 Apr 2020 15:17:59 +0200
Subject: Fix bugs reported by sonar

Fix bugs reported by sonar as critical, major, ...

Issue-ID: CLAMP-841
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Id525d532d4f405216da44f95503e06e172458e70
---
 .../dialogs/ManageDictionaries/ManageDictionaries.js         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 2af1b7ce4..71477ae0c 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -88,11 +88,13 @@ function SubDict(props) {
 	const {onChange} = props;
 	const subDicts = [];
 	subDicts.push('Default');
-	for(var item in dictList) {
-		if(dictList[item].secondLevelDictionary === 1) {
-			subDicts.push(dictList[item].name);
-		}
-	};
+	if (dictList != "undefined"  && dictList.length > 0) {
+        for(var item in dictList) {
+            if(dictList[item].secondLevelDictionary === 1) {
+                subDicts.push(dictList[item].name);
+            }
+        };
+	}
 	subDicts.push('');
  	var optionItems = subDicts.map(
 		(item) => <option key={item}>{item}</option>
-- 
cgit 1.2.3-korg


From 28aa29f66de909223bd67da717fdd810df735afc Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Mon, 4 May 2020 15:33:06 +0200
Subject: Add unit test

Add unit tests to improve code coverage.

Issue-ID: CLAMP-844
Change-Id: I7792212d476103086e063cf8fe4a9abed1294fd6
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../clds/tosca/update/JsonTemplateFieldTest.java   |  69 ++++++++++
 .../clamp/clds/tosca/update/JsonTemplateTest.java  |  30 ++++-
 .../loop/LoopTemplateLoopElementModelTest.java     | 106 ++++++++++++++++
 .../clamp/policy/pdpgroup/PolicyModelKeyTest.java  |  55 ++++++++
 ui-react/src/api/LoopCache.test.js                 |  98 +++++++++++++-
 ui-react/src/api/LoopCache_mokeLoopJsonCache.json  |   6 +
 .../dialogs/Loop/CreateLoopModal.test.js           | 137 ++++++++++++++++++++
 .../__snapshots__/CreateLoopModal.test.js.snap     | 141 +++++++++++++++++++++
 8 files changed, 634 insertions(+), 8 deletions(-)
 create mode 100644 src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
 create mode 100644 src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
 create mode 100644 src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
 create mode 100644 ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
 create mode 100644 ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap

(limited to 'ui-react/src')

diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
new file mode 100644
index 000000000..29f5a1da8
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateFieldTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.tosca.update;
+
+import junit.framework.TestCase;
+import org.onap.clamp.clds.tosca.update.templates.JsonTemplateField;
+
+public class JsonTemplateFieldTest extends TestCase {
+
+    JsonTemplateField field1 = new JsonTemplateField("type", "testType", true, true);
+    JsonTemplateField field2 = new JsonTemplateField("type");
+    JsonTemplateField field3 = new JsonTemplateField("type", "testType1", true, true);
+    JsonTemplateField field4 = new JsonTemplateField("type", "testType", false, true);
+    JsonTemplateField field5 = new JsonTemplateField("type", "testType", true, false);
+    JsonTemplateField field6 = new JsonTemplateField("type", "testType", true, true);
+
+    /**
+     * Test fieldsEqual method.
+     */
+    public void testFieldsEqualsMethod() {
+        assertFalse(JsonTemplateField.fieldsEquals(field1,field3));
+        assertFalse(JsonTemplateField.fieldsEquals(field1,field4));
+        assertFalse(JsonTemplateField.fieldsEquals(field1,field5));
+        assertTrue(JsonTemplateField.fieldsEquals(field1,field6));
+    }
+
+    /**
+     * Test equals method.
+     */
+    public void testEqualsMethod() {
+        assertTrue(field1.equals(field2));
+        assertTrue(field1.equals(field3));
+        assertTrue(field1.equals(field4));
+        assertTrue(field1.equals(field5));
+        assertTrue(field1.equals(field6));
+    }
+
+    /**
+     * Test compareWithField method.
+     */
+    public void testCompareWithFieldMethod() {
+        assertFalse(field1.compareWithField(field2));
+        assertFalse(field1.compareWithField(field3));
+        assertFalse(field1.compareWithField(field4));
+        assertFalse(field1.compareWithField(field5));
+        assertTrue(field1.equals(field6));
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java
index fab3030ca..dc736a48b 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateTest.java
@@ -32,20 +32,38 @@ import org.onap.clamp.clds.tosca.update.templates.JsonTemplateField;
 
 public class JsonTemplateTest extends TestCase {
 
+    JsonTemplate toTest = new JsonTemplate("toTest");
+    List<JsonTemplateField>
+            jsonTemplateFields = new ArrayList<>(
+            Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
+                    new JsonTemplateField(
+                            "enum")));
+
     /**
      * Test check failed.
      */
     public void testCheckFields() {
-        JsonTemplate toTest = new JsonTemplate("toTest");
-        List<JsonTemplateField>
-                jsonTemplateFields = new ArrayList<>(
-                Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
-                        new JsonTemplateField(
-                                "enum")));
         toTest.setJsonTemplateFields(jsonTemplateFields);
         JsonTemplate reference = new JsonTemplate("toTest");
         reference.setJsonTemplateFields(jsonTemplateFields);
         assertTrue(toTest.checkFields(reference));
     }
 
+    /**
+     * Test other methods.
+     */
+    public void testOtherFields() {
+        toTest.setJsonTemplateFields(jsonTemplateFields);
+        toTest.addField(new JsonTemplateField("moreField"));
+        toTest.setVisibility("moreField", true);
+        toTest.setStatic("moreField", true);
+        toTest.updateValueField("moreField", "testValue");
+        
+        assertTrue(toTest.isVisible("moreField"));
+        assertTrue(toTest.getSpecificField("moreField").getValue().equals("testValue"));
+        assertTrue(toTest.fieldStaticStatus("moreField"));
+        assertTrue(toTest.toString()
+            .equals(" templateFields : [type null null null, description null null null, "
+            + "enum null null null, moreField testValue true true]"));
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java b/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
new file mode 100644
index 000000000..e5b64c99c
--- /dev/null
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplateLoopElementModelTest.java
@@ -0,0 +1,106 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.onap.clamp.loop.template.LoopElementModel;
+import org.onap.clamp.loop.template.LoopTemplate;
+import org.onap.clamp.loop.template.LoopTemplateLoopElementModel;
+import org.onap.clamp.loop.template.PolicyModel;
+
+
+public class LoopTemplateLoopElementModelTest {
+
+    private LoopElementModel loopElementModel = getLoopElementModel("yaml", "microService1",
+        getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"));
+    private LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", "svg", 1);
+
+    private LoopElementModel getLoopElementModel(String yaml, String name, PolicyModel policyModel) {
+        LoopElementModel model = new LoopElementModel();
+        model.setBlueprint(yaml);
+        model.setName(name);
+        model.addPolicyModel(policyModel);
+        model.setLoopElementType("OPERATIONAL_POLICY");
+        return model;
+    }
+
+    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, String policyAcronym,
+                                       String policyVariant) {
+        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
+    }
+
+    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,
+                                         Integer maxInstancesAllowed) {
+        LoopTemplate template = new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);
+        template.addLoopElementModel(loopElementModel);
+        return template;
+    }
+
+    /**
+     * This tests compareTo method.
+     */
+    @Test
+    public void compareToTest() {
+        LoopTemplateLoopElementModel model1 = new LoopTemplateLoopElementModel();
+        LoopTemplateLoopElementModel model2 = new LoopTemplateLoopElementModel();
+        assertThat(model1.compareTo(model2)).isEqualTo(1);
+
+        model1.setFlowOrder(2);
+        assertThat(model1.compareTo(model2)).isEqualTo(-1);
+
+        model2.setFlowOrder(3);
+        assertThat(model1.compareTo(model2)).isEqualTo(1);
+    }
+
+    /**
+     * This tests equals method.
+     */
+    @Test
+    public void equalsTest() {
+        LoopTemplateLoopElementModel model1 = new LoopTemplateLoopElementModel();
+        LoopTemplateLoopElementModel model2 = new LoopTemplateLoopElementModel();
+
+        assertThat(model1.equals(model2)).isTrue();
+
+        model1.setLoopTemplate(loopTemplate);
+        assertThat(model1.equals(model2)).isFalse();
+        model2.setLoopTemplate(loopTemplate);
+        assertThat(model1.equals(model2)).isTrue();
+
+        model1.setLoopElementModel(loopElementModel);
+        assertThat(model1.equals(model2)).isFalse();
+        model2.setLoopElementModel(loopElementModel);
+        assertThat(model1.equals(model2)).isTrue();
+
+        model1.setFlowOrder(1);
+        assertThat(model1.equals(model2)).isTrue();
+        model2.setFlowOrder(2);
+        assertThat(model1.equals(model2)).isTrue();
+    }
+
+}
diff --git a/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java b/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
new file mode 100644
index 000000000..413ce60ab
--- /dev/null
+++ b/src/test/java/org/onap/clamp/policy/pdpgroup/PolicyModelKeyTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy.pdpgroup;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import org.junit.Test;
+
+public class PolicyModelKeyTest {
+
+    @Test
+    public void testEqualsMethod() throws IOException {
+        PolicyModelKey key1 = new PolicyModelKey("name1","1.0.0");
+        PolicyModelKey key2 = new PolicyModelKey(null,"1.0.0");
+        PolicyModelKey key3 = new PolicyModelKey("name1",null);
+
+        assertThat(key1.equals(null)).isFalse();
+        assertThat(key1.equals("key2")).isFalse();
+
+        assertThat(key2.equals(key1)).isFalse();
+        assertThat(key3.equals(key1)).isFalse();
+
+        PolicyModelKey key4 = new PolicyModelKey("name2","1.0.0");
+        PolicyModelKey key5 = new PolicyModelKey("name1","2.0.0");
+        assertThat(key1.equals(key4)).isFalse();
+        assertThat(key1.equals(key5)).isFalse();
+
+        PolicyModelKey key6 = new PolicyModelKey("name(.*)","1.0.0");
+        PolicyModelKey key7 = new PolicyModelKey("name1","1.0.0");
+        assertThat(key1.equals(key6)).isTrue();
+        assertThat(key1.equals(key7)).isTrue();
+    }
+}
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index b0eef755c..3ae081704 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -39,7 +39,9 @@ describe('Verify LoopCache functions', () => {
             "policies": []
           }
         },
-       "jsonRepresentation": {
+        "pdpGroup": "pdpGroupTest",
+        "pdpSubgroup": "pdpSubgroupTest",
+        "jsonRepresentation": {
         "schema": {}
       }
       }];
@@ -54,7 +56,9 @@ describe('Verify LoopCache functions', () => {
             "controlLoop": {},
             "policies": []
           }
-        }
+        },
+        "pdpGroup": "pdpGroupTest",
+        "pdpSubgroup": "pdpSubgroupTest",
       }];
       expect(loopCache.getOperationalPoliciesNoJsonSchema()).toStrictEqual(opPolicy);
     });
@@ -92,6 +96,9 @@ describe('Verify LoopCache functions', () => {
           "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
           "configurationsJson": {"domain": "measurementsForVfScaling"},
           "shared": false,
+          "pdpGroup": "pdpGroupTest",
+          "pdpSubgroup": "pdpSubgroupTest",
+          "policyModel": {"policyPdpGroup": {"supportedPdpGroups": "supportedPdpGroupsTest"}},
           "jsonRepresentation": {"schema": {}}
       };
       expect(loopCache.getMicroServiceForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msJson);
@@ -180,6 +187,84 @@ describe('Verify LoopCache functions', () => {
       expect(loopCache.getComponentStates()).toStrictEqual(component);
     });
 
+    it('getOperationalPolicyForName', () => {
+      const opPolicy = {
+      "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
+      "configurationsJson": {
+        "operational_policy": {
+          "controlLoop": {},
+          "policies": []
+        }
+      },
+      "pdpGroup": "pdpGroupTest",
+      "pdpSubgroup": "pdpSubgroupTest",
+      "jsonRepresentation": {
+        "schema": {}
+      }
+    };
+      expect(loopCache.getOperationalPolicyForName("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(opPolicy);
+      expect(loopCache.getOperationalPolicyForName("Not_Exist")).toBeNull();
+    });
+
+    it('getOperationalPolicyPropertiesForName', () => {
+      const opPolicyJson = {
+        "operational_policy": {
+          "controlLoop": {},
+          "policies": []
+        }};
+      expect(loopCache.getOperationalPolicyPropertiesForName("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(opPolicyJson);
+      expect(loopCache.getOperationalPolicyPropertiesForName("Not_Exist")).toBeNull();
+    });
+
+    it('getOperationalPolicyJsonRepresentationForName', () => {
+      const opPolicySchema = {
+        "schema": {}
+      };
+      expect(loopCache.getOperationalPolicyJsonRepresentationForName("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(opPolicySchema);
+      expect(loopCache.getOperationalPolicyJsonRepresentationForName("Not_Exist")).toBeNull();
+    });
+
+    it('getOperationalPolicySupportedPdpGroup', () => {
+      expect(loopCache.getOperationalPolicySupportedPdpGroup("Not_Exist")).toStrictEqual([]);
+    });
+
+    it('getOperationalPolicyPdpGroup', () => {
+      expect(loopCache.getOperationalPolicyPdpGroup("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("pdpGroupTest");
+      expect(loopCache.getOperationalPolicyPdpGroup("Not_Exist")).toBeNull();
+    });
+
+    it('getOperationalPolicyPdpSubgroup', () => {
+      expect(loopCache.getOperationalPolicyPdpSubgroup("OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("pdpSubgroupTest");
+      expect(loopCache.getOperationalPolicyPdpSubgroup("Not_Exist")).toBeNull();
+    });
+
+    it('getMicroServiceSupportedPdpGroup', () => {
+      expect(loopCache.getMicroServiceSupportedPdpGroup("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("supportedPdpGroupsTest");
+      expect(loopCache.getMicroServiceSupportedPdpGroup("Not_Exist")).toStrictEqual([]);
+    });
+
+    it('getMicroServicePdpGroup', () => {
+      expect(loopCache.getMicroServicePdpGroup("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("pdpGroupTest");
+      expect(loopCache.getMicroServicePdpGroup("Not_Exist")).toBeNull();
+    });
+
+    it('getMicroServicePdpSubgroup', () => {
+      expect(loopCache.getMicroServicePdpSubgroup("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("pdpSubgroupTest");
+      expect(loopCache.getMicroServicePdpSubgroup("Not_Exist")).toBeNull();
+    });
+
+    it('getMicroServiceJsonRepresentationForName', () => {
+      const msPolicySchema = {
+        "schema": {}
+      };
+      expect(loopCache.getMicroServiceJsonRepresentationForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(msPolicySchema);
+      expect(loopCache.getMicroServiceJsonRepresentationForName("Not_Exist")).toBeNull();
+    });
+
+    it('getTemplateName', () => {
+      expect(loopCache.getTemplateName()).toStrictEqual("loopTemplateTest");
+    });
+
     it('updateGlobalProperties', () => {
       const newGlobalProps = {
         "dcaeDeployParameters": {
@@ -208,4 +293,13 @@ describe('Verify LoopCache functions', () => {
       loopCache.updateMicroServiceProperties("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", newMsPolicyProperties);
       expect(loopCache.getMicroServicePropertiesForName("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual(newMsPolicyProperties);
     });
+
+    it('updateMicroServicePdpGroup', () => {
+      const newMsPolicyProperties = {"domain": "measurementsForVfScalingNew"};
+      loopCache.updateMicroServicePdpGroup("TCA_h2NMX_v1_0_ResourceInstanceName1_tca", "pdpGroupTest1", "pdpSubgroupTest1");
+      expect(loopCache.getMicroServicePdpGroup("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("pdpGroupTest1");
+      expect(loopCache.getMicroServicePdpGroup("Not_Exist")).toBeNull();
+      expect(loopCache.getMicroServicePdpSubgroup("TCA_h2NMX_v1_0_ResourceInstanceName1_tca")).toStrictEqual("pdpSubgroupTest1");
+      expect(loopCache.getMicroServicePdpSubgroup("Not_Exist")).toBeNull();
+    });
  });
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index 788306b8e..cb9ed87b0 100644
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -8,6 +8,7 @@
       "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
     }
   },
+  "loopTemplate": {"name": "loopTemplateTest"},
   "modelService": {
     "serviceDetails": {
       "serviceType": "",
@@ -93,6 +94,8 @@
           "policies": []
         }
       },
+      "pdpGroup": "pdpGroupTest",
+      "pdpSubgroup": "pdpSubgroupTest",
       "jsonRepresentation": {
         "schema": {}
       }
@@ -104,6 +107,9 @@
       "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
       "configurationsJson": {"domain": "measurementsForVfScaling"},
       "shared": false,
+      "pdpGroup": "pdpGroupTest",
+      "pdpSubgroup": "pdpSubgroupTest",
+      "policyModel": {"policyPdpGroup": {"supportedPdpGroups": "supportedPdpGroupsTest"}},
       "jsonRepresentation": {"schema": {}}
     }
   ],
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
new file mode 100644
index 000000000..18ec6fdce
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import CreateLoopModal from './CreateLoopModal';
+import LoopService from '../../../api/LoopService';
+import TemplateService from '../../../api/TemplateService';
+
+describe('Verify CreateLoopModal', () => {
+
+  it('Test the render method', async () => {
+	const flushPromises = () => new Promise(setImmediate);
+    TemplateService.getTemplateNames = jest.fn().mockImplementation(() => {
+    	return Promise.resolve(["template1","template2"]);
+	});
+	
+	const component = shallow(<CreateLoopModal/>);
+    expect(component).toMatchSnapshot();
+	await flushPromises();
+	component.update();
+		
+    expect(component.state('templateNames')).toStrictEqual([{"label": "template1", "value": "template1"}, {"label": "template2", "value": "template2"}]);
+  });
+
+  it('handleDropdownListChange event', async () => {
+  	const flushPromises = () => new Promise(setImmediate);
+    const event = {value: 'template1'};
+    TemplateService.getBlueprintMicroServiceTemplateSvg = jest.fn().mockImplementation(() => {
+		return Promise.resolve("");
+	});
+
+    const component = shallow(<CreateLoopModal/>);
+    component.find('StateManager').simulate('change', event);
+    await flushPromises();
+    component.update();
+    expect(component.state('chosenTemplateName')).toEqual("template1");
+    expect(component.state('content')).toEqual("Error1");
+    
+    TemplateService.getBlueprintMicroServiceTemplateSvg = jest.fn().mockImplementation(() => {
+		return Promise.resolve("svgContentTest");
+	});
+	component.find('StateManager').simulate('change', {value: 'template2'});
+    await flushPromises();
+    component.update();
+    expect(component.state('chosenTemplateName')).toEqual("template2");
+    expect(component.state('content')).toEqual("svgContentTest");
+  });
+
+
+
+  it('handleModelName event', () => {
+    const event = {target: {value : "model1"} };
+    const component = shallow(<CreateLoopModal/>);
+    component.find('input').simulate('change', event);
+    component.update();
+    expect(component.state('modelName')).toEqual("model1");
+  });
+
+
+  it('Test handleClose', () => {
+    const historyMock = { push: jest.fn() }; 
+    const handleClose = jest.spyOn(CreateLoopModal.prototype,'handleClose');
+    const component = shallow(<CreateLoopModal history={historyMock} />)
+
+    component.find('[variant="secondary"]').prop('onClick')();
+
+    expect(handleClose).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+    
+    handleClose.mockClear();
+  });
+
+  it('Test handleCreate Fail', () => {
+    const handleCreate = jest.spyOn(CreateLoopModal.prototype,'handleCreate');
+    const component = shallow(<CreateLoopModal/>)
+
+    component.find('[variant="primary"]').prop('onClick')();
+
+    expect(handleCreate).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(true);
+
+    handleCreate.mockClear();
+  });
+
+  it('Test handleCreate Suc', async () => {
+	const flushPromises = () => new Promise(setImmediate);
+    const historyMock = { push: jest.fn() };
+    const loadLoopFunction = jest.fn();  
+    
+    LoopService.createLoop = jest.fn().mockImplementation(() => {
+			return Promise.resolve({
+				ok: true,
+				status: 200,
+				json: () => {}
+			});
+		});
+
+    const handleCreate = jest.spyOn(CreateLoopModal.prototype,'handleCreate');
+    const component = shallow(<CreateLoopModal history={historyMock} loadLoopFunction={loadLoopFunction}/>)
+    component.setState({
+			modelName: "modelNameTest",
+			chosenTemplateName: "template1"
+		});
+
+    component.find('[variant="primary"]').prop('onClick')();
+	await flushPromises();
+	component.update();
+
+    expect(handleCreate).toHaveBeenCalledTimes(1);
+    expect(component.state('show')).toEqual(false);
+    expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
+
+    handleCreate.mockClear();
+  });
+
+});
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
new file mode 100644
index 000000000..305c87bf2
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
@@ -0,0 +1,141 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Verify CreateLoopModal Test the render method 1`] = `
+<Styled(Bootstrap(Modal))
+  backdrop="static"
+  keyboard={false}
+  onHide={[Function]}
+  show={true}
+  size="xl"
+>
+  <ModalHeader
+    closeButton={true}
+    closeLabel="Close"
+  >
+    <ModalTitle>
+      Create Model
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formPlaintextEmail"
+    >
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+        Template Name:
+      </FormLabel>
+      <Col
+        sm="10"
+      >
+        <StateManager
+          defaultInputValue=""
+          defaultMenuIsOpen={false}
+          defaultValue={null}
+          onChange={[Function]}
+          options={Array []}
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formSvgPreview"
+      style={
+        Object {
+          "alignItems": "center",
+        }
+      }
+    >
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+        Model Preview:
+      </FormLabel>
+      <Col
+        sm="10"
+      >
+        <styled.svg
+          dangerouslySetInnerHTML={
+            Object {
+              "__html": "",
+            }
+          }
+          value=""
+        />
+      </Col>
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formPlaintextEmail"
+    >
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+        Model Name:
+      </FormLabel>
+      <input
+        onChange={[Function]}
+        style={
+          Object {
+            "marginLeft": "1em",
+            "width": "50%",
+          }
+        }
+        type="text"
+        value=""
+      />
+    </FormGroup>
+  </ModalBody>
+  <ModalFooter>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="null"
+      variant="secondary"
+    >
+      Cancel
+    </Button>
+    <Button
+      active={false}
+      disabled={false}
+      onClick={[Function]}
+      type="submit"
+      variant="primary"
+    >
+      Create
+    </Button>
+  </ModalFooter>
+</Styled(Bootstrap(Modal))>
+`;
-- 
cgit 1.2.3-korg


From c0ec0fc448af1c5d6eacb195e95938c921ba1bce Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 18 May 2020 12:31:11 +0200
Subject: Create SVG in UI

Remove the SVG generation from the backend and put it in the UI

Issue-ID: CLAMP-854
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Icfa9e107d83bb244ac3d87300d013555bfa0b037
---
 docs/swagger/swagger.pdf                           |   4 +-
 .../onap/clamp/loop/template/LoopElementModel.java |   1 +
 ui-react/src/LoopUI.js                             |   4 +-
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   4 +-
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   4 +-
 ui-react/src/api/LoopCache.js                      |  27 ++-
 ui-react/src/api/TemplateService.js                |  41 +---
 .../src/components/dialogs/Loop/CreateLoopModal.js |  74 +++----
 .../dialogs/Loop/CreateLoopModal.test.js           |  25 +--
 .../src/components/dialogs/Loop/OpenLoopModal.js   |  45 ++--
 .../components/dialogs/Loop/OpenLoopModal.test.js  |  12 +-
 .../__snapshots__/CreateLoopModal.test.js.snap     |  11 +-
 .../Loop/__snapshots__/OpenLoopModal.test.js.snap  |  13 +-
 .../src/components/dialogs/Policy/PolicyModal.js   |  91 +++++---
 .../components/dialogs/Policy/PolicyModal.test.js  |   3 +-
 .../dialogs/Tosca/ViewLoopTemplatesModal.js        |  68 ++----
 .../dialogs/Tosca/ViewLoopTemplatesModal.test.js   |   3 +-
 .../ViewLoopTemplatesModal.test.js.snap            |  28 +--
 .../loop_viewer/svg/LoopComponentConverter.js      |  17 --
 ui-react/src/components/loop_viewer/svg/LoopSvg.js | 110 ----------
 .../src/components/loop_viewer/svg/LoopSvg.test.js | 132 ------------
 .../src/components/loop_viewer/svg/SvgGenerator.js | 240 +++++++++++++++++++++
 .../svg/__snapshots__/LoopSvg.test.js.snap         |  34 ---
 .../src/components/loop_viewer/svg/example.svg     |   1 -
 ui-react/src/theme/globalStyle.js                  |   7 +-
 ui-react/src/utils/OnapConstants.js                |   4 +-
 26 files changed, 463 insertions(+), 540 deletions(-)
 delete mode 100644 ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
 delete mode 100644 ui-react/src/components/loop_viewer/svg/LoopSvg.js
 delete mode 100644 ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
 create mode 100644 ui-react/src/components/loop_viewer/svg/SvgGenerator.js
 delete mode 100644 ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
 delete mode 100644 ui-react/src/components/loop_viewer/svg/example.svg

(limited to 'ui-react/src')

diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index ed429f29e..e5e2bb04e 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
@@ -4,8 +4,8 @@
 << /Title (Clamp Rest API)
 /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0)
-/CreationDate (D:20200513003949+02'00')
-/ModDate (D:20200513003949+02'00')
+/CreationDate (D:20200519123507+02'00')
+/ModDate (D:20200519123507+02'00')
 >>
 endobj
 2 0 obj
diff --git a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
index 35fdf43cd..70cdbe233 100644
--- a/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
+++ b/src/main/java/org/onap/clamp/loop/template/LoopElementModel.java
@@ -80,6 +80,7 @@ public class LoopElementModel extends AuditEntity implements Serializable {
     /**
      * The type of element.
      */
+    @Expose
     @Column(nullable = false, name = "loop_element_type")
     private String loopElementType;
 
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index efd02b41f..6522cc3dd 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -29,7 +29,7 @@ import logo from './logo.png';
 import { GlobalClampStyle } from './theme/globalStyle.js';
 import OnapConstants from './utils/OnapConstants';
 
-import LoopSvg from './components/loop_viewer/svg/LoopSvg';
+import SvgGenerator from './components/loop_viewer/svg/SvgGenerator';
 import LoopLogs from './components/loop_viewer/logs/LoopLogs';
 import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
@@ -203,7 +203,7 @@ export default class LoopUI extends React.Component {
 	renderLoopViewBody() {
 		return (
 			<LoopViewBodyDivStyled>
-				<LoopSvg loopCache={this.state.loopCache} />
+				<SvgGenerator loopCache={this.state.loopCache} clickable={true} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE}/>
 				<LoopStatus loopCache={this.state.loopCache}/>
 				<LoopLogs loopCache={this.state.loopCache} />
 			</LoopViewBodyDivStyled>
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index ff08f7afb..d8b2e7be5 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -180,7 +180,9 @@ exports[`Verify LoopUI Test the render method 1`] = `
       )
     </styled.div>
     <styled.div>
-      <withRouter(LoopViewSvg)
+      <withRouter(SvgGenerator)
+        clickable={true}
+        generatedFrom="INSTANCE"
         loopCache={
           LoopCache {
             "loopJsonCache": Object {},
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 93dc44286..39b544556 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -205,7 +205,9 @@ exports[`Verify OnapClamp Test the render method 1`] = `
         )
       </styled.div>
       <styled.div>
-        <withRouter(LoopViewSvg)
+        <withRouter(SvgGenerator)
+          clickable={true}
+          generatedFrom="INSTANCE"
           loopCache={
             LoopCache {
               "loopJsonCache": Object {},
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 4f22dc2bb..3e19b4fc7 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -221,9 +221,32 @@ export default class LoopCache {
 	}
 
 	getTemplateName() {
-	    if (this.loopJsonCache["loopTemplate"] !== undefined) {
-        			return this.loopJsonCache["loopTemplate"].name;
+	    if (this.getLoopTemplate() !== undefined) {
+        			return this.getLoopTemplate().name;
         }
 	    return null;
 	}
+
+	getLoopTemplate() {
+		return this.loopJsonCache["loopTemplate"];
+	}
+
+	isOpenLoopTemplate() {
+		var loopTemplate = this.getLoopTemplate();
+		if(loopTemplate != null && loopTemplate["allowedLoopType"] === "OPEN") {
+			return true;
+		}
+		return false;
+	}
+
+	getAllLoopElementModels() {
+	    var loopTemplate = this.getLoopTemplate();
+	    var loopElementModels = [];
+	    if(loopTemplate != null) {
+	        for (var element of loopTemplate['loopElementModelsUsed']) {
+	            loopElementModels.push(element['loopElementModel'])
+	        }
+	    }
+	    return loopElementModels;
+	}
 }
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index eddd58dff..3a780dd65 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -21,57 +21,24 @@
  */
 
 export default class TemplateService {
-	static getTemplateNames() {
-		return fetch('/restservices/clds/v2/templates/names', { method: 'GET', credentials: 'same-origin' })
-			.then(function (response) {
-				console.debug("GetTemplateNames response received: ", response.status);
-				if (response.ok) {
-					return response.json();
-				} else {
-					console.error("GetTemplateNames query failed");
-					return {};
-				}
-			})
-			.catch(function (error) {
-				console.error("GetTemplateNames error received", error);
-				return {};
-			});
-	}
 
-	static getBlueprintMicroServiceTemplates() {
+	static getAllLoopTemplates() {
 	    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
 	        .then(function (response) {
-	            console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
+	            console.debug("getAllLoopTemplates response received: ", response.status);
 	            if (response.ok) {
 	                return response.json();
 	            } else {
-	                console.error("getBlueprintMicroServiceTemplates query failed");
+	                console.error("getAllLoopTemplates query failed");
 	                return {};
 	            }
 	        })
 	        .catch(function (error) {
-	            console.error("getBlueprintMicroServiceTemplates error received", error);
+	            console.error("getAllLoopTemplates error received", error);
 	            return {};
 	        });
 	    }
 
-	static getBlueprintMicroServiceTemplateSvg(templateName) {
-	  	return fetch('/restservices/clds/v2/templates/' + templateName + ' /svgRepresentation', { method: 'GET', credentials: 'same-origin', })
-			.then(function (response) {
-			console.debug("getBlueprintMicroServiceTemplateSvg response received: ", response.status);
-			if (response.ok) {
-				return response.text();
-			} else {
-				console.error("getBlueprintMicroServiceTemplateSvg query failed");
-				return {};
-			}
-		})
-		.catch(function (error) {
-			console.error("getBlueprintMicroServiceTemplateSvg error received", error);
-			return {};
-		});
-	}
-	
 	static getDictionary() {
 	    return fetch('restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', })
 	      .then(function (response) {
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index e98b59566..a8e8dee1f 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -30,46 +30,33 @@ import Col from 'react-bootstrap/Col';
 import styled from 'styled-components';
 import LoopService from '../../../api/LoopService';
 import TemplateService from '../../../api/TemplateService';
+import LoopCache from '../../../api/LoopCache';
+import SvgGenerator from '../../loop_viewer/svg/SvgGenerator';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-const LoopViewSvgDivStyled = styled.svg`
-	display: flex;
-	flex-direction: row;
-	overflow-x: scroll;
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
-	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-	margin-top: 3em;
-	margin-left: auto;
-	margin-right:auto;
-	margin-bottom: -1em;
-	text-align: center;
-	align-items: center;
-	height: 100%;
-	width: 100%;
-`
 
 export default class CreateLoopModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 
-		this.getTemplateNames = this.getTemplateNames.bind(this);
+		this.getAllLoopTemplates = this.getAllLoopTemplates.bind(this);
 		this.handleCreate = this.handleCreate.bind(this);
 		this.handleModelName = this.handleModelName.bind(this);
 		this.handleClose = this.handleClose.bind(this);
-		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.handleDropDownListChange = this.handleDropDownListChange.bind(this);
 		this.state = {
 			show: true,
-			content: '',
 			chosenTemplateName: '',
 			modelName: '',
-			templateNames: []
+			templateNames: [],
+			fakeLoopCacheWithTemplate: new LoopCache({})
 		};
 	}
 
 	componentWillMount() {
-		this.getTemplateNames();
+		this.getAllLoopTemplates();
 	}
 
 	handleClose() {
@@ -77,21 +64,26 @@ export default class CreateLoopModal extends React.Component {
 		this.props.history.push('/');
 	}
 
-	handleDropdownListChange(e) {
-		this.setState({ chosenTemplateName: e.value });
-		TemplateService.getBlueprintMicroServiceTemplateSvg(e.value).then(svgXml => {
-			if (svgXml.length !== 0) {
-				this.setState({ content: svgXml })
-			} else {
-				this.setState({ content: 'Error1' })
-			}
-		})
+	handleDropDownListChange(e) {
+	    if (typeof e.value !== "undefined") {
+	        this.setState({
+	        fakeLoopCacheWithTemplate:
+                new LoopCache({
+                    "loopTemplate":e.templateObject,
+                    "name": "fakeLoop"
+                }),
+                chosenTemplateName: e.value
+	        })
+		} else {
+          	this.setState({ fakeLoopCacheWithTemplate: new LoopCache({}) })
+        }
 	}
 
-	getTemplateNames() {
-		TemplateService.getTemplateNames().then(templateNames => {
-			const templateOptions = templateNames.map((templateName) => { return { label: templateName, value: templateName } });
-			this.setState({ templateNames: templateOptions })
+	getAllLoopTemplates() {
+		TemplateService.getAllLoopTemplates().then(templatesData => {
+		    const templateOptions = templatesData.map((templateData) => { return { label: templateData.name, value: templateData.name, templateObject: templateData } });
+            this.setState({
+                templateNames: templateOptions })
 		});
 	}
 
@@ -133,17 +125,15 @@ export default class CreateLoopModal extends React.Component {
 					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Template Name:</Form.Label>
 						<Col sm="10">
-							<Select onChange={this.handleDropdownListChange} options={this.state.templateNames} />
+							<Select onChange={this.handleDropDownListChange} options={this.state.templateNames} />
 						</Col>
 					</Form.Group>
-                                        <Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
-                                                <Form.Label column sm="2">Model Preview:</Form.Label>
-                                                <Col sm="10">
-                                                        <LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }}
-                                                                value={this.state.content} >
-                                                        </LoopViewSvgDivStyled>
-                                                </Col>
-                                        </Form.Group>
+                    <Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
+                    <Form.Label column sm="2">Model Preview:</Form.Label>
+                        <Col sm="10">
+                            <SvgGenerator loopCache={this.state.fakeLoopCacheWithTemplate} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_TEMPLATE}/>
+                        </Col>
+                    </Form.Group>
 					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Model Name:</Form.Label>
 						<input type="text" style={{width: '50%', marginLeft: '1em' }}
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
index 18ec6fdce..5b6ea9e62 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
@@ -30,8 +30,8 @@ describe('Verify CreateLoopModal', () => {
 
   it('Test the render method', async () => {
 	const flushPromises = () => new Promise(setImmediate);
-    TemplateService.getTemplateNames = jest.fn().mockImplementation(() => {
-    	return Promise.resolve(["template1","template2"]);
+    TemplateService.getAllLoopTemplates = jest.fn().mockImplementation(() => {
+    	return Promise.resolve([{"name":"template1"},{"name":"template2"}]);
 	});
 	
 	const component = shallow(<CreateLoopModal/>);
@@ -39,31 +39,26 @@ describe('Verify CreateLoopModal', () => {
 	await flushPromises();
 	component.update();
 		
-    expect(component.state('templateNames')).toStrictEqual([{"label": "template1", "value": "template1"}, {"label": "template2", "value": "template2"}]);
+    expect(component.state('templateNames')).toStrictEqual([{"label": "template1", "value": "template1", "templateObject": {"name": "template1"}}, {"label": "template2", "value": "template2","templateObject": {"name": "template2"}}]);
   });
 
   it('handleDropdownListChange event', async () => {
   	const flushPromises = () => new Promise(setImmediate);
-    const event = {value: 'template1'};
-    TemplateService.getBlueprintMicroServiceTemplateSvg = jest.fn().mockImplementation(() => {
-		return Promise.resolve("");
-	});
 
     const component = shallow(<CreateLoopModal/>);
-    component.find('StateManager').simulate('change', event);
+    component.find('StateManager').simulate('change', {value: 'template1', templateObject: {"name":"template1"} });
     await flushPromises();
     component.update();
     expect(component.state('chosenTemplateName')).toEqual("template1");
-    expect(component.state('content')).toEqual("Error1");
-    
-    TemplateService.getBlueprintMicroServiceTemplateSvg = jest.fn().mockImplementation(() => {
-		return Promise.resolve("svgContentTest");
-	});
-	component.find('StateManager').simulate('change', {value: 'template2'});
+    expect(component.state('fakeLoopCacheWithTemplate').getLoopTemplate()['name']).toEqual("template1");
+    expect(component.state('fakeLoopCacheWithTemplate').getLoopName()).toEqual("fakeLoop");
+
+	component.find('StateManager').simulate('change',{value: 'template2', templateObject: {"name":"template2"} });
     await flushPromises();
     component.update();
     expect(component.state('chosenTemplateName')).toEqual("template2");
-    expect(component.state('content')).toEqual("svgContentTest");
+    expect(component.state('fakeLoopCacheWithTemplate').getLoopTemplate()['name']).toEqual("template2");
+    expect(component.state('fakeLoopCacheWithTemplate').getLoopName()).toEqual("fakeLoop");
   });
 
 
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index c04883443..7ca90b493 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -30,6 +30,8 @@ import Col from 'react-bootstrap/Col';
 import FormCheck from 'react-bootstrap/FormCheck'
 import styled from 'styled-components';
 import LoopService from '../../../api/LoopService';
+import SvgGenerator from '../../loop_viewer/svg/SvgGenerator';
+import LoopCache from '../../../api/LoopCache';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -37,21 +39,6 @@ const ModalStyled = styled(Modal)`
 const CheckBoxStyled = styled(FormCheck.Input)`
 	margin-left:3rem;
 `
-const LoopViewSvgDivStyled = styled.svg`
-	overflow-x: scroll;
-	display: flex;
-	flex-direction: row;
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
-	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-	margin-top: 2em;
-	margin-left: auto;
-	margin-right:auto;
-	margin-bottom: -3em;
-	text-align: center;
-	align-items: center;
-	height: 100%;
-	width: 100%;
-`
 
 export default class OpenLoopModal extends React.Component {
 	constructor(props, context) {
@@ -60,13 +47,13 @@ export default class OpenLoopModal extends React.Component {
 		this.getLoopNames = this.getLoopNames.bind(this);
 		this.handleOpen = this.handleOpen.bind(this);
 		this.handleClose = this.handleClose.bind(this);
-		this.handleDropdownListChange = this.handleDropdownListChange.bind(this);
+		this.handleDropDownListChange = this.handleDropDownListChange.bind(this);
 		this.showReadOnly = props.showReadOnly ? props.showReadOnly : true;
 		this.state = {
 			show: true,
 			chosenLoopName: '',
 			loopNames: [],
-			content:''
+			loopCacheOpened: new LoopCache({})
 		};
 	}
 
@@ -79,14 +66,12 @@ export default class OpenLoopModal extends React.Component {
 		this.props.history.push('/');
 	}
 
-	handleDropdownListChange(e) {
-		this.setState({ chosenLoopName: e.value });
-		LoopService.getSvg(e.value).then(svgXml => {
-			if (svgXml.length !== 0) {
-				this.setState({ content: svgXml })
-			} else {
-				this.setState({ content: 'Error1' })
-			}
+	handleDropDownListChange(e) {
+        LoopService.getLoop(e.value).then(loop => {
+            this.setState({
+                chosenLoopName: e.value,
+                loopCacheOpened: new LoopCache(loop)
+             });
 		});
 	}
 
@@ -95,9 +80,7 @@ export default class OpenLoopModal extends React.Component {
 		    if (Object.entries(loopNames).length !== 0) {
 		        const loopOptions = loopNames.filter(loopName => loopName!=='undefined').map((loopName) => { return { label: loopName, value: loopName } });
             	this.setState({ loopNames: loopOptions })
-
 		    }
-
 		});
 	}
 
@@ -117,20 +100,18 @@ export default class OpenLoopModal extends React.Component {
 					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Model Name:</Form.Label>
 						<Col sm="10">
-							<Select onChange={this.handleDropdownListChange}
+							<Select onChange={this.handleDropDownListChange}
 							options={this.state.loopNames} />
 						</Col>
 					</Form.Group>
 					<Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
 						<Form.Label column sm="2">Model Preview:</Form.Label>
 						<Col sm="10">
-                         				<LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }}
-								value={this.state.content} >
-							</LoopViewSvgDivStyled>
+						    <SvgGenerator loopCache={this.state.loopCacheOpened} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE}/>
 						</Col>
 					</Form.Group>
 					{this.showReadOnly === true ?
-						<Form.Group as={Row} controlId="formBasicChecbox">
+						<Form.Group as={Row} controlId="formBasicCheckbox">
 							<Form.Check>
 								<FormCheck.Label>Read Only Mode:</FormCheck.Label>
 								<CheckBoxStyled style={{marginLeft: '3.5em'}} type="checkbox" />
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
index f362cfaa6..1865869df 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.test.js
@@ -23,6 +23,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import OpenLoopModal from './OpenLoopModal';
+import LoopService from '../../../api/LoopService';
 
 describe('Verify OpenLoopModal', () => {
 
@@ -41,10 +42,19 @@ describe('Verify OpenLoopModal', () => {
     expect(component).toMatchSnapshot();
   });
 
-  it('Onchange event', () => {
+  it('Onchange event', async () => {
+    const flushPromises = () => new Promise(setImmediate);
+    LoopService.getLoop = jest.fn().mockImplementation(() => {
+  		return Promise.resolve({
+  			ok: true,
+  			status: 200,
+  			json: () => {}
+  		});
+  	});
     const event = {value: 'LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3'};
     const component = shallow(<OpenLoopModal/>);
     component.find('StateManager').simulate('change', event);
+    await flushPromises();
     component.update();
     expect(component.state('chosenLoopName')).toEqual("LOOP_gmtAS_v1_0_ResourceInstanceName1_tca_3");
   });
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
index 305c87bf2..e69b809c7 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
@@ -75,13 +75,14 @@ exports[`Verify CreateLoopModal Test the render method 1`] = `
       <Col
         sm="10"
       >
-        <styled.svg
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "",
+        <withRouter(SvgGenerator)
+          clickable={false}
+          generatedFrom="TEMPLATE"
+          loopCache={
+            LoopCache {
+              "loopJsonCache": Object {},
             }
           }
-          value=""
         />
       </Col>
     </FormGroup>
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
index 196854446..477260477 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/OpenLoopModal.test.js.snap
@@ -75,13 +75,14 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
       <Col
         sm="10"
       >
-        <styled.svg
-          dangerouslySetInnerHTML={
-            Object {
-              "__html": "",
+        <withRouter(SvgGenerator)
+          clickable={false}
+          generatedFrom="INSTANCE"
+          loopCache={
+            LoopCache {
+              "loopJsonCache": Object {},
             }
           }
-          value=""
         />
       </Col>
     </FormGroup>
@@ -95,7 +96,7 @@ exports[`Verify OpenLoopModal Test the render method 1`] = `
           "render": [Function],
         }
       }
-      controlId="formBasicChecbox"
+      controlId="formBasicCheckbox"
     >
       <FormCheck
         disabled={false}
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index 5930386c2..d3b427396 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -33,6 +33,7 @@ import LoopService from '../../../api/LoopService';
 import LoopCache from '../../../api/LoopCache';
 import JSONEditor from '@json-editor/json-editor';
 import Alert from 'react-bootstrap/Alert';
+import OnapConstant from '../../../utils/OnapConstants';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
@@ -66,6 +67,9 @@ export default class PolicyModal extends React.Component {
 		this.createJsonEditor = this.createJsonEditor.bind(this);
 		this.handleRefresh = this.handleRefresh.bind(this);
 		this.disableAlert =  this.disableAlert.bind(this);
+		this.renderPdpGroupDropDown = this.renderPdpGroupDropDown.bind(this);
+		this.renderOpenLoopMessage = this.renderOpenLoopMessage.bind(this);
+		this.renderModalTitle = this.renderModalTitle.bind(this);
 	}
 
 	handleSave() {
@@ -82,7 +86,7 @@ export default class PolicyModal extends React.Component {
 		}
 		else {
 			console.info("NO validation errors found in policy data");
-			if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
+			if (this.state.policyInstanceType === OnapConstant.microServiceType) {
                 this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData);
                 this.state.loopCache.updateMicroServicePdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
                 LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
@@ -90,7 +94,7 @@ export default class PolicyModal extends React.Component {
                     this.props.history.push('/');
                     this.props.loadLoopFunction(this.state.loopCache.getLoopName());
                 });
-			} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
+			} else if (this.state.policyInstanceType === OnapConstant.operationalPolicyType) {
 				this.state.loopCache.updateOperationalPolicyProperties(this.state.policyName, editorData);
 				this.state.loopCache.updateOperationalPolicyPdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
 				LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()).then(resp => {
@@ -154,13 +158,13 @@ export default class PolicyModal extends React.Component {
 		var editorData = {};
 		var pdpGroupValues = {};
 		var chosenPdpGroupValue, chosenPdpSubgroupValue;
-		if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
+		if (this.state.policyInstanceType === OnapConstant.microServiceType) {
 			toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
 			editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
 			pdpGroupValues = this.state.loopCache.getMicroServiceSupportedPdpGroup(this.state.policyName);
 			chosenPdpGroupValue = this.state.loopCache.getMicroServicePdpGroup(this.state.policyName);
 			chosenPdpSubgroupValue = this.state.loopCache.getMicroServicePdpSubgroup(this.state.policyName);
-		} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
+		} else if (this.state.policyInstanceType === OnapConstant.operationalPolicyType) {
 			toscaModel = this.state.loopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
 			editorData = this.state.loopCache.getOperationalPolicyPropertiesForName(this.state.policyName);
 			pdpGroupValues = this.state.loopCache.getOperationalPolicySupportedPdpGroup(this.state.policyName);
@@ -207,7 +211,7 @@ export default class PolicyModal extends React.Component {
 
 	handleRefresh() {
 		var newLoopCache, toscaModel, editorData;
-		if (this.state.policyInstanceType === 'MICRO-SERVICE-POLICY') {
+		if (this.state.policyInstanceType === OnapConstant.microServiceType) {
 			LoopService.refreshMicroServicePolicyJson(this.state.loopCache.getLoopName(),this.state.policyName).then(data => {
 				newLoopCache =  new LoopCache(data);
 				toscaModel = newLoopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
@@ -227,7 +231,7 @@ export default class PolicyModal extends React.Component {
 					showMessage: "Refreshing of UI failed"
 				});
 			});
-		} else if (this.state.policyInstanceType === 'OPERATIONAL-POLICY') {
+		} else if (this.state.policyInstanceType === OnapConstant.operationalPolicyType) {
 			LoopService.refreshOperationalPolicyJson(this.state.loopCache.getLoopName(),this.state.policyName).then(data => {
 				var newLoopCache =  new LoopCache(data);
 				toscaModel = newLoopCache.getOperationalPolicyJsonRepresentationForName(this.state.policyName);
@@ -254,11 +258,60 @@ export default class PolicyModal extends React.Component {
 		this.setState ({ showSucAlert: false, showFailAlert: false });
 	}
 
+	renderPdpGroupDropDown() {
+		if(this.state.policyInstanceType !== OnapConstant.operationalPolicyType || !this.state.loopCache.isOpenLoopTemplate()) {
+			return (
+				<Form.Group as={Row} controlId="formPlaintextEmail">
+					<Form.Label column sm="2">Pdp Group Info</Form.Label>
+					<Col sm="3">
+						<Select value={{ label: this.state.chosenPdpGroup, value: this.state.chosenPdpGroup }} onChange={this.handlePdpGroupChange} options={this.state.pdpGroupList} />
+					</Col>
+					<Col sm="3">
+						<Select value={{ label: this.state.chosenPdpSubgroup, value: this.state.chosenPdpSubgroup }} onChange={this.handlePdpSubgroupChange} options={this.state.pdpSubgroupList} />
+					</Col>
+				</Form.Group>
+			);
+		}
+	}
+
+    renderOpenLoopMessage() {
+    	if(this.state.policyInstanceType === OnapConstant.operationalPolicyType && this.state.loopCache.isOpenLoopTemplate()) {
+    		return (
+   				"Operational Policy cannot be configured as only Open Loop is supported for this Template!"
+   			);
+   		}
+    }
+
+	renderModalTitle() {
+		return (
+				<Modal.Title>Edit the policy</Modal.Title>
+		);
+	}
+
+	renderButton() {
+	    var allElement = [(<Button variant="secondary" onClick={this.handleClose}>
+                                   				Close
+                         </Button>)];
+		if(this.state.policyInstanceType !== OnapConstant.operationalPolicyType || !this.state.loopCache.isOpenLoopTemplate()) {
+             allElement.push((
+                <Button variant="primary" disabled={this.readOnly} onClick={this.handleSave}>
+                                Save Changes
+                </Button>
+             ));
+             allElement.push((
+                <Button variant="primary" disabled={this.readOnly} onClick={this.handleRefresh}>
+                                Refresh
+                </Button>
+             ));
+		}
+		return allElement;
+	}
+
 	render() {
 		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose } backdrop="static">
+			<ModalStyled size="xl" backdrop="static" keyboard={false} show={this.state.show} onHide={this.handleClose}>
 				<Modal.Header closeButton>
-					<Modal.Title>Edit the policy</Modal.Title>
+					{this.renderModalTitle()}
 				</Modal.Header>
 				<Alert variant="success" show={this.state.showSucAlert} onClose={this.disableAlert} dismissible>
 					{this.state.showMessage}
@@ -267,30 +320,14 @@ export default class PolicyModal extends React.Component {
 					{this.state.showMessage}
 				</Alert>
 				<Modal.Body>
+					{this.renderOpenLoopMessage()}
 					<div id="editor" />
-					<Form.Group as={Row} controlId="formPlaintextEmail">
-						<Form.Label column sm="2">Pdp Group Info</Form.Label>
-						<Col sm="3">
-							<Select value={{ label: this.state.chosenPdpGroup, value: this.state.chosenPdpGroup }} onChange={this.handlePdpGroupChange} options={this.state.pdpGroupList} />
-						</Col>
-						<Col sm="3">
-							<Select value={{ label: this.state.chosenPdpSubgroup, value: this.state.chosenPdpSubgroup }} onChange={this.handlePdpSubgroupChange} options={this.state.pdpSubgroupList} />
-						</Col>
-					</Form.Group>
+					{this.renderPdpGroupDropDown()}
 				</Modal.Body>
 				<Modal.Footer>
-					<Button variant="secondary" onClick={this.handleClose}>
-						Close
-					</Button>
-					<Button variant="primary" onClick={this.handleSave}>
-						Save Changes
-					</Button>
-					<Button variant="primary" onClick={this.handleRefresh}>
-						Refresh
-					</Button>
+					{this.renderButton()}
 				</Modal.Footer>
 			</ModalStyled>
-
 		);
 	}
 }
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
index d4021c97c..cb0a32020 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
@@ -25,6 +25,7 @@ import { mount } from 'enzyme';
 import PolicyModal from './PolicyModal';
 import LoopCache from '../../../api/LoopCache';
 import LoopService from '../../../api/LoopService';
+import OnapConstant from '../../../utils/OnapConstants';
 
 describe('Verify PolicyModal', () => {
     beforeEach(() => {
@@ -54,7 +55,7 @@ describe('Verify PolicyModal', () => {
     const loopCache = new LoopCache(loopCacheStr);
     const historyMock = { push: jest.fn() };
     const flushPromises = () => new Promise(setImmediate);
-    const match = {params: {policyName:"OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", policyInstanceType: "OPERATIONAL-POLICY"}}
+    const match = {params: {policyName:"OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", policyInstanceType: OnapConstant.operationalPolicyType}}
         
     it('Test handleClose', () => {
       const handleClose = jest.spyOn(PolicyModal.prototype,'handleClose');
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index 7cf02f711..962ab4bda 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -34,30 +34,12 @@ import FirstPage from '@material-ui/icons/FirstPage';
 import LastPage from '@material-ui/icons/LastPage';
 import Search from '@material-ui/icons/Search';
 import MaterialTable from "material-table";
+import LoopCache from '../../../api/LoopCache';
+import SvgGenerator from '../../loop_viewer/svg/SvgGenerator';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-const LoopViewSvgDivStyled = styled.svg`
-	overflow-x: scroll;
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
-	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-	margin-top: 3em;
-	margin-left: 2em;
-	margin-right:auto;
-	text-align: center;
-	height: 100%;
-	width: 100%;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	
-`
-const SvgContainerDivStyled = styled.div`
-	display: flex;
-	align-items: center;
-	border: 1px solid;
-`
 
 const cellStyle = { border: '1px solid black' };
 const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
@@ -68,7 +50,8 @@ export default class ViewLoopTemplatesModal extends React.Component {
         show: true,
 		content: 'Please select a loop template to display it',
 		selectedRow: -1,
-		loopTemplateData: [],
+		loopTemplatesData: [],
+		fakeLoopCacheWithTemplate: new LoopCache({}),
 		loopTemplateColumnsDefinition: [
 			{ title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
 				cellStyle: cellStyle,
@@ -109,29 +92,27 @@ export default class ViewLoopTemplatesModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 		this.handleClose = this.handleClose.bind(this);
-		this.getBlueprintMicroServiceTemplate = this.getBlueprintMicroServiceTemplate.bind(this);
-		this.getBlueprintMicroServiceTemplates();
+		this.getLoopTemplate = this.getLoopTemplate.bind(this);
+		this.getAllLoopTemplates();
 	}
 
-	getBlueprintMicroServiceTemplates() {
-		TemplateService.getBlueprintMicroServiceTemplates().then(loopTemplateData => {
-		this.setState({ loopTemplateData: loopTemplateData })
+	getAllLoopTemplates() {
+		TemplateService.getAllLoopTemplates().then(templatesData => {
+		    this.setState({ loopTemplatesData: templatesData })
 		});
 	}
 
-	getBlueprintMicroServiceTemplate(templateName) {
-	    if (typeof templateName !== "undefined") {
-		    TemplateService.getBlueprintMicroServiceTemplateSvg(templateName).then(svgXml => {
-				if (svgXml.length !== 0) {
-					this.setState({ content: svgXml })
-				} else {
-					this.setState({ content: 'Please select a loop template to view the details' })
-
-				}
-			});
+	getLoopTemplate(templateIdInDataArray) {
+	    if (typeof templateIdInDataArray !== "undefined") {
+	        this.setState({ fakeLoopCacheWithTemplate:
+                new LoopCache({
+                    "loopTemplate":this.state.loopTemplatesData[templateIdInDataArray],
+                    "name": "fakeLoop"
+                })
+	        })
 		} else {
-          	this.setState({ content: 'Please select a loop template to view the details' })
-          	}
+          	this.setState({ fakeLoopCacheWithTemplate: new LoopCache({}) })
+        }
     }
 
 	handleClose() {
@@ -147,21 +128,18 @@ export default class ViewLoopTemplatesModal extends React.Component {
     			<Modal.Body>
     			   <MaterialTable
     				  title={"View Blueprint MicroService Templates"}
-    				  data={this.state.loopTemplateData}
+    				  data={this.state.loopTemplatesData}
 					  columns={this.state.loopTemplateColumnsDefinition}
 					  icons={this.state.tableIcons}
-    			      onRowClick={(event, rowData) => {this.getBlueprintMicroServiceTemplate(rowData.name);this.setState({selectedRow: rowData.tableData.id})}}
+    			      onRowClick={(event, rowData) => {this.getLoopTemplate(rowData.tableData.id);this.setState({selectedRow: rowData.tableData.id})}}
 					  options={{
 					      headerStyle:rowHeaderStyle,
 					      rowStyle: rowData => ({
 					      backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF'
                           })
                       }}
-                  />
-	              <SvgContainerDivStyled>
-		            <LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.content }} value={this.state.content} >
-					</LoopViewSvgDivStyled>
-	              </SvgContainerDivStyled>
+                />
+	            <SvgGenerator loopCache={this.state.fakeLoopCacheWithTemplate} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_TEMPLATE}/>
                 </Modal.Body>
                 <Modal.Footer>
                 	<Button variant="secondary" onClick={this.handleClose}>Close</Button>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
index 1a6cc1959..7680ec4b9 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.test.js
@@ -24,6 +24,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import ViewLoopTemplatesModal from './ViewLoopTemplatesModal';
 import { mount } from 'enzyme';
+import { BrowserRouter as Router } from 'react-router-dom';
 
 describe('Verify ViewLoopTemplatesModal', () => {
 	beforeEach(() => {
@@ -128,7 +129,7 @@ describe('Verify ViewLoopTemplatesModal', () => {
 					}
 				});
 			});
-			const component = mount(<ViewLoopTemplatesModal/>);
+			const component = mount(<Router><ViewLoopTemplatesModal/></Router>);
 			expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
 		});
 		
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
index 3f6dc9482..ee7b679a5 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/ViewLoopTemplatesModal.test.js.snap
@@ -86,16 +86,7 @@ exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1
           },
         ]
       }
-      data={
-        Object {
-          "allowedLoopType": "CLOSED",
-          "index": "1",
-          "maximumInstancesAllowed": 1,
-          "modelService.serviceDetails.name": "MTCA",
-          "name": "MTCA version 1",
-          "updatedDate": "2019-09-06 19:09:42",
-        }
-      }
+      data={Array []}
       icons={
         Object {
           "FirstPage": Object {
@@ -142,16 +133,15 @@ exports[`Verify ViewLoopTemplatesModal Test the tosca model view render method 1
       }
       title="View Blueprint MicroService Templates"
     />
-    <styled.div>
-      <styled.svg
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "Please select a loop template to display it",
-          }
+    <withRouter(SvgGenerator)
+      clickable={false}
+      generatedFrom="TEMPLATE"
+      loopCache={
+        LoopCache {
+          "loopJsonCache": Object {},
         }
-        value="Please select a loop template to display it"
-      />
-    </styled.div>
+      }
+    />
   </ModalBody>
   <ModalFooter>
     <Button
diff --git a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js b/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
deleted file mode 100644
index 29422a1f5..000000000
--- a/ui-react/src/components/loop_viewer/svg/LoopComponentConverter.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export default class LoopComponentConverter {
-
-	static buildMapOfComponents(loopCache) {
-		var componentsMap = new Map([]);
-		if (typeof (loopCache.getMicroServicePolicies()) !== "undefined") {
-			loopCache.getMicroServicePolicies().forEach(ms => {
-				componentsMap.set(ms.name, "/policyModal/MICRO-SERVICE-POLICY/"+ms.name);
-			})
-		}
-		if (typeof (loopCache.getOperationalPolicies()) !== "undefined") {
-			loopCache.getOperationalPolicies().forEach(op => {
-				componentsMap.set(op.name, "/policyModal/OPERATIONAL-POLICY/"+op.name);
-			})
-		}
-		return componentsMap;
-	}
-}
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
deleted file mode 100644
index 048f63044..000000000
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import styled from 'styled-components';
-import LoopCache from '../../../api/LoopCache';
-import { withRouter } from "react-router-dom";
-import LoopService from '../../../api/LoopService';
-import LoopComponentConverter from './LoopComponentConverter';
-
-const LoopViewSvgDivStyled = styled.svg`
-	display: flex;
-	flex-direction: row;
-	overflow-x: scroll;
-	background-color: ${props => (props.theme.loopViewerBackgroundColor)};
-	border: 1px solid;
-	border-color: ${props => (props.theme.loopViewerHeaderColor)};
-	margin-top: 1em;
-	margin-left: auto;
-	margin-right:auto;
-	margin-bottom: -3em;
-	align-items: center;
-	height: 100%;
-	width: 100%;
-
-`
-
-class LoopViewSvg extends React.Component {
-
-	static emptySvg = "<svg><text x=\"20\" y=\"40\">No LOOP (SVG)</text></svg>";
-
-	state = {
-		svgContent: LoopViewSvg.emptySvg,
-		loopCache: new LoopCache({}),
-		componentModalMapping: new Map([])
-	}
-
-	constructor(props) {
-		super(props);
-		this.handleSvgClick = this.handleSvgClick.bind(this);
-		this.getSvg = this.getSvg.bind(this);
-		this.state.loopCache = props.loopCache;
-		this.state.componentModalMapping = LoopComponentConverter.buildMapOfComponents(props.loopCache);
-		this.getSvg(props.loopCache.getLoopName());
-	}
-
-	shouldComponentUpdate(nextProps, nextState) {
-		return this.state.svgContent !== nextState.svgContent;
-	}
-
-	componentWillReceiveProps(newProps) {
-		if (this.state.loopCache !== newProps.loopCache) {
-			this.setState({
-				loopCache: newProps.loopCache,
-				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache)
-			});
-			this.getSvg(newProps.loopCache.getLoopName());
-		}
-	}
-
-	getSvg(loopName) {
-		if (typeof loopName !== "undefined") {
-			LoopService.getSvg(loopName).then(svgXml => {
-				if (svgXml.length !== 0) {
-					this.setState({ svgContent: svgXml })
-				} else {
-					this.setState({ svgContent: LoopViewSvg.emptySvg })
-				}
-			});
-		} else {
-			this.setState({ svgContent: LoopViewSvg.emptySvg })
-		}
-	}
-
-	handleSvgClick(event) {
-		console.debug("svg click event received");
-		var elementName = event.target.parentNode.parentNode.parentNode.getAttribute('data-element-id');
-		console.info("SVG element clicked", elementName);
-		this.props.history.push(this.state.componentModalMapping.get(elementName));
-	}
-
-	render() {
-		return (
-			<LoopViewSvgDivStyled dangerouslySetInnerHTML={{ __html: this.state.svgContent }} onClick={this.handleSvgClick}>
-
-			</LoopViewSvgDivStyled>
-		);
-	}
-}
-
-export default withRouter(LoopViewSvg);
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
deleted file mode 100644
index e54b500f5..000000000
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import LoopSvg from './LoopSvg';
-import LoopCache from '../../../api/LoopCache';
-import LoopService from '../../../api/LoopService';
-
-describe('Verify LoopSvg', () => {
-    const loopCache = new LoopCache({
-        "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-        "microServicePolicies": [{
-            "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-            "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            "properties": {"domain": "measurementsForVfScaling"},
-            "shared": false,
-            "jsonRepresentation": {"schema": {}}
-        }],
-        "operationalPolicies": [{
-            "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
-            "configurationsJson": {
-                "operational_policy": {
-                    "controlLoop": {},
-                    "policies": []
-                }
-            }
-        }]
-    });
-
-    it('Test the render method no loopName', () => {
-        const localLoopCache = new LoopCache({
-        "microServicePolicies": [{
-            "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-            "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            "properties": {"domain": "measurementsForVfScaling"},
-            "shared": false,
-            "jsonRepresentation": {"schema": {}}
-          }]
-        });
-        const component = shallow(
-            <LoopSvg.WrappedComponent loopCache={localLoopCache}/>
-        );
-
-        expect(component).toMatchSnapshot();
-    });
-
-    it('Test the render method', () => {
-        const component = shallow(
-            <LoopSvg.WrappedComponent  loopCache={loopCache}/>
-        );
-
-        expect(component).toMatchSnapshot();
-    });
-
-    it('Test the render method svg not empty', async () => {
-        const flushPromises = () => new Promise(setImmediate);
-        LoopService.getSvg = jest.fn().mockImplementation(() => {
-            return Promise.resolve("<svg><text test</text></svg>");
-        });
-        const component = shallow(
-            <LoopSvg.WrappedComponent  loopCache={loopCache}/>
-        );
-        await flushPromises();
-        expect(component).toMatchSnapshot();
-    });
-
-    it('Test handleSvgClick', () => {
-        const historyMock = { push: jest.fn() };
-
-        const component = shallow(
-            <LoopSvg.WrappedComponent loopCache={loopCache} history={historyMock}/>
-        );
-        let dummyElement = document.createElement('div');
-        dummyElement.setAttribute("data-element-id","TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
-
-        const event = { target: { parentNode: { parentNode:{ parentNode: dummyElement }}}};
-
-        component.simulate('click', event);
-        component.update();
-
-        expect(historyMock.push.mock.calls[0]).toEqual([ '/policyModal/MICRO-SERVICE-POLICY/TCA_h2NMX_v1_0_ResourceInstanceName1_tca']);
-
-        //click operational policy
-        dummyElement.setAttribute("data-element-id","OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca");
-        const event2 = { target: { parentNode: { parentNode:{ parentNode: dummyElement }}}};
-
-        component.simulate('click', event2);
-        component.update();
-
-        expect(historyMock.push.mock.calls[1]).toEqual([ '/policyModal/OPERATIONAL-POLICY/OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca']);
-    });
-
-    it('Test componentWillReceiveProps method', () => {
-        const localLoopCache = new LoopCache({
-        "microServicePolicies": [{
-            "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-            "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-            "properties": {"domain": "measurementsForVfScaling"},
-            "shared": false,
-            "jsonRepresentation": {"schema": {}}
-          }]
-        });
-        const component = shallow(
-            <LoopSvg.WrappedComponent loopCache={localLoopCache}/>
-        );
-
-        expect(component.state('componentModalMapping').size).toEqual(1);
-
-        component.setProps({loopCache: loopCache});
-        expect(component.state('componentModalMapping').size).toEqual(2);
-    });
-});
diff --git a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js b/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
new file mode 100644
index 000000000..d718c2e44
--- /dev/null
+++ b/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
@@ -0,0 +1,240 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import styled from 'styled-components';
+import { withRouter } from "react-router-dom";
+import LoopCache from '../../../api/LoopCache';
+import OnapConstant from '../../../utils/OnapConstants';
+
+const DivStyled = styled.div`
+	overflow-x: scroll;
+    width: 100%;
+    height: 100%;
+`
+
+const emptySvg = (<svg> <text x="20" y="40">No LOOP (SVG)</text> </svg>);
+
+class SvgGenerator extends React.Component {
+    boxWidth = 200;
+    boxHeight = 100;
+    boxSpace = 50;
+
+    static GENERATED_FROM_INSTANCE = "INSTANCE";
+    static GENERATED_FROM_TEMPLATE = "TEMPLATE";
+
+	state = {
+		loopCache: new LoopCache({}),
+		clickable: false,
+		generatedFrom: SvgGenerator.GENERATED_FROM_INSTANCE, // INSTANCE / TEMPLATE
+	}
+
+	constructor(props) {
+		super(props);
+		this.state.loopCache = props.loopCache;
+		this.state.clickable = props.clickable;
+		this.state.generatedFrom = props.generatedFrom;
+		this.handleSvgClick = this.handleSvgClick.bind(this);
+		this.renderSvg = this.renderSvg.bind(this);
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		return this.state.loopCache !== nextState.loopCache;
+	}
+
+	componentWillReceiveProps(newProps) {
+		if (this.state.loopCache !== newProps.loopCache) {
+			this.setState({
+				loopCache: newProps.loopCache,
+			});
+		}
+	}
+
+	handleSvgClick(event) {
+	    if (this.state.clickable) {
+            console.debug("svg click event received");
+            var elementName = event.target.parentNode.getAttribute('policyId');
+            console.info("SVG element clicked", elementName);
+            if (elementName !== null) {
+                this.props.history.push("/policyModal/"+event.target.parentNode.getAttribute('policyType')+"/"+elementName);
+            }
+		}
+	}
+
+    createVesBox (xPos) {
+        return this.createOneBox(xPos,null,null,'VES Collector','VES',null);
+    }
+
+    createOneArrow(xPos) {
+        return (
+         <svg width={this.boxSpace} height={this.boxHeight} x={xPos}>
+           <defs>
+            		<marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" orient="auto" refX="8.5" refY="5" id="arrow">
+            			<path d="m 1 5 l 0 -3 l 7 3 l -7 3 z"
+            				stroke-width= "1" stroke-linecap= "butt" stroke-dasharray= "10000, 1"
+            				fill="#000000" stroke="#000000" />
+            		</marker>
+           </defs>
+           <line x1="0" y1="50%" x2="100%" y2="50%" stroke-width="2" color="black" stroke="black" marker-end="url(#arrow)"/>
+         </svg>
+        );
+    }
+
+    createBeginCircle(xPos, text) {
+            return (
+            <svg width={this.boxWidth} height={this.boxHeight} x={xPos}>
+                <circle cx={this.boxWidth-30} cy="50%" r="30" stroke-width="1" color="black" stroke="black" fill="#27ae60"/>
+                <text x={this.boxWidth-30} y="50%" text-anchor="middle" dominant-baseline="middle" textLength="20%" lengthAdjust="spacingAndGlyphs" >{text}</text>
+            </svg>
+            );
+    }
+
+    createEndCircle(xPos, text) {
+            return (
+            <svg width={this.boxWidth} height={this.boxHeight} x={xPos}>
+                <circle cx={30} cy="50%" r="30" stroke-width="2" color="black" stroke="black" fill="#27ae60"/>
+                <text x={30} y="50%" text-anchor="middle" dominant-baseline="middle" textLength="20%" lengthAdjust="spacingAndGlyphs" >{text}</text>
+            </svg>
+            );
+    }
+
+    createOneBox(xPos, policyId, loopElementModelId , name, title, policyType) {
+        return (
+        <svg width={this.boxWidth} height={this.boxHeight} x={xPos} title="test">
+            <g policyId={policyId} loopElementModelId={loopElementModelId} policyType={policyType}>
+                <rect width="100%" height="100%" stroke-width="2" color="black" stroke="black" fill="#1abc9c"/>
+                <text x="50%" y="15%" color="white" fill="white" dominant-baseline="middle" text-anchor="middle" textLength="50%" lengthAdjust="spacingAndGlyphs">{title}</text>
+                <text x="50%" y="50%" text-anchor="middle" dominant-baseline="middle" textLength="80%" lengthAdjust="spacingAndGlyphs" >{name}</text>
+                <text x="50%" y="80%" text-anchor="middle" dominant-baseline="middle" textLength="110%" lengthAdjust="spacingAndGlyphs" >{policyId}</text>
+            </g>
+        </svg>
+        );
+    }
+
+    createSvgFromTemplate() {
+        const allElements = [];
+        var xPos = 0;
+
+        allElements.push(this.createBeginCircle(xPos,"Start"))
+        xPos+=(this.boxWidth+this.boxSpace);
+
+        allElements.push(this.createOneArrow(xPos-this.boxSpace));
+
+        allElements.push(this.createVesBox(xPos));
+        xPos+=(this.boxWidth+this.boxSpace);
+
+        allElements.push(this.createOneArrow(xPos-this.boxSpace));
+        //createOneBox(xPos, policyId, loopElementModelId , name, title, policyType)
+        for (var loopElement of this.state.loopCache.getAllLoopElementModels()) {
+
+            allElements.push(this.createOneBox(xPos,
+                loopElement['name'],
+                loopElement['name'],
+                loopElement['shortName'],
+                loopElement['loopElementType'],
+                loopElement['loopElementType']))
+            xPos+=(this.boxWidth+this.boxSpace);
+            allElements.push(this.createOneArrow(xPos-this.boxSpace));
+        }
+
+        allElements.push(this.createEndCircle(xPos, "End"))
+        xPos+=(this.boxWidth+this.boxSpace);
+
+        return allElements;
+    }
+
+    createSvgFromInstance() {
+        const allElements = [];
+        var xPos = 0;
+
+        allElements.push(this.createBeginCircle(xPos,"Start"))
+        xPos+=(this.boxWidth+this.boxSpace);
+
+        allElements.push(this.createOneArrow(xPos-this.boxSpace));
+
+        allElements.push(this.createVesBox(xPos));
+        xPos+=(this.boxWidth+this.boxSpace);
+
+        allElements.push(this.createOneArrow(xPos-this.boxSpace));
+
+        for (var msPolicy in this.state.loopCache.getMicroServicePolicies()) {
+            var loopElementModelName =  this.state.loopCache.getMicroServicePolicies()[msPolicy]['loopElementModel'];
+            if (loopElementModelName !== undefined) {
+                loopElementModelName = loopElementModelName['name'];
+            }
+            allElements.push(this.createOneBox(xPos,
+                this.state.loopCache.getMicroServicePolicies()[msPolicy]['name'],
+                loopElementModelName,
+                this.state.loopCache.getMicroServicePolicies()[msPolicy]['policyModel']['policyAcronym'],
+                'microservice',
+                OnapConstant.microServiceType))
+            xPos+=(this.boxWidth+this.boxSpace);
+            allElements.push(this.createOneArrow(xPos-this.boxSpace));
+        }
+
+        for (var opPolicy in this.state.loopCache.getOperationalPolicies()) {
+            loopElementModelName =  this.state.loopCache.getOperationalPolicies()[opPolicy]['loopElementModel'];
+            if (loopElementModelName !== undefined) {
+                loopElementModelName = loopElementModelName['name'];
+            }
+            allElements.push(this.createOneBox(xPos,
+                this.state.loopCache.getOperationalPolicies()[opPolicy]['name'],
+                loopElementModelName,
+                this.state.loopCache.getOperationalPolicies()[opPolicy]['policyModel']['policyAcronym'],
+                'operational',
+                OnapConstant.operationalPolicyType))
+            xPos+=(this.boxWidth+this.boxSpace);
+            allElements.push(this.createOneArrow(xPos-this.boxSpace));
+        }
+
+        allElements.push(this.createEndCircle(xPos, "End"))
+        xPos+=(this.boxWidth+this.boxSpace);
+
+        return allElements;
+    }
+
+    renderSvg() {
+        if (this.state.loopCache.getLoopName() === undefined) {
+            return [emptySvg];
+        }
+        if (this.state.generatedFrom === SvgGenerator.GENERATED_FROM_INSTANCE) {
+            return this.createSvgFromInstance();
+        } else if (this.state.generatedFrom === SvgGenerator.GENERATED_FROM_TEMPLATE) {
+            return this.createSvgFromTemplate();
+        }
+    }
+
+    render() {
+        var allTheElements = this.renderSvg();
+        var svgWidth = this.boxWidth*allTheElements.length;
+        var svgHeight = this.boxHeight+100;
+        return (
+            <DivStyled onClick={this.handleSvgClick} >
+                <svg height={svgHeight} width={svgWidth}  preserveAspectRatio="none">
+                    {allTheElements}
+                </svg>
+            </DivStyled>
+        );
+    }
+}
+
+export default withRouter(SvgGenerator);
diff --git a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap b/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
deleted file mode 100644
index e05f1c794..000000000
--- a/ui-react/src/components/loop_viewer/svg/__snapshots__/LoopSvg.test.js.snap
+++ /dev/null
@@ -1,34 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Verify LoopSvg Test the render method 1`] = `
-<styled.svg
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<svg><text x=\\"20\\" y=\\"40\\">No LOOP (SVG)</text></svg>",
-    }
-  }
-  onClick={[Function]}
-/>
-`;
-
-exports[`Verify LoopSvg Test the render method no loopName 1`] = `
-<styled.svg
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<svg><text x=\\"20\\" y=\\"40\\">No LOOP (SVG)</text></svg>",
-    }
-  }
-  onClick={[Function]}
-/>
-`;
-
-exports[`Verify LoopSvg Test the render method svg not empty 1`] = `
-<styled.svg
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<svg><text test</text></svg>",
-    }
-  }
-  onClick={[Function]}
-/>
-`;
diff --git a/ui-react/src/components/loop_viewer/svg/example.svg b/ui-react/src/components/loop_viewer/svg/example.svg
deleted file mode 100644
index a7c40ee27..000000000
--- a/ui-react/src/components/loop_viewer/svg/example.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="start-circle" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><circle fill="none" r="17" cx="18" cy="41"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-82c14603-02fc-4df7-8977-9b10e4c775d1" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="35" x2="123" y1="41"/><polygon fill="none" points=" 121 39 121 43 125 41"/><polygon points=" 121 39 121 43 125 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="VES" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><rect fill="none" x="127" width="123" y="1" height="82"/></g><g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"><rect x="127" width="123" y="1" height="82" stroke="none"/></g><g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"><text x="176.5" xml:space="preserve" y="46.5" stroke="none">VES</text><line y2="83" fill="none" x1="147" x2="147" y1="1"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-dbbb2d5a-e9c4-446d-92b9-c71908854434" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="250" x2="338" y1="41"/><polygon fill="none" points=" 336 39 336 43 340 41"/><polygon points=" 336 39 336 43 340 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="TCA_Jbv1z_v1_0_ResourceInstanceName1_tca" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><rect fill="none" x="342" width="123" y="1" height="82"/></g><g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"><rect x="342" width="123" y="1" height="82" stroke="none"/></g><g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"><text x="392" xml:space="preserve" y="46.5" stroke="none">TCA</text><line y2="61" fill="none" x1="342" x2="465" y1="61"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-3892abbc-c49c-40df-984b-8959b6df44e6" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="465" x2="553" y1="41"/><polygon fill="none" points=" 551 39 551 43 555 41"/><polygon points=" 551 39 551 43 555 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="OperationalPolicy" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><rect fill="none" x="557" width="123" y="1" height="82"/></g><g fill-opacity="0" fill="rgb(0,0,0)" text-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="rgb(0,0,0)" stroke-opacity="0" stroke-width="2"><rect x="557" width="123" y="1" height="82" stroke="none"/></g><g text-rendering="optimizeQuality" stroke-width="2" shape-rendering="geometricPrecision" font-family="sans-serif"><text x="564.5" xml:space="preserve" y="46.5" stroke="none">OperationalPolicy</text><line y2="1" fill="none" x1="557" x2="618" y1="42"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="Arrow-44a8b77e-d0eb-4c0d-82b6-0822ff35573f" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="2"><line y2="41" fill="none" x1="680" x2="768" y1="41"/><polygon fill="none" points=" 766 39 766 43 770 41"/><polygon points=" 766 39 766 43 770 41" stroke="none"/></g></g></g><g fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" font-family="'Dialog'" font-style="normal" data-element-id="stop-circle" stroke-linejoin="miter" font-size="12px" image-rendering="auto" stroke-dashoffset="0"><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"/><g><g shape-rendering="geometricPrecision" text-rendering="optimizeQuality" stroke-width="4"><circle fill="none" r="17" cx="789" cy="41"/></g></g></g></svg>
\ No newline at end of file
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index 64fd7c5d9..43aa30f00 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -51,12 +51,6 @@ export const GlobalClampStyle = createGlobalStyle`
 		margin-top: 1px;
 	}
 
-	svg {
-		overflow: hidden;
-		width: 100%;
-		height: 100%;
-	}
-
 	label {
 		font-family: ${props => props.theme.fontFamily};
 		font-size: ${props => props.theme.fontSize};
@@ -68,6 +62,7 @@ export const GlobalClampStyle = createGlobalStyle`
 		font-size: ${props => props.theme.fontSize};
 		font-weight: bold;
 	}
+
 `
 
 export const DefaultClampTheme = {
diff --git a/ui-react/src/utils/OnapConstants.js b/ui-react/src/utils/OnapConstants.js
index 22460c3d1..8460340d1 100644
--- a/ui-react/src/utils/OnapConstants.js
+++ b/ui-react/src/utils/OnapConstants.js
@@ -24,7 +24,9 @@
 // Maintain a list of ONAP CLAMP UI "constants" that can be used by any componenet within CLAMP
 
 const OnapConstants = {
-	defaultLoopName: "Empty (NO loop loaded yet)"
+	defaultLoopName: "Empty (NO loop loaded yet)",
+	microServiceType: "MICRO-SERVICE-POLICY",
+	operationalPolicyType: "OPERATIONAL_POLICY_TYPE"
 };
 
 export default OnapConstants;
-- 
cgit 1.2.3-korg


From 5f98f5d2da9d6227d466797ada3c9562fa0b856a Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 2 Jun 2020 18:09:45 +0200
Subject: Removal of useless code

Removal of previous modal not used anymore

Issue-ID: CLAMP-854
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ica6a316369433714323bf0fddff60722281d0f5f
---
 ui-react/src/LoopUI.js                             |   5 -
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   8 -
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   8 -
 .../ConfigurationPolicyModal.js                    | 127 ---------------
 .../ConfigurationPolicyModal.test.js               |  78 ----------
 .../OperationalPolicy/OperationalPolicyModal.js    | 173 ---------------------
 .../OperationalPolicyModal.test.js                 |  93 -----------
 .../dialogs/OperationalPolicy/template.json        |  37 -----
 8 files changed, 529 deletions(-)
 delete mode 100644 ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
 delete mode 100644 ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
 delete mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
 delete mode 100644 ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
 delete mode 100644 ui-react/src/components/dialogs/OperationalPolicy/template.json

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 6522cc3dd..107992137 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -40,8 +40,6 @@ import { Route } from 'react-router-dom'
 import CreateLoopModal from './components/dialogs/Loop/CreateLoopModal';
 import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
 import ModifyLoopModal from './components/dialogs/Loop/ModifyLoopModal';
-import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
-import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
 import PolicyModal from './components/dialogs/Policy/PolicyModal';
 import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
 import UserInfoModal from './components/dialogs/UserInfoModal';
@@ -268,10 +266,7 @@ export default class LoopUI extends React.Component {
 				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
 				<Route path="/ViewLoopTemplatesModal" render={(routeProps) => (<ViewLoopTemplatesModal {...routeProps} />)} />
 				<Route path="/ManageDictionaries" render={(routeProps) => (<ManageDictionaries {...routeProps} />)} />
-				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
-				<Route path="/configurationPolicyModal/:policyName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/createLoop" render={(routeProps) => (<CreateLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index d8b2e7be5..958e77a99 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -20,18 +20,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/ManageDictionaries"
     render={[Function]}
   />
-  <Route
-    path="/operationalPolicyModal"
-    render={[Function]}
-  />
   <Route
     path="/policyModal/:policyInstanceType/:policyName"
     render={[Function]}
   />
-  <Route
-    path="/configurationPolicyModal/:policyName"
-    render={[Function]}
-  />
   <Route
     path="/createLoop"
     render={[Function]}
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 39b544556..a06f1edfa 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -47,18 +47,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/ManageDictionaries"
       render={[Function]}
     />
-    <Route
-      path="/operationalPolicyModal"
-      render={[Function]}
-    />
     <Route
       path="/policyModal/:policyInstanceType/:policyName"
       render={[Function]}
     />
-    <Route
-      path="/configurationPolicyModal/:policyName"
-      render={[Function]}
-    />
     <Route
       path="/createLoop"
       render={[Function]}
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
deleted file mode 100644
index 3ff1ebec7..000000000
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import styled from 'styled-components';
-import LoopService from '../../../api/LoopService';
-import JSONEditor from '@json-editor/json-editor';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-
-export default class ConfigurationPolicyModal extends React.Component {
-
-	state = {
-		show: true,
-		loopCache: this.props.loopCache,
-		jsonEditor: null,
-		policyName: this.props.match.params.policyName
-	};
-
-	constructor(props, context) {
-		super(props, context);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleSave = this.handleSave.bind(this);
-		this.renderJsonEditor = this.renderJsonEditor.bind(this);
-	}
-
-	handleSave() {
-		var errors = this.state.jsonEditor.validate();
-		var editorData = this.state.jsonEditor.getValue();
-
-		if (errors.length !== 0) {
-			console.error("Errors detected during config policy data validation ", errors);
-			this.setState({ show: false });
-			this.props.history.push('/');
-		}
-		else {
-			console.info("NO validation errors found in config policy data");
-			this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
-			LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
-				this.setState({ show: false });
-				this.props.history.push('/');
-				this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-			});
-		}
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-	}
-
-	componentDidMount() {
-		this.renderJsonEditor();
-	}
-
-	renderJsonEditor() {
-		console.debug("Rendering ConfigurationPolicyModal ", this.state.policyName);
-		var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
-		if (toscaModel == null) {
-			return;
-		}
-		var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
-
-		this.setState({
-			jsonEditor: new JSONEditor(document.getElementById("editor"),
-				{
-				    schema: toscaModel,
-				    startval: editorData,
-				    theme: 'bootstrap4',
-                    object_layout: 'grid',
-                    disable_properties: true,
-                    disable_edit_json: false,
-                    disable_array_reorder: true,
-                    disable_array_delete_last_row: true,
-                    disable_array_delete_all_rows: false,
-                    show_errors: 'always'
-				 })
-		})
-	}
-
-	render() {
-		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
-				<Modal.Header closeButton>
-					<Modal.Title>Configuration policies</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<div id="editor" />
-
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" onClick={this.handleClose}>
-						Close
-	            </Button>
-					<Button variant="primary" onClick={this.handleSave}>
-						Save Changes
-	            </Button>
-				</Modal.Footer>
-			</ModalStyled>
-
-		);
-	}
-}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
deleted file mode 100644
index a19c18c96..000000000
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { mount } from 'enzyme';
-import ConfigurationPolicyModal from './ConfigurationPolicyModal';
-import LoopCache from '../../../api/LoopCache';
-
-describe('Verify ConfigurationPolicyModal', () => {
-    beforeEach(() => {
-        fetch.resetMocks();
-        fetch.mockImplementation(() => {
-            return Promise.resolve({
-                ok: true,
-                status: 200,
-                text: () => "OK"
-            });
-        });
-    })
-    const loopCache = new LoopCache({
-            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-            "microServicePolicies": [{
-                "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
-                "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-                "properties": {"domain": "measurementsForVfScaling"},
-                "shared": false,
-                "jsonRepresentation": {"schema": {}}
-        }]
-    });
-    const historyMock = { push: jest.fn() };
-    const matchMock = { params:{ policyName: "TCA_h2NMX_v1_0_ResourceInstanceName1_tca" } } 
-    const flushPromises = () => new Promise(setImmediate);
-	
-    it('Test handleClose', () => {
-      const handleClose = jest.spyOn(ConfigurationPolicyModal.prototype,'handleClose');
-      const component = mount(<ConfigurationPolicyModal history={historyMock} loopCache={loopCache} match={matchMock}/>)
-
-      component.find('[variant="secondary"]').prop('onClick')();
-
-      expect(handleClose).toHaveBeenCalledTimes(1);
-      expect(component.state('show')).toEqual(false);
-      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    });
-
-    it('Test handleSave', async () => {
-        const loadLoopFunction = jest.fn();
-        const handleSave = jest.spyOn(ConfigurationPolicyModal.prototype,'handleSave');
-        const component = mount(<ConfigurationPolicyModal history={historyMock} match={matchMock} loopCache={loopCache} loadLoopFunction={loadLoopFunction}/>)
-
-        component.find('[variant="primary"]').prop('onClick')();
-        await flushPromises();
-        component.update();
-
-        expect(handleSave).toHaveBeenCalledTimes(1);
-        expect(component.state('show')).toEqual(false);
-        expect(component.state('policyName')).toEqual("TCA_h2NMX_v1_0_ResourceInstanceName1_tca");
-        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    });
-});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
deleted file mode 100644
index 77dce1656..000000000
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import React from 'react'
-import Button from 'react-bootstrap/Button';
-import Modal from 'react-bootstrap/Modal';
-import styled from 'styled-components';
-import LoopCache from '../../../api/LoopCache';
-import LoopService from '../../../api/LoopService';
-import JSONEditor from '@json-editor/json-editor';
-
-const ModalStyled = styled(Modal)`
-	background-color: transparent;
-`
-
-export default class OperationalPolicyModal extends React.Component {
-
-	state = {
-		show: true,
-		loopCache: this.props.loopCache,
-		jsonEditor: null
-	};
-
-	constructor(props, context) {
-		super(props, context);
-		this.handleClose = this.handleClose.bind(this);
-		this.handleSave = this.handleSave.bind(this);
-		this.renderJsonEditor = this.renderJsonEditor.bind(this);
-		this.handleRefresh = this.handleRefresh.bind(this);
-		this.setDefaultJsonEditorOptions();
-	}
-
-	handleSave() {
-		var errors = this.state.jsonEditor.validate();
-		var editorData = this.state.jsonEditor.getValue();
-
-		if (errors.length !== 0) {
-			console.error("Errors detected during config policy data validation ", errors);
-			this.props.showFailAlert(errors);
-		}
-		else {
-			console.info("NO validation errors found in config policy data");
-			this.state.loopCache.updateOperationalPolicyProperties(editorData);
-			LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()).then(resp => {
-				this.setState({ show: false });
-				this.props.history.push('/');
-				this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-			});
-		}
-	}
-
-	handleClose() {
-		this.setState({ show: false });
-		this.props.history.push('/');
-	}
-
-	componentDidMount() {
-		this.renderJsonEditor();
-	}
-
-	setDefaultJsonEditorOptions() {
-		JSONEditor.defaults.themes.myBootstrap4 = JSONEditor.defaults.themes.bootstrap4.extend({
-			getTab: function(text,tabId) {
-				var liel = document.createElement('li');
-				liel.classList.add('nav-item');
-				var ael = document.createElement("a");
-				ael.classList.add("nav-link");
-				ael.setAttribute("style",'padding:10px;max-width:160px;');
-				ael.setAttribute("href", "#" + tabId);
-				ael.setAttribute('data-toggle', 'tab');
-				text.setAttribute("style",'word-wrap:break-word;');
-				ael.appendChild(text);
-				liel.appendChild(ael);
-				return liel;
-			}
-		});
-	}
-
-	renderJsonEditor() {
-		console.debug("Rendering OperationalPolicyModal");
-		var schema_json = this.state.loopCache.getOperationalPolicyJsonSchema();
-		
-		if (schema_json == null) {
-			console.error("NO Operational policy schema found");
-			return;
-		}
-		var operationalPoliciesData = this.state.loopCache.getOperationalPoliciesNoJsonSchema();
-
-		this.setState({
-				jsonEditor: new JSONEditor(document.getElementById("editor"),
-					{
-					    schema: schema_json.schema,
-					    startval: operationalPoliciesData,
-					    theme: 'myBootstrap4',
-                        object_layout: 'grid',
-                        disable_properties: true,
-                        disable_edit_json: false,
-                        disable_array_reorder: true,
-                        disable_array_delete_last_row: true,
-                        disable_array_delete_all_rows: false,
-                        array_controls_top: true,
-                        show_errors: 'always',
-                        keep_oneof_values: false,
-                        collapsed:true
-					})
-			})
-	}
-
-	handleRefresh() {
-		LoopService.refreshOperationalPolicyJson(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()[0]).then(data => {
-			var newLoopCache =  new LoopCache(data);
-			var schema_json = newLoopCache.getOperationalPolicyJsonSchema();
-			var operationalPoliciesData = newLoopCache.getOperationalPoliciesNoJsonSchema();
-			document.getElementById("editor").innerHTML = "";
-			this.setState({
-				loopCache: newLoopCache,
-				jsonEditor: new JSONEditor(document.getElementById("editor"),
-					{ schema: schema_json.schema, startval: operationalPoliciesData })
-			})
-			this.props.updateLoopFunction(data);
-			
-		})
-		.catch(error => {
-			console.error("Error while refreshing the Operational Policy Json Representation");
-		});
-	}
-
-	render() {
-		return (
-			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
-				<Modal.Header closeButton>
-					<Modal.Title>Operational policies</Modal.Title>
-				</Modal.Header>
-				<Modal.Body>
-					<div id="editor" />
-
-				</Modal.Body>
-				<Modal.Footer>
-					<Button variant="secondary" onClick={this.handleClose}>
-						Close
-					</Button>
-					<Button variant="secondary" onClick={this.handleRefresh}>
-						Refresh
-					</Button>
-					<Button variant="primary" onClick={this.handleSave}>
-						Save Changes
-					</Button>
-				</Modal.Footer>
-			</ModalStyled>
-
-		);
-	}
-}
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
deleted file mode 100644
index 4c11ce535..000000000
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-import React from 'react';
-import { mount } from 'enzyme';
-import OperationalPolicyModal from './OperationalPolicyModal';
-import LoopCache from '../../../api/LoopCache';
-
-describe('Verify OperationalPolicyModal', () => {
-    beforeEach(() => {
-        fetch.resetMocks();
-        fetch.mockImplementation(() => {
-            return Promise.resolve({
-                ok: true,
-                status: 200,
-                text: () => "OK"
-            });
-        });
-    })
-    const loopCache = new LoopCache({
-            "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
-            "operationalPolicies": [{
-                "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
-                "configurationsJson": {
-                    "operational_policy": {
-                        "controlLoop": {},
-                        "policies": []
-                    }
-                },
-                "jsonRepresentation" : {"schema": {}}
-             }]
-    });
-    const historyMock = { push: jest.fn() };
-    const flushPromises = () => new Promise(setImmediate);
-
-    it('Test handleClose', () => {
-      const handleClose = jest.spyOn(OperationalPolicyModal.prototype,'handleClose');
-      const component = mount(<OperationalPolicyModal history={historyMock} loopCache={loopCache}/>)
-
-      component.find('[variant="secondary"]').get(0).props.onClick();
-
-      expect(handleClose).toHaveBeenCalledTimes(1);
-      expect(component.state('show')).toEqual(false);
-      expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    });
-
-    it('Test handleSave', async () => {
-        const loadLoopFunction = jest.fn();
-        const handleSave = jest.spyOn(OperationalPolicyModal.prototype,'handleSave');
-        const component = mount(<OperationalPolicyModal history={historyMock} 
-                          loopCache={loopCache} loadLoopFunction={loadLoopFunction} />)
-
-        component.find('[variant="primary"]').prop('onClick')();
-        await flushPromises();
-        component.update();
-
-        expect(handleSave).toHaveBeenCalledTimes(1);
-        expect(component.state('show')).toEqual(false);
-        expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
-    });
-
-    it('Test handleRefresh', async () => {
-        const updateLoopFunction = jest.fn();
-        const handleRefresh = jest.spyOn(OperationalPolicyModal.prototype,'handleRefresh');
-        const component = mount(<OperationalPolicyModal loopCache={loopCache} updateLoopFunction={updateLoopFunction} />)
-
-        component.find('[variant="secondary"]').get(1).props.onClick();
-        await flushPromises();
-        component.update();
-
-        expect(handleRefresh).toHaveBeenCalledTimes(1);
-        expect(component.state('show')).toEqual(true);
-    });
-});
\ No newline at end of file
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/template.json b/ui-react/src/components/dialogs/OperationalPolicy/template.json
deleted file mode 100644
index 7c9dc0cdd..000000000
--- a/ui-react/src/components/dialogs/OperationalPolicy/template.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"operationalPolicies": [
-		{
-			"name": "OPERATIONAL_LOOP_NAME",
-			"configurationsJson": {
-				"operational_policy": {
-					"controlLoop": {
-						"trigger_policy": "new",
-						"timeout": "0",
-						"abatement": "false",
-						"controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
-					},
-					"policies": [
-						{
-							"id": "new",
-							"recipe": "",
-							"retry": "0",
-							"timeout": "0",
-							"actor": "",
-							"payload": "",
-							"success": "",
-							"failure": "",
-							"failure_timeout": "",
-							"failure_retries": "",
-							"failure_exception": "",
-							"failure_guard": "",
-							"target": {
-								"type": "VM",
-								"resourceID": ""
-							}
-						}
-					]
-				}
-			}
-		}
-	]
-}
\ No newline at end of file
-- 
cgit 1.2.3-korg


From 715746fbd2bcb18193138d56df50b0d44da2681b Mon Sep 17 00:00:00 2001
From: xuegao <xg353y@intl.att.com>
Date: Wed, 3 Jun 2020 16:18:03 +0200
Subject: Remove logout

Remove the logout option from UI.

Issue-ID: CLAMP-860
Change-Id: I711b8a7eaf523195f0534044efd3dd74c3f1e0be
Signed-off-by: xuegao <xg353y@intl.att.com>
---
 .../clds/config/DefaultUserConfiguration.java      |  4 +---
 ui-react/src/LoopUI.js                             | 11 ----------
 ui-react/src/LoopUI.test.js                        |  9 --------
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |  9 --------
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |  9 --------
 ui-react/src/api/UserService.js                    | 25 ----------------------
 6 files changed, 1 insertion(+), 66 deletions(-)

(limited to 'ui-react/src')

diff --git a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
index d20a7370c..cfd5f990f 100644
--- a/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/DefaultUserConfiguration.java
@@ -74,9 +74,7 @@ public class DefaultUserConfiguration extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) {
         try {
             http.csrf().disable().httpBasic().and().authorizeRequests().antMatchers("/restservices/clds/v1/user/**")
-                    .authenticated().anyRequest().permitAll().and().logout()
-                    .logoutUrl("/restservices/clds/v1/user/logout").logoutSuccessUrl("/index.html")
-                    .invalidateHttpSession(true).deleteCookies("JSESSIONID").and().sessionManagement()
+                    .authenticated().anyRequest().permitAll().and().sessionManagement()
                     .maximumSessions(1);
 
         } catch (Exception e) {
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 107992137..8624726be 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -114,7 +114,6 @@ export default class LoopUI extends React.Component {
 	constructor() {
 		super();
 		this.getUser = this.getUser.bind(this);
-		this.logout = this.logout.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
 		this.closeLoop = this.closeLoop.bind(this);
@@ -132,14 +131,6 @@ export default class LoopUI extends React.Component {
 			this.setState({ userName: user })
 		});
 	}
-	
-	logout() {
-		UserService.logout().then(user => {
-			this.setState({ userName: user });
-			window.location.reload();
-		});
-		
-	}
 
 	renderMenuNavBar() {
 		return (
@@ -152,7 +143,6 @@ export default class LoopUI extends React.Component {
 			<Navbar.Text>
 			<StyledLoginInfo>Signed in as: </StyledLoginInfo>
 				<StyledRouterLink to="/userInfo">{this.state.userName}</StyledRouterLink>
-				<StyledRouterLink to="/logout/"> (logout)</StyledRouterLink>
 			</Navbar.Text>
 		);
 	}
@@ -281,7 +271,6 @@ export default class LoopUI extends React.Component {
 				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
 				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/logout" render={this.logout} />
 				<GlobalClampStyle />
 					{this.renderAlertBar()}
 					{this.renderNavBar()}
diff --git a/ui-react/src/LoopUI.test.js b/ui-react/src/LoopUI.test.js
index 6885e7932..bfd6376e3 100644
--- a/ui-react/src/LoopUI.test.js
+++ b/ui-react/src/LoopUI.test.js
@@ -83,15 +83,6 @@ describe('Verify LoopUI', () => {
 		expect(historyMock.push.mock.calls[0]).toEqual([ '/']);
 	})
 
-	test('Test logout method', async () => {
-		const flushPromises = () => new Promise(setImmediate);
-		const component = shallow(<LoopUI />)
-		const instance = component.instance();
-		instance.logout();
-		await flushPromises();
-		expect(component.state('userName')).toEqual("testUser");
-	})
-
 	test('Test loadLoop method refresh suc', async () => {
 		const historyMock = { push: jest.fn() };
 		LoopService.getLoop = jest.fn().mockImplementation(() => {
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 958e77a99..2dfa48091 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -76,10 +76,6 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/refreshStatus"
     render={[Function]}
   />
-  <Route
-    path="/logout"
-    render={[Function]}
-  />
   <GlobalStyleComponent />
   <div>
     <Alert
@@ -157,11 +153,6 @@ exports[`Verify LoopUI Test the render method 1`] = `
       >
         testUser
       </Styled(Link)>
-      <Styled(Link)
-        to="/logout/"
-      >
-         (logout)
-      </Styled(Link)>
     </NavbarText>
   </Navbar>
   <styled.div>
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index a06f1edfa..56d022fc6 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -103,10 +103,6 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/refreshStatus"
       render={[Function]}
     />
-    <Route
-      path="/logout"
-      render={[Function]}
-    />
     <GlobalStyleComponent />
     <div>
       <Alert
@@ -182,11 +178,6 @@ exports[`Verify OnapClamp Test the render method 1`] = `
         <Styled(Link)
           to="/userInfo"
         />
-        <Styled(Link)
-          to="/logout/"
-        >
-           (logout)
-        </Styled(Link)>
       </NavbarText>
     </Navbar>
     <styled.div>
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 5703fdcc7..477ca4269 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -47,31 +47,6 @@ export default class UserService {
 			return UserService.notLoggedUserName;
 		});
 	}
-	
-	static logout() {
-		return fetch('/restservices/clds/v1/user/logout', {
-			method: 'POST',
-			credentials: 'same-origin'
-		})
-		.then(function (response) {
-			console.debug("logout response received, status code:", response.status);
-			if (response.ok) {
-				return response.text();
-			} else {
-				console.error("logout response is nok");
-				return UserService.notLoggedUserName;
-			}
-		})
-		.then(function (data) {
-			console.info ("User disconnected:",data)
-			return data;
-		})
-		.catch(function(error) {
-			console.warn("logout error received, user set to: ",UserService.notLoggedUserName);
-			console.error("logout error:",error);
-			return UserService.notLoggedUserName;
-		});
-	}
 
 	static getUserInfo() {
 		return fetch('/restservices/clds/v2/clampInformation', {
-- 
cgit 1.2.3-korg


From 5a2056470b71df0917a6c967f9bf4c1fc7f3f560 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Fri, 12 Jun 2020 12:27:07 +0200
Subject: Removal of Svg api

Removal of previous api not even presetn in backend

Issue-ID: CLAMP-854
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I199b8aab1e3f333d31fed68415058419bf352f21
---
 ui-react/src/api/LoopService.js | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 8f9805e33..c45df6c61 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -79,26 +79,6 @@ export default class LoopService {
 			});
 	}
 
-	static getSvg(loopName) {
-		return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, {
-			method: 'GET',
-			credentials: 'same-origin'
-		})
-			.then(function (response) {
-				console.debug("svgRepresentation response received: ", response.status);
-				if (response.ok) {
-					return response.text();
-				} else {
-					console.error("svgRepresentation query failed");
-					return "";
-				}
-			})
-			.catch(function (error) {
-				console.error("svgRepresentation error received", error);
-				return "";
-			});
-	}
-
 	static setMicroServiceProperties(loopName, jsonData) {
 		return fetch('/restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, {
 			method: 'POST',
-- 
cgit 1.2.3-korg


From b56cb11bb745c34455b7159980be38b81d8c115f Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Fri, 12 Jun 2020 03:17:35 -0400
Subject: Address Manage Dictionary issues

A variety of bugs are addressed. See JIRA.

Issue-ID: CLAMP-849
Change-Id: I620c1ec774fdcec484f40fc638551960a98973c8
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 ui-react-lib/libIndex.js                           |   1 +
 .../ManageDictionaries/ManageDictionaries.js       | 694 +++++++++++----------
 .../ManageDictionaries/ManageDictionaries.test.js  | 106 ++--
 .../__snapshots__/ManageDictionaries.test.js.snap  |   1 -
 ui-react/src/utils/CsvToJson.js                    | 204 ++++++
 ui-react/src/utils/CsvToJson.test.js               | 268 ++++++++
 6 files changed, 891 insertions(+), 383 deletions(-)
 create mode 100644 ui-react/src/utils/CsvToJson.js
 create mode 100644 ui-react/src/utils/CsvToJson.test.js

(limited to 'ui-react/src')

diff --git a/ui-react-lib/libIndex.js b/ui-react-lib/libIndex.js
index 16728ef8d..f090b6145 100755
--- a/ui-react-lib/libIndex.js
+++ b/ui-react-lib/libIndex.js
@@ -21,6 +21,7 @@
  *
  */
 
+export { default as CsvToJson } from './src/utils/CsvToJson';
 export { default as CreateLoopModal } from './src/components/dialogs/Loop/CreateLoopModal';
 export { default as DeployLoopModal } from './src/components/dialogs/Loop/DeployLoopModal';
 export { default as LoopActionService } from './src/api/LoopActionService';
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 54ac6411b..58cb9c6c3 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -24,12 +24,14 @@
 import React, { forwardRef } from 'react';
 import Button from 'react-bootstrap/Button';
 import Modal from 'react-bootstrap/Modal';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
 import styled from 'styled-components';
 import TemplateMenuService from '../../../api/TemplateService';
+import CsvToJson from '../../../utils/CsvToJson';
 import MaterialTable, {MTableToolbar} from "material-table";
 import IconButton from '@material-ui/core/IconButton';
 import Tooltip from '@material-ui/core/Tooltip';
-import Grid from '@material-ui/core/Grid';
 import AddBox from '@material-ui/icons/AddBox';
 import ArrowUpward from '@material-ui/icons/ArrowUpward';
 import Check from '@material-ui/icons/Check';
@@ -49,19 +51,37 @@ import ViewColumn from '@material-ui/icons/ViewColumn';
 
 
 const ModalStyled = styled(Modal)`
+	@media (min-width: 1200px) {
+		.modal-xl {
+			max-width: 96%;
+		}
+	}
 	background-color: transparent;
 `
+
+const MTableToolbarStyled = styled(MTableToolbar)`
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+`
+const ColPullLeftStyled = styled(Col)`
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	margin-left: -40px;
+`
+
 const cellStyle = { border: '1px solid black' };
 const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
 const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
-var dictList = [];
+let dictList = [];
 
 function SelectSubDictType(props) {
 	const {onChange} = props;
 	const selectedValues = (e) => {
-		var options = e.target.options;
-		var SelectedDictTypes = '';
-		for (var dictType = 0, values = options.length; dictType < values; dictType++) {
+		let options = e.target.options;
+		let SelectedDictTypes = '';
+		for (let dictType = 0, values = options.length; dictType < values; dictType++) {
 			if (options[dictType].selected) {
 				SelectedDictTypes = SelectedDictTypes.concat(options[dictType].value);
 				SelectedDictTypes = SelectedDictTypes.concat('|');
@@ -87,15 +107,16 @@ function SubDict(props) {
 	const {onChange} = props;
 	const subDicts = [];
 	subDicts.push('Default');
-	if (dictList != "undefined"  && dictList.length > 0) {
-        for(var item in dictList) {
+	if (dictList !== undefined  && dictList.length > 0) {
+	let item;
+        for(item in dictList) {
             if(dictList[item].secondLevelDictionary === 1) {
                 subDicts.push(dictList[item].name);
             }
         };
 	}
 	subDicts.push('');
- 	var optionItems = subDicts.map(
+ 	let optionItems = subDicts.map(
 		(item) => <option key={item}>{item}</option>
 	  );
  	function selectedValue (e) {
@@ -112,46 +133,45 @@ export default class ManageDictionaries extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 		this.handleClose = this.handleClose.bind(this);
-		this.getDictionary = this.getDictionary.bind(this);
-		this.getDictionaryElements = this.getDictionaryElements.bind(this);
 		this.clickHandler = this.clickHandler.bind(this);
-		this.addDictionary = this.addDictionary.bind(this);
-		this.deleteDictionary = this.deleteDictionary.bind(this);
+		this.getDictionaries = this.getDictionaries.bind(this);
+		this.getDictionaryElements = this.getDictionaryElements.bind(this);
+		this.addReplaceDictionaryRequest = this.addReplaceDictionaryRequest.bind(this);
+		this.deleteDictionaryRequest = this.deleteDictionaryRequest.bind(this);
+		this.updateDictionaryElementsRequest = this.updateDictionaryElementsRequest.bind(this);
+		this.addDictionaryRow = this.addDictionaryRow.bind(this);
+		this.updateDictionaryRow = this.updateDictionaryRow.bind(this);
+		this.deleteDictionaryRow = this.deleteDictionaryRow.bind(this);
+		this.addDictionaryElementRow = this.addDictionaryElementRow.bind(this);
+		this.deleteDictionaryElementRow = this.deleteDictionaryElementRow.bind(this);
+		this.updateDictionaryElementRow = this.updateDictionaryElementRow.bind(this);
 		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
 		this.state = {
 			show: true,
 			selectedFile: '',
-			dictNameFlag: false,
+			currentSelectedDictionary: null,
 			exportFilename: '',
 			content: null,
-			newDict: '',
-			newDictItem: '',
-			delDictItem: '',
-			addDict: false,
-			delData: '',
-			delDict: false,
-			validImport: false,
-			dictionaryNames: [],
 			dictionaryElements: [],
-      tableIcons: {
-		Add: forwardRef((props, ref) => <AddBox {...props} ref={ref} />),
-        Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
-        Clear: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-        Delete: forwardRef((props, ref) => <DeleteOutline {...props} ref={ref} />),
-        DetailPanel: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-        Edit: forwardRef((props, ref) => <Edit {...props} ref={ref} />),
-        Export: forwardRef((props, ref) => <VerticalAlignBottomIcon {...props} ref={ref} />),
-        Filter: forwardRef((props, ref) => <FilterList {...props} ref={ref} />),
-        FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
-        LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
-        NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
-        PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
-        ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
-        Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
-        SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />),
-        ThirdStateCheck: forwardRef((props, ref) => <Remove {...props} ref={ref} />),
-        ViewColumn: forwardRef((props, ref) => <ViewColumn {...props} ref={ref} />)
-      },
+			tableIcons: {
+				Add: forwardRef((props, ref) => <AddBox {...props} ref={ref} />),
+				Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
+				Clear: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+				Delete: forwardRef((props, ref) => <DeleteOutline {...props} ref={ref} />),
+				DetailPanel: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+				Edit: forwardRef((props, ref) => <Edit {...props} ref={ref} />),
+				Export: forwardRef((props, ref) => <VerticalAlignBottomIcon {...props} ref={ref} />),
+				Filter: forwardRef((props, ref) => <FilterList {...props} ref={ref} />),
+				FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+				LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+				NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+				PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+				ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+				Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+				SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />),
+				ThirdStateCheck: forwardRef((props, ref) => <Remove {...props} ref={ref} />),
+				ViewColumn: forwardRef((props, ref) => <ViewColumn {...props} ref={ref} />)
+			},
 			dictColumns: [
 				{
 					title: "Dictionary Name", field: "name",editable: 'onAdd',
@@ -185,7 +205,7 @@ export default class ManageDictionaries extends React.Component {
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
 				},
-        {
+				{
 					title: "Element Name", field: "name",
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
@@ -194,8 +214,8 @@ export default class ManageDictionaries extends React.Component {
 					title: "Element Description", field: "description",
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
-				 },
-				 {
+				},
+				{
 					title: "Element Type", field: "type",
 					editComponent: props => (
 						<div>
@@ -204,8 +224,8 @@ export default class ManageDictionaries extends React.Component {
 					),
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
-				 },
-				 {
+				},
+				{
 				    title: "Sub-Dictionary", field: "subDictionary",
 				      editComponent: props => (
 						 <div>
@@ -214,8 +234,8 @@ export default class ManageDictionaries extends React.Component {
 				      ),
 				    cellStyle: cellStyle,
 				    headerStyle: headerStyle
-				 },
-				{   
+				},
+				{
 					title: "Updated By", field: "updatedBy", editable: 'never',
 					cellStyle: cellStyle,
 					headerStyle: headerStyle
@@ -229,325 +249,325 @@ export default class ManageDictionaries extends React.Component {
 		}
 	}
 
-	componentWillMount() {
-        this.getDictionary();
-    }
+	componentDidMount() {
+		this.getDictionaries();
+	}
 
-    getDictionary() {
-        TemplateMenuService.getDictionary().then(dictionaryNames => {
-            this.setState({ dictionaryNames: dictionaryNames })
-        });
-    }
+	getDictionaries() {
+		TemplateMenuService.getDictionary().then(arrayOfdictionaries => {
+			this.setState({ dictionaries: arrayOfdictionaries, currentSelectedDictionary: null })
+		});
+	}
 
-    getDictionaryElements(dictionaryName) {
-        TemplateMenuService.getDictionaryElements(dictionaryName).then(dictionaryElements => {
-            dictList = this.state.dictionaryNames;
-            this.setState({ dictionaryElements: dictionaryElements.dictionaryElements});
-        });
-    }
+	getDictionaryElements(dictionaryName) {
+		TemplateMenuService.getDictionaryElements(dictionaryName).then(dictionaryElements => {
+			dictList = this.state.dictionaries;
+			this.setState({ dictionaryElements: dictionaryElements.dictionaryElements} );
+		});
+	}
 
-    clickHandler(rowData)   {
-        this.setState({
-            dictNameFlag: false,
-            addDict: false,
-    });
-    }
+	clickHandler(rowData) {
+		this.getDictionaries();
+	}
 
-    handleClose() {
-        this.setState({ show: false });
-        this.props.history.push('/');
-    }
+	handleClose() {
+		this.setState({ show: false });
+		this.props.history.push('/');
+	}
 
-    addDictionary() {
-        var modifiedData = [];
-        if(this.state.newDict !== '') {
-            modifiedData = this.state.newDict;
-        } else {
-            modifiedData = {"name": this.state.dictionaryName, 'dictionaryElements': this.state.newDictItem};
-        }
-        if(this.state.newDictItem === '') {
-            TemplateMenuService.insDictionary(modifiedData).then(resp => {
-            });
-        } else {
-            TemplateMenuService.insDictionaryElements(modifiedData).then(resp => {
-            });
-        }
-    }
+	addReplaceDictionaryRequest(dictionaryEntry) {
+		TemplateMenuService.insDictionary(dictionaryEntry)
+		.then(resp => {})
+		.then(() => {this.getDictionaries()});
+	}
 
-    deleteDictionary() {
-        var modifiedData = [];
-        if(this.state.delData !== '') {
-            modifiedData = this.state.delData.name;
-        } else {
-            modifiedData = {"name": this.state.dictionaryName, "shortName": this.state.delDictItem.shortName};
-        }
-        if(this.state.delDictItem === '') {
-            TemplateMenuService.deleteDictionary(modifiedData).then(resp => {
-            });
-        } else {
-            TemplateMenuService.deleteDictionaryElements(modifiedData).then(resp => {
-            });
-        }
-    }
+	updateDictionaryElementsRequest(dictElements) {
+		let reqData = { "name": this.state.currentSelectedDictionary, 'dictionaryElements': dictElements };
+		TemplateMenuService.insDictionaryElements(reqData)
+		.then(resp => {})
+		.then(() => { this.getDictionaryElements(this.state.currentSelectedDictionary) });
+	}
 
-    fileSelectedHandler = (event) => {
-        const text = this;
-        var dictionaryElements = [];
-        if (event.target.files[0].type === 'text/csv' ) {
-            if (event.target.files && event.target.files[0]) {
-                const reader = new FileReader();
-                reader.onload = function(e) {
-                    var dictElems = reader.result.split('\n');
-                    var jsonObj = [];
-                    var headers = dictElems[0].split(',');
-                    for(var i = 0; i < dictElems.length; i++) {
-                        var data = dictElems[i].split(',');
-                        var obj = {};
-                        for(var j = 0; j < data.length; j++) {
-                            obj[headers[j].trim()] = data[j].trim();
-                        }
-                        jsonObj.push(obj);
-                    }
-                    JSON.stringify(jsonObj);
-                    const dictKeys = ['Element Short Name','Element Name','Element Description','Element Type','Sub-Dictionary'];
-                    const mandatoryKeys = [ 'Element Short Name', 'Element Name', 'Element Type' ];
-                    const validTypes = ['string','number','datetime','json','map'];
-                    if (!dictElems){
-                        text.setState({validData: false});
-                    } else if (headers.length !== dictKeys.length){
-                        text.setState({validImport: false});
-                    } else {
-                        var subDictionaries = [];
-                        for(var item in dictList) {
-                            if(dictList[item].secondLevelDictionary === 1) {
-                                subDictionaries.push(dictList[item].name);
-                            }
-                        };
-                        subDictionaries = subDictionaries.toString();
-                        var row = 0;
-                        for (var dictElem of jsonObj){
-                            ++row;
-                            for (var itemKey in dictElem){
-                                var value = dictElem[itemKey].trim();
-                                if (dictKeys.indexOf(itemKey) < 0){
-                                    var errorMessage = 'unknown field name of, ' + itemKey + ', found in CSV header';
-                                    text.setState({validImport: false});
-                                    alert(errorMessage);
-                                    break;
-                                } else if (value === "" && mandatoryKeys.indexOf(itemKey) >= 0){
-                                    errorMessage = 'value for ' + itemKey + ', at row #, ' + row + ', is empty but required';
-                                    text.setState({validImport: false});
-                                    alert(errorMessage);
-                                    break;
-                                } else if (itemKey === 'Element Type' && validTypes.indexOf(value) < 0 && row > 1) {
-                                    errorMessage = 'invalid dictElemenType of ' + value + ' at row #' + row;
-                                    text.setState({validImport: false});
-                                    alert(errorMessage);
-                                    break;
-                                } else if (value !== "" && itemKey === 'Sub-Dictionary' && subDictionaries.indexOf(value) < 0 && row > 1) {
-                                    errorMessage = 'invalid subDictionary of ' + value + ' at row #' + row;
-                                    text.setState({validImport: false});
-                                    alert(errorMessage);
-                                }
+	deleteDictionaryRequest(dictionaryName) {
+		TemplateMenuService.deleteDictionary(dictionaryName)
+		.then(resp => { this.getDictionaries() });
+	}
+
+	deleteDictionaryElementRequest(dictionaryName, elemenetShortName) {
+		TemplateMenuService.deleteDictionaryElements({ 'name': dictionaryName, 'shortName': elemenetShortName })
+		.then(resp => {
+			this.getDictionaryElements(dictionaryName);
+		});
+	}
+
+	fileSelectedHandler = (event) => {
+
+		if (event.target.files[0].type === 'text/csv' || event.target.files[0].type === 'application/vnd.ms-excel') {
+			if (event.target.files && event.target.files[0]) {
+				const reader = new FileReader();
+				reader.onload = (e) => {
+
+				const jsonKeyNames = [ 'shortName', 'name', 'description', 'type', 'subDictionary' ];
+				const userHeaderNames = [ 'Element Short Name', 'Element Name', 'Element Description', 'Element Type', 'Sub-Dictionary'  ];
+				const mandatory = [ true, true, true, true, false ];
+				const validTypes = ['string','number','datetime','json','map'];
+
+				let result = CsvToJson(reader.result, ',', '||||', userHeaderNames, jsonKeyNames, mandatory);
+
+				let errorMessages = result.errorMessages;
+				let jsonObjArray = result.jsonObjArray;
+
+				let validTypesErrorMesg = '';
+
+				for (let i=0; i < validTypes.length; ++i) {
+					if (i === 0) {
+						validTypesErrorMesg = validTypes[i];
+					} else {
+						validTypesErrorMesg += ',' + validTypes[i];
+					}
+				}
+
+				if (errorMessages !== '') {
+					alert(errorMessages);
+					return;
+				}
+
+				// Perform further checks on data that is now in JSON form
+                    		let subDictionaries = [];
+
+				// NOTE: dictList is a global variable  maintained faithfully
+				//       by the getDictionaries() method outside this import
+				//       functionality.
+				let item;
+                    		for (item in dictList) {
+					if (dictList[item].secondLevelDictionary === 1) {
+						subDictionaries.push(dictList[item].name);
+					}
+				};
+
+				// Check for valid Sub-Dictionary and Element Type values
+				subDictionaries = subDictionaries.toString();
+				let row = 2;
+				let dictElem;
+				for (dictElem of jsonObjArray) {
+					let itemKey;
+					for (itemKey in dictElem){
+						let value = dictElem[itemKey].trim();
+						let keyIndex = jsonKeyNames.indexOf(itemKey);
+						if (itemKey === 'shortName' && /[^a-zA-Z0-9-_.]/.test(value)) {
+							errorMessages += '\n' + userHeaderNames[keyIndex] +
+								' at row #' + row +
+								' can only contain alphanumeric characters and periods, hyphens or underscores';
+						}
+						if (itemKey === 'type' && validTypes.indexOf(value) < 0) {
+							errorMessages += '\nInvalid value of "' + value + '" for "' + userHeaderNames[keyIndex] + '" at row #' + row;
+							errorMessages += '\nValid types are: ' + validTypesErrorMesg;
+						}
+						if (value !== "" && itemKey === 'subDictionary' && subDictionaries.indexOf(value) < 0) {
+							errorMessages += '\nInvalid Sub-Dictionary value of "' + value + '" at row #' + row;
                             }
                         }
+					++row;
                     }
-                    const headerKeys = ['shortName','name','description','type','subDictionary'];
+					if (errorMessages) {
+						alert(errorMessages);
+						return;
+					}
 
-                    for(i = 1; i < dictElems.length; i++) {
-                        data = dictElems[i].split(',');
-                        obj = {};
-                        for(j = 0; j < data.length; j++) {
-                            obj[headerKeys[j].trim()] = data[j].trim();
-                        }
-                        dictionaryElements.push(obj);
-                    }
-                    text.setState({newDictItem: dictionaryElements, addDict: true});
-                }
-                reader.readAsText(event.target.files[0]);
-            }
-            this.setState({selectedFile: event.target.files[0]})
-        } else {
-            text.setState({validImport: false});
-            alert('Please upload .csv extention files only.');
-        }
+					// We made it through all the checks. Send it to back end
+					this.updateDictionaryElementsRequest(jsonObjArray);
+				}
+				reader.readAsText(event.target.files[0]);
+			}
+			this.setState({selectedFile: event.target.files[0]})
+		} else {
+			alert('Please upload .csv extention files only.');
+		}
+	}
 
-    }
-   
-    render() {
-        return (
-            <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
-                <Modal.Header closeButton>
-                    <Modal.Title>Manage Dictionaries</Modal.Title>
-                </Modal.Header>
-                <Modal.Body>
-                    {!this.state.dictNameFlag? <MaterialTable
-                        title={"Dictionary List"}
-                        data={this.state.dictionaryNames}
-                        columns={this.state.dictColumns}
-                        icons={this.state.tableIcons}
-                        onRowClick={(event, rowData) => {this.getDictionaryElements(rowData.name);this.setState({dictNameFlag: true, exportFilename: rowData.name, dictionaryName: rowData.name})}}
-                        options={{
-                            headerStyle: rowHeaderStyle,
-                        }}
-                        editable={{
-                            onRowAdd: newData =>
-                            new Promise((resolve, reject) => {
-                                setTimeout(() => {
-                                    {
-                                        const dictionaryNames = this.state.dictionaryNames;
-                                        var validData =  true;
-                                        if(/[^a-zA-Z0-9-_.]/.test(newData.name)) {
-                                            validData = false;
-                                            alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
-                                        }
-                                        for (var i = 0; i < this.state.dictionaryNames.length; i++) {
-                                            if (this.state.dictionaryNames[i].name === newData.name) {
-                                                validData = false;
-                                                alert(newData.name + ' dictionary name already exists')
-                                            }
-                                        }
-                                        if(validData){
-                                            dictionaryNames.push(newData);
-                                            this.setState({ dictionaryNames }, () => resolve());
-                                            this.setState({addDict: true, newDict: newData});
-                                        }
-                                    }
-                                    resolve();
-                                }, 1000);
-                            }),
-                            onRowUpdate: (newData, oldData) =>
-                            new Promise((resolve, reject) => {
-                                setTimeout(() => {
-                                    {
-                                        const dictionaryNames = this.state.dictionaryNames;
-                                        var validData =  true;
-                                        if(/[^a-zA-Z0-9-_.]/.test(newData.name)) {
-                                            validData = false;
-                                            alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
-                                        }
-                                        if(validData){
-                                            const index = dictionaryNames.indexOf(oldData);
-                                            dictionaryNames[index] = newData;
-                                            this.setState({ dictionaryNames }, () => resolve());
-                                            this.setState({addDict: true, newDict: newData});
-                                        }
-                                    }
-                                    resolve();
-                                }, 1000);
-                            }),
-                            onRowDelete: oldData =>
-                new Promise((resolve, reject) => {
-                                setTimeout(() => {
-                                    {
-                                        const data = this.state.dictionaryNames;
-                    const index = data.indexOf(oldData);
-                    data.splice(index, 1);
-                    this.setState({ data }, () => resolve());
-                                        this.setState({delDict: true, delData: oldData})
-                    }
-                    resolve()
-                }, 1000)
-                })
-                        }}
-                        />:""
+	addDictionaryRow(newData) {
+		let validData = true;
+		return new Promise((resolve, reject) => {
+			setTimeout(() => {
+					if (/[^a-zA-Z0-9-_.]/.test(newData.name)) {
+						validData = false;
+						alert('Please enter alphanumeric input. Only allowed special characters are:(period, hyphen, underscore)');
+						reject(() => {});
+					}
+					for (let i = 0; i < this.state.dictionaries.length; i++) {
+						if (this.state.dictionaries[i].name === newData.name) {
+							validData = false;
+							alert(newData.name + ' dictionary name already exists')
+							reject(() => {});
+						}
+					}
+					if (validData) {
+						this.addReplaceDictionaryRequest(newData);
+					}
+					resolve();
+			}, 1000);
+		});
+	}
+
+
+	updateDictionaryRow(oldData, newData) {
+		let validData = true;
+		return new Promise((resolve) => {
+			setTimeout(() => {
+				if (/[^a-zA-Z0-9-_.]/.test(newData.name)) {
+					validData = false;
+					alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
+				}
+				if (validData) {
+					this.addReplaceDictionaryRequest(newData);
+				}
+				resolve();
+			}, 1000);
+		});
+	}
+
+	deleteDictionaryRow(oldData) {
+		return new Promise((resolve) => {
+			setTimeout(() => {
+				this.deleteDictionaryRequest(oldData.name);
+				resolve();
+			}, 1000);
+		});
+	}
+
+	addDictionaryElementRow(newData) {
+		return new Promise((resolve, reject) => {
+			setTimeout(() => {
+				let dictionaryElements = this.state.dictionaryElements;
+				let errorMessage = '';
+				for (let i = 0; i < this.state.dictionaryElements.length; i++) {
+					if (this.state.dictionaryElements[i].shortName === newData.shortName) {
+						alert('Short Name "' + newData.shortName + '" already exists');
+						reject(() => {});
+					}
+				}
+				if (newData.shortName !== '' && /[^a-zA-Z0-9-_.]/.test(newData.shortName)) {
+					errorMessage += '\nShort Name is limited to alphanumeric characters and also period, hyphen, and underscore';
+				}
+				if (!newData.shortName){
+					errorMessage += '\nShort Name must be specified';
+				}
+				if (!newData.name){
+					errorMessage += '\nElement Name must be specified';
+				}
+				if (!newData.type){
+					errorMessage += '\nElement Type must be specified';
+				}
+				if (!newData.description){
+					errorMessage += '\nElement Description must be specified';
+				}
+				if (errorMessage === '') {
+					dictionaryElements.push(newData);
+					this.updateDictionaryElementsRequest(dictionaryElements);
+					resolve();
+				} else {
+					alert(errorMessage);
+					reject(() => {});
+				}
+			}, 1000);
+		});
+	}
+
+	updateDictionaryElementRow(newData, oldData) {
+		return new Promise((resolve) => {
+			setTimeout(() => {
+				let dictionaryElements = this.state.dictionaryElements;
+				let validData =  true;
+				if (!newData.type) {
+					validData = false;
+					alert('Element Type cannot be null');
+				}
+				if (validData) {
+					const index = dictionaryElements.indexOf(oldData);
+					dictionaryElements[index] = newData;
+					this.updateDictionaryElementsRequest(dictionaryElements);
+				}
+				resolve();
+			}, 1000);
+		});
+	}
+
+
+	deleteDictionaryElementRow(oldData) {
+		return new Promise((resolve) => {
+			setTimeout(() => {
+				this.deleteDictionaryElementRequest(this.state.currentSelectedDictionary, oldData.shortName);
+				resolve();
+			}, 1000);
+		});
+	}
+
+	render() {
+		return (
+			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
+				<Modal.Header closeButton>
+					<Modal.Title>Manage Dictionaries</Modal.Title>
+				</Modal.Header>
+				<Modal.Body>
+					{this.state.currentSelectedDictionary === null ? <MaterialTable
+                        	title={"Dictionary List"}
+                        	data={this.state.dictionaries}
+                        	columns={this.state.dictColumns}
+                        	icons={this.state.tableIcons}
+                        	onRowClick={(event, rowData) => {
+								this.setState({
+									currentSelectedDictionary : rowData.name,
+									exportFilename: rowData.name
+								})
+								this.getDictionaryElements(rowData.name);
+							}}
+                        	options={{
+                            	headerStyle: rowHeaderStyle,
+                        	}}
+                        	editable={{
+                            	onRowAdd: this.addDictionaryRow,
+                            	onRowUpdate: this.updateDictionaryRow,
+                            	onRowDelete: this.deleteDictionaryRow
+							}}
+						/> : null
                     }
-                    {this.state.dictNameFlag? <MaterialTable
-                        title={"Dictionary Elements List"}
+                    {this.state.currentSelectedDictionary !== null ? <MaterialTable
+                        title={'Dictionary Elements List for "' + this.state.currentSelectedDictionary + '"'}
                         data={this.state.dictionaryElements}
                         columns={this.state.dictElementColumns}
                         icons={this.state.tableIcons}
                         options={{
+							exportAllData: true,
                             exportButton: true,
                             exportFileName: this.state.exportFilename,
                             headerStyle:{backgroundColor:'white',  fontSize: '15pt', text: 'bold', border: '1px solid black'}
                         }}
                         components={{
                             Toolbar: props => (
-                                <div>
-                                    <MTableToolbar {...props} />
-                                <div>
-                                    <Grid item container xs={12} alignItems="flex-end" direction="column" justify="flex-end">
+								<Row>
+									<Col sm="11">
+                                    	<MTableToolbarStyled {...props} />
+									</Col>
+									<ColPullLeftStyled sm="1">
                                         <Tooltip title="Import" placement = "bottom">
-                                            <IconButton aria-label="import" onClick={() => this.fileUpload.click()}>
-                                                <VerticalAlignTopIcon />
-                                            </IconButton>
+                                        <IconButton aria-label="import" onClick={() => this.fileUpload.click()}>
+                                        	<VerticalAlignTopIcon />
+                                        </IconButton>
                                         </Tooltip>
-                                    </Grid>
-                                </div>
-                                <input type="file" ref={(fileUpload) => {this.fileUpload = fileUpload;}} style={{ visibility: 'hidden'}} onChange={this.fileSelectedHandler} />
-                                </div>
+                                		<input type="file" ref={(fileUpload) => {this.fileUpload = fileUpload;}}
+											style={{ visibility: 'hidden', width: '1px' }} onChange={this.fileSelectedHandler} />
+									</ColPullLeftStyled>
+                                </Row>
                             )
                         }}
                         editable={{
-                            onRowAdd: newData =>
-                            new Promise((resolve, reject) => {
-                                setTimeout(() => {
-                                    {
-                                        const dictionaryElements = this.state.dictionaryElements;
-                                        var validData =  true;
-                                        for (var i = 0; i < this.state.dictionaryElements.length; i++) {
-                                            if (this.state.dictionaryElements[i].shortName === newData.shortName) {
-                                                validData = false;
-                                                alert(newData.shortname + 'short name already exists')
-                                            }
-                                        }
-                                        if(/[^a-zA-Z0-9-_.]/.test(newData.shortName)) {
-                                            validData = false;
-                                            alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
-                                        }
-                                        if(!newData.type){
-                                            validData = false;
-                                            alert('Element Type cannot be null');
-                                        }
-                                        if(validData){
-                                            dictionaryElements.push(newData);
-                                            this.setState({ dictionaryElements }, () => resolve());
-                                            this.setState({addDict: true, newDictItem: [newData]});
-                                        }
-                                    }
-                                    resolve();
-                                }, 1000);
-                            }),
-                            onRowUpdate: (newData, oldData) =>
-                            new Promise((resolve, reject) => {
-                                setTimeout(() => {
-                                    {
-                                        const dictionaryElements = this.state.dictionaryElements;
-                                        var validData =  true;
-                                        if(!newData.type){
-                                            validData = false;
-                                            alert('Element Type cannot be null');
-                                        }
-                                        if(validData){
-                                            const index = dictionaryElements.indexOf(oldData);
-                                            dictionaryElements[index] = newData;
-                                            this.setState({ dictionaryElements }, () => resolve());
-                                            this.setState({addDict: true, newDictItem: [newData]});
-                                        }
-                                    }
-                                    resolve();
-                                }, 1000);
-                            }),
-                            onRowDelete: oldData =>
-                new Promise((resolve, reject) => {
-                                setTimeout(() => {
-                                    {
-                                        let data = this.state.dictionaryElements;
-                    const index = data.indexOf(oldData);
-                    data.splice(index, 1);
-                    this.setState({ data }, () => resolve());
-                                        this.setState({delDict: true, delDictItem: oldData})
-                    }
-                    resolve()
-                }, 1000)
-                })
+                            onRowAdd: this.addDictionaryElementRow,
+                            onRowUpdate: this.updateDictionaryElementRow,
+                            onRowDelete: this.deleteDictionaryElementRow
                         }}
-                        />:""
+                        /> : null
                     }
-                    {this.state.dictNameFlag?<button onClick={this.clickHandler} style={{marginTop: '25px'}}>Go Back to Dictionaries List</button>:""}
-                    {this.state.addDict && this.addDictionary()}
-                    {this.state.delDict && this.deleteDictionary()}
+                    {this.state.currentSelectedDictionary !== null ? <button onClick={this.clickHandler} style={{marginTop: '25px'}}>Go Back to Dictionaries List</button>:""}
                 </Modal.Body>
                 <Modal.Footer>
                     <Button variant="secondary" type="null" onClick={this.handleClose}>Close</Button>
@@ -555,4 +575,4 @@ export default class ManageDictionaries extends React.Component {
             </ModalStyled>
         );
     }
-}					
+}
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
index 13a6035a3..d1d4aa662 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
@@ -60,10 +60,10 @@ describe('Verify ManageDictionaries', () => {
 				json: () => {
 					return Promise.resolve({
 						"name": "vtest",
-            "secondLevelDictionary": "1",
+						"secondLevelDictionary": "1",
 						"subDictionaryType": "string",
-        		"updatedBy": "test",
-            "updatedDate": "05-07-2019 19:09:42"
+						"updatedBy": "test",
+						"updatedDate": "05-07-2019 19:09:42"
 					});
 				}
 			});
@@ -90,10 +90,10 @@ describe('Verify ManageDictionaries', () => {
 				json: () => {
 					return Promise.resolve({
 						"name": "vtest",
-	          "secondLevelDictionary": "1",
+						"secondLevelDictionary": "1",
 						"subDictionaryType": "string",
-	       		"updatedBy": "test",
-	          "updatedDate": "05-07-2019 19:09:42"
+						"updatedBy": "test",
+						"updatedDate": "05-07-2019 19:09:42"
 					});
 				}
 			});
@@ -103,12 +103,33 @@ describe('Verify ManageDictionaries', () => {
 	});
 
 	test('Test get dictionaryNames/dictionaryElements, add/delete dictionary functions', async () => {
+		const dictionaries = [
+			{
+				name: "DefaultActors",
+				secondLevelDictionary: 0,
+				subDictionaryType: "",
+				dictionaryElements: [
+      					{
+        					"shortName": "SDNR",
+        					"name": "SDNR Change",
+        					"description": "SDNR component",
+        					"type": "string",
+        					"createdDate": "2020-06-07T18:57:18.130858Z",
+        					"updatedDate": "2020-06-11T13:10:52.239282Z",
+        					"updatedBy": "admin"
+      					}
+    				],
+    				createdDate: "2020-06-07T22:21:08.428742Z",
+    				updatedDate: "2020-06-10T00:41:49.122908Z",
+    				updatedBy: "Not found"
+  			}
+		];
 		const historyMock = { push: jest.fn() };
 		TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
-			return Promise.resolve("test");
+			return Promise.resolve(dictionaries);
 		});
 		TemplateMenuService.getDictionaryElements = jest.fn().mockImplementation(() => {
-			return Promise.resolve({dictionaryElements:"testitem"});
+			return Promise.resolve(dictionaries[0]);
 		});
 		TemplateMenuService.insDictionary = jest.fn().mockImplementation(() => {
 			return Promise.resolve(200);
@@ -118,33 +139,40 @@ describe('Verify ManageDictionaries', () => {
 		});
 		const flushPromises = () => new Promise(setImmediate);
 		const component = shallow(<ManageDictionaries history={historyMock} />)
-		component.setState({ newDict: {
-			"name": "test",
-			"secondLevelDictionary": "0",
-			"subDictionaryType": "string"
-			}
-		});
-		component.setState({ delData: {
-			"name": "test",
-			"secondLevelDictionary": "0",
-			"subDictionaryType": "string"
-			}
-		});
 		const instance = component.instance();
-		instance.getDictionaryElements("test");
+		instance.getDictionaryElements("DefaultActors");
 		instance.clickHandler();
-		instance.addDictionary();
-		instance.deleteDictionary();
+		instance.addReplaceDictionaryRequest();
+		instance.deleteDictionaryRequest();
 		await flushPromises();
-		expect(component.state('dictionaryNames')).toEqual("test");
-		expect(component.state('dictionaryElements')).toEqual("testitem");
-		expect(component.state('dictNameFlag')).toEqual(false);
+		expect(component.state('dictionaries')).toEqual(dictionaries);
 	});
 
 	test('Test adding and deleting dictionaryelements', async () => {
 		const historyMock = { push: jest.fn() };
+		const dictionaries = [
+			{
+				name: "DefaultActors",
+				secondLevelDictionary: 0,
+				subDictionaryType: "",
+				dictionaryElements: [
+      					{
+        					"shortName": "SDNR",
+        					"name": "SDNR Change",
+        					"description": "SDNR component",
+        					"type": "string",
+        					"createdDate": "2020-06-07T18:57:18.130858Z",
+        					"updatedDate": "2020-06-11T13:10:52.239282Z",
+        					"updatedBy": "admin"
+      					}
+    				],
+    				createdDate: "2020-06-07T22:21:08.428742Z",
+    				updatedDate: "2020-06-10T00:41:49.122908Z",
+    				updatedBy: "Not found"
+  			}
+		];
 		TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
-			return Promise.resolve("test");
+			return Promise.resolve(dictionaries);
 		});
 		TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
 			return Promise.resolve(200);
@@ -154,23 +182,11 @@ describe('Verify ManageDictionaries', () => {
 		});
 		const flushPromises = () => new Promise(setImmediate);
 		const component = shallow(<ManageDictionaries history={historyMock}/>)
-		component.setState({ newDictItem: {
-			"name": "test",
-			"dictionaryElements" : {
-				"shortName": "shorttest",
-				}
-		}});
-		component.setState({ delDictItem: {
-			"name": "test",
-			"dictionaryElements" : {
-				"shortName": "shortTest",
-				}
-		}});
 		const instance = component.instance();
-		instance.addDictionary();
-		instance.deleteDictionary();
+		instance.addReplaceDictionaryRequest({ name: "EventDictionary", secondLevelDictionary: "0", subDictionaryType: "string"} );
+		instance.deleteDictionaryRequest('EventDictionary');
 		await flushPromises();
-		expect(component.state('dictionaryNames')).toEqual("test");
+		expect(component.state('currentSelectedDictionary')).toEqual(null);
 	});
 
 	it('Test handleClose', () => {
@@ -181,10 +197,10 @@ describe('Verify ManageDictionaries', () => {
 				json: () => {
 					return Promise.resolve({
 						"name": "vtest",
-		      	"secondLevelDictionary": "1",
+						"secondLevelDictionary": "1",
 						"subDictionaryType": "string",
-		      	"updatedBy": "test",
-		      	"updatedDate": "05-07-2019 19:09:42"
+						"updatedBy": "test",
+						"updatedDate": "05-07-2019 19:09:42"
 					});
 				}
 			});
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
index 71cc393b8..40914aee6 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
+++ b/ui-react/src/components/dialogs/ManageDictionaries/__snapshots__/ManageDictionaries.test.js.snap
@@ -88,7 +88,6 @@ exports[`Verify ManageDictionaries Test API Successful 1`] = `
           },
         ]
       }
-      data={Array []}
       editable={
         Object {
           "onRowAdd": [Function],
diff --git a/ui-react/src/utils/CsvToJson.js b/ui-react/src/utils/CsvToJson.js
new file mode 100644
index 000000000..5ec19c9e2
--- /dev/null
+++ b/ui-react/src/utils/CsvToJson.js
@@ -0,0 +1,204 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default function CsvToJson(rawCsvData, delimiter, internalDelimiter, csvHeaderNames, jsonKeyNames, mandatory) {
+
+	let printDictKeys = '';
+	let result = { jsonObjArray: [], errorMessages: '' };
+
+	// Validate that all parallel arrays passed in have same number of elements;
+	// this would be a developer error.
+
+	let checkLength = csvHeaderNames.length;
+
+	if (checkLength !== jsonKeyNames.length || checkLength !== mandatory.length) {
+		result.errorMessages = 'interanl error: csvHeaderNames, jsonKeyNames, and mandatory arrays parameters are not the same length';
+		return result;
+	}
+
+	if (checkLength < 1) {
+		result.errorMessages = 'interanl error: csvHeaderNames, jsonKeyNames, and mandatory arrays have no entries';
+		return result;
+	}
+
+	// Make a nice string to print in the error case to tell user what is the
+	//  required heaer row format
+
+	for (let i=0; i < csvHeaderNames.length; ++i) {
+		if (i === 0) {
+			printDictKeys = csvHeaderNames[i];
+		} else {
+			printDictKeys += ',' +  csvHeaderNames[i];
+		}
+	}
+
+	let dictElems = rawCsvData.split('\n');
+	let numColumns = 0;
+	let filteredDictElems = [];
+
+	// The task of the following loop is to convert raw CSV rows into easily parseable
+	// and streamlined versions of the rows with an internalDelimiter replacing the standard
+	// comma; it is presumed (and checked) that the internalDelimiter cannot exist as a valid
+	// sequence of characters in the user's data.
+
+	// This conversion process also strips leading and trailing whitespace from each row,
+	// discards empty rows, correctly interprets and removes all double quotes that programs like
+	// Excel use to support user columns that contain special characters, most notably, the comma
+	// delimiter. A double-quote that is contained within a double-quoted column value 
+	// must appear in this raw data as a sequence of two double quotes. Furthermore, any column
+	// value in the raw CSV data that does not contain a delimiter may or may not be enclosed in
+	// double quotes. It is the Excel convention to not use double qoutes unless necessary, and
+	// there is no reasonable way to tell Excel to surround every column value with double quotes. 
+	// Any files that were directly "exported" by CLAMP itself from the Managing Dictionaries
+	// capability, surround all columns with double quotes.
+
+	for (let i = 0; i < dictElems.length; i++) {
+
+		let oneRow = dictElems[i].trim();
+		let j = 0;
+		let inQuote = false
+		let nextChar = undefined;
+		let prevChar = null;
+
+		
+		if (oneRow === '') {
+			continue; // Skip blank rows
+		} else if (oneRow.indexOf(internalDelimiter) !== -1) {
+			result.errorMessages += '\nRow #' + i + ' contains illegal sequence of characters (' + internalDelimiter + ')';
+			break;
+		} else {
+			nextChar = oneRow[1];
+		}
+
+		let newStr = '';
+		numColumns = 1;
+
+		// This "while loop" performs the very meticulous task of removing double quotes that
+		// are used by Excel to encase special characters as user string value data,
+		// and manages to correctly identify columns that are defined with or without
+		// double quotes and to process the comma delimiter correctly when encountered
+		// as a user value within a column. Such a column would have to be encased in
+		// double quotes; a comma found outside double quotes IS a delimiter.
+
+		while (j < oneRow.length) {
+		 	if (oneRow[j] === '"') {
+		 		if (inQuote === false) {
+					if (prevChar !== delimiter && prevChar !== null) {
+						result.errorMessages += '\nMismatched double quotes or illegal whitespace around delimiter at row #' + (i + 1) + ' near column #' + numColumns;
+						break;
+					} else {
+						inQuote = true;
+					}
+				} else {
+					if (nextChar === '"') {
+						newStr += '"';
+						++j;
+					} else if ((nextChar !== delimiter) && (nextChar !== undefined)) {
+						result.errorMessages += '\nRow #' + (i + 1) + ' is badly formatted at column #' + numColumns + '. Perhaps an unescaped double quote.';
+						break;
+					} else if (nextChar === delimiter) {
+						++numColumns;
+						inQuote = false;
+						newStr += internalDelimiter;
+						prevChar = delimiter;
+						j += 2;
+						nextChar = oneRow[j+1];
+						continue;
+					} else {
+						++numColumns;
+						inQuote = false;
+						break;
+					}
+				}
+			} else {
+				if (oneRow[j] === delimiter && inQuote === false) {
+					newStr += internalDelimiter;
+					++numColumns;
+				} else {
+					newStr += oneRow[j];
+				}
+			}
+			prevChar = oneRow[j];
+			++j;
+			nextChar = oneRow[j+1]; // can result in undefined at the end
+		}
+
+		if (result.errorMessages === '' && inQuote !== false) {
+			result.errorMessages += '\nMismatched double quotes at row #' + (i + 1);
+			break;
+		} else if (result.errorMessages === '' && numColumns < jsonKeyNames.length) {
+			result.errorMessages += '\nNot enough columns (' + jsonKeyNames.length + ') at row #' + (i + 1);
+			break;
+		}
+
+		filteredDictElems.push(newStr);
+	}
+
+	if (result.errorMessages !== '') {
+		return result;
+	}
+
+	// Perform further checks on data that is now in JSON form
+	if (filteredDictElems.length < 2) {
+		result.errorMessages += '\nNot enough row data found in import file. Need at least a header row and one row of data';
+		return result;
+	}
+
+	// Now that we have something reliably parsed into sanitized columns lets run some checks
+	// and convert it all into an array of JSON objects to push to the back end if all the
+	// checks pass.
+
+	let headers = filteredDictElems[0].split(internalDelimiter);
+
+	// check that headers are included in proper order
+	for (let i=0; i < jsonKeyNames.length; ++i) {
+		if (csvHeaderNames[i] !== headers[i]) {
+			result.errorMessages += 'Row 1 header key at column #' + (i + 1) + ' is a mismatch. Expected row header must contain at least:\n' + printDictKeys; 
+			return result;
+		}
+	}
+
+	// Convert the ASCII rows of data into an array of JSON obects that omit the header
+	// row which is not sent to the back end.
+
+	for (let i = 1; i < filteredDictElems.length; i++) {
+		let data = filteredDictElems[i].split(internalDelimiter);
+		let obj = {};
+		for (let j = 0; j < data.length && j < jsonKeyNames.length; j++) {
+			let value = data[j].trim();
+			if (mandatory[j] === true && value === '') {
+				result.errorMessages += '\n' + csvHeaderNames[j] + ' at row #' + (i+1) + ' is empty but requires a value.';
+			}
+			obj[jsonKeyNames[j]] = value;
+		}
+		result.jsonObjArray.push(obj);
+	}
+
+	if (result.errorMessages !== '') {
+		// If we have errors, return empty parse result even though some things
+		// may have parsed properly. We do not want to encourage the caller
+		// to think the data is good for use.
+		result.jsonObjArray = [];
+	}
+
+	return result;
+}
diff --git a/ui-react/src/utils/CsvToJson.test.js b/ui-react/src/utils/CsvToJson.test.js
new file mode 100644
index 000000000..88fa7a472
--- /dev/null
+++ b/ui-react/src/utils/CsvToJson.test.js
@@ -0,0 +1,268 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import CsvToJson from './CsvToJson'
+
+describe('Verify CsvToJson', () => {
+
+	const hdrNames= [ 
+		"Element Short Name",
+		"Element Name",
+		"Element Description",
+		"Element Type",
+		"Sub-Dictionary"
+	];
+
+	const jsonKeyNames = [
+		"shortName",
+		"name",
+		"description",
+		"type",
+		"subDictionary"
+	];
+
+	const mandatory = [ true, true, true, true, false ];
+
+	it('Test CsvToJson No Error Case, Quoted Columns', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Type of Alert","string","","admin","2020-06-11T13:56:14.927437Z"';
+				
+		let expectedResult = {
+			 errorMessages: '',
+			 jsonObjArray: [
+				{
+					description: "Type of Alert",
+					name: "Alert Type",
+					shortName: "alertType",
+					subDictionary: "",
+					type: "string"
+				}
+			]
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson No Error Case, Unquoted Columns', () => {
+
+		let rawCsv = 'Element Short Name,Element Name,Element Description,Element Type,Sub-Dictionary\n';
+		rawCsv += 'alertType,Alert Type,Type of Alert,string,,admin,2020-06-11T13:56:14.927437Z';
+				
+		let expectedResult = {
+			 errorMessages: '',
+			 jsonObjArray: [
+				{
+					description: "Type of Alert",
+					name: "Alert Type",
+					shortName: "alertType",
+					subDictionary: "",
+					type: "string"
+				}
+			]
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Properly Escaped Double Quote and Delimiter', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert ""Type""","Type of Alert, Varies","string","","admin","2020-06-11T13:56:14.927437Z"';
+		
+		let errorMessage = '';
+				
+		let expectedResult = {
+			errorMessages: errorMessage,
+			jsonObjArray: [
+				{
+					description: "Type of Alert, Varies",
+					name: 'Alert "Type"',
+					shortName: 'alertType',
+					subDictionary: "",
+					type: "string",
+				}
+
+			]
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+
+	it('Test CsvToJson Error Header Mismatch Error Case', () => {
+
+		let rawCsv = '"Element Short Names","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Type of Alert","string","","admin","2020-06-11T13:56:14.927437Z"';
+		
+		let errorMessage = 'Row 1 header key at column #1 is a mismatch. Expected row header must contain at least:\n';
+		errorMessage += 'Element Short Name,Element Name,Element Description,Element Type,Sub-Dictionary';
+				
+		let expectedResult = {
+			 errorMessages: errorMessage,
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Mismatched Double Quotes in Column', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alert"Type","Alert Type","Type of Alert","string","","admin","2020-06-11T13:56:14.927437Z"';
+		
+		let errorMessage = '\nRow #2 is badly formatted at column #1. Perhaps an unescaped double quote.'
+				
+		let expectedResult = {
+			 errorMessages: errorMessage,
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Illegal Whitespace', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += 'alertType ,  "Alert Type","Type of Alert","string","","admin","2020-06-11T13:56:14.927437Z"';
+		
+		let errorMessage = '\nMismatched double quotes or illegal whitespace around delimiter at row #2 near column #2';
+				
+		let expectedResult = {
+			 errorMessages: errorMessage,
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Too Few Data Columns', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Type of Alert"';
+		
+		let errorMessage = '\nNot enough columns (5) at row #2';
+				
+		let expectedResult = {
+			errorMessages: errorMessage,
+			jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Wrong Header Column Order', () => {
+
+		let rawCsv = '"Element Name","Element Short Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Type of Alert","string","","admin","2020-06-11T13:56:14.927437Z"';
+		
+		let errorMessage = 'Row 1 header key at column #1 is a mismatch. Expected row header must contain at least:\n';
+		errorMessage += 'Element Short Name,Element Name,Element Description,Element Type,Sub-Dictionary';
+				
+		let expectedResult = {
+			errorMessages: errorMessage,
+			jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Not Enough Rows', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		
+		let errorMessage = '\nNot enough row data found in import file. Need at least a header row and one row of data';
+				
+		let expectedResult = {
+			errorMessages: errorMessage,
+			jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Mandatory Field Is Empty', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"","Alert Type","Type of Alert","string","","admin","2020-06-11T13:56:14.927437Z"';
+				
+		let expectedResult = {
+			 errorMessages: '\nElement Short Name at row #2 is empty but requires a value.',
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '|', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Mismatched Double Quotes At End', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Alert Type Description","string","admin","2020-06-11T13:56:14.927437Z';
+				
+		let expectedResult = {
+			 errorMessages: '\nMismatched double quotes at row #2',
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '||', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Mismatched Mandatory Array Parameters', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Alert Type Description","string","admin","2020-06-11T13:56:14.927437Z';
+				
+		let expectedResult = {
+			 errorMessages: 'interanl error: csvHeaderNames, jsonKeyNames, and mandatory arrays parameters are not the same length',
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '||', hdrNames, jsonKeyNames, [ true ])).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Empty Mandatory Array Parameters', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Alert Type Description","string","admin","2020-06-11T13:56:14.927437Z';
+				
+		let expectedResult = {
+			 errorMessages: 'interanl error: csvHeaderNames, jsonKeyNames, and mandatory arrays have no entries',
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '||', [], [], [])).toEqual(expectedResult);
+	});
+
+	it('Test CsvToJson Error Illegal Data Contains Internal Delimiter', () => {
+
+		let rawCsv = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+		rawCsv += '"alertType","Alert Type","Alert Type||Description","string","admin","2020-06-11T13:56:14.927437Z';
+
+		let expectedResult = {
+			 errorMessages: '\nRow #1 contains illegal sequence of characters (||)',
+			 jsonObjArray: []
+		};
+
+		expect(CsvToJson(rawCsv, ',', '||', hdrNames, jsonKeyNames, mandatory)).toEqual(expectedResult);
+	});
+})
-- 
cgit 1.2.3-korg


From 9dfd03bce65a903c3379e1e07b3c972f208c8fdb Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Tue, 7 Jul 2020 03:37:37 -0400
Subject: Add a customValidation method to PolicyModal

In order for derivations of PolicyModal to apply their own custom error
checking, a new customValidation method is introduced into
PolicyModal.js

Issue-ID: CLAMP-863
Change-Id: If2ed515357741cab6f5b675b4b99423f9f3defed
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 ui-react-lib/libIndex.js                           |  1 +
 .../src/components/dialogs/Policy/PolicyModal.js   | 63 ++++++++++++++-------
 ui-react/src/utils/OnapUtils.js                    | 65 ++++++++++++++++++++++
 3 files changed, 110 insertions(+), 19 deletions(-)
 create mode 100644 ui-react/src/utils/OnapUtils.js

(limited to 'ui-react/src')

diff --git a/ui-react-lib/libIndex.js b/ui-react-lib/libIndex.js
index f090b6145..583cc7128 100755
--- a/ui-react-lib/libIndex.js
+++ b/ui-react-lib/libIndex.js
@@ -36,6 +36,7 @@ export { default as MenuBar } from './src/components/menu/MenuBar';
 export { default as ModifyLoopModal } from './src/components/dialogs/Loop/ModifyLoopModal';
 export { default as NotFound } from './src/NotFound';
 export { default as OnapConstants } from './src/utils/OnapConstants';
+export { default as OnapUtils } from './src/utils/OnapUtils';
 export { default as OpenLoopModal } from './src/components/dialogs/Loop/OpenLoopModal';
 export { default as PerformActions } from './src/components/dialogs/PerformActions';
 export { default as PolicyModal } from './src/components/dialogs/Policy/PolicyModal';
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js
index d3b427396..6b1ebe178 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js
@@ -34,11 +34,16 @@ import LoopCache from '../../../api/LoopCache';
 import JSONEditor from '@json-editor/json-editor';
 import Alert from 'react-bootstrap/Alert';
 import OnapConstant from '../../../utils/OnapConstants';
+import OnapUtils from '../../../utils/OnapUtils';
 
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
 
+const DivWhiteSpaceStyled = styled.div`
+	white-space: pre;
+`
+
 export default class PolicyModal extends React.Component {
 
 	state = {
@@ -70,42 +75,49 @@ export default class PolicyModal extends React.Component {
 		this.renderPdpGroupDropDown = this.renderPdpGroupDropDown.bind(this);
 		this.renderOpenLoopMessage = this.renderOpenLoopMessage.bind(this);
 		this.renderModalTitle = this.renderModalTitle.bind(this);
+		this.readOnly = props.readOnly !== undefined ? props.readOnly : false;
 	}
 
 	handleSave() {
-		var errors = this.state.jsonEditor.validate();
 		var editorData = this.state.jsonEditor.getValue();
+		var errors = this.state.jsonEditor.validate();
+		errors = errors.concat(this.customValidation(editorData, this.state.loopCache.getTemplateName()));
 
 		if (errors.length !== 0) {
 			console.error("Errors detected during policy data validation ", errors);
 			this.setState({
-            		showFailAlert: true,
-            		showMessage: "Errors detected during policy data validation " + errors
-            });
+				showFailAlert: true,
+				showMessage: 'Errors detected during policy data validation:\n' + OnapUtils.jsonEditorErrorFormatter(errors)
+			});
 			return;
 		}
 		else {
 			console.info("NO validation errors found in policy data");
 			if (this.state.policyInstanceType === OnapConstant.microServiceType) {
-                this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData);
-                this.state.loopCache.updateMicroServicePdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
-                LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
-                    this.setState({ show: false });
-                    this.props.history.push('/');
-                    this.props.loadLoopFunction(this.state.loopCache.getLoopName());
-                });
+				this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData);
+				this.state.loopCache.updateMicroServicePdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
+				LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
+					this.setState({ show: false });
+					this.props.history.push('/');
+					this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+				});
 			} else if (this.state.policyInstanceType === OnapConstant.operationalPolicyType) {
 				this.state.loopCache.updateOperationalPolicyProperties(this.state.policyName, editorData);
 				this.state.loopCache.updateOperationalPolicyPdpGroup(this.state.policyName, this.state.chosenPdpGroup, this.state.chosenPdpSubgroup);
 				LoopService.setOperationalPolicyProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()).then(resp => {
 					this.setState({ show: false });
-				this.props.history.push('/');
+					this.props.history.push('/');
 					this.props.loadLoopFunction(this.state.loopCache.getLoopName());
 				});
 			}
 		}
 	}
 
+	customValidation(editorData, templateName) {
+		// method for sub-classes to override with customized validation
+		return [];
+	}
+
 	handleClose() {
 		this.setState({ show: false });
 		this.props.history.push('/');
@@ -115,6 +127,15 @@ export default class PolicyModal extends React.Component {
 		this.renderJsonEditor();
 	}
 
+	componentDidUpdate() {
+		if (this.state.showSucAlert === true || this.state.showFailAlert === true) {
+			let modalElement = document.getElementById("policyModal")
+			if (modalElement) {
+				modalElement.scrollTo(0, 0);
+			}
+		}
+	}
+
     createJsonEditor(toscaModel, editorData) {
         JSONEditor.defaults.themes.myBootstrap4 = JSONEditor.defaults.themes.bootstrap4.extend({
     			getTab: function(text,tabId) {
@@ -313,12 +334,16 @@ export default class PolicyModal extends React.Component {
 				<Modal.Header closeButton>
 					{this.renderModalTitle()}
 				</Modal.Header>
-				<Alert variant="success" show={this.state.showSucAlert} onClose={this.disableAlert} dismissible>
-					{this.state.showMessage}
-				</Alert>
-				<Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
-					{this.state.showMessage}
-				</Alert>
+                                <Alert variant="success" show={this.state.showSucAlert} onClose={this.disableAlert} dismissible>
+                                        <DivWhiteSpaceStyled>
+                                                {this.state.showMessage}
+                                        </DivWhiteSpaceStyled>
+                                </Alert>
+                                <Alert variant="danger" show={this.state.showFailAlert} onClose={this.disableAlert} dismissible>
+                                        <DivWhiteSpaceStyled>
+                                                {this.state.showMessage}
+                                        </DivWhiteSpaceStyled>
+                                </Alert>
 				<Modal.Body>
 					{this.renderOpenLoopMessage()}
 					<div id="editor" />
@@ -330,4 +355,4 @@ export default class PolicyModal extends React.Component {
 			</ModalStyled>
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/ui-react/src/utils/OnapUtils.js b/ui-react/src/utils/OnapUtils.js
new file mode 100644
index 000000000..316a0d65f
--- /dev/null
+++ b/ui-react/src/utils/OnapUtils.js
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class OnapUtils {
+
+	constructor() {
+		this.clickBlocked = false;
+	}
+
+	static jsonEditorErrorFormatter(errors) {
+
+		let messages = [];
+		let messagesOutputString = null;
+
+		// errors is an array of JSON Editor "error" objects, where each
+		// object looks like this:
+
+		//	{
+		//		message: "Please populate the required property "Threshold""
+		//		path: "root.signatures.0"
+		//		property: "required"
+		//	}
+
+		// In this function we concatenate all the messages, removing any duplicates,
+		// and adding a newline between each message. The result returned is a single
+		// string that can be displayed to the user in an alert message
+
+		if (!Array.isArray(errors)) {
+			console.error('jsoneEditorErrorFormatter was passed a non-array argument');
+		} else {
+			for (let ii=0; ii < errors.length; ++ii) {
+				if (!messages.includes(errors[ii].message)) {
+					messages.push(errors[ii].message);
+					if (messagesOutputString) {
+						messagesOutputString += '\n' + errors[ii].message;
+					} else {
+						messagesOutputString = errors[ii].message;
+					}
+				}
+			}
+		}
+
+		return messagesOutputString;
+	}
+}
-- 
cgit 1.2.3-korg


From 4fb32395392c3c65ad8dcadc42d7804d2e656c63 Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Mon, 6 Jul 2020 16:59:47 -0400
Subject: add framework for blocking user interaction

this adds two new methods to LoopUI.js, setBusyLoading and
clearBusyLoading, and one new state variable, busyLoadingCount, for
supporting the blocking of user clicking during async back end calls
that might take a bit of time to return. Blocking the user from clicking
on a component box is implemented as an important first case use, as
well as all PerformAction calls.

Issue-ID: CLAMP-894
Change-Id: I28660afe26b6cc8184b9392aee42157f44601bf6
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 ui-react/src/LoopUI.js                             | 155 ++++++++++++++++++---
 ui-react/src/__snapshots__/LoopUI.test.js.snap     |   4 +-
 ui-react/src/__snapshots__/OnapClamp.test.js.snap  |   4 +-
 ui-react/src/components/dialogs/PerformActions.js  |  52 ++++---
 .../src/components/dialogs/PerformActions.test.js  |   8 +-
 .../src/components/loop_viewer/svg/SvgGenerator.js |  16 ++-
 6 files changed, 188 insertions(+), 51 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 8624726be..0ee6e6e24 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -52,6 +52,7 @@ import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoopModal from './components/dialogs/Loop/DeployLoopModal';
 import Alert from 'react-bootstrap/Alert';
+import Spinner from 'react-bootstrap/Spinner';
 
 import { Link } from 'react-router-dom';
 
@@ -59,6 +60,11 @@ const StyledMainDiv = styled.div`
 	background-color: ${props => props.theme.backgroundColor};
 `
 
+const StyledSpinnerDiv = styled.div`
+	justify-content: center !important;
+	display: flex !important;
+`;
+
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
 	padding-left: 30px;
@@ -108,7 +114,8 @@ export default class LoopUI extends React.Component {
 		loopName: OnapConstants.defaultLoopName,
 		loopCache: new LoopCache({}),
 		showSucAlert: false,
-		showFailAlert: false
+		showFailAlert: false,
+		busyLoadingCount: 0
 	};
 
 	constructor() {
@@ -120,6 +127,9 @@ export default class LoopUI extends React.Component {
 		this.showSucAlert =  this.showSucAlert.bind(this);
 		this.showFailAlert =  this.showFailAlert.bind(this);
 		this.disableAlert =  this.disableAlert.bind(this);
+		this.setBusyLoading = this.setBusyLoading.bind(this);
+		this.clearBusyLoading = this.clearBusyLoading.bind(this);
+		this.isBusyLoading = this.isBusyLoading.bind(this);
 	}
 
 	componentWillMount() {
@@ -191,7 +201,7 @@ export default class LoopUI extends React.Component {
 	renderLoopViewBody() {
 		return (
 			<LoopViewBodyDivStyled>
-				<SvgGenerator loopCache={this.state.loopCache} clickable={true} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE}/>
+				<SvgGenerator loopCache={this.state.loopCache} clickable={true} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE} isBusyLoading={this.isBusyLoading}/>
 				<LoopStatus loopCache={this.state.loopCache}/>
 				<LoopLogs loopCache={this.state.loopCache} />
 			</LoopViewBodyDivStyled>
@@ -225,53 +235,160 @@ export default class LoopUI extends React.Component {
 	showFailAlert(message) {
 		this.setState ({ showFailAlert: true, showMessage:message });
 	}
- 
+
 	disableAlert() {
 		this.setState ({ showSucAlert: false, showFailAlert: false });
 	}
 
 	loadLoop(loopName) {
+		this.setBusyLoading();
 		LoopService.getLoop(loopName).then(loop => {
 			console.debug("Updating loopCache");
 			LoopActionService.refreshStatus(loopName).then(data => {
 				this.updateLoopCache(data);
+				this.clearBusyLoading();
 				this.props.history.push('/');
 			})
 			.catch(error => {
 				this.updateLoopCache(loop);
+				this.clearBusyLoading();
 				this.props.history.push('/');
 			});
 		});
 	}
 
+	setBusyLoading() {
+		this.setState((state,props) => ({ busyLoadingCount: ++state.busyLoadingCount }));
+	}
+
+	clearBusyLoading() {
+		this.setState((state,props) => ({ busyLoadingCount: --state.busyLoadingCount }));
+	}
+
+	isBusyLoading() {
+		if (this.state.busyLoadingCount === 0) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
 	closeLoop() {
 		this.setState({ loopCache: new LoopCache({}), loopName: OnapConstants.defaultLoopName });
 		this.props.history.push('/');
 	}
 
-	render() {
-		return (
-				<StyledMainDiv id="main_div">
+	renderRoutes() {
+		return(
+			<React.Fragment>
 				<Route path="/uploadToscaPolicyModal" render={(routeProps) => (<UploadToscaPolicyModal {...routeProps} />)} />
 				<Route path="/viewToscaPolicyModal" render={(routeProps) => (<ViewToscaPolicyModal {...routeProps} />)} />
 				<Route path="/ViewLoopTemplatesModal" render={(routeProps) => (<ViewLoopTemplatesModal {...routeProps} />)} />
 				<Route path="/ManageDictionaries" render={(routeProps) => (<ManageDictionaries {...routeProps} />)} />
-				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
-				<Route path="/createLoop" render={(routeProps) => (<CreateLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
-				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
-				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
-				<Route path="/modifyLoop" render={(routeProps) => (<ModifyLoopModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+
+				<Route path="/policyModal/:policyInstanceType/:policyName" render={(routeProps) => (<PolicyModal {...routeProps}
+					loopCache={this.getLoopCache()}
+					loadLoopFunction={this.loadLoop}/>)}
+				/>
+				<Route path="/createLoop" render={(routeProps) => (<CreateLoopModal {...routeProps}
+					loadLoopFunction={this.loadLoop} />)}
+				/>
+				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps}
+					loadLoopFunction={this.loadLoop} />)}
+				/>
+				<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps}
+					loopCache={this.getLoopCache()}
+					loadLoopFunction={this.loadLoop}/>)}
+				/>
+				<Route path="/modifyLoop" render={(routeProps) => (<ModifyLoopModal {...routeProps}
+					loopCache={this.getLoopCache()}
+					loadLoopFunction={this.loadLoop}/>)}
+				/>
 
 				<Route path="/userInfo" render={(routeProps) => (<UserInfoModal {...routeProps} />)} />
 				<Route path="/closeLoop" render={this.closeLoop} />
-				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showSucAlert={this.showSucAlert} showFailAlert={this.showFailAlert}/>)} />
-				<GlobalClampStyle />
+
+				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps}
+					loopAction="submit"
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}
+					setBusyLoading={this.setBusyLoading}
+					clearBusyLoading={this.clearBusyLoading}/>)}
+				/>
+				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps}
+					loopAction="stop"
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}
+					setBusyLoading={this.setBusyLoading}
+					clearBusyLoading={this.clearBusyLoading}/>)}
+				/>
+				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps}
+					loopAction="restart"
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}
+					setBusyLoading={this.setBusyLoading}
+					clearBusyLoading={this.clearBusyLoading}/>)}
+				/>
+				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps}
+					loopAction="delete"
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}
+					setBusyLoading={this.setBusyLoading}
+					clearBusyLoading={this.clearBusyLoading}/>)}
+				/>
+				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps}
+					loopAction="undeploy"
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}
+					setBusyLoading={this.setBusyLoading}
+					clearBusyLoading={this.clearBusyLoading}/>)}
+				/>
+				<Route path="/deploy" render={(routeProps) => (<DeployLoopModal {...routeProps}
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}/>)}
+				/>
+				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps}
+					loopCache={this.getLoopCache()}
+					updateLoopFunction={this.updateLoopCache}
+					showSucAlert={this.showSucAlert}
+					showFailAlert={this.showFailAlert}/>)}
+				/>
+			</React.Fragment>
+		);
+	}
+
+	renderSpinner() {
+		if (this.isBusyLoading()) {
+			return (
+				<StyledSpinnerDiv>
+					<Spinner animation="border" role="status">
+						<span className="sr-only">Loading...</span>
+					</Spinner>
+				</StyledSpinnerDiv>
+			);
+		} else {
+			return (<div></div>);
+		}
+	}
+
+	render() {
+		return (
+				<StyledMainDiv id="main_div">
+					<GlobalClampStyle />
+					{this.renderRoutes()}
+					{this.renderSpinner()}
 					{this.renderAlertBar()}
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 2dfa48091..cae9182ff 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -4,6 +4,7 @@ exports[`Verify LoopUI Test the render method 1`] = `
 <styled.div
   id="main_div"
 >
+  <GlobalStyleComponent />
   <Route
     path="/uploadToscaPolicyModal"
     render={[Function]}
@@ -76,7 +77,7 @@ exports[`Verify LoopUI Test the render method 1`] = `
     path="/refreshStatus"
     render={[Function]}
   />
-  <GlobalStyleComponent />
+  <div />
   <div>
     <Alert
       closeLabel="Close alert"
@@ -166,6 +167,7 @@ exports[`Verify LoopUI Test the render method 1`] = `
       <withRouter(SvgGenerator)
         clickable={true}
         generatedFrom="INSTANCE"
+        isBusyLoading={[Function]}
         loopCache={
           LoopCache {
             "loopJsonCache": Object {},
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 56d022fc6..d4573b3d1 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -31,6 +31,7 @@ exports[`Verify OnapClamp Test the render method 1`] = `
   <styled.div
     id="main_div"
   >
+    <GlobalStyleComponent />
     <Route
       path="/uploadToscaPolicyModal"
       render={[Function]}
@@ -103,7 +104,7 @@ exports[`Verify OnapClamp Test the render method 1`] = `
       path="/refreshStatus"
       render={[Function]}
     />
-    <GlobalStyleComponent />
+    <div />
     <div>
       <Alert
         closeLabel="Close alert"
@@ -191,6 +192,7 @@ exports[`Verify OnapClamp Test the render method 1`] = `
         <withRouter(SvgGenerator)
           clickable={true}
           generatedFrom="INSTANCE"
+          isBusyLoading={[Function]}
           loopCache={
             LoopCache {
               "loopJsonCache": Object {},
diff --git a/ui-react/src/components/dialogs/PerformActions.js b/ui-react/src/components/dialogs/PerformActions.js
index cf5a3c20e..f6001e21f 100644
--- a/ui-react/src/components/dialogs/PerformActions.js
+++ b/ui-react/src/components/dialogs/PerformActions.js
@@ -22,24 +22,19 @@
  */
 import React from 'react';
 import LoopActionService from '../../api/LoopActionService';
-import Spinner from 'react-bootstrap/Spinner'
-import styled from 'styled-components';
 
-const StyledSpinnerDiv = styled.div`
-	justify-content: center !important;
-	display: flex !important;
-`;
 
 export default class PerformActions extends React.Component {
 	state = {
 		loopName: this.props.loopCache.getLoopName(),
 		loopAction: this.props.loopAction
 	};
+
 	constructor(props, context) {
 		super(props, context);
-
 		this.refreshStatus = this.refreshStatus.bind(this);
 	}
+
 	componentWillReceiveProps(newProps) {
 		this.setState({
 			loopName: newProps.loopCache.getLoopName(),
@@ -51,35 +46,50 @@ export default class PerformActions extends React.Component {
 		const action = this.state.loopAction;
 		const loopName = this.state.loopName;
 
-		LoopActionService.performAction(loopName, action).then(pars => {
+		if (action === 'delete') {
+			if (window.confirm('You are about to remove Control Loop Model "' + loopName +
+					'". Select OK to continue with deletion or Cancel to keep the model.') === false) {
+				return;
+			}
+		}
+
+		this.props.setBusyLoading(); // Alert top level to start block user clicks
+
+		LoopActionService.performAction(loopName, action)
+		.then(pars => {
 			this.props.showSucAlert("Action " + action + " successfully performed");
-			// refresh status and update loop logs
-			this.refreshStatus(loopName);
+			if (action === 'delete') {
+				this.props.updateLoopFunction(null);
+				this.props.history.push('/');
+			} else {
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			}
 		})
 		.catch(error => {
 			this.props.showFailAlert("Action " + action + " failed");
 			// refresh status and update loop logs
 			this.refreshStatus(loopName);
-		});
-
+		})
+		.finally(() => this.props.clearBusyLoading());
 	}
 
 	refreshStatus(loopName) {
-		LoopActionService.refreshStatus(loopName).then(data => {
+
+		this.props.setBusyLoading();
+
+		LoopActionService.refreshStatus(loopName)
+		.then(data => {
 			this.props.updateLoopFunction(data);
 			this.props.history.push('/');
 		})
-			.catch(error => {
+		.catch(error => {
 			this.props.history.push('/');
-		});
+		})
+		.finally(() => this.props.clearBusyLoading());
 	}
 
 	render() {
-		return (
-			<StyledSpinnerDiv>
-				<Spinner animation="border" role="status">
-				</Spinner>
-			</StyledSpinnerDiv>
-		);
+		return null;
 	}
 }
diff --git a/ui-react/src/components/dialogs/PerformActions.test.js b/ui-react/src/components/dialogs/PerformActions.test.js
index b833a929d..c91c2f675 100644
--- a/ui-react/src/components/dialogs/PerformActions.test.js
+++ b/ui-react/src/components/dialogs/PerformActions.test.js
@@ -38,6 +38,8 @@ describe('Verify PerformActions', () => {
 		const updateLoopFunction = jest.fn();
 		const showSucAlert = jest.fn();
 		const showFailAlert = jest.fn();
+		const setBusyLoading = jest.fn();
+		const clearBusyLoading = jest.fn();
 		
 		LoopActionService.refreshStatus = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -47,7 +49,7 @@ describe('Verify PerformActions', () => {
 			});
 		});
 		const component = shallow(<PerformActions loopCache={loopCache} 
-					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
+					loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} setBusyLoading={setBusyLoading} clearBusyLoading={clearBusyLoading}/>)
 		await flushPromises();
 		component.update();
 
@@ -60,6 +62,8 @@ describe('Verify PerformActions', () => {
 		const updateLoopFunction = jest.fn();
 		const showSucAlert = jest.fn();
 		const showFailAlert = jest.fn();
+		const setBusyLoading = jest.fn();
+		const clearBusyLoading = jest.fn();
 
 		LoopActionService.performAction = jest.fn().mockImplementation(() => {
 			return Promise.resolve({
@@ -76,7 +80,7 @@ describe('Verify PerformActions', () => {
 			});
 		});
 		const component = shallow(<PerformActions loopCache={loopCache} 
-						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} />)
+						loopAction="submit" history={historyMock} updateLoopFunction={updateLoopFunction} showSucAlert={showSucAlert} showFailAlert={showFailAlert} setBusyLoading={setBusyLoading} clearBusyLoading={clearBusyLoading}/>)
 		await flushPromises();
 		component.update();
 
diff --git a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js b/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
index d718c2e44..7070455e7 100644
--- a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
+++ b/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
@@ -70,13 +70,15 @@ class SvgGenerator extends React.Component {
 	}
 
 	handleSvgClick(event) {
-	    if (this.state.clickable) {
-            console.debug("svg click event received");
-            var elementName = event.target.parentNode.getAttribute('policyId');
-            console.info("SVG element clicked", elementName);
-            if (elementName !== null) {
-                this.props.history.push("/policyModal/"+event.target.parentNode.getAttribute('policyType')+"/"+elementName);
-            }
+		console.debug("svg click event received");
+		if (this.state.clickable) {
+			var elementName = event.target.parentNode.getAttribute('policyId');
+			console.info("SVG element clicked", elementName);
+			// Only allow movement to policy editing IF there busyLoadingCOunt is 0,
+			// meaning we are not waiting for refreshStatus to complete, for example
+			if (elementName !== null && !this.props.isBusyLoading()) {
+				this.props.history.push("/policyModal/"+event.target.parentNode.getAttribute('policyType')+"/"+elementName);
+			}
 		}
 	}
 
-- 
cgit 1.2.3-korg


From b80ded057a71f33f5d3365ba5393880a4296a229 Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Wed, 17 Jun 2020 21:40:35 -0400
Subject: Add many jests tests and implement block on element type and
 subdictionary fields for subdictionary elements

Issue-ID: CLAMP-849
Change-Id: Ic6c4c06ee3b41e2e4dfe1913b7ecf57a951d9993
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 .../ManageDictionaries/ManageDictionaries.js       | 437 ++++++++++---------
 .../ManageDictionaries/ManageDictionaries.test.js  | 463 ++++++++++++++++-----
 2 files changed, 599 insertions(+), 301 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
index 58cb9c6c3..90bbc887c 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js
@@ -74,7 +74,9 @@ const ColPullLeftStyled = styled(Col)`
 const cellStyle = { border: '1px solid black' };
 const headerStyle = { backgroundColor: '#ddd',	border: '2px solid black'	};
 const rowHeaderStyle = {backgroundColor:'#ddd',  fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
 let dictList = [];
+let subDictFlag = false;
 
 function SelectSubDictType(props) {
 	const {onChange} = props;
@@ -90,9 +92,10 @@ function SelectSubDictType(props) {
 		SelectedDictTypes = SelectedDictTypes.slice(0,-1);
 		onChange(SelectedDictTypes);
 	}
+	// When the subDictFlag is true, we need to disable selection of element "type"
 	return(
 		<div>
-			<select multiple={true}  onChange={selectedValues}>
+			<select disabled={subDictFlag} multiple={true} onChange={selectedValues}>
 				<option value="string">string</option>
 				<option value="number">number</option>
 				<option value="datetime">datetime</option>
@@ -100,66 +103,75 @@ function SelectSubDictType(props) {
 				<option value="json">json</option>
 			</select>
 		</div>
-	)
+	);
 }
 
 function SubDict(props) {
 	const {onChange} = props;
 	const subDicts = [];
-	subDicts.push('Default');
+	subDicts.push('none');
 	if (dictList !== undefined  && dictList.length > 0) {
-	let item;
-        for(item in dictList) {
-            if(dictList[item].secondLevelDictionary === 1) {
-                subDicts.push(dictList[item].name);
-            }
-        };
+		let item;
+        	for(item in dictList) {
+            		if(dictList[item].secondLevelDictionary === 1) {
+                		subDicts.push(dictList[item].name);
+            		}
+        	}
+	}
+	let optionItems = [];
+	for (let i=0; i<subDicts.length; ++i) {
+		if (i === 0) {
+			optionItems.push(<option selected key={subDicts[i]}>{subDicts[i]}</option>);
+		} else {
+			optionItems.push(<option key={subDicts[i]}>{subDicts[i]}</option>);
+		}
 	}
-	subDicts.push('');
- 	let optionItems = subDicts.map(
-		(item) => <option key={item}>{item}</option>
-	  );
+
  	function selectedValue (e) {
 		onChange(e.target.value);
 	}
+	// When the subDictFlag is true, we need to disable selection of
+	// the sub-dictionary flag
 	return(
-		<select onChange={selectedValue} >
-			{optionItems}
-		</select>
-	)
+			<select disabled={subDictFlag} onChange={selectedValue} >
+				{optionItems}
+			</select>
+	);
 }
 
 export default class ManageDictionaries extends React.Component {
 	constructor(props, context) {
 		super(props, context);
-		this.handleClose = this.handleClose.bind(this);
+		this.addDictionaryElementRow = this.addDictionaryElementRow.bind(this);
+		this.addDictionaryRow = this.addDictionaryRow.bind(this);
+		this.addReplaceDictionaryRequest = this.addReplaceDictionaryRequest.bind(this);
 		this.clickHandler = this.clickHandler.bind(this);
+		this.deleteDictionaryElementRow = this.deleteDictionaryElementRow.bind(this);
+		this.deleteDictionaryRequest = this.deleteDictionaryRequest.bind(this);
+		this.deleteDictionaryRow = this.deleteDictionaryRow.bind(this);
+		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
 		this.getDictionaries = this.getDictionaries.bind(this);
 		this.getDictionaryElements = this.getDictionaryElements.bind(this);
-		this.addReplaceDictionaryRequest = this.addReplaceDictionaryRequest.bind(this);
-		this.deleteDictionaryRequest = this.deleteDictionaryRequest.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleDictionaryRowClick = this.handleDictionaryRowClick.bind(this);
+		this.importCsvData = this.importCsvData.bind(this);
+		this.updateDictionaryElementRow = this.updateDictionaryElementRow.bind(this);
 		this.updateDictionaryElementsRequest = this.updateDictionaryElementsRequest.bind(this);
-		this.addDictionaryRow = this.addDictionaryRow.bind(this);
 		this.updateDictionaryRow = this.updateDictionaryRow.bind(this);
-		this.deleteDictionaryRow = this.deleteDictionaryRow.bind(this);
-		this.addDictionaryElementRow = this.addDictionaryElementRow.bind(this);
-		this.deleteDictionaryElementRow = this.deleteDictionaryElementRow.bind(this);
-		this.updateDictionaryElementRow = this.updateDictionaryElementRow.bind(this);
-		this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
+		this.readOnly = props.readOnly !== undefined ? props.readOnly : false;
 		this.state = {
 			show: true,
-			selectedFile: '',
 			currentSelectedDictionary: null,
 			exportFilename: '',
 			content: null,
 			dictionaryElements: [],
 			tableIcons: {
 				Add: forwardRef((props, ref) => <AddBox {...props} ref={ref} />),
-				Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
-				Clear: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
 				Delete: forwardRef((props, ref) => <DeleteOutline {...props} ref={ref} />),
 				DetailPanel: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
 				Edit: forwardRef((props, ref) => <Edit {...props} ref={ref} />),
+				Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
+				Clear: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
 				Export: forwardRef((props, ref) => <VerticalAlignBottomIcon {...props} ref={ref} />),
 				Filter: forwardRef((props, ref) => <FilterList {...props} ref={ref} />),
 				FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
@@ -226,10 +238,10 @@ export default class ManageDictionaries extends React.Component {
 					headerStyle: headerStyle
 				},
 				{
-				    title: "Sub-Dictionary", field: "subDictionary",
-				      editComponent: props => (
+					title: "Sub-Dictionary", field: "subDictionary",
+					editComponent: props => (
 						 <div>
-							 <SubDict  value={props.value} onChange={props.onChange} />
+							 <SubDict value={props.value} onChange={props.onChange} />
 						 </div>
 				      ),
 				    cellStyle: cellStyle,
@@ -256,14 +268,19 @@ export default class ManageDictionaries extends React.Component {
 	getDictionaries() {
 		TemplateMenuService.getDictionary().then(arrayOfdictionaries => {
 			this.setState({ dictionaries: arrayOfdictionaries, currentSelectedDictionary: null })
+			// global variable setting used functional components in this file
+			dictList = arrayOfdictionaries;
+		}).catch(() => {
+			console.error('Failed to retrieve dictionaries');
+			this.setState({ dictionaries: [], currentSelectedDictionary: null })
 		});
 	}
 
 	getDictionaryElements(dictionaryName) {
 		TemplateMenuService.getDictionaryElements(dictionaryName).then(dictionaryElements => {
-			dictList = this.state.dictionaries;
 			this.setState({ dictionaryElements: dictionaryElements.dictionaryElements} );
-		});
+			this.setState({ currentSelectDictionary: dictionaryName });
+		}).catch(() => console.error('Failed to retrieve dictionary elements'))
 	}
 
 	clickHandler(rowData) {
@@ -277,27 +294,33 @@ export default class ManageDictionaries extends React.Component {
 
 	addReplaceDictionaryRequest(dictionaryEntry) {
 		TemplateMenuService.insDictionary(dictionaryEntry)
-		.then(resp => {})
-		.then(() => {this.getDictionaries()});
+		.then(resp => {
+			this.getDictionaries();
+		})
+		.catch(() => console.error('Failed to insert new dictionary elements'));
 	}
 
 	updateDictionaryElementsRequest(dictElements) {
 		let reqData = { "name": this.state.currentSelectedDictionary, 'dictionaryElements': dictElements };
 		TemplateMenuService.insDictionaryElements(reqData)
-		.then(resp => {})
-		.then(() => { this.getDictionaryElements(this.state.currentSelectedDictionary) });
+		.then(resp => { this.getDictionaryElements(this.state.currentSelectedDictionary) })
+		.catch(() => console.error('Failed to update dictionary elements'));
 	}
 
 	deleteDictionaryRequest(dictionaryName) {
 		TemplateMenuService.deleteDictionary(dictionaryName)
-		.then(resp => { this.getDictionaries() });
+		.then(resp => {
+			this.getDictionaries();
+		})
+		.catch(() => console.error('Failed to delete dictionary'));
 	}
 
 	deleteDictionaryElementRequest(dictionaryName, elemenetShortName) {
 		TemplateMenuService.deleteDictionaryElements({ 'name': dictionaryName, 'shortName': elemenetShortName })
 		.then(resp => {
 			this.getDictionaryElements(dictionaryName);
-		});
+		})
+		.catch(() => console.error('Failed to delete dictionary elements'));
 	}
 
 	fileSelectedHandler = (event) => {
@@ -306,83 +329,94 @@ export default class ManageDictionaries extends React.Component {
 			if (event.target.files && event.target.files[0]) {
 				const reader = new FileReader();
 				reader.onload = (e) => {
+					let errorMessages = this.importCsvData(reader.result);
+					if (errorMessages !== '') {
+						alert(errorMessages);
+					}
+				}
+				reader.readAsText(event.target.files[0]);
+			}
+		} else {
+			alert('Please upload .csv extention files only.');
+		}
+	}
 
-				const jsonKeyNames = [ 'shortName', 'name', 'description', 'type', 'subDictionary' ];
-				const userHeaderNames = [ 'Element Short Name', 'Element Name', 'Element Description', 'Element Type', 'Sub-Dictionary'  ];
-				const mandatory = [ true, true, true, true, false ];
-				const validTypes = ['string','number','datetime','json','map'];
+	importCsvData(rawCsvData) {
 
-				let result = CsvToJson(reader.result, ',', '||||', userHeaderNames, jsonKeyNames, mandatory);
+		const jsonKeyNames = [ 'shortName', 'name', 'description', 'type', 'subDictionary' ];
+		const userHeaderNames = [ 'Element Short Name', 'Element Name', 'Element Description', 'Element Type', 'Sub-Dictionary'  ];
+		const validTypes = ['string','number','datetime','json','map'];
 
-				let errorMessages = result.errorMessages;
-				let jsonObjArray = result.jsonObjArray;
+		let mandatory;
 
-				let validTypesErrorMesg = '';
+		if (subDictFlag) {
+			mandatory = [ true, true, true, false, false ];
+		} else {
+			mandatory = [ true, true, true, true, false ];
+		}
 
-				for (let i=0; i < validTypes.length; ++i) {
-					if (i === 0) {
-						validTypesErrorMesg = validTypes[i];
-					} else {
-						validTypesErrorMesg += ',' + validTypes[i];
-					}
-				}
+		let result = CsvToJson(rawCsvData, ',', '||||', userHeaderNames, jsonKeyNames, mandatory);
 
-				if (errorMessages !== '') {
-					alert(errorMessages);
-					return;
-				}
+		let errorMessages = result.errorMessages;
+		let jsonObjArray = result.jsonObjArray;
 
-				// Perform further checks on data that is now in JSON form
-                    		let subDictionaries = [];
+		let validTypesErrorMesg = '';
 
-				// NOTE: dictList is a global variable  maintained faithfully
-				//       by the getDictionaries() method outside this import
-				//       functionality.
-				let item;
-                    		for (item in dictList) {
-					if (dictList[item].secondLevelDictionary === 1) {
-						subDictionaries.push(dictList[item].name);
-					}
-				};
-
-				// Check for valid Sub-Dictionary and Element Type values
-				subDictionaries = subDictionaries.toString();
-				let row = 2;
-				let dictElem;
-				for (dictElem of jsonObjArray) {
-					let itemKey;
-					for (itemKey in dictElem){
-						let value = dictElem[itemKey].trim();
-						let keyIndex = jsonKeyNames.indexOf(itemKey);
-						if (itemKey === 'shortName' && /[^a-zA-Z0-9-_.]/.test(value)) {
-							errorMessages += '\n' + userHeaderNames[keyIndex] +
-								' at row #' + row +
-								' can only contain alphanumeric characters and periods, hyphens or underscores';
-						}
-						if (itemKey === 'type' && validTypes.indexOf(value) < 0) {
-							errorMessages += '\nInvalid value of "' + value + '" for "' + userHeaderNames[keyIndex] + '" at row #' + row;
-							errorMessages += '\nValid types are: ' + validTypesErrorMesg;
-						}
-						if (value !== "" && itemKey === 'subDictionary' && subDictionaries.indexOf(value) < 0) {
-							errorMessages += '\nInvalid Sub-Dictionary value of "' + value + '" at row #' + row;
-                            }
-                        }
-					++row;
-                    }
-					if (errorMessages) {
-						alert(errorMessages);
-						return;
-					}
+		for (let i=0; i < validTypes.length; ++i) {
+			if (i === 0) {
+				validTypesErrorMesg = validTypes[i];
+			} else {
+				validTypesErrorMesg += ',' + validTypes[i];
+			}
+		}
+
+		if (errorMessages !== '') {
+			return errorMessages;
+		}
+
+		// Perform further checks on data that is now in JSON form
+		let subDictionaries = [];
 
-					// We made it through all the checks. Send it to back end
-					this.updateDictionaryElementsRequest(jsonObjArray);
+		// NOTE: dictList is a global variable  maintained faithfully
+		//       by the getDictionaries() method outside this import
+		//       functionality.
+		let item;
+		for (item in dictList) {
+			if (dictList[item].secondLevelDictionary === 1) {
+				subDictionaries.push(dictList[item].name);
+			}
+		};
+
+		// Check for valid Sub-Dictionary and Element Type values
+		subDictionaries = subDictionaries.toString();
+		let row = 2;
+		let dictElem;
+		for (dictElem of jsonObjArray) {
+			let itemKey;
+			for (itemKey in dictElem){
+				let value = dictElem[itemKey].trim();
+				let keyIndex = jsonKeyNames.indexOf(itemKey);
+				if (itemKey === 'shortName' && /[^a-zA-Z0-9-_.]/.test(value)) {
+					errorMessages += '\n' + userHeaderNames[keyIndex] +
+						' at row #' + row +
+						' can only contain alphanumeric characters and periods, hyphens or underscores';
+				}
+				if (itemKey === 'type' && validTypes.indexOf(value) < 0) {
+					errorMessages += '\nInvalid value of "' + value + '" for "' + userHeaderNames[keyIndex] + '" at row #' + row;
+					errorMessages += '\nValid types are: ' + validTypesErrorMesg;
+				}
+				if (value !== "" && itemKey === 'subDictionary' && subDictionaries.indexOf(value) < 0) {
+					errorMessages += '\nInvalid Sub-Dictionary value of "' + value + '" at row #' + row;
 				}
-				reader.readAsText(event.target.files[0]);
 			}
-			this.setState({selectedFile: event.target.files[0]})
-		} else {
-			alert('Please upload .csv extention files only.');
+			++row;
+		}
+		if (errorMessages === '') {
+			// We made it through all the checks. Send it to back end
+			this.updateDictionaryElementsRequest(jsonObjArray);
 		}
+
+		return errorMessages;
 	}
 
 	addDictionaryRow(newData) {
@@ -392,13 +426,13 @@ export default class ManageDictionaries extends React.Component {
 					if (/[^a-zA-Z0-9-_.]/.test(newData.name)) {
 						validData = false;
 						alert('Please enter alphanumeric input. Only allowed special characters are:(period, hyphen, underscore)');
-						reject(() => {});
+						reject();
 					}
 					for (let i = 0; i < this.state.dictionaries.length; i++) {
 						if (this.state.dictionaries[i].name === newData.name) {
 							validData = false;
 							alert(newData.name + ' dictionary name already exists')
-							reject(() => {});
+							reject();
 						}
 					}
 					if (validData) {
@@ -410,13 +444,14 @@ export default class ManageDictionaries extends React.Component {
 	}
 
 
-	updateDictionaryRow(oldData, newData) {
+	updateDictionaryRow(newData, oldData) {
 		let validData = true;
-		return new Promise((resolve) => {
+		return new Promise((resolve, reject) => {
 			setTimeout(() => {
 				if (/[^a-zA-Z0-9-_.]/.test(newData.name)) {
 					validData = false;
 					alert('Please enter alphanumberic input. Only allowed special characters are:(period, hyphen, underscore)');
+					reject();
 				}
 				if (validData) {
 					this.addReplaceDictionaryRequest(newData);
@@ -427,7 +462,7 @@ export default class ManageDictionaries extends React.Component {
 	}
 
 	deleteDictionaryRow(oldData) {
-		return new Promise((resolve) => {
+		return new Promise((resolve, reject) => {
 			setTimeout(() => {
 				this.deleteDictionaryRequest(oldData.name);
 				resolve();
@@ -439,53 +474,63 @@ export default class ManageDictionaries extends React.Component {
 		return new Promise((resolve, reject) => {
 			setTimeout(() => {
 				let dictionaryElements = this.state.dictionaryElements;
-				let errorMessage = '';
+				let errorMessages = '';
 				for (let i = 0; i < this.state.dictionaryElements.length; i++) {
 					if (this.state.dictionaryElements[i].shortName === newData.shortName) {
 						alert('Short Name "' + newData.shortName + '" already exists');
-						reject(() => {});
+						reject("");
 					}
 				}
-				if (newData.shortName !== '' && /[^a-zA-Z0-9-_.]/.test(newData.shortName)) {
-					errorMessage += '\nShort Name is limited to alphanumeric characters and also period, hyphen, and underscore';
+				// MaterialTable returns no property at all if the user has not touched a
+				// new column, so we want to add the property with an emptry string
+				// for several cases if that is the case to simplify other checks.
+				if (newData.description === undefined) {
+					newData.description = "";
+				}
+				if (newData.subDictionary === undefined) {
+					newData.subDictionary = null;
+				}
+				if (newData.type === undefined) {
+					newData.type = "";
+				}
+				if (!newData.shortName && /[^a-zA-Z0-9-_.]/.test(newData.shortName)) {
+					errorMessages += '\nShort Name is limited to alphanumeric characters and also period, hyphen, and underscore';
 				}
 				if (!newData.shortName){
-					errorMessage += '\nShort Name must be specified';
+					errorMessages += '\nShort Name must be specified';
 				}
 				if (!newData.name){
-					errorMessage += '\nElement Name must be specified';
+					errorMessages += '\nElement Name must be specified';
 				}
-				if (!newData.type){
-					errorMessage += '\nElement Type must be specified';
+				if (!newData.type && !subDictFlag){
+					errorMessages += '\nElement Type must be specified';
 				}
-				if (!newData.description){
-					errorMessage += '\nElement Description must be specified';
-				}
-				if (errorMessage === '') {
+				if (errorMessages === '') {
 					dictionaryElements.push(newData);
-					this.updateDictionaryElementsRequest(dictionaryElements);
+					this.updateDictionaryElementsRequest([newData]);
 					resolve();
 				} else {
-					alert(errorMessage);
-					reject(() => {});
+					alert(errorMessages);
+					reject("");
 				}
 			}, 1000);
 		});
 	}
 
 	updateDictionaryElementRow(newData, oldData) {
-		return new Promise((resolve) => {
+		return new Promise((resolve, reject) => {
 			setTimeout(() => {
 				let dictionaryElements = this.state.dictionaryElements;
 				let validData =  true;
 				if (!newData.type) {
 					validData = false;
 					alert('Element Type cannot be null');
+					reject();
 				}
 				if (validData) {
 					const index = dictionaryElements.indexOf(oldData);
 					dictionaryElements[index] = newData;
-					this.updateDictionaryElementsRequest(dictionaryElements);
+					this.updateDictionaryElementsRequest([newData]);
 				}
 				resolve();
 			}, 1000);
@@ -502,6 +547,15 @@ export default class ManageDictionaries extends React.Component {
 		});
 	}
 
+	handleDictionaryRowClick(event, rowData) {
+		subDictFlag = rowData.secondLevelDictionary === 1 ? true : false;
+		this.setState({
+			currentSelectedDictionary : rowData.name,
+			exportFilename: rowData.name
+		})
+		this.getDictionaryElements(rowData.name);
+	}
+
 	render() {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
@@ -509,70 +563,69 @@ export default class ManageDictionaries extends React.Component {
 					<Modal.Title>Manage Dictionaries</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
-					{this.state.currentSelectedDictionary === null ? <MaterialTable
-                        	title={"Dictionary List"}
-                        	data={this.state.dictionaries}
-                        	columns={this.state.dictColumns}
-                        	icons={this.state.tableIcons}
-                        	onRowClick={(event, rowData) => {
-								this.setState({
-									currentSelectedDictionary : rowData.name,
-									exportFilename: rowData.name
-								})
-								this.getDictionaryElements(rowData.name);
-							}}
-                        	options={{
-                            	headerStyle: rowHeaderStyle,
-                        	}}
-                        	editable={{
-                            	onRowAdd: this.addDictionaryRow,
-                            	onRowUpdate: this.updateDictionaryRow,
-                            	onRowDelete: this.deleteDictionaryRow
-							}}
+					{this.state.currentSelectedDictionary === null ?
+						<MaterialTable
+                        				title={"Dictionary List"}
+                        				data={this.state.dictionaries}
+                        				columns={this.state.dictColumns}
+                        				icons={this.state.tableIcons}
+                        				onRowClick={this.handleDictionaryRowClick}
+                        				options={{
+								headerStyle: rowHeaderStyle,
+                        				}}
+                        				editable={!this.readOnly ?
+								{
+									onRowAdd: this.addDictionaryRow,
+									onRowUpdate: this.updateDictionaryRow,
+									onRowDelete: this.deleteDictionaryRow
+								} : undefined }
+						/> : null
+					}
+					{this.state.currentSelectedDictionary !== null ?
+						<MaterialTable
+                        				title={'Dictionary Elements List for ' + (subDictFlag ? 'Sub-Dictionary "' : '"') + this.state.currentSelectedDictionary + '"'}
+                        				data={this.state.dictionaryElements}
+                        				columns={this.state.dictElementColumns}
+                        				icons={this.state.tableIcons}
+                        				options={{
+								exportAllData: true,
+								exportButton: true,
+								exportFileName: this.state.exportFilename,
+								headerStyle:{backgroundColor:'white',  fontSize: '15pt', text: 'bold', border: '1px solid black'}
+                        				}}
+                        				components={{
+								Toolbar: props => (
+									<Row>
+										<Col sm="11">
+											<MTableToolbarStyled {...props} />
+										</Col>
+										<ColPullLeftStyled sm="1">
+											<Tooltip title="Import" placement = "bottom">
+												<IconButton aria-label="import" disabled={this.readOnly} onClick={() => this.fileUpload.click()}>
+													<VerticalAlignTopIcon />
+												</IconButton>
+											</Tooltip>
+                                							<input type="file" ref={(fileUpload) => {this.fileUpload = fileUpload;}}
+												style={{ visibility: 'hidden', width: '1px' }} onChange={this.fileSelectedHandler} />
+										</ColPullLeftStyled>
+									</Row>
+                            					)
+                        				}}
+                        				editable={!this.readOnly ?
+								{
+                            						onRowAdd: this.addDictionaryElementRow,
+                            						onRowUpdate: this.updateDictionaryElementRow,
+                            						onRowDelete: this.deleteDictionaryElementRow
+                        					} : undefined
+							 }
 						/> : null
-                    }
-                    {this.state.currentSelectedDictionary !== null ? <MaterialTable
-                        title={'Dictionary Elements List for "' + this.state.currentSelectedDictionary + '"'}
-                        data={this.state.dictionaryElements}
-                        columns={this.state.dictElementColumns}
-                        icons={this.state.tableIcons}
-                        options={{
-							exportAllData: true,
-                            exportButton: true,
-                            exportFileName: this.state.exportFilename,
-                            headerStyle:{backgroundColor:'white',  fontSize: '15pt', text: 'bold', border: '1px solid black'}
-                        }}
-                        components={{
-                            Toolbar: props => (
-								<Row>
-									<Col sm="11">
-                                    	<MTableToolbarStyled {...props} />
-									</Col>
-									<ColPullLeftStyled sm="1">
-                                        <Tooltip title="Import" placement = "bottom">
-                                        <IconButton aria-label="import" onClick={() => this.fileUpload.click()}>
-                                        	<VerticalAlignTopIcon />
-                                        </IconButton>
-                                        </Tooltip>
-                                		<input type="file" ref={(fileUpload) => {this.fileUpload = fileUpload;}}
-											style={{ visibility: 'hidden', width: '1px' }} onChange={this.fileSelectedHandler} />
-									</ColPullLeftStyled>
-                                </Row>
-                            )
-                        }}
-                        editable={{
-                            onRowAdd: this.addDictionaryElementRow,
-                            onRowUpdate: this.updateDictionaryElementRow,
-                            onRowDelete: this.deleteDictionaryElementRow
-                        }}
-                        /> : null
-                    }
-                    {this.state.currentSelectedDictionary !== null ? <button onClick={this.clickHandler} style={{marginTop: '25px'}}>Go Back to Dictionaries List</button>:""}
-                </Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" type="null" onClick={this.handleClose}>Close</Button>
-                </Modal.Footer>
-            </ModalStyled>
-        );
-    }
+					}
+					{this.state.currentSelectedDictionary !== null ? <button onClick={this.clickHandler} style={{marginTop: '25px'}}>Go Back to Dictionaries List</button>:""}
+				</Modal.Body>
+				<Modal.Footer>
+					<Button variant="secondary" type="null" onClick={this.handleClose}>Close</Button>
+				</Modal.Footer>
+			</ModalStyled>
+		);
+	}
 }
diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
index d1d4aa662..a4c1335d8 100644
--- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
+++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.test.js
@@ -27,7 +27,94 @@ import { render } from 'enzyme';
 import ManageDictionaries from './ManageDictionaries';
 import TemplateMenuService from '../../../api/TemplateService'
 
+const TestDictionaryElements = {
+    name: "test",
+    secondLevelDictionary: 0,
+    subDictionaryType: "", 
+    dictionaryElements: [
+      {
+        shortName: "alertType",
+        name: "Alert Type",
+        description: "Type of Alert",
+        type: "string",
+        subDictionary: "", 
+        createdDate: "2020-06-12T13:58:51.443931Z",
+        updatedDate: "2020-06-13T16:27:57.084870Z",
+        updatedBy: "admin",
+        createdBy: "admin"
+      }
+    ]
+};
+
+const TestDictionaries =
+[
+  {
+    name: "test",
+    secondLevelDictionary: 0,
+    subDictionaryType: "string",
+    dictionaryElements: [ TestDictionaryElements ],
+    createdDate: "2020-06-14T21:00:33.231166Z",
+    updatedDate: "2020-06-14T21:00:33.231166Z",
+    updatedBy: "admin",
+    createdBy: "admin"
+  },
+  {
+    name: "testSub1",
+    secondLevelDictionary: 1,
+    subDictionaryType: "string",
+    dictionaryElements: [
+      {
+        shortName: "subElem",
+        name: "Sub Element",
+        description: "Sub Element Description",
+        type: "string",
+        createdDate: "2020-06-14T21:04:44.402287Z",
+        updatedDate: "2020-06-14T21:04:44.402287Z",
+        updatedBy: "admin",
+        createdBy: "admin"
+      }
+    ],
+    createdDate: "2020-06-14T21:01:16.390250Z",
+    updatedDate: "2020-06-14T21:01:16.390250Z",
+    updatedBy: "admin",
+    createdBy: "admin"
+  }
+];
+
+
+const historyMock = { push: jest.fn() };
+
+let errorMessage = '';
+
+window.alert = jest.fn().mockImplementation((mesg) => { errorMessage = mesg ; return });
+
+TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
+	return Promise.resolve(TestDictionaries);
+});
+
+TemplateMenuService.insDictionary = jest.fn().mockImplementation(() => {
+	return Promise.resolve({ ok: true, status: 200 });
+});
+
+TemplateMenuService.deleteDictionary = jest.fn().mockImplementation(() => {
+	return Promise.resolve("200");
+});
+
+TemplateMenuService.getDictionaryElements = jest.fn().mockImplementation(() => {
+	return Promise.resolve(TestDictionaryElements);
+});
+
+TemplateMenuService.deleteDictionaryElements = jest.fn().mockImplementation(() => {
+	return Promise.resolve("200");
+});
+
+TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
+	return Promise.resolve("200");
+});
+
+
 describe('Verify ManageDictionaries', () => {
+
 	beforeEach(() => {
 		fetch.resetMocks();
 	});
@@ -40,7 +127,7 @@ describe('Verify ManageDictionaries', () => {
 				json: () => {
 					return Promise.resolve({
 						"name": "vtest",
-						"secondLevelDictionary": "1",
+						"secondLevelDictionary": 1,
 						"subDictionaryType": "string",
 						"updatedBy": "test",
 						"updatedDate": "05-07-2019 19:09:42"
@@ -60,7 +147,7 @@ describe('Verify ManageDictionaries', () => {
 				json: () => {
 					return Promise.resolve({
 						"name": "vtest",
-						"secondLevelDictionary": "1",
+						"secondLevelDictionary": 1,
 						"subDictionaryType": "string",
 						"updatedBy": "test",
 						"updatedDate": "05-07-2019 19:09:42"
@@ -71,124 +158,283 @@ describe('Verify ManageDictionaries', () => {
 		const component = shallow(<ManageDictionaries />);
 	});
 
-	it('Test API Rejection', () => {
-		const myMockFunc  = fetch.mockImplementationOnce(() => Promise.reject('error'));
-		setTimeout( () => myMockFunc().catch(e => {
-			console.info(e);
-		}),
-		100
-		);
-		const component = shallow(<ManageDictionaries />);
-		expect(myMockFunc.mock.calls.length).toBe(1);
-	});
-
 	it('Test Table icons', () => {
-		fetch.mockImplementationOnce(() => {
-			return Promise.resolve({
-				ok: true,
-				status: 200,
-				json: () => {
-					return Promise.resolve({
-						"name": "vtest",
-						"secondLevelDictionary": "1",
-						"subDictionaryType": "string",
-						"updatedBy": "test",
-						"updatedDate": "05-07-2019 19:09:42"
-					});
-				}
-			});
-		});
+
 		const component = mount(<ManageDictionaries />);
 		expect(component.find('[className="MuiSelect-icon MuiTablePagination-selectIcon"]')).toBeTruthy();
 	});
 
-	test('Test get dictionaryNames/dictionaryElements, add/delete dictionary functions', async () => {
-		const dictionaries = [
-			{
-				name: "DefaultActors",
-				secondLevelDictionary: 0,
-				subDictionaryType: "",
-				dictionaryElements: [
-      					{
-        					"shortName": "SDNR",
-        					"name": "SDNR Change",
-        					"description": "SDNR component",
-        					"type": "string",
-        					"createdDate": "2020-06-07T18:57:18.130858Z",
-        					"updatedDate": "2020-06-11T13:10:52.239282Z",
-        					"updatedBy": "admin"
-      					}
-    				],
-    				createdDate: "2020-06-07T22:21:08.428742Z",
-    				updatedDate: "2020-06-10T00:41:49.122908Z",
-    				updatedBy: "Not found"
-  			}
-		];
-		const historyMock = { push: jest.fn() };
-		TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
-			return Promise.resolve(dictionaries);
-		});
-		TemplateMenuService.getDictionaryElements = jest.fn().mockImplementation(() => {
-			return Promise.resolve(dictionaries[0]);
-		});
-		TemplateMenuService.insDictionary = jest.fn().mockImplementation(() => {
-			return Promise.resolve(200);
-		});
-		TemplateMenuService.deleteDictionary = jest.fn().mockImplementation(() => {
-			return Promise.resolve(200);
-		});
-		const flushPromises = () => new Promise(setImmediate);
-		const component = shallow(<ManageDictionaries history={historyMock} />)
+	test('Test add/replace and delete dictionary requests', async () => {
+
+		const component = shallow(<ManageDictionaries history={historyMock}/>)
 		const instance = component.instance();
-		instance.getDictionaryElements("DefaultActors");
-		instance.clickHandler();
-		instance.addReplaceDictionaryRequest();
-		instance.deleteDictionaryRequest();
+
+		const flushPromises = () => new Promise(setImmediate);
+
+		instance.addReplaceDictionaryRequest({name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string"});
+		instance.deleteDictionaryRequest("test");
+
 		await flushPromises();
-		expect(component.state('dictionaries')).toEqual(dictionaries);
+
+		expect(component.state('currentSelectedDictionary')).toEqual(null);
+		expect(component.state('dictionaries')).toEqual(TestDictionaries);
 	});
 
-	test('Test adding and deleting dictionaryelements', async () => {
-		const historyMock = { push: jest.fn() };
-		const dictionaries = [
-			{
-				name: "DefaultActors",
-				secondLevelDictionary: 0,
-				subDictionaryType: "",
-				dictionaryElements: [
-      					{
-        					"shortName": "SDNR",
-        					"name": "SDNR Change",
-        					"description": "SDNR component",
-        					"type": "string",
-        					"createdDate": "2020-06-07T18:57:18.130858Z",
-        					"updatedDate": "2020-06-11T13:10:52.239282Z",
-        					"updatedBy": "admin"
-      					}
-    				],
-    				createdDate: "2020-06-07T22:21:08.428742Z",
-    				updatedDate: "2020-06-10T00:41:49.122908Z",
-    				updatedBy: "Not found"
-  			}
-		];
-		TemplateMenuService.getDictionary = jest.fn().mockImplementation(() => {
-			return Promise.resolve(dictionaries);
-		});
-		TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
-			return Promise.resolve(200);
-		});
-		TemplateMenuService.deleteDictionaryElements = jest.fn().mockImplementation(() => {
-			return Promise.resolve(200);
-		});
-		const flushPromises = () => new Promise(setImmediate);
+	test('Test update dictionary row', async () => {
+
 		const component = shallow(<ManageDictionaries history={historyMock}/>)
 		const instance = component.instance();
-		instance.addReplaceDictionaryRequest({ name: "EventDictionary", secondLevelDictionary: "0", subDictionaryType: "string"} );
-		instance.deleteDictionaryRequest('EventDictionary');
-		await flushPromises();
-		expect(component.state('currentSelectedDictionary')).toEqual(null);
+		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+
+		await expect(instance.updateDictionaryRow(rowData, rowData)).resolves.toEqual(undefined);
+
+	}, 2000);
+
+	test('Test add dictionary row', async () => {
+
+		const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype,'addReplaceDictionaryRequest');
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+
+		await instance.addDictionaryRow(rowData);
+                expect(addReplaceRequest).toHaveBeenCalledWith(rowData);
+
+	}, 2000);
+
+	test('Test add dictionary row with errors name already exists', async () => {
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		let  rowData = { name: "test", secondLevelDictionary: 0, subDictionaryType: "" };
+
+		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
+
+	}, 2000);
+
+	test('Test add dictionary row with errors illegal chars in name', async () => {
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
+
+		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
+
+	}, 2000);
+
+	test('Test update dictionary row with errors illegal chars in name', async () => {
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
+
+		await expect(instance.updateDictionaryRow(rowData)).rejects.toEqual(undefined);
+	});
+
+
+	test('Test add dictionary row with errors (illegal chars)', async () => {
+
+		const addReplaceRequest = jest.spyOn(ManageDictionaries.prototype,'addReplaceDictionaryRequest');
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		let  rowData = { name: "test@@", secondLevelDictionary: 0, subDictionaryType: "" };
+
+		await expect(instance.addDictionaryRow(rowData)).rejects.toEqual(undefined);
+
+	}, 2000);
+
+
+	test('Test delete dictionary row', async () => {
+
+		const deleteRequest = jest.spyOn(ManageDictionaries.prototype,'deleteDictionaryRequest');
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+
+		await instance.deleteDictionaryRow(rowData);
+                expect(deleteRequest).toHaveBeenCalledWith("newdict");
+
+	}, 2000);
+
+	test('Test handle select dictionary row click', async () => {
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		const rowData = { name: "newdict", secondLevelDictionary: 0, subDictionaryType: "string" };
+
+		instance.handleDictionaryRowClick("event", rowData);
+		expect(component.state('currentSelectedDictionary')).toEqual("newdict");
+	}, 2000);
+
+	test('Test dictionary element row add, update, delete', async () => {
+
+		const rowData = {
+			createdBy: "admin",
+			createdDate: "2020-06-15T13:59:20.467381Z",
+			description: "Description",
+			name: "Some Elem",
+			shortName: "someElem",
+			type: "string",
+			updatedBy: "admin",
+			updatedDate: "2020-06-15T13:59:20.467381Z"
+		};
+
+		const component = shallow(<ManageDictionaries/>)
+		const instance = component.instance();
+
+		const badRowData = {
+			description: "Description",
+			name: "Some Elem",
+			shortName: "someElem",
+			type: "string"
+		};
+
+                await instance.clickHandler();
+                await instance.getDictionaryElements("test");
+
+		await expect(instance.addDictionaryElementRow(rowData)).resolves.toEqual(undefined);
+		await expect(instance.updateDictionaryElementRow(rowData, rowData)).resolves.toEqual(undefined);
+		await expect(instance.deleteDictionaryElementRow(rowData)).resolves.toEqual(undefined);
+	});
+
+	test('Test dictionary element row add with errors', async () => {
+
+		const badRowData = {
+			description: "",
+			name: "",
+			shortName: "some#Elem",
+			type: ""
+		};
+
+		const component = shallow(<ManageDictionaries/>)
+		const instance = component.instance();
+
+		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
+	});
+
+	test('Test dictionary element update with error illegal name', async () => {
+
+		const badRowData = {
+			description: "",
+			name: "test@@",
+			shortName: "some#Elem",
+			type: ""
+		};
+
+		const component = shallow(<ManageDictionaries/>)
+		const instance = component.instance();
+
+		await expect(instance.updateDictionaryElementRow(badRowData)).rejects.toEqual(undefined);
+	});
+
+	test('Test dictionary element addition with duplicate name error', async () => {
+
+		const badRowData = {
+			description: "description",
+			name: "Alert Type",
+			shortName: "alertType",
+			type: "string"
+		};
+
+		const component = shallow(<ManageDictionaries/>)
+		const instance = component.instance();
+
+		component.setState({ currentSelectedDictionary: 'test' });
+
+		await instance.getDictionaryElements();
+		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
+	});
+
+	test('Test dictionary element addition with empty name error', async () => {
+
+		const badRowData = {
+			description: "description",
+			name: "Alert Type",
+			shortName: "",
+			type: "string"
+		};
+
+		const component = shallow(<ManageDictionaries/>)
+		const instance = component.instance();
+
+		component.setState({ currentSelectedDictionary: 'test' });
+
+		await instance.getDictionaryElements();
+		await expect(instance.addDictionaryElementRow(badRowData)).rejects.toEqual("");
+	});
+
+
+	it('Test Import CSV Sunny Day', async () => {
+
+                TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
+                        return Promise.resolve({ ok: true, status: 200 });
+                });
+
+                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+                rawCsvData += '"alertType","Alert Type","Alert Type Description","string","","admin","2020-06-11T13:56:14.927437Z"';
+
+                let expectedResult = [
+                                {
+                                        description: "Alert Type Description",
+                                        name: "Alert Type",
+                                        shortName: "alertType",
+                                        subDictionary: "",
+                                        type: "string"
+                                }
+		];
+
+		const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype,'updateDictionaryElementsRequest');
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+
+		await expect(instance.importCsvData(rawCsvData)).toEqual('');
+                expect(updateDictionaryElementsRequest).toHaveBeenCalledWith(expectedResult);
+	});
+
+	it('Test Import CSV Mandatory Field Check Errors', () => {
+
+                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+                rawCsvData += '"","","","","","",""';
+
+		// The empty values for all the fields in row 1 of the rawCsvData will trigger a bunch of errors.
+		// Getting Enzyme to properly match them with embedded newlines turned out to be impossible
+		// and maybe not desirable anyway; so our test for "success" here is simply that the
+		// routine returns a non-empty error string.
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+		expect(instance.importCsvData(rawCsvData)).not.toEqual('');
+	});
+
+	it('Test Import CSV Errors in Row Data', async () => {
+
+                TemplateMenuService.insDictionaryElements = jest.fn().mockImplementation(() => {
+                        return Promise.resolve({ ok: true, status: 200 });
+                });
+
+                let rawCsvData = '"Element Short Name","Element Name","Element Description","Element Type","Sub-Dictionary"\n';
+                rawCsvData += '"alert@Type","Alert Type","Alert Type Description","strin","subby","admin","2020-06-11T13:56:14.927437Z"';
+
+                let expectedResult = [
+                                {
+                                        description: "Alert Type Description",
+                                        name: "Alert Type",
+                                        shortName: "alertType",
+                                        subDictionary: "",
+                                        type: "string"
+                                }
+		];
+
+		const updateDictionaryElementsRequest = jest.spyOn(ManageDictionaries.prototype,'updateDictionaryElementsRequest');
+
+		const component = shallow(<ManageDictionaries />)
+		const instance = component.instance();
+
+		await expect(instance.importCsvData(rawCsvData)).not.toEqual('');
 	});
 
+
 	it('Test handleClose', () => {
 		fetch.mockImplementationOnce(() => {
 			return Promise.resolve({
@@ -197,7 +443,7 @@ describe('Verify ManageDictionaries', () => {
 				json: () => {
 					return Promise.resolve({
 						"name": "vtest",
-						"secondLevelDictionary": "1",
+						"secondLevelDictionary": 1,
 						"subDictionaryType": "string",
 						"updatedBy": "test",
 						"updatedDate": "05-07-2019 19:09:42"
@@ -205,7 +451,6 @@ describe('Verify ManageDictionaries', () => {
 				}
 			});
 		});
-		const historyMock = { push: jest.fn() };
 		const handleClose = jest.spyOn(ManageDictionaries.prototype,'handleClose');
 		const component = shallow(<ManageDictionaries history={historyMock} />)
 		component.find('[variant="secondary"]').prop('onClick')();
-- 
cgit 1.2.3-korg


From 14c47dc6bc1bd4632df62fd41b54a8094578d2c7 Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Tue, 14 Jul 2020 09:04:01 -0400
Subject: Support disabling of Loop Instance Properties "Save" button

Issue-ID: CLAMP-895
Change-Id: I0e8fd70b750a59c14bb8e73407c49cc09f1d2657
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
index c0a2084f5..acd0acade 100644
--- a/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
+++ b/ui-react/src/components/dialogs/Loop/LoopPropertiesModal.js
@@ -48,6 +48,7 @@ export default class LoopPropertiesModal extends React.Component {
 		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
 		this.renderAllParameters = this.renderAllParameters.bind(this);
 		this.getDcaeParameters = this.getDcaeParameters.bind(this);
+		this.readOnly = props.readOnly !== undefined ? props.readOnly : false;
 	}
 
 	componentWillReceiveProps(newProps) {
@@ -109,7 +110,7 @@ export default class LoopPropertiesModal extends React.Component {
 					{this.renderAllParameters()}
 				<Modal.Footer>
 					<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
-					<Button variant="primary" type="submit" onClick={this.handleSave}>Save Changes</Button>
+					<Button variant="primary" type="submit" disabled={this.readOnly}  onClick={this.handleSave}>Save Changes</Button>
 				</Modal.Footer>
 			</ModalStyled>
 		);
-- 
cgit 1.2.3-korg


From 083e5a2aefd76bb1fc25bcb5528b7288b059c1c2 Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Wed, 8 Jul 2020 16:48:40 -0400
Subject: block re-use of existing loop name; support derivation of
 SvgGenerator

added changes to LoopUI for global style and support of "delete" CL case

Issue-ID: CLAMP-896
Change-Id: I97f603f38c277011835b8e206e5e05226a296606
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
---
 ui-react/src/LoopUI.js                             | 34 ++++++++++++--
 ui-react/src/api/TemplateService.js                | 17 +++++++
 .../src/components/dialogs/Loop/CreateLoopModal.js | 54 ++++++++++++++++++----
 .../dialogs/Loop/CreateLoopModal.test.js           | 31 ++++++++-----
 .../src/components/dialogs/Loop/OpenLoopModal.js   | 11 ++++-
 .../__snapshots__/CreateLoopModal.test.js.snap     | 25 ++++++++++
 .../dialogs/Tosca/ViewLoopTemplatesModal.js        |  9 +++-
 .../src/components/loop_viewer/svg/SvgGenerator.js | 10 ++--
 8 files changed, 160 insertions(+), 31 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 0ee6e6e24..5491ab187 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -130,6 +130,8 @@ export default class LoopUI extends React.Component {
 		this.setBusyLoading = this.setBusyLoading.bind(this);
 		this.clearBusyLoading = this.clearBusyLoading.bind(this);
 		this.isBusyLoading = this.isBusyLoading.bind(this);
+		this.renderGlobalStyle = this.renderGlobalStyle.bind(this);
+		this.renderSvg = this.renderSvg.bind(this);
 	}
 
 	componentWillMount() {
@@ -198,10 +200,15 @@ export default class LoopUI extends React.Component {
 		);
 	}
 
+	renderSvg() {
+		return (
+			<SvgGenerator loopCache={this.state.loopCache} clickable={true} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE} isBusyLoading={this.isBusyLoading}/>
+		)
+	}
 	renderLoopViewBody() {
 		return (
 			<LoopViewBodyDivStyled>
-				<SvgGenerator loopCache={this.state.loopCache} clickable={true} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE} isBusyLoading={this.isBusyLoading}/>
+				{this.renderSvg()}
 				<LoopStatus loopCache={this.state.loopCache}/>
 				<LoopLogs loopCache={this.state.loopCache} />
 			</LoopViewBodyDivStyled>
@@ -223,10 +230,20 @@ export default class LoopUI extends React.Component {
 	}
 
 	updateLoopCache(loopJson) {
-		this.setState({ loopCache: new LoopCache(loopJson) });
-		this.setState({ loopName: this.state.loopCache.getLoopName() });
+
+		// If call with an empty object for loopJson, this is a reset to empty
+		// from someplace like PerformActions for the case where we are "deleting"
+		// a Control Loop model. Set the loopName to the default.
+
+		if (loopJson === null) {
+			this.setState({ loopName: OnapConstants.defaultLoopName });
+			this.setState({ loopCache: new LoopCache({}) });
+		} else {
+			this.setState({ loopCache: new LoopCache(loopJson) });
+			this.setState({ loopName: this.state.loopCache.getLoopName() });
+		}
 		console.info(this.state.loopName+" loop loaded successfully");
-	}
+        }
 
 	showSucAlert(message) {
 		this.setState ({ showSucAlert: true, showMessage:message });
@@ -369,6 +386,13 @@ export default class LoopUI extends React.Component {
 		);
 	}
 
+        renderGlobalStyle() {
+                return (
+                        <GlobalClampStyle />
+                );
+        };
+
+
 	renderSpinner() {
 		if (this.isBusyLoading()) {
 			return (
@@ -386,7 +410,7 @@ export default class LoopUI extends React.Component {
 	render() {
 		return (
 				<StyledMainDiv id="main_div">
-					<GlobalClampStyle />
+					{this.renderGlobalStyle()}
 					{this.renderRoutes()}
 					{this.renderSpinner()}
 					{this.renderAlertBar()}
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index 3a780dd65..7d8a3400e 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -22,6 +22,23 @@
 
 export default class TemplateService {
 
+        static getLoopNames() {
+                return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
+                        .then(function (response) {
+                                console.debug("getLoopNames response received: ", response.status);
+                                if (response.ok) {
+                                        return response.json();
+                                } else {
+                                        console.error("getLoopNames query failed");
+                                        return {};
+                                }
+                        })
+                        .catch(function (error) {
+                                console.error("getLoopNames error received", error);
+                                return {};
+                        });
+        }
+
 	static getAllLoopTemplates() {
 	    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
 	        .then(function (response) {
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
index a8e8dee1f..5663360a0 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.js
@@ -37,6 +37,10 @@ const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
 
+const ErrMsgStyled = styled.div`
+	color: red;
+`
+
 export default class CreateLoopModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
@@ -46,17 +50,20 @@ export default class CreateLoopModal extends React.Component {
 		this.handleModelName = this.handleModelName.bind(this);
 		this.handleClose = this.handleClose.bind(this);
 		this.handleDropDownListChange = this.handleDropDownListChange.bind(this);
+		this.renderSvg = this.renderSvg.bind(this);
 		this.state = {
 			show: true,
 			chosenTemplateName: '',
+			modelInputErrMsg: '',
 			modelName: '',
 			templateNames: [],
 			fakeLoopCacheWithTemplate: new LoopCache({})
 		};
 	}
 
-	componentWillMount() {
-		this.getAllLoopTemplates();
+	async componentDidMount() {
+		await this.getAllLoopTemplates();
+		await this.getModelNames();
 	}
 
 	handleClose() {
@@ -87,6 +94,17 @@ export default class CreateLoopModal extends React.Component {
 		});
 	}
 
+	getModelNames() {
+		TemplateService.getLoopNames().then(loopNames => {
+			if (!loopNames) {
+				loopNames = [];
+			}
+			// Remove LOOP_ prefix
+			let trimmedLoopNames = loopNames.map(str => str.replace('LOOP_', ''));
+			this.setState({ modelNames: trimmedLoopNames });
+		});
+	}
+
 	handleCreate() {
 		if (!this.state.modelName) {
 			alert("A model name is required");
@@ -109,10 +127,25 @@ export default class CreateLoopModal extends React.Component {
 		});
 	}
 
-	handleModelName = event => {
-		this.setState({
-			modelName: event.target.value
-		})
+	handleModelName(event) {
+		if (this.state.modelNames.includes(event.target.value)) {
+			this.setState({
+				modelInputErrMsg: 'A model named "' + event.target.value + '" already exists. Please pick another name.',
+				modelName: event.target.value
+			});
+			return;
+		} else {
+			this.setState({
+				modelInputErrMsg: '',
+				modelName: event.target.value
+			});
+		}
+	}
+
+	renderSvg() {
+		return (
+			<SvgGenerator loopCache={this.state.fakeLoopCacheWithTemplate} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_TEMPLATE}/>
+		);
 	}
 
 	render() {
@@ -131,15 +164,20 @@ export default class CreateLoopModal extends React.Component {
                     <Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
                     <Form.Label column sm="2">Model Preview:</Form.Label>
                         <Col sm="10">
-                            <SvgGenerator loopCache={this.state.fakeLoopCacheWithTemplate} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_TEMPLATE}/>
+                            {this.renderSvg()}
                         </Col>
                     </Form.Group>
 					<Form.Group as={Row} controlId="formPlaintextEmail">
 						<Form.Label column sm="2">Model Name:</Form.Label>
-						<input type="text" style={{width: '50%', marginLeft: '1em' }}
+						<input sm="5" type="text" style={{width: '50%', marginLeft: '1em' }}
 							value={this.state.modelName}
 							onChange={this.handleModelName}
 						/>
+						<span sm="5"/>
+					</Form.Group>
+					<Form.Group as={Row} controlId="formPlaintextEmail">
+						<Form.Label column sm="2"> </Form.Label>
+						<ErrMsgStyled>{this.state.modelInputErrMsg}</ErrMsgStyled>
 					</Form.Group>
 				</Modal.Body>
 				<Modal.Footer>
diff --git a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js b/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
index 5b6ea9e62..1caa22dc7 100644
--- a/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
+++ b/ui-react/src/components/dialogs/Loop/CreateLoopModal.test.js
@@ -29,16 +29,18 @@ import TemplateService from '../../../api/TemplateService';
 describe('Verify CreateLoopModal', () => {
 
   it('Test the render method', async () => {
-	const flushPromises = () => new Promise(setImmediate);
+    const flushPromises = () => new Promise(setImmediate);
     TemplateService.getAllLoopTemplates = jest.fn().mockImplementation(() => {
-    	return Promise.resolve([{"name":"template1"},{"name":"template2"}]);
-	});
-	
-	const component = shallow(<CreateLoopModal/>);
+      return Promise.resolve([{"name":"template1"},{"name":"template2"}]);
+    });
+    TemplateService.getLoopNames = jest.fn().mockImplementation(() => {
+      return Promise.resolve([]);
+    });
+
+    const component = shallow(<CreateLoopModal/>);
     expect(component).toMatchSnapshot();
-	await flushPromises();
-	component.update();
-		
+    await flushPromises();
+    component.update();
     expect(component.state('templateNames')).toStrictEqual([{"label": "template1", "value": "template1", "templateObject": {"name": "template1"}}, {"label": "template2", "value": "template2","templateObject": {"name": "template2"}}]);
   });
 
@@ -61,17 +63,22 @@ describe('Verify CreateLoopModal', () => {
     expect(component.state('fakeLoopCacheWithTemplate').getLoopName()).toEqual("fakeLoop");
   });
 
-
-
-  it('handleModelName event', () => {
+  it('handleModelName event', async () => {
+    const flushPromises = () => new Promise(setImmediate);
+    TemplateService.getAllLoopTemplates = jest.fn().mockImplementation(() => {
+      return Promise.resolve([{"name":"template1"},{"name":"template2"}]);
+    });
+    TemplateService.getLoopNames = jest.fn().mockImplementation(() => {
+      return Promise.resolve([]);
+    });
     const event = {target: {value : "model1"} };
     const component = shallow(<CreateLoopModal/>);
+    await flushPromises();
     component.find('input').simulate('change', event);
     component.update();
     expect(component.state('modelName')).toEqual("model1");
   });
 
-
   it('Test handleClose', () => {
     const historyMock = { push: jest.fn() }; 
     const handleClose = jest.spyOn(CreateLoopModal.prototype,'handleClose');
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index 7ca90b493..b45df6502 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -48,7 +48,8 @@ export default class OpenLoopModal extends React.Component {
 		this.handleOpen = this.handleOpen.bind(this);
 		this.handleClose = this.handleClose.bind(this);
 		this.handleDropDownListChange = this.handleDropDownListChange.bind(this);
-		this.showReadOnly = props.showReadOnly ? props.showReadOnly : true;
+		this.renderSvg = this.renderSvg.bind(this);
+		this.showReadOnly = props.showReadOnly !== undefined ? props.showReadOnly : true;
 		this.state = {
 			show: true,
 			chosenLoopName: '',
@@ -90,6 +91,12 @@ export default class OpenLoopModal extends React.Component {
 		this.props.loadLoopFunction(this.state.chosenLoopName);
 	}
 
+	renderSvg() {
+		return(
+				<SvgGenerator loopCache={this.state.loopCacheOpened} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE}/>
+		);
+	}
+
 	render() {
 		return (
 			<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
@@ -107,7 +114,7 @@ export default class OpenLoopModal extends React.Component {
 					<Form.Group as={Row} style={{alignItems: 'center'}} controlId="formSvgPreview">
 						<Form.Label column sm="2">Model Preview:</Form.Label>
 						<Col sm="10">
-						    <SvgGenerator loopCache={this.state.loopCacheOpened} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_INSTANCE}/>
+						    {this.renderSvg()}
 						</Col>
 					</Form.Group>
 					{this.showReadOnly === true ?
diff --git a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap b/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
index e69b809c7..b05781641 100644
--- a/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Loop/__snapshots__/CreateLoopModal.test.js.snap
@@ -107,6 +107,7 @@ exports[`Verify CreateLoopModal Test the render method 1`] = `
       </FormLabel>
       <input
         onChange={[Function]}
+        sm="5"
         style={
           Object {
             "marginLeft": "1em",
@@ -116,6 +117,30 @@ exports[`Verify CreateLoopModal Test the render method 1`] = `
         type="text"
         value=""
       />
+      <span
+        sm="5"
+      />
+    </FormGroup>
+    <FormGroup
+      as={
+        Object {
+          "$$typeof": Symbol(react.forward_ref),
+          "defaultProps": Object {
+            "noGutters": false,
+          },
+          "render": [Function],
+        }
+      }
+      controlId="formPlaintextEmail"
+    >
+      <FormLabel
+        column={true}
+        sm="2"
+        srOnly={false}
+      >
+         
+      </FormLabel>
+      <styled.div />
     </FormGroup>
   </ModalBody>
   <ModalFooter>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index 962ab4bda..10473944f 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -92,6 +92,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
 	constructor(props, context) {
 		super(props, context);
 		this.handleClose = this.handleClose.bind(this);
+		this.renderSvg = this.renderSvg.bind(this);
 		this.getLoopTemplate = this.getLoopTemplate.bind(this);
 		this.getAllLoopTemplates();
 	}
@@ -120,6 +121,12 @@ export default class ViewLoopTemplatesModal extends React.Component {
 		this.props.history.push('/')
 	}
 
+	renderSvg() {
+		return(
+			<SvgGenerator loopCache={this.state.fakeLoopCacheWithTemplate} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_TEMPLATE}/>
+		)
+	}
+
 	render() {
     return (
     		<ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static"  keyboard={false}>
@@ -139,7 +146,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
                           })
                       }}
                 />
-	            <SvgGenerator loopCache={this.state.fakeLoopCacheWithTemplate} clickable={false} generatedFrom={SvgGenerator.GENERATED_FROM_TEMPLATE}/>
+	            {this.renderSvg()}
                 </Modal.Body>
                 <Modal.Footer>
                 	<Button variant="secondary" onClick={this.handleClose}>Close</Button>
diff --git a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js b/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
index 7070455e7..f5f5047ba 100644
--- a/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
+++ b/ui-react/src/components/loop_viewer/svg/SvgGenerator.js
@@ -28,11 +28,12 @@ import OnapConstant from '../../../utils/OnapConstants';
 
 const DivStyled = styled.div`
 	overflow-x: scroll;
+	  display: flex;
     width: 100%;
     height: 100%;
 `
 
-const emptySvg = (<svg> <text x="20" y="40">No LOOP (SVG)</text> </svg>);
+const emptySvg = (<svg> <text x="60" y="40">No LOOP (SVG)</text> </svg>);
 
 class SvgGenerator extends React.Component {
     boxWidth = 200;
@@ -228,11 +229,14 @@ class SvgGenerator extends React.Component {
     render() {
         var allTheElements = this.renderSvg();
         var svgWidth = this.boxWidth*allTheElements.length;
-        var svgHeight = this.boxHeight+100;
+        var svgHeight = this.boxHeight+50;
         return (
+
             <DivStyled onClick={this.handleSvgClick} >
-                <svg height={svgHeight} width={svgWidth}  preserveAspectRatio="none">
+                <svg height={svgHeight} width={svgWidth}  viewBox="0,0,{svgWidth},{svgHeight}" preserveAspectRatio="none">
+									<svg x="-50" y="25">
                     {allTheElements}
+									</svg>
                 </svg>
             </DivStyled>
         );
-- 
cgit 1.2.3-korg


From db90efcaf3cb809af254f8029b480baf062c1e1f Mon Sep 17 00:00:00 2001
From: Ted Humphrey <Thomas.Humphrey@att.com>
Date: Wed, 29 Jul 2020 18:59:12 -0400
Subject: change -1 to No Limit in View All Templates for # Instances Allowed

Issue-ID: CLAMP-912
Signed-off-by: Ted Humphrey <Thomas.Humphrey@att.com>
Change-Id: I3d7732ae741bd3ab0766fc022e8920af2a08e9af
---
 ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index 10473944f..eb6e70f3d 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -99,7 +99,13 @@ export default class ViewLoopTemplatesModal extends React.Component {
 
 	getAllLoopTemplates() {
 		TemplateService.getAllLoopTemplates().then(templatesData => {
-		    this.setState({ loopTemplatesData: templatesData })
+			// replace -1 in maximumInstancesAllowed with more meaningful 'No Limit'
+			for (let item in templatesData) {
+				if (templatesData[item].maximumInstancesAllowed === -1) {
+					templatesData[item].maximumInstancesAllowed = 'No Limit';
+				}
+			} 
+			this.setState({ loopTemplatesData: templatesData })
 		});
 	}
 
-- 
cgit 1.2.3-korg


From e673a058c995392b3ad6cbab91a9571bed29a57b Mon Sep 17 00:00:00 2001
From: Ashwin Sharma <ashwin.shyam.sharma@att.com>
Date: Thu, 30 Jul 2020 16:05:02 +0000
Subject: Clamp react ui to use url pathname dynamically instead of hardcoded
 prefix for calling apis

Issue-ID: CLAMP-914
Signed-off-by: Ashwin Sharma <ashwin.shyam.sharma@att.com>
Change-Id: I266aeafe9a543e95bcb96fcab6437227c148f8c4
---
 ui-react/src/api/LoopActionService.js  |  4 ++--
 ui-react/src/api/LoopService.js        | 20 ++++++++++----------
 ui-react/src/api/PolicyToscaService.js | 10 +++++-----
 ui-react/src/api/TemplateService.js    | 16 ++++++++--------
 ui-react/src/api/UserService.js        |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'ui-react/src')

diff --git a/ui-react/src/api/LoopActionService.js b/ui-react/src/api/LoopActionService.js
index 7cea3ff9f..bff812a2f 100644
--- a/ui-react/src/api/LoopActionService.js
+++ b/ui-react/src/api/LoopActionService.js
@@ -26,7 +26,7 @@ export default class LoopActionService{
 	static performAction(cl_name, uiAction) {
 		console.info("LoopActionService perform action: " + uiAction + " closedloopName=" + cl_name);
 		const svcAction = uiAction.toLowerCase();
- 		return fetch("/restservices/clds/v2/loop/" + svcAction + "/" + cl_name, {
+ 		return fetch(window.location.pathname + "restservices/clds/v2/loop/" + svcAction + "/" + cl_name, {
  				method: 'PUT',
  				credentials: 'same-origin'
  			})
@@ -51,7 +51,7 @@ export default class LoopActionService{
 	static refreshStatus(cl_name) {
 		console.info("Refresh the status for closedloopName=" + cl_name);
 
-		return fetch("/restservices/clds/v2/loop/getstatus/" + cl_name, {
+		return fetch(window.location.pathname + "restservices/clds/v2/loop/getstatus/" + cl_name, {
 			method: 'GET',
 			credentials: 'same-origin'
 		})
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index c45df6c61..96bb8a0a7 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -22,7 +22,7 @@
 
 export default class LoopService {
 	static getLoopNames() {
-		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
 			.then(function (response) {
 				console.debug("GetLoopNames response received: ", response.status);
 				if (response.ok) {
@@ -39,7 +39,7 @@ export default class LoopService {
 	}
 
 	static createLoop(loopName, templateName) {
-		return fetch('/restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, {
 			method: 'POST',
 			headers: {
 				"Content-Type": "application/json"
@@ -57,7 +57,7 @@ export default class LoopService {
 	}
 
 	static getLoop(loopName) {
-		return fetch('/restservices/clds/v2/loop/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/' + loopName, {
 			method: 'GET',
 			headers: {
 				"Content-Type": "application/json"
@@ -80,7 +80,7 @@ export default class LoopService {
 	}
 
 	static setMicroServiceProperties(loopName, jsonData) {
-		return fetch('/restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
@@ -104,7 +104,7 @@ export default class LoopService {
 	}
 	
 	static setOperationalPolicyProperties(loopName, jsonData) {
-		return fetch('/restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
@@ -128,7 +128,7 @@ export default class LoopService {
 	}
 
 	static updateGlobalProperties(loopName, jsonData) {
-		return fetch('/restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
@@ -152,7 +152,7 @@ export default class LoopService {
 	}
 
 	static refreshOperationalPolicyJson(loopName,operationalPolicyName) {
-		return fetch('/restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
@@ -175,7 +175,7 @@ export default class LoopService {
 	}
 
 		static refreshMicroServicePolicyJson(loopName,microServicePolicyName) {
-    		return fetch('/restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, {
+    		return fetch(window.location.pathname + 'restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, {
     			method: 'PUT',
     			headers: {
     				"Content-Type": "application/json"
@@ -198,7 +198,7 @@ export default class LoopService {
     }
 
 	static addOperationalPolicyType(loopName, policyType, policyVersion) {
-		return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
@@ -220,7 +220,7 @@ export default class LoopService {
 	}
 
 	static removeOperationalPolicyType(loopName, policyType, policyVersion, policyName) {
-		return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
diff --git a/ui-react/src/api/PolicyToscaService.js b/ui-react/src/api/PolicyToscaService.js
index 610a11418..a7bc140b6 100644
--- a/ui-react/src/api/PolicyToscaService.js
+++ b/ui-react/src/api/PolicyToscaService.js
@@ -22,7 +22,7 @@
 
 export default class PolicyToscaService {
   static getToscaPolicyModels() {
-    return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
+    return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
       .then(function (response) {
         console.debug("getToscaPolicyModels response received: ", response.status);
         if (response.ok) {
@@ -39,7 +39,7 @@ export default class PolicyToscaService {
   }
 
   static getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
-		return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType + "/" + policyModelVersion, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/yaml/' + policyModelType + "/" + policyModelVersion, {
 			method: 'GET',
 			credentials: 'same-origin'
 		})
@@ -59,7 +59,7 @@ export default class PolicyToscaService {
  }
 
  static getToscaPolicyModel(policyModelType, policyModelVersion) {
- 		return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + "/" + policyModelVersion, {
+ 		return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/' + policyModelType + "/" + policyModelVersion, {
  			method: 'GET',
  			credentials: 'same-origin'
  		})
@@ -79,7 +79,7 @@ export default class PolicyToscaService {
   }
 
   static createPolicyModelFromToscaModel(jsonData) {
-       return fetch('/restservices/clds/v2/policyToscaModels', {
+       return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels', {
            method: 'POST',
            credentials: 'same-origin',
            headers: {
@@ -107,7 +107,7 @@ export default class PolicyToscaService {
      }
 
      static updatePolicyModelTosca(policyModelType, policyModelVersion, jsonData) {
-         return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, {
+         return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, {
              method: 'PUT',
              credentials: 'same-origin',
              headers: {
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
index 7d8a3400e..08436f2b8 100644
--- a/ui-react/src/api/TemplateService.js
+++ b/ui-react/src/api/TemplateService.js
@@ -23,7 +23,7 @@
 export default class TemplateService {
 
         static getLoopNames() {
-                return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
+                return fetch(window.location.pathname + 'restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
                         .then(function (response) {
                                 console.debug("getLoopNames response received: ", response.status);
                                 if (response.ok) {
@@ -40,7 +40,7 @@ export default class TemplateService {
         }
 
 	static getAllLoopTemplates() {
-	    return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
+	    return fetch(window.location.pathname + 'restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
 	        .then(function (response) {
 	            console.debug("getAllLoopTemplates response received: ", response.status);
 	            if (response.ok) {
@@ -57,7 +57,7 @@ export default class TemplateService {
 	    }
 
 	static getDictionary() {
-	    return fetch('restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', })
+	    return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/', { method: 'GET', credentials: 'same-origin', })
 	      .then(function (response) {
 	        console.debug("getDictionary response received: ", response.status);
 	        if (response.ok) {
@@ -74,7 +74,7 @@ export default class TemplateService {
 	  }
 
 	  static getDictionaryElements(dictionaryName) {
-	    return fetch('restservices/clds/v2/dictionary/' + dictionaryName, {
+	    return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + dictionaryName, {
 	      method: 'GET',
 	      headers: {
 	        "Content-Type": "application/json",
@@ -98,7 +98,7 @@ export default class TemplateService {
 
 	  static insDictionary(jsonData) {
 	    console.log("dictionaryName is", jsonData.name)
-	    return fetch('/restservices/clds/v2/dictionary/', {
+	    return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/', {
 	      method: 'PUT',
 	      credentials: 'same-origin',
 	      headers: {
@@ -124,7 +124,7 @@ export default class TemplateService {
 
 	  static insDictionaryElements(jsonData) {
 	    console.log("dictionaryName is", jsonData.name)
-	    return fetch('/restservices/clds/v2/dictionary/' + jsonData.name, {
+	    return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + jsonData.name, {
 	      method: 'PUT',
 	      credentials: 'same-origin',
 	      headers: {
@@ -150,7 +150,7 @@ export default class TemplateService {
 
 	  static deleteDictionary(dictionaryName) {
 	    console.log("inside templaemenu service", dictionaryName)
-	    return fetch('restservices/clds/v2/dictionary/' + dictionaryName, {
+	    return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + dictionaryName, {
 	      method: 'DELETE',
 	      headers: {
 	        "Content-Type": "application/json",
@@ -173,7 +173,7 @@ export default class TemplateService {
 	  }
 
 	  static deleteDictionaryElements(dictionaryData) {
-	    return fetch('restservices/clds/v2/dictionary/' + dictionaryData.name + '/elements/' + dictionaryData.shortName , {
+	    return fetch(window.location.pathname + 'restservices/clds/v2/dictionary/' + dictionaryData.name + '/elements/' + dictionaryData.shortName , {
 	      method: 'DELETE',
 	      headers: {
 	        "Content-Type": "application/json",
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 477ca4269..5fb4aa6b4 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -24,7 +24,7 @@
 export default class UserService {
 	static notLoggedUserName='Anonymous';
 	static login() {
-		return fetch('/restservices/clds/v1/user/getUser', {
+		return fetch(window.location.pathname + 'restservices/clds/v1/user/getUser', {
 				method: 'GET',
 				credentials: 'same-origin'
 			})
@@ -49,7 +49,7 @@ export default class UserService {
 	}
 
 	static getUserInfo() {
-		return fetch('/restservices/clds/v2/clampInformation', {
+		return fetch(window.location.pathname + 'restservices/clds/v2/clampInformation', {
 				method: 'GET',
 				credentials: 'same-origin'
 			})
-- 
cgit 1.2.3-korg